diff options
| author | Michael Brown | 2011-04-28 12:56:27 +0200 |
|---|---|---|
| committer | Michael Brown | 2011-04-28 12:56:27 +0200 |
| commit | 57e65d2c4d76beecc461c8785d781a254646eae0 (patch) | |
| tree | a8fc23703694213ec78d3f3368bea4d5108cefe3 /src/Makefile.housekeeping | |
| parent | [int13] Add support for INT 13,4b (diff) | |
| download | ipxe-57e65d2c4d76beecc461c8785d781a254646eae0.tar.gz ipxe-57e65d2c4d76beecc461c8785d781a254646eae0.tar.xz ipxe-57e65d2c4d76beecc461c8785d781a254646eae0.zip | |
[build] Accept EMBED=... as a synonym for EMBEDDED_IMAGE=...
Make the build command line less cumbersome by accepting
make DEBUG=int13 EMBED=test.ipxe
rather then
make DEBUG=int13 EMBEDDED_IMAGE=test.ipxe
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/Makefile.housekeeping')
| -rw-r--r-- | src/Makefile.housekeeping | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping index b05aedd6..06f9e7ae 100644 --- a/src/Makefile.housekeeping +++ b/src/Makefile.housekeeping @@ -601,21 +601,22 @@ roms : # This is needed in order to correctly rebuild embedded.o whenever the # list of objects changes. # +EMBED := $(EMBEDDED_IMAGE) # Maintain backwards compatibility EMBEDDED_LIST := $(BIN)/.embedded.list ifeq ($(wildcard $(EMBEDDED_LIST)),) -EMBEDDED_IMAGE_OLD := <invalid> +EMBED_OLD := <invalid> else -EMBEDDED_IMAGE_OLD := $(shell cat $(EMBEDDED_LIST)) +EMBED_OLD := $(shell cat $(EMBEDDED_LIST)) endif -ifneq ($(EMBEDDED_IMAGE_OLD),$(EMBEDDED_IMAGE)) -$(shell $(ECHO) "$(EMBEDDED_IMAGE)" > $(EMBEDDED_LIST)) +ifneq ($(EMBED_OLD),$(EMBED)) +$(shell $(ECHO) "$(EMBED)" > $(EMBEDDED_LIST)) endif $(EMBEDDED_LIST) : VERYCLEANUP += $(EMBEDDED_LIST) -EMBEDDED_FILES := $(subst $(COMMA), ,$(EMBEDDED_IMAGE)) +EMBEDDED_FILES := $(subst $(COMMA), ,$(EMBED)) EMBED_ALL := $(foreach i,$(call seq,1,$(words $(EMBEDDED_FILES))),\ EMBED ( $(i), \"$(word $(i), $(EMBEDDED_FILES))\",\ \"$(notdir $(word $(i),$(EMBEDDED_FILES)))\" )) |