From 461835146204ad8db16c80e6490206e9f0704e4c Mon Sep 17 00:00:00 2001 From: bsx Date: Sun, 22 May 2011 17:46:25 +0200 Subject: [PATCH] fixed main Makefile libfont was renamed to liblcd --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 05ede9e..7ba3c5d 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ OBJS += OBJS += basic/basic.o OBJS += eeprom/eeprom.o OBJS += reinvoke_isp.o -LIBS += core/libcore.a lcd/libfont.a modules/libmodules.a +LIBS += core/libcore.a lcd/liblcd.a modules/libmodules.a ########################################################################## # GNU GCC compiler flags @@ -29,7 +29,7 @@ OBJS += $(TARGET)_handlers.o LPC1xxx_startup.o LDLIBS = -lm LDLIBS += -Lmodules -lmodules LDLIBS += -Lcore -lcore -LDLIBS += -Llcd -lfont +LDLIBS += -Llcd -llcd OCFLAGS = --strip-unneeded LD_PATH = lpc1xxx @@ -44,7 +44,7 @@ all: firmware core/libcore.a: core/projectconfig.h cd core && $(MAKE) ROOT_PATH=../$(ROOT_PATH) -lcd/libfont.a lcd/render.o lcd/display.o: +lcd/liblcd.a lcd/render.o lcd/display.o: cd lcd && $(MAKE) ROOT_PATH=../$(ROOT_PATH) modules/libmodules.a: @@ -76,5 +76,5 @@ clean: @cd modules && $(MAKE) clean -.PHONY: lcd/libfont.a modules/libmodules.a +.PHONY: lcd/liblcd.a modules/libmodules.a