From 22ec7e24162530146f43e1688aae963f0a0ba4ee Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Mon, 2 Sep 2013 20:33:57 +1200 Subject: [PATCH] Rotate module dep graph --- apps/bounce2/Makefile | 2 +- apps/bounce3/Makefile | 2 +- apps/bounce4/Makefile | 2 +- apps/bounce5/Makefile | 2 +- apps/chooser/Makefile | 2 +- apps/demo2/Makefile | 2 +- apps/fonttest1/Makefile | 2 +- apps/hello1/Makefile | 2 +- apps/hello2/Makefile | 2 +- apps/hello3/Makefile | 2 +- apps/hello4/Makefile | 2 +- apps/hello5/Makefile | 2 +- apps/hello5/doc/files.d | 46 ++++++++++---------- apps/ir_uart_test1/Makefile | 2 +- apps/ir_uart_test2/Makefile | 2 +- apps/ir_uart_test3/Makefile | 2 +- apps/ir_uart_test3/doc/files.d | 76 +++++++++++++++++----------------- apps/led0/Makefile | 2 +- apps/led2/Makefile | 2 +- apps/led3/Makefile | 2 +- apps/led4/Makefile | 2 +- apps/led5/Makefile | 2 +- apps/scribble1/Makefile | 2 +- apps/snake1/Makefile | 2 +- apps/space11/Makefile | 2 +- apps/space9/Makefile | 2 +- apps/squeak3/Makefile | 2 +- apps/squeak3/Makefile.test | 2 +- apps/squeak4/Makefile | 2 +- apps/squeak4/Makefile.test | 2 +- apps/steer1/Makefile | 2 +- apps/stopwatch1/Makefile | 2 +- apps/task1/Makefile | 2 +- apps/task2/Makefile | 2 +- apps/tdmdemo2/Makefile | 2 +- apps/updown1/Makefile | 2 +- apps/updown2/Makefile | 2 +- apps/voltmeter1/Makefile | 2 +- etc/Makefile | 2 +- etc/Makefile.doc.template | 5 ++- 40 files changed, 102 insertions(+), 99 deletions(-) diff --git a/apps/bounce2/Makefile b/apps/bounce2/Makefile index 805b279..fbeb8fc 100644 --- a/apps/bounce2/Makefile +++ b/apps/bounce2/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/bounce3/Makefile b/apps/bounce3/Makefile index 68e7ade..9a793bd 100644 --- a/apps/bounce3/Makefile +++ b/apps/bounce3/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/bounce4/Makefile b/apps/bounce4/Makefile index facb9ae..a85efb7 100644 --- a/apps/bounce4/Makefile +++ b/apps/bounce4/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/bounce5/Makefile b/apps/bounce5/Makefile index 89fb46f..ccba1bd 100644 --- a/apps/bounce5/Makefile +++ b/apps/bounce5/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/chooser/Makefile b/apps/chooser/Makefile index 20d1196..617f83d 100644 --- a/apps/chooser/Makefile +++ b/apps/chooser/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/demo2/Makefile b/apps/demo2/Makefile index 3d4a0f2..3dab479 100644 --- a/apps/demo2/Makefile +++ b/apps/demo2/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../drivers/avr OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/fonttest1/Makefile b/apps/fonttest1/Makefile index d36eb81..b7d49bd 100644 --- a/apps/fonttest1/Makefile +++ b/apps/fonttest1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/hello1/Makefile b/apps/hello1/Makefile index d15e0e3..bddf9dd 100644 --- a/apps/hello1/Makefile +++ b/apps/hello1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers/avr -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/hello2/Makefile b/apps/hello2/Makefile index c4b7cfb..8c9c605 100644 --- a/apps/hello2/Makefile +++ b/apps/hello2/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/hello3/Makefile b/apps/hello3/Makefile index cadd282..1b80463 100644 --- a/apps/hello3/Makefile +++ b/apps/hello3/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/hello4/Makefile b/apps/hello4/Makefile index 3c0e120..1ebb67e 100644 --- a/apps/hello4/Makefile +++ b/apps/hello4/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/hello5/Makefile b/apps/hello5/Makefile index 9ae971d..626c4be 100644 --- a/apps/hello5/Makefile +++ b/apps/hello5/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/hello5/doc/files.d b/apps/hello5/doc/files.d index aa6984d..33592a6 100644 --- a/apps/hello5/doc/files.d +++ b/apps/hello5/doc/files.d @@ -1,9 +1,3 @@ -../../drivers/avr/timer.h: - -../../drivers/avr/timer.c: ../../drivers/avr/timer.h - -../../drivers/avr/timer.o: ../../drivers/avr/timer.c - ../../drivers/navswitch.h: ../../drivers/display.h: @@ -20,16 +14,32 @@ hello5.c: ../../drivers/navswitch.h ../../utils/tinygl.h ../../utils/pacer.h ../ hello5.o: hello5.c -../../drivers/avr/delay.h: +../../drivers/avr/system.c: + +../../drivers/avr/system.o: ../../drivers/avr/system.c ../../drivers/avr/pio.h: -../../drivers/navswitch.c: ../../drivers/navswitch.h ../../drivers/avr/delay.h ../../drivers/avr/pio.h +../../drivers/avr/pio.c: ../../drivers/avr/pio.h -../../drivers/navswitch.o: ../../drivers/navswitch.c +../../drivers/avr/pio.o: ../../drivers/avr/pio.c + +../../drivers/avr/timer.h: + +../../drivers/avr/timer.c: ../../drivers/avr/timer.h + +../../drivers/avr/timer.o: ../../drivers/avr/timer.c + +../../utils/tinygl.c: ../../utils/tinygl.h ../../drivers/display.h ../../utils/font.h + +../../utils/tinygl.o: ../../utils/tinygl.c ../../drivers/ledmat.h: +../../drivers/display.c: ../../drivers/ledmat.h ../../drivers/display.h + +../../drivers/display.o: ../../drivers/display.c + ../../drivers/ledmat.c: ../../drivers/avr/pio.h ../../drivers/ledmat.h ../../drivers/ledmat.o: ../../drivers/ledmat.c @@ -38,25 +48,15 @@ hello5.o: hello5.c ../../utils/font.o: ../../utils/font.c -../../drivers/avr/pio.c: ../../drivers/avr/pio.h - -../../drivers/avr/pio.o: ../../drivers/avr/pio.c - ../../utils/pacer.c: ../../drivers/avr/timer.h ../../utils/pacer.h ../../utils/pacer.o: ../../utils/pacer.c -../../drivers/display.c: ../../drivers/ledmat.h ../../drivers/display.h - -../../drivers/display.o: ../../drivers/display.c - -../../utils/tinygl.c: ../../utils/tinygl.h ../../drivers/display.h ../../utils/font.h - -../../utils/tinygl.o: ../../utils/tinygl.c +../../drivers/avr/delay.h: -../../drivers/avr/system.c: +../../drivers/navswitch.c: ../../drivers/navswitch.h ../../drivers/avr/delay.h ../../drivers/avr/pio.h -../../drivers/avr/system.o: ../../drivers/avr/system.c +../../drivers/navswitch.o: ../../drivers/navswitch.c -hello5.out: ../../drivers/avr/timer.o hello5.o ../../drivers/navswitch.o ../../drivers/ledmat.o ../../utils/font.o ../../drivers/avr/pio.o ../../utils/pacer.o ../../drivers/display.o ../../utils/tinygl.o ../../drivers/avr/system.o +hello5.out: hello5.o ../../drivers/avr/system.o ../../drivers/avr/pio.o ../../drivers/avr/timer.o ../../utils/tinygl.o ../../drivers/display.o ../../drivers/ledmat.o ../../utils/font.o ../../utils/pacer.o ../../drivers/navswitch.o diff --git a/apps/ir_uart_test1/Makefile b/apps/ir_uart_test1/Makefile index 144ca8a..1e977ce 100644 --- a/apps/ir_uart_test1/Makefile +++ b/apps/ir_uart_test1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/ir_uart_test2/Makefile b/apps/ir_uart_test2/Makefile index 3e308e6..e34b37a 100644 --- a/apps/ir_uart_test2/Makefile +++ b/apps/ir_uart_test2/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/ir_uart_test3/Makefile b/apps/ir_uart_test3/Makefile index a53b963..3d77367 100644 --- a/apps/ir_uart_test3/Makefile +++ b/apps/ir_uart_test3/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/ir_uart_test3/doc/files.d b/apps/ir_uart_test3/doc/files.d index 0680612..aeb929e 100644 --- a/apps/ir_uart_test3/doc/files.d +++ b/apps/ir_uart_test3/doc/files.d @@ -4,53 +4,49 @@ ../../drivers/avr/timer.o: ../../drivers/avr/timer.c -../../drivers/avr/pio.h: - -../../drivers/ledmat.h: - -../../drivers/ledmat.c: ../../drivers/avr/pio.h ../../drivers/ledmat.h +../../utils/font.h: -../../drivers/ledmat.o: ../../drivers/ledmat.c +../../utils/font.c: ../../utils/font.h -../../drivers/navswitch.h: +../../utils/font.o: ../../utils/font.c -../../drivers/display.h: +../../drivers/avr/timer0.h: -../../utils/font.h: +../../drivers/avr/bits.h: -../../utils/tinygl.h: ../../drivers/display.h ../../utils/font.h +../../drivers/avr/prescale.h: -../../utils/pacer.h: +../../drivers/avr/timer0.c: ../../drivers/avr/timer0.h ../../drivers/avr/bits.h ../../drivers/avr/prescale.h -../../utils/uint8toa.h: +../../drivers/avr/timer0.o: ../../drivers/avr/timer0.c ../../drivers/avr/ir_uart.h: -../../fonts/font3x5_1.h: ../../utils/font.h +../../drivers/avr/usart1.h: -ir_uart_test3.c: ../../drivers/navswitch.h ../../utils/tinygl.h ../../utils/pacer.h ../../utils/uint8toa.h ../../drivers/avr/ir_uart.h ../../fonts/font3x5_1.h +../../drivers/avr/pio.h: -ir_uart_test3.o: ir_uart_test3.c +../../drivers/avr/ir_uart.c: ../../drivers/avr/ir_uart.h ../../drivers/avr/usart1.h ../../drivers/avr/timer0.h ../../drivers/avr/pio.h -../../utils/uint8toa.c: +../../drivers/avr/ir_uart.o: ../../drivers/avr/ir_uart.c -../../utils/uint8toa.o: ../../utils/uint8toa.c +../../drivers/avr/pio.c: ../../drivers/avr/pio.h -../../utils/tinygl.c: ../../utils/tinygl.h ../../drivers/display.h ../../utils/font.h +../../drivers/avr/pio.o: ../../drivers/avr/pio.c -../../utils/tinygl.o: ../../utils/tinygl.c +../../utils/uint8toa.c: -../../utils/font.c: ../../utils/font.h +../../utils/uint8toa.o: ../../utils/uint8toa.c -../../utils/font.o: ../../utils/font.c +../../drivers/display.h: -../../drivers/avr/pio.c: ../../drivers/avr/pio.h +../../utils/tinygl.h: ../../drivers/display.h ../../utils/font.h -../../drivers/avr/pio.o: ../../drivers/avr/pio.c +../../utils/tinygl.c: ../../utils/tinygl.h ../../drivers/display.h ../../utils/font.h -../../utils/pacer.c: ../../drivers/avr/timer.h ../../utils/pacer.h +../../utils/tinygl.o: ../../utils/tinygl.c -../../utils/pacer.o: ../../utils/pacer.c +../../drivers/ledmat.h: ../../drivers/display.c: ../../drivers/ledmat.h ../../drivers/display.h @@ -60,35 +56,39 @@ ir_uart_test3.o: ir_uart_test3.c ../../drivers/avr/system.o: ../../drivers/avr/system.c -../../drivers/avr/prescale.h: - -../../drivers/avr/prescale.c: ../../drivers/avr/prescale.h - -../../drivers/avr/prescale.o: ../../drivers/avr/prescale.c +../../drivers/ledmat.c: ../../drivers/avr/pio.h ../../drivers/ledmat.h -../../drivers/avr/usart1.h: +../../drivers/ledmat.o: ../../drivers/ledmat.c -../../drivers/avr/timer0.h: +../../drivers/navswitch.h: -../../drivers/avr/ir_uart.c: ../../drivers/avr/ir_uart.h ../../drivers/avr/usart1.h ../../drivers/avr/timer0.h ../../drivers/avr/pio.h +../../utils/pacer.h: -../../drivers/avr/ir_uart.o: ../../drivers/avr/ir_uart.c +../../utils/uint8toa.h: -../../drivers/avr/bits.h: +../../fonts/font3x5_1.h: ../../utils/font.h -../../drivers/avr/timer0.c: ../../drivers/avr/timer0.h ../../drivers/avr/bits.h ../../drivers/avr/prescale.h +ir_uart_test3.c: ../../drivers/navswitch.h ../../utils/tinygl.h ../../utils/pacer.h ../../utils/uint8toa.h ../../drivers/avr/ir_uart.h ../../fonts/font3x5_1.h -../../drivers/avr/timer0.o: ../../drivers/avr/timer0.c +ir_uart_test3.o: ir_uart_test3.c ../../drivers/avr/usart1.c: ../../drivers/avr/usart1.h ../../drivers/avr/usart1.o: ../../drivers/avr/usart1.c +../../drivers/avr/prescale.c: ../../drivers/avr/prescale.h + +../../drivers/avr/prescale.o: ../../drivers/avr/prescale.c + ../../drivers/avr/delay.h: ../../drivers/navswitch.c: ../../drivers/navswitch.h ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/navswitch.o: ../../drivers/navswitch.c -ir_uart_test3.out: ../../drivers/avr/timer.o ../../drivers/ledmat.o ir_uart_test3.o ../../utils/uint8toa.o ../../utils/tinygl.o ../../utils/font.o ../../drivers/avr/pio.o ../../utils/pacer.o ../../drivers/display.o ../../drivers/avr/system.o ../../drivers/avr/prescale.o ../../drivers/avr/ir_uart.o ../../drivers/avr/timer0.o ../../drivers/avr/usart1.o ../../drivers/navswitch.o +../../utils/pacer.c: ../../drivers/avr/timer.h ../../utils/pacer.h + +../../utils/pacer.o: ../../utils/pacer.c + +ir_uart_test3.out: ../../drivers/avr/timer.o ../../utils/font.o ../../drivers/avr/timer0.o ../../drivers/avr/ir_uart.o ../../drivers/avr/pio.o ../../utils/uint8toa.o ../../utils/tinygl.o ../../drivers/display.o ../../drivers/avr/system.o ../../drivers/ledmat.o ir_uart_test3.o ../../drivers/avr/usart1.o ../../drivers/avr/prescale.o ../../drivers/navswitch.o ../../utils/pacer.o diff --git a/apps/led0/Makefile b/apps/led0/Makefile index 2a9e864..9680ff4 100644 --- a/apps/led0/Makefile +++ b/apps/led0/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/led2/Makefile b/apps/led2/Makefile index 9107fae..667a214 100644 --- a/apps/led2/Makefile +++ b/apps/led2/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/led3/Makefile b/apps/led3/Makefile index 7a7f417..64fc73a 100644 --- a/apps/led3/Makefile +++ b/apps/led3/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/led4/Makefile b/apps/led4/Makefile index 1c8850a..1949fcb 100644 --- a/apps/led4/Makefile +++ b/apps/led4/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/led5/Makefile b/apps/led5/Makefile index 9bbf3a9..55c9934 100644 --- a/apps/led5/Makefile +++ b/apps/led5/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../drivers/avr OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/scribble1/Makefile b/apps/scribble1/Makefile index 9f461f9..4caac80 100644 --- a/apps/scribble1/Makefile +++ b/apps/scribble1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/snake1/Makefile b/apps/snake1/Makefile index da204ec..8aed64a 100644 --- a/apps/snake1/Makefile +++ b/apps/snake1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/space11/Makefile b/apps/space11/Makefile index bc2dc86..d965503 100644 --- a/apps/space11/Makefile +++ b/apps/space11/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/space9/Makefile b/apps/space9/Makefile index 1194dde..1a47df6 100644 --- a/apps/space9/Makefile +++ b/apps/space9/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/squeak3/Makefile b/apps/squeak3/Makefile index bc5e7df..96fa51e 100644 --- a/apps/squeak3/Makefile +++ b/apps/squeak3/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../extra -I../../drivers/avr -I../../fonts -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../extra -I../../drivers -I../../fonts -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/squeak3/Makefile.test b/apps/squeak3/Makefile.test index 71ea2ee..2179ddf 100644 --- a/apps/squeak3/Makefile.test +++ b/apps/squeak3/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for squeak3 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../extra -I../../utils +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../extra -I../../fonts -I../../utils DEL = rm diff --git a/apps/squeak4/Makefile b/apps/squeak4/Makefile index dca79c1..269d084 100644 --- a/apps/squeak4/Makefile +++ b/apps/squeak4/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../extra -I../../drivers/avr -I../../fonts -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../extra -I../../drivers -I../../fonts -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/squeak4/Makefile.test b/apps/squeak4/Makefile.test index 0b5b49c..0f915b5 100644 --- a/apps/squeak4/Makefile.test +++ b/apps/squeak4/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for squeak4 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../extra -I../../utils +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../extra -I../../fonts -I../../utils DEL = rm diff --git a/apps/steer1/Makefile b/apps/steer1/Makefile index 7f14bee..404e160 100644 --- a/apps/steer1/Makefile +++ b/apps/steer1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/stopwatch1/Makefile b/apps/stopwatch1/Makefile index 709b8a1..93aa171 100644 --- a/apps/stopwatch1/Makefile +++ b/apps/stopwatch1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/task1/Makefile b/apps/task1/Makefile index 9605f52..0190482 100644 --- a/apps/task1/Makefile +++ b/apps/task1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/task2/Makefile b/apps/task2/Makefile index abce4d9..6d9a113 100644 --- a/apps/task2/Makefile +++ b/apps/task2/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/tdmdemo2/Makefile b/apps/tdmdemo2/Makefile index 8a779ba..c1c1a0d 100644 --- a/apps/tdmdemo2/Makefile +++ b/apps/tdmdemo2/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/updown1/Makefile b/apps/updown1/Makefile index e6726dc..64652a7 100644 --- a/apps/updown1/Makefile +++ b/apps/updown1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/updown2/Makefile b/apps/updown2/Makefile index 721bf4e..748df6e 100644 --- a/apps/updown2/Makefile +++ b/apps/updown2/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/voltmeter1/Makefile b/apps/voltmeter1/Makefile index 30dad5b..ce5fdef 100644 --- a/apps/voltmeter1/Makefile +++ b/apps/voltmeter1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/etc/Makefile b/etc/Makefile index 83d4e5a..53bf366 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -9,7 +9,7 @@ # the applications looking for #includes. # It also creates the doc directories and the callgraphs, etc. -APPDIRS = $(filter-out ../apps/README ../Makefile, $(wildcard ../apps/*/ ../lab*/*/)) +APPDIRS = $(filter-out ../apps/README ../Makefile, $(wildcard ../apps/*/ )) DOCDIRS = $(addsuffix /doc, $(APPDIRS)) # Don't link against test-scaffold if directly accessing harware diff --git a/etc/Makefile.doc.template b/etc/Makefile.doc.template index 632eb0f..a4601cb 100644 --- a/etc/Makefile.doc.template +++ b/etc/Makefile.doc.template @@ -3,6 +3,9 @@ # Date: 11 Sep 2010 # Descr: Makefile for @PROJECT@ docs +# The scripts used to make the graphs require the program dot; this +# is part of the graphviz package. + DEL = rm all: file_dependencies.pdf module_dependencies.pdf makefile_dependencies.pdf build_dependencies.pdf callgraph.pdf @@ -11,7 +14,7 @@ file_dependencies.pdf: files.d ../../../etc/graphdeps.py $< --out $@ module_dependencies.pdf: modules.d - ../../../etc/graphdeps.py $< --modules --out $@ + ../../../etc/graphdeps.py $< --modules --rotate --out $@ makefile_dependencies.pdf: ../Makefile ../../../etc/graphdeps.py $< --out $@