From 0a90df2a974786f188315f04ffebdcd549669cf8 Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Mon, 11 Apr 2011 13:38:36 +0100 Subject: [PATCH] menu.c32: Delete superfluous $(LIBS) prerequistite com32.mk already includes the necessary libraries in $(C_LIBS), we don't need to list them again in $(LIBS). Signed-off-by: Matt Fleming --- com32/menu/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/com32/menu/Makefile b/com32/menu/Makefile index f97a804..b67b997 100644 --- a/com32/menu/Makefile +++ b/com32/menu/Makefile @@ -18,7 +18,6 @@ topdir = ../.. 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 @@ -29,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: -- 2.7.4