Makefiles: Small updates

For consistency only...

Signed-off-by: Michel Pollet <buserror@gmail.com>

diff --git a/.simavr.jcc b/.simavr.jcc
index 261bb2d..595a2ed 100644 (file)
--- a/.simavr.jcc
+++ b/.simavr.jcc
@@ -48,6 +48,14 @@ T
 F
 "./simavr/sim/avr_eeprom.h"
 T
+2 "avr_extint.c"
+F
+"./simavr/sim/avr_extint.c"
+T
+2 "avr_extint.h"
+F
+"./simavr/sim/avr_extint.h"
+T
 2 "avr_uart.c"
 F
 "./simavr/sim/avr_uart.c"
@@ -170,6 +178,10 @@ T
 F
 "./simavr/cores/sim_mega168.c"
 T
+2 "sim_mega328.c"
+F
+"./simavr/cores/sim_mega328.c"
+T
 2 "sim_mega48.c"
 F
 "./simavr/cores/sim_mega48.c"
@@ -186,9 +198,41 @@ T
 F
 "./simavr/cores/sim_tiny85.c"
 T
+2 "sim_tiny25.c"
+F
+"./simavr/cores/sim_tiny25.c"
+T
+2 "sim_tiny45.c"
+F
+"./simavr/cores/sim_tiny45.c"
+T
+2 "sim_tinyx5.c"
+F
+"./simavr/cores/sim_tinyx5.c"
+T
+2 "sim_tinyx5.h"
+F
+"./simavr/cores/sim_tinyx5.h"
+T
 2 "sim_mega644.c"
 F
 "./simavr/cores/sim_mega644.c"
+T
+2 "sim_mega164.c"
+F
+"./simavr/cores/sim_mega164.c"
+T
+2 "sim_mega324.c"
+F
+"./simavr/cores/sim_mega324.c"
+T
+2 "sim_megax4.h"
+F
+"./simavr/cores/sim_megax4.h"
+T
+2 "sim_megax4.c"
+F
+"./simavr/cores/sim_megax4.c"
 F
 T
 1 "examples"
@@ -208,6 +252,22 @@ T
 2 "button.h"
 F
 "./examples/parts/button.h"
+T
+2 "atmega168_timer_64led.c"
+F
+"./examples/board_timer_64led/atmega168_timer_64led.c"
+T
+2 "timer_64led.c"
+F
+"./examples/board_timer_64led/timer_64led.c"
+T
+2 "hc595.c"
+F
+"./examples/parts/hc595.c"
+T
+2 "hc595.h"
+F
+"./examples/parts/hc595.h"
 F
 F
 # tasks

diff --git a/Makefile b/Makefile
index cd3b15b..65946e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 
 
 all:   make-tests
-       make -C simavr
+       make -C simavr && make -C examples
 
 make-tests:
        make -C tests
@@ -9,4 +9,4 @@ make-tests:
 clean:
        make -C simavr clean
        make -C tests clean
-       
\ No newline at end of file
+       make -C examples clean

diff --git a/examples/Makefile b/examples/Makefile
index e9ef6c5..1b7df3e 100644 (file)
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,7 +1,7 @@
 
 all:
-       make -C board_ledramp
+       for bi in board_*; do make -C $$bi; done
 
 clean:
-       make -C board_ledramp clean
+       for bi in board_*; do make -C $$bi clean; done
 

diff --git a/examples/board_ledramp/Makefile b/examples/board_ledramp/Makefile
index 18238ab..9072185 100644 (file)
--- a/examples/board_ledramp/Makefile
+++ b/examples/board_ledramp/Makefile
@@ -37,7 +37,8 @@ include ${simavr}/Makefile.common
 
 ${board} : ${OBJ}/button.o
 ${board} : ${OBJ}/${board}.o
-       gcc -MD ${CFLAGS} -o $@ $^ $(LDFLAGS) ${simavr}/simavr/libsimavr.a
+       @echo LD $@
+       @gcc -MD ${CFLAGS} -o $@ $^ $(LDFLAGS) ${simavr}/simavr/libsimavr.a
 
 clean:
-       rm -rf obj *.hex *.a *.axf ${board}
+       rm -rf obj *.hex *.a *.axf ${board} *.vcd