diff options
| author | Sylvain Gault <sylvain.gault@gmail.com> | 2015-11-27 22:38:26 +0100 |
|---|---|---|
| committer | Sylvain Gault <sylvain.gault@gmail.com> | 2015-11-27 23:09:58 +0100 |
| commit | 2d14923c02aa343f650a5bee128e9ea383a0ed59 (patch) | |
| tree | 8a8f7f8b45a3fc861716d922cd8578740bedca47 /Makefile | |
| parent | 82c0ec7b39acb87175ea588f2fa11b21331503c4 (diff) | |
| download | syslinux-2d14923c02aa343f650a5bee128e9ea383a0ed59.tar.gz | |
Makefile: Pass down the variable EFI_BUILD
This variable indicates whether or nor the files are compiled for EFI.
The lack of it lead the Makefiles to forget to add some compilation
options specific to EFI.
Signed-off-by: Sylvain Gault <sylvain.gault@gmail.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 9 insertions, 8 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 |