aboutsummaryrefslogtreecommitdiffstats
path: root/com32/cmenu
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-06-13 09:23:13 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-06-20 16:34:42 +0100
commitfb543aa635ff117187c73ce0ae3dccf8ffe32161 (patch)
tree7be11edbcccb5e44ac621fe4f8bf54a1dbf3bb56 /com32/cmenu
parent3e7446afe578dcad987076fdd340740d2c2f53d2 (diff)
downloadsyslinux-fb543aa635ff117187c73ce0ae3dccf8ffe32161.tar.gz
syslinux-fb543aa635ff117187c73ce0ae3dccf8ffe32161.tar.xz
syslinux-fb543aa635ff117187c73ce0ae3dccf8ffe32161.zip
com32: Per-object file LDFLAGS
Some object files need to link against the ELF libraries. Allow them to be specified with the following syntax in the Makefiles, LDFLAGS_$(object_file) = $(LIBS) By adding libraries in this way DT_NEEDED entries are created in the ELF modules and the required library dependencies are automatically loaded before running the module. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32/cmenu')
-rw-r--r--com32/cmenu/Makefile17
1 files changed, 15 insertions, 2 deletions
diff --git a/com32/cmenu/Makefile b/com32/cmenu/Makefile
index 00825b46..40a09d1f 100644
--- a/com32/cmenu/Makefile
+++ b/com32/cmenu/Makefile
@@ -26,13 +26,26 @@ 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
+
LIBMENU = libmenu/syslnx.o libmenu/com32io.o libmenu/tui.o \
- libmenu/menu.o libmenu/passwords.o libmenu/des.o libmenu/help.o
+ libmenu/menu.o libmenu/passwords.o libmenu/des.o libmenu/help.o \
+ $(com32)/libutil/libutil_com.c32 $(com32)/lib/libcom32.c32
CMENUS = $(patsubst %.c,%.c32,$(wildcard *.c))
IMENUS = $(patsubst %.menu,%.c32,$(wildcard *.menu))
-MENUS = $(CMENUS) $(IMENUS) $(LIBS)
+MENUS = $(LIBS) $(CMENUS) $(IMENUS)
.SUFFIXES: .S .c .o .elf .c32 .menu