diff options
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | com32/Makefile | 2 | ||||
| -rw-r--r-- | diag/Makefile | 2 | ||||
| -rw-r--r-- | tests/Makefile | 6 |
4 files changed, 14 insertions, 13 deletions
@@ -102,7 +102,8 @@ endif .PHONY: $(filter-out $(private-targets), $(MAKECMDGOALS)) $(filter-out $(private-targets), $(MAKECMDGOALS)): $(MAKE) -C $(OBJDIR) -f $(CURDIR)/Makefile SRC="$(topdir)" \ - OBJ=$(OBJDIR) objdir=$(OBJDIR) $(MAKECMDGOALS) + OBJ=$(OBJDIR) objdir=$(OBJDIR) EFI_BUILD=$(EFI_BUILD) \ + $(MAKECMDGOALS) unittest: printf "Executing unit tests\n" @@ -111,7 +112,7 @@ unittest: regression: $(MAKE) -C tests SRC="$(topdir)/tests" OBJ="$(topdir)/tests" \ - objdir=$(OBJDIR) \ + objdir=$(OBJDIR) EFI_BUILD=$(EFI_BUILD) \ -f $(topdir)/tests/Makefile all test: unittest regression @@ -284,17 +285,17 @@ subdirs: $(BSUBDIRS) $(ISUBDIRS) $(sort $(ISUBDIRS) $(BSUBDIRS)): @mkdir -p $@ - $(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" \ + $(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" EFI_BUILD=$(EFI_BUILD) \ -f $(SRC)/$@/Makefile $(MAKECMDGOALS) $(ITARGET): @mkdir -p $@ - $(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" \ + $(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" EFI_BUILD=$(EFI_BUILD) \ -f $(SRC)/$@/Makefile $(MAKECMDGOALS) $(BINFILES): @mkdir -p $@ - $(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" \ + $(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" EFI_BUILD=$(EFI_BUILD) \ -f $(SRC)/$@/Makefile $(MAKECMDGOALS) # @@ -309,7 +310,7 @@ gpxe: core installer: installer-local set -e; for i in $(ISUBDIRS); \ do $(MAKE) -C $$i SRC="$(SRC)/$$i" OBJ="$(OBJ)/$$i" \ - -f $(SRC)/$$i/Makefile all; done + EFI_BUILD=$(EFI_BUILD) -f $(SRC)/$$i/Makefile all; done installer-local: $(ITARGET) $(BINFILES) @@ -317,7 +318,7 @@ installer-local: $(ITARGET) $(BINFILES) strip: strip-local set -e; for i in $(ISUBDIRS); \ do $(MAKE) -C $$i SRC="$(SRC)/$$i" OBJ="$(OBJ)/$$i" \ - -f $(SRC)/$$i/Makefile strip; done + EFI_BUILD=$(EFI_BUILD) -f $(SRC)/$$i/Makefile strip; done -ls -l $(BOBJECTS) $(IOBJECTS) strip-local: @@ -355,7 +356,7 @@ install: set -e ; for i in $(INSTALLSUBDIRS) ; \ do $(MAKE) -C $$i SRC="$(SRC)/$$i" OBJ="$(OBJ)/$$i" \ BITS="$(BITS)" AUXDIR="$(AUXDIR)/efi$(BITS)" \ - -f $(SRC)/$$i/Makefile $@; done + EFI_BUILD=$(EFI_BUILD) -f $(SRC)/$$i/Makefile $@; done -install -m 644 $(INSTALLABLE_MODULES) $(INSTALLROOT)$(AUXDIR)/efi$(BITS) install -m 644 com32/elflink/ldlinux/$(LDLINUX) $(INSTALLROOT)$(AUXDIR)/efi$(BITS) endif diff --git a/com32/Makefile b/com32/Makefile index 5efda1ce..3e7a7700 100644 --- a/com32/Makefile +++ b/com32/Makefile @@ -6,7 +6,7 @@ subdirs: $(SUBDIRS) $(SUBDIRS): @mkdir -p $(OBJ)/$@ $(MAKE) -C $(OBJ)/$@ SRC="$(SRC)"/$@ OBJ="$(OBJ)"/$@/ \ - -f $(SRC)/$@/Makefile $(MAKECMDGOALS) + EFI_BUILD=$(EFI_BUILD) -f $(SRC)/$@/Makefile $(MAKECMDGOALS) all tidy dist clean spotless install: subdirs diff --git a/diag/Makefile b/diag/Makefile index e3353753..619c1632 100644 --- a/diag/Makefile +++ b/diag/Makefile @@ -4,4 +4,4 @@ all tidy dist clean spotless install: @mkdir -p $(addprefix $(OBJ)/,$(SUBDIRS)) set -e; for d in $(SUBDIRS); \ do $(MAKE) -C $(OBJ)/$$d -f $(SRC)/$$d/Makefile \ - SRC="$(SRC)"/$$d OBJ="$(OBJ)"/$$d $@; done + SRC="$(SRC)"/$$d OBJ="$(OBJ)"/$$d EFI_BUILD=$(EFI_BUILD) $@; done diff --git a/tests/Makefile b/tests/Makefile index 99b1618f..7c0f9794 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -39,7 +39,7 @@ QEMU = qemu-system-i386 all: syslinux-tests pxelinux-tests syslinux-tests: - $(MAKE) SRC="$(SRC)" OBJ="$(OBJ)" objdir="$(objdir)" \ + $(MAKE) SRC="$(SRC)" OBJ="$(OBJ)" objdir="$(objdir)" EFI_BUILD=$(EFI_BUILD) \ INITIAL="$(INITIAL)" INSTALL_DIR="$(SYSLINUX_INSTALL_DIR)" \ CONFIG_FILE="$(SYSLINUX_CONFIG_FILE)" \ DERIVATIVE=SYSLINUX @@ -47,7 +47,7 @@ syslinux-tests: $(SYSLINUX_LOOPDEV) test.cfg pxelinux-tests: - $(MAKE) SRC="$(SRC)" OBJ="$(OBJ)" objdir="$(objdir)" \ + $(MAKE) SRC="$(SRC)" OBJ="$(OBJ)" objdir="$(objdir)" EFI_BUILD=$(EFI_BUILD) \ INITIAL="$(INITIAL)" INSTALL_DIR="$(PXELINUX_INSTALL_DIR)" \ CONFIG_FILE="$(PXELINUX_CONFIG_FILE)" \ DERIVATIVE=PXELINUX @@ -71,7 +71,7 @@ SUBDIRS = linux com32 subdirs: $(SUBDIRS) $(SUBDIRS): mkdir -p $(OBJ)/$@ - $(MAKE) -C $(OBJ)/$@ SRC="$(SRC)"/$@ OBJ="$(OBJ)"/$@/ \ + $(MAKE) -C $(OBJ)/$@ SRC="$(SRC)"/$@ OBJ="$(OBJ)"/$@/ EFI_BUILD=$(EFI_BUILD) \ -f $(SRC)/$@/Makefile objdir="$(objdir)/tests" \ INSTALL_DIR="$(INSTALL_DIR)" CONFIG_FILE="$(CONFIG_FILE)" \ DERIVATIVE="$(DERIVATIVE)" |