Tweak deps

README

@@ -2,8 +2,9 @@ apps         --- contains a sub-directory for each application
 drivers      --- device driver modules (hardware independent)
 drivers/avr  --- device driver modules specifically for AVR architecture
 drivers/test --- device driver modules for test scaffold
-common       --- common modules (utilities, etc.)
 doc          --- documentation
-etc          --- miscellaneous scripts
+etc          --- miscellaneous scripts and makefile templates
 fonts        --- fonts and font creation program
+utils        --- utility modules
+
 

apps/bounce1/Makefile.test

@@ -20,7 +20,7 @@ bounce1-test.o: bounce1.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/bounce2/Makefile.test

@@ -26,7 +26,7 @@ ledmat-test.o: ../../drivers/ledmat.c ../../drivers/ledmat.h ../../drivers/test/
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/bounce3/Makefile.test

@@ -26,7 +26,7 @@ ledmat-test.o: ../../drivers/ledmat.c ../../drivers/ledmat.h ../../drivers/test/
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/bounce4/Makefile.test

@@ -26,7 +26,7 @@ ledmat-test.o: ../../drivers/ledmat.c ../../drivers/ledmat.h ../../drivers/test/
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/bounce5/Makefile.test

@@ -26,7 +26,7 @@ ledmat-test.o: ../../drivers/ledmat.c ../../drivers/ledmat.h ../../drivers/test/
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/chooser/Makefile.test

@@ -29,7 +29,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/demo1/Makefile.test

@@ -20,7 +20,7 @@ demo1-test.o: demo1.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../.
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/demo2/Makefile.test

@@ -23,7 +23,7 @@ led-test.o: ../../drivers/led.c ../../drivers/led.h ../../drivers/test/avrtest.h
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/fonttest1/Makefile.test

@@ -29,7 +29,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/hello1/Makefile.test

@@ -23,7 +23,7 @@ ledmat-test.o: ../../drivers/ledmat.c ../../drivers/ledmat.h ../../drivers/test/
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/hello2/Makefile.test

@@ -26,7 +26,7 @@ ledmat-test.o: ../../drivers/ledmat.c ../../drivers/ledmat.h ../../drivers/test/
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/hello3/Makefile.test

@@ -26,7 +26,7 @@ ledmat-test.o: ../../drivers/ledmat.c ../../drivers/ledmat.h ../../drivers/test/
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/hello4/Makefile.test

@@ -29,7 +29,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/ir_grab1/Makefile.test

@@ -32,7 +32,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/ir_grab2/Makefile.test

@@ -32,7 +32,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/ir_grab3/Makefile.test

@@ -41,7 +41,7 @@ eeprom-test.o: ../../drivers/test/eeprom.c ../../drivers/test/eeprom.h ../../dri
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/ir_serial_test1/Makefile.test

@@ -35,7 +35,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/ir_serial_test2/Makefile.test

@@ -35,7 +35,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/ir_serial_test3/Makefile.test

@@ -35,7 +35,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/ir_uart_test1/Makefile.test

@@ -32,7 +32,7 @@ ir_uart-test.o: ../../drivers/test/ir_uart.c ../../drivers/test/ir_uart.h ../../
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/ir_uart_test2/Makefile.test

@@ -32,7 +32,7 @@ ir_uart-test.o: ../../drivers/test/ir_uart.c ../../drivers/test/ir_uart.h ../../
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/led0/Makefile

@@ -16,7 +16,7 @@ all: led0.out
 
 
 # Compile: create object files from C source files.
-led0.o: led0.c ../../drivers/avr/system.h ../../drivers/avr/target.h ../../drivers/led.h ../../utils/pacer.h
+led0.o: led0.c ../../drivers/avr/system.h ../../drivers/led.h ../../utils/pacer.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 pio.o: ../../drivers/avr/pio.c ../../drivers/avr/pio.h ../../drivers/avr/system.h

apps/led0/Makefile.test

@@ -14,7 +14,7 @@ all: led0
 
 
 # Compile: create object files from C source files.
-led0-test.o: led0.c ../../drivers/led.h ../../drivers/test/system.h ../../drivers/test/target.h ../../utils/pacer.h
+led0-test.o: led0.c ../../drivers/led.h ../../drivers/test/system.h ../../utils/pacer.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 led-test.o: ../../drivers/led.c ../../drivers/led.h ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/led1/Makefile.test

@@ -23,7 +23,7 @@ led-test.o: ../../drivers/led.c ../../drivers/led.h ../../drivers/test/avrtest.h
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/led2/Makefile.test

