diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2016-02-09 18:13:20 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2016-02-09 18:13:20 -0800 |
| commit | c7e6d511df730b26336ea2c24020a058aad6be1d (patch) | |
| tree | 2f85c6f863221d0be304074dc36ad8faf20d5119 /tests/Makefile | |
| parent | f2f897a1762fab84d2905f32b1c15dd7b42abb56 (diff) | |
| download | syslinux-c7e6d511df730b26336ea2c24020a058aad6be1d.tar.gz | |
Makefile: make the handling of firmware selection a little saner
Clean up the handling of firmware selection inside the Makefiles.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/Makefile b/tests/Makefile index 7c0f9794..99b1618f 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)" EFI_BUILD=$(EFI_BUILD) \ + $(MAKE) SRC="$(SRC)" OBJ="$(OBJ)" objdir="$(objdir)" \ 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)" EFI_BUILD=$(EFI_BUILD) \ + $(MAKE) SRC="$(SRC)" OBJ="$(OBJ)" objdir="$(objdir)" \ 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)"/$@/ EFI_BUILD=$(EFI_BUILD) \ + $(MAKE) -C $(OBJ)/$@ SRC="$(SRC)"/$@ OBJ="$(OBJ)"/$@/ \ -f $(SRC)/$@/Makefile objdir="$(objdir)/tests" \ INSTALL_DIR="$(INSTALL_DIR)" CONFIG_FILE="$(CONFIG_FILE)" \ DERIVATIVE="$(DERIVATIVE)" |