diff options
| author | Michael Brown | 2007-01-18 20:00:09 +0100 |
|---|---|---|
| committer | Michael Brown | 2007-01-18 20:00:09 +0100 |
| commit | 37f1b1258784add1ea9ebec6a99aa07711908a13 (patch) | |
| tree | 8c57d74dbdf3e351cdd4b178d7c59f12c2a78c8b /src | |
| parent | Declaring the CPU architecture in the middle of an assembly file is (diff) | |
| download | ipxe-37f1b1258784add1ea9ebec6a99aa07711908a13.tar.gz ipxe-37f1b1258784add1ea9ebec6a99aa07711908a13.tar.xz ipxe-37f1b1258784add1ea9ebec6a99aa07711908a13.zip | |
Allow truly arbitrary debug levels to be specified via DEBUG=
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/Makefile.housekeeping | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index c75e95b1e..7c8af3fd1 100644 --- 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 7c3c4bbf6..497e69e7d 100644 --- 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))) |