From f48538b47c58b1ecf4f84072db5d2515cb583628 Mon Sep 17 00:00:00 2001 From: bernd Date: Mon, 1 Aug 2011 17:33:48 +0200 Subject: [PATCH] Some Makefile fixes --- simulat0r/tui/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/simulat0r/tui/Makefile b/simulat0r/tui/Makefile index 6d798d8..a66ec02 100644 --- a/simulat0r/tui/Makefile +++ b/simulat0r/tui/Makefile @@ -9,11 +9,8 @@ CFLAGS += -I../simcore OBJS+= ../firmware/basic/*.o OBJS+= ../firmware/core/*.o OBJS+= ../firmware/core/*/*.o -LDFLAGS+= -L../firmware/applications LIBS+= ../firmware/applications/libapp.a -LDFLAGS+= -L../firmware/lcd LIBS+= ../firmware/lcd/liblcd.a -LDFLAGS+= -L../firmware/usb LIBS+= ../firmware/usb/libusb.a #LIBS += -lm @@ -27,10 +24,13 @@ LIBS += ../firmware/basic/libbasic.a OBJS+=../simcore/simcore.o ../simcore/misc.o ../simcore/timecounter.o +OBJS += simulat0r.o + .PHONY : all all : simulat0r -simulat0r : simulat0r.o $(OBJS) $(LIBS) +simulat0r : $(OBJS) $(LIBS) + $(LD) $(OBJS) $(LIBS) -lc -o $@ clean: $(RM) simulat0r.o