aboutsummaryrefslogtreecommitdiffstats
path: root/com32
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-06-29 07:38:33 -0700
committerH. Peter Anvin <hpa@zytor.com>2012-06-29 07:38:33 -0700
commit4678fd92a21e0139b0126bafcccda82c16404d3e (patch)
tree66656435b5eac245bce87eeb59f5f620d1d2212f /com32
parent62efc644beddf9e13198456eb1a00acca43b2927 (diff)
downloadsyslinux-4678fd92a21e0139b0126bafcccda82c16404d3e.tar.gz
syslinux-4678fd92a21e0139b0126bafcccda82c16404d3e.tar.xz
syslinux-4678fd92a21e0139b0126bafcccda82c16404d3e.zip
elflink: fix dependency problem in cmenu/Makefilesyslinux-5.00-pre6
Instead of adding library dependencies implicitly, make them explicit and use --as-needed to avoid bogus DT_NEEDED entries from being generated. The other Makefiles should be adjusted accordingly as well. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32')
-rw-r--r--com32/cmenu/Makefile19
1 files changed, 4 insertions, 15 deletions
diff --git a/com32/cmenu/Makefile b/com32/cmenu/Makefile
index 40a09d1f..c6e0cae3 100644
--- a/com32/cmenu/Makefile
+++ b/com32/cmenu/Makefile
@@ -17,26 +17,15 @@
NOGPL := 1
-# This must be defined before com32.mk is included
-LIBS = libmenu/libmenu.c32
-
topdir = ../..
MAKEDIR = $(topdir)/mk
include $(MAKEDIR)/elf.mk
CFLAGS += -I./libmenu
-LDFLAGS_complex.o = $(com32)/cmenu/libmenu/libmenu.c32 \
- $(com32)/libutil/libutil_com.c32 \
- $(com32)/lib/libcom32.c32
-LDFLAGS_display.o = $(com32)/cmenu/libmenu/libmenu.c32 \
- $(com32)/libutil/libutil_com.c32 \
- $(com32)/lib/libcom32.c32
-LDFLAGS_simple.o = $(com32)/cmenu/libmenu/libmenu.c32 \
- $(com32)/libutil/libutil_com.c32 \
- $(com32)/lib/libcom32.c32
-LDFLAGS_test.o = $(com32)/cmenu/libmenu/libmenu.c32
-LDFLAGS_test2.o = $(com32)/cmenu/libmenu/libmenu.c32
+LIBS = libmenu/libmenu.c32 \
+ $(com32)/libutil/libutil_com.c32 \
+ $(com32)/lib/libcom32.c32
LIBMENU = libmenu/syslnx.o libmenu/com32io.o libmenu/tui.o \
libmenu/menu.o libmenu/passwords.o libmenu/des.o libmenu/help.o \
@@ -53,7 +42,7 @@ MENUS = $(LIBS) $(CMENUS) $(IMENUS)
%.c: %.menu adv_menu.tpl
python menugen.py --input=$< --output=$@ --template=adv_menu.tpl
-all: menus
+all: menus
libmenu/libmenu.c32: $(LIBMENU)
$(LD) -shared $(LDFLAGS) -o $@ $^