Browse Source

[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>
tags/v1.20.1
Michael Brown 13 years ago
parent
commit
57e65d2c4d
1 changed files with 6 additions and 5 deletions
  1. 6
    5
      src/Makefile.housekeeping

+ 6
- 5
src/Makefile.housekeeping View File

601
 # This is needed in order to correctly rebuild embedded.o whenever the
601
 # This is needed in order to correctly rebuild embedded.o whenever the
602
 # list of objects changes.
602
 # list of objects changes.
603
 #
603
 #
604
+EMBED		:= $(EMBEDDED_IMAGE) # Maintain backwards compatibility
604
 EMBEDDED_LIST	:= $(BIN)/.embedded.list
605
 EMBEDDED_LIST	:= $(BIN)/.embedded.list
605
 ifeq ($(wildcard $(EMBEDDED_LIST)),)
606
 ifeq ($(wildcard $(EMBEDDED_LIST)),)
606
-EMBEDDED_IMAGE_OLD := <invalid>
607
+EMBED_OLD := <invalid>
607
 else
608
 else
608
-EMBEDDED_IMAGE_OLD := $(shell cat $(EMBEDDED_LIST))
609
+EMBED_OLD := $(shell cat $(EMBEDDED_LIST))
609
 endif
610
 endif
610
-ifneq ($(EMBEDDED_IMAGE_OLD),$(EMBEDDED_IMAGE))
611
-$(shell $(ECHO) "$(EMBEDDED_IMAGE)" > $(EMBEDDED_LIST))
611
+ifneq ($(EMBED_OLD),$(EMBED))
612
+$(shell $(ECHO) "$(EMBED)" > $(EMBEDDED_LIST))
612
 endif
613
 endif
613
 
614
 
614
 $(EMBEDDED_LIST) :
615
 $(EMBEDDED_LIST) :
615
 
616
 
616
 VERYCLEANUP	+= $(EMBEDDED_LIST)
617
 VERYCLEANUP	+= $(EMBEDDED_LIST)
617
 
618
 
618
-EMBEDDED_FILES	:= $(subst $(COMMA), ,$(EMBEDDED_IMAGE))
619
+EMBEDDED_FILES	:= $(subst $(COMMA), ,$(EMBED))
619
 EMBED_ALL	:= $(foreach i,$(call seq,1,$(words $(EMBEDDED_FILES))),\
620
 EMBED_ALL	:= $(foreach i,$(call seq,1,$(words $(EMBEDDED_FILES))),\
620
 		     EMBED ( $(i), \"$(word $(i), $(EMBEDDED_FILES))\",\
621
 		     EMBED ( $(i), \"$(word $(i), $(EMBEDDED_FILES))\",\
621
 			     \"$(notdir $(word $(i),$(EMBEDDED_FILES)))\" ))
622
 			     \"$(notdir $(word $(i),$(EMBEDDED_FILES)))\" ))

Loading…
Cancel
Save