@@ -26,7 +26,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/led3/Makefile.test

@@ -26,7 +26,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/led4/Makefile.test

@@ -26,7 +26,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/led5/Makefile.test

@@ -23,7 +23,7 @@ led-test.o: ../../drivers/led.c ../../drivers/led.h ../../drivers/test/avrtest.h
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/pio1/Makefile.test

@@ -20,7 +20,7 @@ pio1-test.o: pio1.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/pio2/Makefile.test

@@ -20,7 +20,7 @@ pio2-test.o: pio2.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/pio3/Makefile.test

@@ -20,7 +20,7 @@ pio3-test.o: pio3.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/scribble1/Makefile.test

@@ -35,7 +35,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/snake1/Makefile.test

@@ -29,7 +29,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/space10/Makefile.test

@@ -41,7 +41,7 @@ eeprom-test.o: ../../drivers/test/eeprom.c ../../drivers/test/eeprom.h ../../dri
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/space11/Makefile.test

@@ -41,7 +41,7 @@ eeprom-test.o: ../../drivers/test/eeprom.c ../../drivers/test/eeprom.h ../../dri
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/space12/Makefile.test

@@ -41,7 +41,7 @@ eeprom-test.o: ../../drivers/test/eeprom.c ../../drivers/test/eeprom.h ../../dri
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/space9/Makefile.test

@@ -41,7 +41,7 @@ eeprom-test.o: ../../drivers/test/eeprom.c ../../drivers/test/eeprom.h ../../dri
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/spacey_remote1/Makefile.test

@@ -35,7 +35,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/squeak1/Makefile.test

@@ -23,7 +23,7 @@ led-test.o: ../../drivers/led.c ../../drivers/led.h ../../drivers/test/avrtest.h
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/squeak2/Makefile.test

@@ -26,7 +26,7 @@ led-test.o: ../../drivers/led.c ../../drivers/led.h ../../drivers/test/avrtest.h
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/squeak3/Makefile.test

@@ -35,7 +35,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/squeak4/Makefile.test

@@ -32,7 +32,7 @@ ledmat-test.o: ../../drivers/ledmat.c ../../drivers/ledmat.h ../../drivers/test/
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/steer1/Makefile.test

@@ -29,7 +29,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/task1/Makefile.test

@@ -23,7 +23,7 @@ led-test.o: ../../drivers/led.c ../../drivers/led.h ../../drivers/test/avrtest.h
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/task2/Makefile.test

@@ -29,7 +29,7 @@ ledmat-test.o: ../../drivers/ledmat.c ../../drivers/ledmat.h ../../drivers/test/
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/tdmdemo1/Makefile.test

@@ -23,7 +23,7 @@ ledmat-test.o: ../../drivers/ledmat.c ../../drivers/ledmat.h ../../drivers/test/
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/tdmdemo2/Makefile.test

@@ -26,7 +26,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/updown1/Makefile.test

@@ -26,7 +26,7 @@ ledmat-test.o: ../../drivers/ledmat.c ../../drivers/ledmat.h ../../drivers/test/
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

apps/updown2/Makefile.test

@@ -29,7 +29,7 @@ navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../driv
 mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-pio-test.o: ../../drivers/test/pio.c
+pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h

etc/Makefile

@@ -9,11 +9,11 @@
 # the applications looking for #includes.
 # It also creates the doc directories and the callgraphs, etc.
 
-APPDIRS = $(filter-out ../apps/README, $(wildcard ../apps/*/ ../lab*/*))
+APPDIRS = $(filter-out ../apps/README, $(wildcard ../apps/*/ ../lab*/*/))
 DOCDIRS = $(addsuffix /doc, $(APPDIRS))
 
 # Don't link against test-scaffold if directly accessing harware
-FOO = $(shell grep -l "\<avr/io.h\>" ../lab*/*.c)
+FOO = $(shell grep -l "\<avr/io.h\>" ../lab*/*/*.c)
 DUDDIRS = $(foreach filename, $(FOO), $(dir $(filename)))
 TESTDIRS = $(filter-out $(DUDDIRS), $(APPDIRS))
 
@@ -29,6 +29,7 @@ CLEANAPPS = $(addsuffix .cleanapps, $(APPDIRS))
 CLEANTESTS = $(addsuffix .cleantests, $(TESTDIRS))
 CLEANDOCS = $(addsuffix .cleandocs, $(APPDIRS))
 
+
 all: testmakefiles appmakefiles docmakefiles apps tests docs
 
 clean: cleanapps cleantests cleandocs