From 57e65d2c4d76beecc461c8785d781a254646eae0 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 28 Apr 2011 11:56:27 +0100 Subject: [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 --- src/Makefile.housekeeping | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/Makefile.housekeeping') 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 := +EMBED_OLD := 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)))\" )) -- cgit v1.2.3-55-g7522