diff options
author | H. Peter Anvin <hpa@zytor.com> | 2019-02-28 16:25:32 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2019-02-28 16:25:32 -0800 |
commit | 26916e96ff201bd08d58c2fe474340fedce31ad3 (patch) | |
tree | 2c410a4ce6223164134e757dc4b9826e33a7f55e | |
parent | b34dc4c9f8c933cc7c2ca830892f2362c11069c5 (diff) | |
download | syslinux-26916e96ff201bd08d58c2fe474340fedce31ad3.tar.gz syslinux-26916e96ff201bd08d58c2fe474340fedce31ad3.tar.xz syslinux-26916e96ff201bd08d58c2fe474340fedce31ad3.zip |
Another build fix; remove Linux test binaries
Linux test binaries haven't worked for a long, long time. Drop them;
we have virtualization for testing now.
Build fix: fix dependency for dmitest.elf.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r-- | com32/modules/Makefile | 3 | ||||
-rw-r--r-- | ldlinux/Makefile | 9 |
2 files changed, 2 insertions, 10 deletions
diff --git a/com32/modules/Makefile b/com32/modules/Makefile index 526f5495..403af543 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -15,7 +15,6 @@ ## COM32 standard modules ## -VPATH = $(SRC) include $(MAKEDIR)/elf.mk # BIOS-specific modules @@ -40,7 +39,7 @@ TESTFILES = all: $(MODULES) $(TESTFILES) OBJS_dmitest = dmi_utils.o -dmi_utils.elf: $(OBJS_dmitest) +dmitest.elf: $(OBJS_dmitest) tidy dist: rm -f *.o *.lo *.a *.lst *.elf .*.d *.tmp diff --git a/ldlinux/Makefile b/ldlinux/Makefile index 9b9302c8..1f428e44 100644 --- a/ldlinux/Makefile +++ b/ldlinux/Makefile @@ -31,7 +31,7 @@ OBJS = main.o cli.o readconfig.o refstr.o colors.o getadv.o adv.o \ # For some reason ldlinux.elf is deleted even with .PRECIOUS, which # breaks the dependencies later on. List it explicitly in the all target # to force it to be kept. -all: $(LDLINUX) ldlinux.elf ldlinux_lnx.a +all: $(LDLINUX) ldlinux.elf ldlinux.elf: $(OBJS) $(LDLINUX_LIBS) $(LD) $(LDFLAGS) $(SHARED) -soname '$(LDLINUX)' -o $@ $(OBJS) $(LDLINUX_LIBS) @@ -39,13 +39,6 @@ ldlinux.elf: $(OBJS) $(LDLINUX_LIBS) $(LDLINUX): ldlinux.elf $(OBJCOPY) --strip-debug --strip-unneeded $< $@ -LNXCFLAGS += -D__export='__attribute__((visibility("default")))' -LNXLIBOBJS = get_key.lo -ldlinux_lnx.a: $(LNXLIBOBJS) - rm -f $@ - $(AR) cq $@ $(LNXLIBOBJS) - $(RANLIB) $@ - tidy dist: rm -f *.o *.lo *.a *.lst .*.d |