improve makefiles

diff --git a/iar_c/Makefile b/iar_c/Makefile
index 949ac7cbedc23b2700c5dab8dbd36d6028b3e064..304b256b26cb6d1636241cdf1ba6acb316a1d8d4 100644 (file)
--- a/iar_c/Makefile
+++ b/iar_c/Makefile
@@ -9,10 +9,10 @@ CC = /Program Files/IAR Systems/Embedded Workbench 5.0/avr/bin/iccavr.exe
 LD = /Program Files/IAR Systems/Embedded Workbench 5.0/avr/bin/xlink.exe\r
 \r
 ## Compile options common for all C compilation units.\r
-CFLAGS = --cpu $(MCU) -lA $(PROJECT).lst -z9 -e --lock_regs 4 -D ENABLE_BIT_DEFINITIONS\r
+CFLAGS = --cpu $(MCU) -l $(PROJECT).lst -s9 -e --lock_regs 4 -D ENABLE_BIT_DEFINITIONS\r
 \r
 ## Linker flags\r
-LDFLAGS = -Fubrof9 -xm -xs -f '/Program Files/IAR Systems/Embedded Workbench 5.0/avr/config/lnktiny2313t.xcl' -l $(PROJECT).map -s main\r
+LDFLAGS = -Fubrof9 -xm -xs -xe -xn -xo -f '/Program Files/IAR Systems/Embedded Workbench 5.0/avr/config/lnktiny2313t.xcl' -l $(PROJECT).map -s main\r
 LIBS =  '/Program Files/IAR Systems/Embedded Workbench 5.0/avr/lib/clib/cl0t.r90'\r
 \r
 ## Include Directories\r

diff --git a/icc_c/Makefile b/icc_c/Makefile
index e0395096a365bd120dcc4b3a181350ad3ab52bd8..f3c232a51c0c90696ce106f73599a8b39c93070d 100644 (file)
--- a/icc_c/Makefile
+++ b/icc_c/Makefile
@@ -9,7 +9,7 @@ CC = iccavr
 OBJECTS = $(PROJECT).o\r
 \r
 ## Compile options common for all C compilation units.\r
-CFLAGS =  -e -D__ICC_VERSION="7.16A" -DATtiny2313  -l -A -A -g -Wf-r20_23  -O24\r
+CFLAGS = -g -e -D__ICC_VERSION="7.16A" -DATtiny2313  -l -A -A -Wf-r20_23  -O24\r
 \r
 ## Linker flags\r
 LDFLAGS = -g -e:0x0800 -bfunc_lit:0x26.0x800 -dram_end:0xdf -bdata:0x60.0xdf -dhwstk_size:30 -beeprom:0.128 -fihx_coff -S2\r
@@ -27,11 +27,11 @@ LINKONLYOBJECTS =
 all: $(TARGET)\r
 \r
 ## Compile\r
-$(PROJECT).o: ../serial_lcd.c\r
+$(PROJECT).o: ../$(PROJECT).c\r
        $(CC) -c $(CFLAGS) $(INCLUDES) $<\r
 \r
 $(TARGET): $(OBJECTS)\r
-       $(CC) -o SERIAL_LCD $(LDFLAGS) $(OBJECTS) -lcavrgr\r
+       $(CC) -o $(project) $(LDFLAGS) $(OBJECTS) -lcavrgr\r
 \r
 ## Clean target\r
 .PHONY: distclean\r

diff --git a/serial_lcd.h b/serial_lcd.h
index ae4a58e7bcff48e1eb2b42d05c554bd1acf04200..9d4439836ca0b847ea223c1ccd707820216ef1a5 100644 (file)
--- a/serial_lcd.h
+++ b/serial_lcd.h
@@ -169,7 +169,7 @@ typedef __flash unsigned int prog_uint32_t;
 \r
 #define FLASH_DECLARE(x) flash x\r
 #define ASM(a) #asm(a)\r
-#define NOP() #asm("nop");\r
+#define NOP() #asm("nop")\r
 #define cli() #asm("cli")\r
 #define sei() #asm("sei")\r
 #define wdt_reset() #asm("wdr")\r