Allow truly arbitrary debug levels to be specified via DEBUG=

diff --git a/src/Makefile b/src/Makefile
index c75e95b1e0db749bb111558cf590ce03f904f984..7c8af3fd18134e69541701d3dc040a5e20e7737a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -116,8 +116,7 @@ $(BIN)/%.flags :
 #
 COMPILE_c      = $(CC) $(CFLAGS) $(CFLAGS_c) $(OBJ_CFLAGS)
 RULE_c         = $(COMPILE_c) -c $< -o $@
-RULE_c_to_dbg.o        = $(COMPILE_c) -Ddebug_$(OBJECT) -c $< -o $@
-RULE_c_to_dbg2.o = $(COMPILE_c) -Ddebug_$(OBJECT)=2 -c $< -o $@
+RULE_c_to_dbg%.o = $(COMPILE_c) -Ddebug_$(OBJECT)=$* -c $< -o $@
 RULE_c_to_c    = $(COMPILE_c) -E -c $< > $@
 RULE_c_to_s    = $(COMPILE_c) -S -g0 -c $< -o $@ 
 
@@ -126,7 +125,7 @@ ASSEMBLE_S  = $(AS) $(ASFLAGS)
 RULE_S         = $(PREPROCESS_S) $< | $(ASSEMBLE_S) -o $@
 RULE_S_to_s    = $(PREPROCESS_S) $< > $@
 
-DEBUG_TARGETS  += dbg2.o dbg.o c s
+DEBUG_TARGETS  += dbg%.o c s
 
 # SRCDIRS lists all directories containing source files.
 #

diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 7c3c4bbf6ecdcdf77884a0aab75f4c2aa68a29ea..497e69e7de3a448fd8277fb7171953af065c58f8 100644 (file)
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -226,7 +226,8 @@ TGT_MAKEROM_FLAGS = $(strip $(MAKEROM_FLAGS_$(TGT_ROM_NAME)) \
 #
 COMMA          := ,
 DEBUG_LIST     = $(subst $(COMMA), ,$(DEBUG))
-DEBUG_OBJ_BASE = $(word 1,$(subst :, ,$(1))).dbg$(word 2,$(subst :, ,$(1)))
+DEBUG_OBJ_LEVEL        = $(firstword $(word 2,$(subst :, ,$(1))) 1)
+DEBUG_OBJ_BASE = $(word 1,$(subst :, ,$(1))).dbg$(call DEBUG_OBJ_LEVEL,$(1))
 DEBUG_OBJ      = $(BIN)/$(call DEBUG_OBJ_BASE,$(1)).o
 DEBUG_ORIG_OBJ = $(BIN)/$(word 1,$(subst :, ,$(1))).o
 DEBUG_OBJS     = $(foreach D,$(DEBUG_LIST),$(call DEBUG_OBJ,$(D)))