aboutsummaryrefslogtreecommitdiffstats
path: root/com32/menu
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2011-04-26 01:31:40 -0700
committerH. Peter Anvin <hpa@zytor.com>2011-04-26 01:31:40 -0700
commit5365992003f44a1d3b8cb2cd8774ed49dddedb10 (patch)
tree4481752a0f54ca93376aa5f6dfc8597b7f5ed4e4 /com32/menu
parent80a29a87118bd7539e8a310810dc0045d7a27279 (diff)
parentd7d20a78c72237f85d8508c93aa411529d0ac17a (diff)
downloadsyslinux-5365992003f44a1d3b8cb2cd8774ed49dddedb10.tar.gz
syslinux-5365992003f44a1d3b8cb2cd8774ed49dddedb10.tar.xz
syslinux-5365992003f44a1d3b8cb2cd8774ed49dddedb10.zip
Merge remote-tracking branch 'origin/master' into lwip
Diffstat (limited to 'com32/menu')
-rw-r--r--com32/menu/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/com32/menu/Makefile b/com32/menu/Makefile
index 2a032728..b67b997d 100644
--- a/com32/menu/Makefile
+++ b/com32/menu/Makefile
@@ -15,9 +15,9 @@
##
topdir = ../..
-include ../MCONFIG
+MAKEDIR = $(topdir)/mk
+include $(MAKEDIR)/com32.mk
-LIBS = ../libutil/libutil_com.a ../lib/libcom32.a $(LIBGCC)
LNXLIBS = ../libutil/libutil_lnx.a
MODULES = menu.c32 vesamenu.c32
@@ -28,10 +28,10 @@ COMMONOBJS = menumain.o readconfig.o passwd.o drain.o printmsg.o colors.o \
all: $(MODULES) $(TESTFILES)
-menu.elf : menu.o $(COMMONOBJS) $(LIBS) $(C_LIBS)
+menu.elf : menu.o $(COMMONOBJS) $(C_LIBS)
$(LD) $(LDFLAGS) -o $@ $^
-vesamenu.elf : vesamenu.o $(COMMONOBJS) $(LIBS) $(C_LIBS)
+vesamenu.elf : vesamenu.o $(COMMONOBJS) $(C_LIBS)
$(LD) $(LDFLAGS) -o $@ $^
tidy dist: