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 /com32 | |
| parent | f2f897a1762fab84d2905f32b1c15dd7b42abb56 (diff) | |
| download | syslinux-c7e6d511df730b26336ea2c24020a058aad6be1d.tar.gz syslinux-c7e6d511df730b26336ea2c24020a058aad6be1d.tar.xz syslinux-c7e6d511df730b26336ea2c24020a058aad6be1d.zip | |
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 'com32')
| -rw-r--r-- | com32/Makefile | 2 | ||||
| -rw-r--r-- | com32/elflink/ldlinux/Makefile | 2 | ||||
| -rw-r--r-- | com32/lib/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/com32/Makefile b/com32/Makefile index 3e7a7700..5efda1ce 100644 --- a/com32/Makefile +++ b/com32/Makefile @@ -6,7 +6,7 @@ subdirs: $(SUBDIRS) $(SUBDIRS): @mkdir -p $(OBJ)/$@ $(MAKE) -C $(OBJ)/$@ SRC="$(SRC)"/$@ OBJ="$(OBJ)"/$@/ \ - EFI_BUILD=$(EFI_BUILD) -f $(SRC)/$@/Makefile $(MAKECMDGOALS) + -f $(SRC)/$@/Makefile $(MAKECMDGOALS) all tidy dist clean spotless install: subdirs diff --git a/com32/elflink/ldlinux/Makefile b/com32/elflink/ldlinux/Makefile index d948da43..87c0d362 100644 --- a/com32/elflink/ldlinux/Makefile +++ b/com32/elflink/ldlinux/Makefile @@ -22,7 +22,7 @@ OBJS = ldlinux.o cli.o readconfig.o refstr.o colors.o getadv.o adv.o \ BTARGET = $(LDLINUX) -ifdef EFI_BUILD +ifeq ($(FWCLASS),EFI) %.e$(BITS): %.elf $(OBJCOPY) --strip-debug --strip-unneeded $< $@ SONAME = $(patsubst %.elf,%.e$(BITS),$(@F)) diff --git a/com32/lib/Makefile b/com32/lib/Makefile index 1624ae78..8865224e 100644 --- a/com32/lib/Makefile +++ b/com32/lib/Makefile @@ -22,7 +22,7 @@ LIBJPG_OBJS = \ jpeg/rgb24.o jpeg/bgr24.o jpeg/yuv420p.o jpeg/grey.o \ jpeg/rgba32.o jpeg/bgra32.o -ifdef EFI_BUILD +ifeq ($(FWCLASS),EFI) I915VESA_OBJ = else I915VESA_OBJ = sys/vesa/i915resolution.o |