[syslinux:firmware] cmenu: Add libmenu.c32 to $(C_LIBS)

syslinux-bot for Matt Fleming matt.fleming at intel.com
Mon Jul 29 06:12:09 PDT 2013


Commit-ID:  9e33f739bcf8455a083ffeb1d8f941d4cd9796b9
Gitweb:     http://www.syslinux.org/commit/9e33f739bcf8455a083ffeb1d8f941d4cd9796b9
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Mon, 29 Jul 2013 12:50:08 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Mon, 29 Jul 2013 13:25:59 +0100

cmenu: Add libmenu.c32 to $(C_LIBS)

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 at intel.com>

---
 com32/cmenu/Makefile | 2 ++
 mk/elf.mk            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/com32/cmenu/Makefile b/com32/cmenu/Makefile
index 100dba5..6bb5231 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 1ec9b2d..56de6de 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


More information about the Syslinux-commits mailing list