[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>
This commit is contained in:
parent
d75d6f65aa
commit
57e65d2c4d
@ -601,21 +601,22 @@ roms :
|
|||||||
# This is needed in order to correctly rebuild embedded.o whenever the
|
# This is needed in order to correctly rebuild embedded.o whenever the
|
||||||
# list of objects changes.
|
# list of objects changes.
|
||||||
#
|
#
|
||||||
|
EMBED := $(EMBEDDED_IMAGE) # Maintain backwards compatibility
|
||||||
EMBEDDED_LIST := $(BIN)/.embedded.list
|
EMBEDDED_LIST := $(BIN)/.embedded.list
|
||||||
ifeq ($(wildcard $(EMBEDDED_LIST)),)
|
ifeq ($(wildcard $(EMBEDDED_LIST)),)
|
||||||
EMBEDDED_IMAGE_OLD := <invalid>
|
EMBED_OLD := <invalid>
|
||||||
else
|
else
|
||||||
EMBEDDED_IMAGE_OLD := $(shell cat $(EMBEDDED_LIST))
|
EMBED_OLD := $(shell cat $(EMBEDDED_LIST))
|
||||||
endif
|
endif
|
||||||
ifneq ($(EMBEDDED_IMAGE_OLD),$(EMBEDDED_IMAGE))
|
ifneq ($(EMBED_OLD),$(EMBED))
|
||||||
$(shell $(ECHO) "$(EMBEDDED_IMAGE)" > $(EMBEDDED_LIST))
|
$(shell $(ECHO) "$(EMBED)" > $(EMBEDDED_LIST))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(EMBEDDED_LIST) :
|
$(EMBEDDED_LIST) :
|
||||||
|
|
||||||
VERYCLEANUP += $(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_ALL := $(foreach i,$(call seq,1,$(words $(EMBEDDED_FILES))),\
|
||||||
EMBED ( $(i), \"$(word $(i), $(EMBEDDED_FILES))\",\
|
EMBED ( $(i), \"$(word $(i), $(EMBEDDED_FILES))\",\
|
||||||
\"$(notdir $(word $(i),$(EMBEDDED_FILES)))\" ))
|
\"$(notdir $(word $(i),$(EMBEDDED_FILES)))\" ))
|
||||||
|
Reference in New Issue
Block a user