aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-07-29 12:50:08 +0100
committerMatt Fleming <matt.fleming@intel.com>2013-07-29 13:25:59 +0100
commit9e33f739bcf8455a083ffeb1d8f941d4cd9796b9 (patch)
tree8a5371ae0bfc7e3bdb973e0b8c14aa18f5111707
parent228194e45c916766e8fddb1124d8fd8b3dea3f92 (diff)
downloadsyslinux-6.02-pre15.tar.gz
syslinux-6.02-pre15.tar.xz
syslinux-6.02-pre15.zip
cmenu: Add libmenu.c32 to $(C_LIBS)syslinux-6.02-pre15
The menu modules, display, text, etc, require libmenu.c32 to be listed as a dependency. Append to $(C_LIBS) in mk/elf.mk so that module Makefiles can make use of the suffix rules. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--com32/cmenu/Makefile2
-rw-r--r--mk/elf.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/com32/cmenu/Makefile b/com32/cmenu/Makefile
index 100dba58..6bb52316 100644
--- a/com32/cmenu/Makefile
+++ b/com32/cmenu/Makefile
@@ -21,6 +21,8 @@ LIBS = libmenu/libmenu.c32 \
$(objdir)/com32/libutil/libutil.c32 \
$(objdir)/com32/lib/libcom32.c32
+C_LIBS = libmenu/libmenu.c32
+
VPATH = $(SRC)
include $(MAKEDIR)/elf.mk
diff --git a/mk/elf.mk b/mk/elf.mk
index 1ec9b2d9..56de6de0 100644
--- a/mk/elf.mk
+++ b/mk/elf.mk
@@ -72,7 +72,7 @@ LNXCFLAGS = -I$(com32)/libutil/include -W -Wall -O -g -D_GNU_SOURCE
LNXSFLAGS = -g
LNXLDFLAGS = -g
-C_LIBS = $(objdir)/com32/libutil/libutil.c32 $(GPLLIB) \
+C_LIBS += $(objdir)/com32/libutil/libutil.c32 $(GPLLIB) \
$(objdir)/com32/lib/libcom32.c32
C_LNXLIBS = $(objdir)/com32/libutil/libutil_lnx.a \
$(objdir)/com32/elflink/ldlinux/ldlinux_lnx.a