From fe0abe1c2392daaac55967e9b29601240f58a0ab Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Tue, 30 Aug 2011 03:29:33 +0000 Subject: [PATCH] Only include necessary dirs --- apps/bounce1/Makefile | 2 +- apps/bounce1/Makefile.test | 2 +- apps/bounce1/doc/Makefile | 6 ++-- apps/bounce2/Makefile | 2 +- apps/bounce2/Makefile.test | 2 +- apps/bounce2/doc/Makefile | 6 ++-- apps/bounce3/Makefile | 2 +- apps/bounce3/Makefile.test | 2 +- apps/bounce3/doc/Makefile | 6 ++-- apps/bounce4/Makefile | 2 +- apps/bounce4/Makefile.test | 2 +- apps/bounce4/doc/Makefile | 6 ++-- apps/bounce5/Makefile | 2 +- apps/bounce5/Makefile.test | 2 +- apps/bounce5/doc/Makefile | 6 ++-- apps/chooser/Makefile | 2 +- apps/chooser/Makefile.test | 2 +- apps/chooser/doc/Makefile | 6 ++-- apps/demo1/Makefile | 2 +- apps/demo1/Makefile.test | 2 +- apps/demo1/doc/Makefile | 6 ++-- apps/demo2/Makefile | 2 +- apps/demo2/Makefile.test | 2 +- apps/demo2/doc/Makefile | 6 ++-- apps/fonttest1/Makefile | 2 +- apps/fonttest1/Makefile.test | 2 +- apps/fonttest1/doc/Makefile | 6 ++-- apps/hello1/Makefile | 2 +- apps/hello1/Makefile.test | 2 +- apps/hello1/doc/Makefile | 6 ++-- apps/hello2/Makefile | 2 +- apps/hello2/Makefile.test | 2 +- apps/hello2/doc/Makefile | 6 ++-- apps/hello3/Makefile | 2 +- apps/hello3/Makefile.test | 2 +- apps/hello3/doc/Makefile | 6 ++-- apps/hello4/Makefile | 2 +- apps/hello4/Makefile.test | 2 +- apps/hello4/doc/Makefile | 6 ++-- apps/ir_grab1/Makefile | 2 +- apps/ir_grab1/Makefile.test | 2 +- apps/ir_grab1/doc/Makefile | 6 ++-- apps/ir_grab2/Makefile | 2 +- apps/ir_grab2/Makefile.test | 2 +- apps/ir_grab2/doc/Makefile | 6 ++-- apps/ir_grab3/Makefile | 2 +- apps/ir_grab3/Makefile.test | 2 +- apps/ir_grab3/doc/Makefile | 6 ++-- apps/ir_serial_test1/Makefile | 2 +- apps/ir_serial_test1/Makefile.test | 2 +- apps/ir_serial_test1/doc/Makefile | 6 ++-- apps/ir_serial_test2/Makefile | 2 +- apps/ir_serial_test2/Makefile.test | 2 +- apps/ir_serial_test2/doc/Makefile | 6 ++-- apps/ir_serial_test3/Makefile | 2 +- apps/ir_serial_test3/Makefile.test | 2 +- apps/ir_serial_test3/doc/Makefile | 6 ++-- apps/ir_uart_test1/Makefile | 2 +- apps/ir_uart_test1/Makefile.test | 2 +- apps/ir_uart_test1/doc/Makefile | 6 ++-- apps/ir_uart_test2/Makefile | 2 +- apps/ir_uart_test2/Makefile.test | 2 +- apps/ir_uart_test2/doc/Makefile | 6 ++-- apps/led1/Makefile | 2 +- apps/led1/Makefile.test | 2 +- apps/led1/doc/Makefile | 6 ++-- apps/led2/Makefile | 2 +- apps/led2/Makefile.test | 2 +- apps/led2/doc/Makefile | 6 ++-- apps/led3/Makefile | 2 +- apps/led3/Makefile.test | 2 +- apps/led3/doc/Makefile | 6 ++-- apps/led4/Makefile | 2 +- apps/led4/Makefile.test | 2 +- apps/led4/doc/Makefile | 6 ++-- apps/led5/Makefile | 2 +- apps/led5/Makefile.test | 2 +- apps/led5/doc/Makefile | 6 ++-- apps/pio1/Makefile | 2 +- apps/pio1/Makefile.test | 2 +- apps/pio2/Makefile | 2 +- apps/pio2/Makefile.test | 2 +- apps/pio3/Makefile | 2 +- apps/pio3/Makefile.test | 2 +- apps/scribble1/Makefile | 2 +- apps/scribble1/Makefile.test | 2 +- apps/snake1/Makefile | 2 +- apps/snake1/Makefile.test | 2 +- apps/space10/Makefile | 2 +- apps/space10/Makefile.test | 2 +- apps/space11/Makefile | 2 +- apps/space11/Makefile.test | 2 +- apps/space9/Makefile | 2 +- apps/space9/Makefile.test | 2 +- apps/spacey_remote1/Makefile | 2 +- apps/spacey_remote1/Makefile.test | 2 +- apps/squeak1/Makefile | 15 ++++++---- apps/squeak1/squeak1.c | 3 +- apps/squeak2/Makefile | 2 +- apps/squeak2/doc/Makefile | 2 +- apps/steer1/Makefile | 2 +- apps/steer1/Makefile.test | 2 +- apps/task1/Makefile | 2 +- apps/task1/Makefile.test | 2 +- apps/task2/Makefile | 2 +- apps/task2/Makefile.test | 2 +- apps/tdmdemo1/Makefile | 2 +- apps/tdmdemo1/Makefile.test | 2 +- apps/tdmdemo2/Makefile | 2 +- apps/tdmdemo2/Makefile.test | 2 +- apps/updown1/Makefile | 2 +- apps/updown1/Makefile.test | 2 +- apps/updown2/Makefile | 2 +- apps/updown2/Makefile.test | 2 +- etc/Makefile | 6 ++-- etc/Makefile.doc.template | 6 ++-- etc/makemake.py | 45 ++++++++++++++++++++++-------- 117 files changed, 214 insertions(+), 189 deletions(-) diff --git a/apps/bounce1/Makefile b/apps/bounce1/Makefile index 718a454..d5fa79b 100644 --- a/apps/bounce1/Makefile +++ b/apps/bounce1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/bounce1/Makefile.test b/apps/bounce1/Makefile.test index cbb52c7..7b9fdac 100644 --- a/apps/bounce1/Makefile.test +++ b/apps/bounce1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for bounce1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/bounce1/doc/Makefile b/apps/bounce1/doc/Makefile index 3a215d2..1ef0bf6 100644 --- a/apps/bounce1/doc/Makefile +++ b/apps/bounce1/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/bounce2/Makefile b/apps/bounce2/Makefile index cc420ac..1148b46 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +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/bounce2/Makefile.test b/apps/bounce2/Makefile.test index f0cf025..5fa1ffd 100644 --- a/apps/bounce2/Makefile.test +++ b/apps/bounce2/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for bounce2 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/bounce2/doc/Makefile b/apps/bounce2/doc/Makefile index 3cd8561..6ed8824 100644 --- a/apps/bounce2/doc/Makefile +++ b/apps/bounce2/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/bounce3/Makefile b/apps/bounce3/Makefile index 5a6af5e..360bcd8 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +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/bounce3/Makefile.test b/apps/bounce3/Makefile.test index f1afd35..87e1b9d 100644 --- a/apps/bounce3/Makefile.test +++ b/apps/bounce3/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for bounce3 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/bounce3/doc/Makefile b/apps/bounce3/doc/Makefile index 85d9a7c..f0275e5 100644 --- a/apps/bounce3/doc/Makefile +++ b/apps/bounce3/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/bounce4/Makefile b/apps/bounce4/Makefile index acf7963..9d799bc 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +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/bounce4/Makefile.test b/apps/bounce4/Makefile.test index 7feb6fd..72b5a53 100644 --- a/apps/bounce4/Makefile.test +++ b/apps/bounce4/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for bounce4 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/bounce4/doc/Makefile b/apps/bounce4/doc/Makefile index 4230004..0c3b14f 100644 --- a/apps/bounce4/doc/Makefile +++ b/apps/bounce4/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/bounce5/Makefile b/apps/bounce5/Makefile index 7d4194f..afabd94 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +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/bounce5/Makefile.test b/apps/bounce5/Makefile.test index 0564a3b..0a41700 100644 --- a/apps/bounce5/Makefile.test +++ b/apps/bounce5/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for bounce5 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/bounce5/doc/Makefile b/apps/bounce5/doc/Makefile index e77407a..09d8eca 100644 --- a/apps/bounce5/doc/Makefile +++ b/apps/bounce5/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/chooser/Makefile b/apps/chooser/Makefile index a25bb45..ad428a9 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/chooser/Makefile.test b/apps/chooser/Makefile.test index 9343657..f5ffdf2 100644 --- a/apps/chooser/Makefile.test +++ b/apps/chooser/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for chooser CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/chooser/doc/Makefile b/apps/chooser/doc/Makefile index 3504e53..69407ba 100644 --- a/apps/chooser/doc/Makefile +++ b/apps/chooser/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/demo1/Makefile b/apps/demo1/Makefile index c02d99e..1962f35 100644 --- a/apps/demo1/Makefile +++ b/apps/demo1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/demo1/Makefile.test b/apps/demo1/Makefile.test index de5a4cd..55bb942 100644 --- a/apps/demo1/Makefile.test +++ b/apps/demo1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for demo1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/demo1/doc/Makefile b/apps/demo1/doc/Makefile index d086905..c374bd1 100644 --- a/apps/demo1/doc/Makefile +++ b/apps/demo1/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/demo2/Makefile b/apps/demo2/Makefile index f80a6d0..9d67c9b 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/demo2/Makefile.test b/apps/demo2/Makefile.test index 27fd0cc..169820f 100644 --- a/apps/demo2/Makefile.test +++ b/apps/demo2/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for demo2 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/demo2/doc/Makefile b/apps/demo2/doc/Makefile index cc18c3e..a00deb0 100644 --- a/apps/demo2/doc/Makefile +++ b/apps/demo2/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/fonttest1/Makefile b/apps/fonttest1/Makefile index aa57c9b..af8d3c3 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/fonttest1/Makefile.test b/apps/fonttest1/Makefile.test index 568b67a..2a35555 100644 --- a/apps/fonttest1/Makefile.test +++ b/apps/fonttest1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for fonttest1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/fonttest1/doc/Makefile b/apps/fonttest1/doc/Makefile index c418d53..199184d 100644 --- a/apps/fonttest1/doc/Makefile +++ b/apps/fonttest1/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/hello1/Makefile b/apps/hello1/Makefile index 0a27196..1f473b6 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../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I -I../../drivers -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/hello1/Makefile.test b/apps/hello1/Makefile.test index 3fe41da..3d2ba47 100644 --- a/apps/hello1/Makefile.test +++ b/apps/hello1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for hello1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/hello1/doc/Makefile b/apps/hello1/doc/Makefile index 75e448c..58d3bb9 100644 --- a/apps/hello1/doc/Makefile +++ b/apps/hello1/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/hello2/Makefile b/apps/hello2/Makefile index 372b19d..3d314ac 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/hello2/Makefile.test b/apps/hello2/Makefile.test index 198866b..f561df2 100644 --- a/apps/hello2/Makefile.test +++ b/apps/hello2/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for hello2 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/hello2/doc/Makefile b/apps/hello2/doc/Makefile index 092f13e..2db1a94 100644 --- a/apps/hello2/doc/Makefile +++ b/apps/hello2/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/hello3/Makefile b/apps/hello3/Makefile index 67136da..d62a2b2 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/hello3/Makefile.test b/apps/hello3/Makefile.test index f8424bd..d5ea08a 100644 --- a/apps/hello3/Makefile.test +++ b/apps/hello3/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for hello3 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/hello3/doc/Makefile b/apps/hello3/doc/Makefile index 9ea4d2d..54a6262 100644 --- a/apps/hello3/doc/Makefile +++ b/apps/hello3/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/hello4/Makefile b/apps/hello4/Makefile index 57f3c1a..0fb80b8 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/hello4/Makefile.test b/apps/hello4/Makefile.test index 11d4960..f7af7ea 100644 --- a/apps/hello4/Makefile.test +++ b/apps/hello4/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for hello4 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/hello4/doc/Makefile b/apps/hello4/doc/Makefile index 5fd5dee..fae5154 100644 --- a/apps/hello4/doc/Makefile +++ b/apps/hello4/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/ir_grab1/Makefile b/apps/ir_grab1/Makefile index 02e8084..cdfe816 100644 --- a/apps/ir_grab1/Makefile +++ b/apps/ir_grab1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/ir_grab1/Makefile.test b/apps/ir_grab1/Makefile.test index f65d0f8..01b3771 100644 --- a/apps/ir_grab1/Makefile.test +++ b/apps/ir_grab1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for ir_grab1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/ir_grab1/doc/Makefile b/apps/ir_grab1/doc/Makefile index ac9d77f..71d3c41 100644 --- a/apps/ir_grab1/doc/Makefile +++ b/apps/ir_grab1/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/ir_grab2/Makefile b/apps/ir_grab2/Makefile index 3052345..dd70742 100644 --- a/apps/ir_grab2/Makefile +++ b/apps/ir_grab2/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/ir_grab2/Makefile.test b/apps/ir_grab2/Makefile.test index 7f2aa2b..fddee74 100644 --- a/apps/ir_grab2/Makefile.test +++ b/apps/ir_grab2/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for ir_grab2 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/ir_grab2/doc/Makefile b/apps/ir_grab2/doc/Makefile index 610d364..93536d2 100644 --- a/apps/ir_grab2/doc/Makefile +++ b/apps/ir_grab2/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/ir_grab3/Makefile b/apps/ir_grab3/Makefile index def926c..7bc8038 100644 --- a/apps/ir_grab3/Makefile +++ b/apps/ir_grab3/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/ir_grab3/Makefile.test b/apps/ir_grab3/Makefile.test index 24f4767..71769c1 100644 --- a/apps/ir_grab3/Makefile.test +++ b/apps/ir_grab3/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for ir_grab3 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/ir_grab3/doc/Makefile b/apps/ir_grab3/doc/Makefile index df00358..b1266ac 100644 --- a/apps/ir_grab3/doc/Makefile +++ b/apps/ir_grab3/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/ir_serial_test1/Makefile b/apps/ir_serial_test1/Makefile index 60d51e1..25e51db 100644 --- a/apps/ir_serial_test1/Makefile +++ b/apps/ir_serial_test1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/ir_serial_test1/Makefile.test b/apps/ir_serial_test1/Makefile.test index 669e59c..799c87d 100644 --- a/apps/ir_serial_test1/Makefile.test +++ b/apps/ir_serial_test1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for ir_serial_test1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/ir_serial_test1/doc/Makefile b/apps/ir_serial_test1/doc/Makefile index 3ebc9f8..6be94cb 100644 --- a/apps/ir_serial_test1/doc/Makefile +++ b/apps/ir_serial_test1/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/ir_serial_test2/Makefile b/apps/ir_serial_test2/Makefile index 9ac770f..94abf1a 100644 --- a/apps/ir_serial_test2/Makefile +++ b/apps/ir_serial_test2/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/ir_serial_test2/Makefile.test b/apps/ir_serial_test2/Makefile.test index bfeb150..a1e6e1c 100644 --- a/apps/ir_serial_test2/Makefile.test +++ b/apps/ir_serial_test2/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for ir_serial_test2 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/ir_serial_test2/doc/Makefile b/apps/ir_serial_test2/doc/Makefile index 9fe58f8..280b435 100644 --- a/apps/ir_serial_test2/doc/Makefile +++ b/apps/ir_serial_test2/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/ir_serial_test3/Makefile b/apps/ir_serial_test3/Makefile index 32348c3..43edf03 100644 --- a/apps/ir_serial_test3/Makefile +++ b/apps/ir_serial_test3/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/ir_serial_test3/Makefile.test b/apps/ir_serial_test3/Makefile.test index 5854389..6dadb2d 100644 --- a/apps/ir_serial_test3/Makefile.test +++ b/apps/ir_serial_test3/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for ir_serial_test3 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/ir_serial_test3/doc/Makefile b/apps/ir_serial_test3/doc/Makefile index 9105524..06d3712 100644 --- a/apps/ir_serial_test3/doc/Makefile +++ b/apps/ir_serial_test3/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/ir_uart_test1/Makefile b/apps/ir_uart_test1/Makefile index fff5335..b828e72 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/ir_uart_test1/Makefile.test b/apps/ir_uart_test1/Makefile.test index d13bc6b..57f17f8 100644 --- a/apps/ir_uart_test1/Makefile.test +++ b/apps/ir_uart_test1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for ir_uart_test1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/ir_uart_test1/doc/Makefile b/apps/ir_uart_test1/doc/Makefile index 01d19c7..c91c428 100644 --- a/apps/ir_uart_test1/doc/Makefile +++ b/apps/ir_uart_test1/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/ir_uart_test2/Makefile b/apps/ir_uart_test2/Makefile index fd3bb45..7eb9e4f 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/ir_uart_test2/Makefile.test b/apps/ir_uart_test2/Makefile.test index fd0c18a..ad7d751 100644 --- a/apps/ir_uart_test2/Makefile.test +++ b/apps/ir_uart_test2/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for ir_uart_test2 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/ir_uart_test2/doc/Makefile b/apps/ir_uart_test2/doc/Makefile index 5d3ff32..7a02109 100644 --- a/apps/ir_uart_test2/doc/Makefile +++ b/apps/ir_uart_test2/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/led1/Makefile b/apps/led1/Makefile index e3fd95e..56d6db5 100644 --- a/apps/led1/Makefile +++ b/apps/led1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +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/led1/Makefile.test b/apps/led1/Makefile.test index 7961cdd..275fb3b 100644 --- a/apps/led1/Makefile.test +++ b/apps/led1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for led1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/led1/doc/Makefile b/apps/led1/doc/Makefile index 040aff6..4dd5b65 100644 --- a/apps/led1/doc/Makefile +++ b/apps/led1/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/led2/Makefile b/apps/led2/Makefile index cb49b22..8e46c81 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +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.test b/apps/led2/Makefile.test index f0105dc..5e8a5a5 100644 --- a/apps/led2/Makefile.test +++ b/apps/led2/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for led2 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/led2/doc/Makefile b/apps/led2/doc/Makefile index 86001ad..bba4a82 100644 --- a/apps/led2/doc/Makefile +++ b/apps/led2/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/led3/Makefile b/apps/led3/Makefile index e61e142..4e8676c 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +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/led3/Makefile.test b/apps/led3/Makefile.test index 5549681..693df87 100644 --- a/apps/led3/Makefile.test +++ b/apps/led3/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for led3 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/led3/doc/Makefile b/apps/led3/doc/Makefile index 0c4f849..66031fb 100644 --- a/apps/led3/doc/Makefile +++ b/apps/led3/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/led4/Makefile b/apps/led4/Makefile index 22ebd67..e49ab9a 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +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/led4/Makefile.test b/apps/led4/Makefile.test index 1ad8783..f38c468 100644 --- a/apps/led4/Makefile.test +++ b/apps/led4/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for led4 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/led4/doc/Makefile b/apps/led4/doc/Makefile index 930ba8c..659c728 100644 --- a/apps/led4/doc/Makefile +++ b/apps/led4/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/led5/Makefile b/apps/led5/Makefile index 94400ff..e01cc19 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/led5/Makefile.test b/apps/led5/Makefile.test index 5c395d5..ab124eb 100644 --- a/apps/led5/Makefile.test +++ b/apps/led5/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for led5 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/led5/doc/Makefile b/apps/led5/doc/Makefile index 4b88af7..56cd6ec 100644 --- a/apps/led5/doc/Makefile +++ b/apps/led5/doc/Makefile @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/apps/pio1/Makefile b/apps/pio1/Makefile index 5bf83d6..dad6058 100644 --- a/apps/pio1/Makefile +++ b/apps/pio1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/pio1/Makefile.test b/apps/pio1/Makefile.test index 764658e..056cbcf 100644 --- a/apps/pio1/Makefile.test +++ b/apps/pio1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for pio1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/pio2/Makefile b/apps/pio2/Makefile index dbfc071..0f5de6c 100644 --- a/apps/pio2/Makefile +++ b/apps/pio2/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/pio2/Makefile.test b/apps/pio2/Makefile.test index df90414..47655f4 100644 --- a/apps/pio2/Makefile.test +++ b/apps/pio2/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for pio2 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/pio3/Makefile b/apps/pio3/Makefile index 76bce1e..03fa516 100644 --- a/apps/pio3/Makefile +++ b/apps/pio3/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/pio3/Makefile.test b/apps/pio3/Makefile.test index 00d8acb..eeb8d40 100644 --- a/apps/pio3/Makefile.test +++ b/apps/pio3/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for pio3 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/scribble1/Makefile b/apps/scribble1/Makefile index f3d7b1c..0ada7df 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/scribble1/Makefile.test b/apps/scribble1/Makefile.test index 3d13f64..ae37e1c 100644 --- a/apps/scribble1/Makefile.test +++ b/apps/scribble1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for scribble1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/snake1/Makefile b/apps/snake1/Makefile index be021d8..0952c15 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/snake1/Makefile.test b/apps/snake1/Makefile.test index ea82249..c26cc20 100644 --- a/apps/snake1/Makefile.test +++ b/apps/snake1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for snake1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/space10/Makefile b/apps/space10/Makefile index 5178f78..9419fd5 100644 --- a/apps/space10/Makefile +++ b/apps/space10/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/space10/Makefile.test b/apps/space10/Makefile.test index e9e20bd..ae74796 100644 --- a/apps/space10/Makefile.test +++ b/apps/space10/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for space10 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/space11/Makefile b/apps/space11/Makefile index 1f0aeeb..053a38a 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../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/space11/Makefile.test b/apps/space11/Makefile.test index 54f4e0e..a789349 100644 --- a/apps/space11/Makefile.test +++ b/apps/space11/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for space11 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/space9/Makefile b/apps/space9/Makefile index fefd6ba..09d6272 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../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/space9/Makefile.test b/apps/space9/Makefile.test index 20da751..34e3294 100644 --- a/apps/space9/Makefile.test +++ b/apps/space9/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for space9 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/spacey_remote1/Makefile b/apps/spacey_remote1/Makefile index b83ba23..4884ab0 100644 --- a/apps/spacey_remote1/Makefile +++ b/apps/spacey_remote1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/spacey_remote1/Makefile.test b/apps/spacey_remote1/Makefile.test index e8be138..a119a26 100644 --- a/apps/spacey_remote1/Makefile.test +++ b/apps/spacey_remote1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for spacey_remote1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/squeak1/Makefile b/apps/squeak1/Makefile index cfbca5e..7a69c14 100644 --- a/apps/squeak1/Makefile +++ b/apps/squeak1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr -I../../extra +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../extra -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm @@ -16,7 +16,7 @@ all: squeak1.out # Compile: create object files from C source files. -squeak1.o: squeak1.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../drivers/led.h ../../extra/mmelody.h ../../extra/squeaker.h ../../extra/tweeter.h ../../utils/font.h ../../utils/task.h +squeak1.o: squeak1.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../drivers/led.h ../../extra/mmelody.h ../../extra/squeaker.h ../../extra/ticker.h ../../extra/tweeter.h ../../utils/task.h $(CC) -c $(CFLAGS) $< -o $@ pio.o: ../../drivers/avr/pio.c ../../drivers/avr/pio.h ../../drivers/avr/system.h @@ -31,13 +31,16 @@ timer.o: ../../drivers/avr/timer.c ../../drivers/avr/system.h ../../drivers/avr/ led.o: ../../drivers/led.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/led.h $(CC) -c $(CFLAGS) $< -o $@ -mmelody.o: ../../extra/mmelody.c ../../drivers/avr/system.h ../../extra/mmelody.h ../../utils/font.h +mmelody.o: ../../extra/mmelody.c ../../drivers/avr/system.h ../../extra/mmelody.h ../../extra/ticker.h $(CC) -c $(CFLAGS) $< -o $@ -squeaker.o: ../../extra/squeaker.c ../../drivers/avr/system.h ../../extra/squeaker.h ../../utils/font.h +squeaker.o: ../../extra/squeaker.c ../../drivers/avr/system.h ../../extra/squeaker.h ../../extra/ticker.h $(CC) -c $(CFLAGS) $< -o $@ -tweeter.o: ../../extra/tweeter.c ../../drivers/avr/system.h ../../extra/tweeter.h ../../utils/font.h +ticker.o: ../../extra/ticker.c + $(CC) -c $(CFLAGS) $< -o $@ + +tweeter.o: ../../extra/tweeter.c ../../drivers/avr/system.h ../../extra/ticker.h ../../extra/tweeter.h $(CC) -c $(CFLAGS) $< -o $@ task.o: ../../utils/task.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/task.h @@ -46,7 +49,7 @@ task.o: ../../utils/task.c ../../drivers/avr/system.h ../../drivers/avr/timer.h # Link: create ELF output file from object files. -squeak1.out: squeak1.o pio.o system.o timer.o led.o mmelody.o squeaker.o tweeter.o task.o +squeak1.out: squeak1.o pio.o system.o timer.o led.o mmelody.o squeaker.o ticker.o tweeter.o task.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/squeak1/squeak1.c b/apps/squeak1/squeak1.c index 4712a87..934be93 100644 --- a/apps/squeak1/squeak1.c +++ b/apps/squeak1/squeak1.c @@ -1,6 +1,6 @@ /** @file squeak1.c @author M.P. Hayes - @date 5 Oct 2010 + @date 30 Aug 2011 */ #include "system.h" @@ -12,6 +12,7 @@ #include "mmelody.h" +/* Connect piezo tweeter to outermost pins of UCFK4 P1 connector. */ #define PIEZO_PIO PIO_DEFINE (PORT_D, 6) /* Define polling rate in Hz. */ diff --git a/apps/squeak2/Makefile b/apps/squeak2/Makefile index 1cb6c69..06892ad 100644 --- a/apps/squeak2/Makefile +++ b/apps/squeak2/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr -I../../extra +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../extra -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/squeak2/doc/Makefile b/apps/squeak2/doc/Makefile index 7713459..c0396aa 100644 --- a/apps/squeak2/doc/Makefile +++ b/apps/squeak2/doc/Makefile @@ -1,7 +1,7 @@ # File: Makefile # Author: M. P. Hayes, UCECE # Date: 11 Sep 2010 -# Descr: Makefile for squeak1 docs +# Descr: Makefile for squeak2 docs DEL = rm diff --git a/apps/steer1/Makefile b/apps/steer1/Makefile index 38f982f..8e37cea 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/steer1/Makefile.test b/apps/steer1/Makefile.test index f863c53..b0c46b4 100644 --- a/apps/steer1/Makefile.test +++ b/apps/steer1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for steer1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/task1/Makefile b/apps/task1/Makefile index b26c8ad..b3dcd58 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +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/task1/Makefile.test b/apps/task1/Makefile.test index aa8700f..def1d6e 100644 --- a/apps/task1/Makefile.test +++ b/apps/task1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for task1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/task2/Makefile b/apps/task2/Makefile index 1cc5c1b..11d4560 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/task2/Makefile.test b/apps/task2/Makefile.test index 6c206d3..94b4028 100644 --- a/apps/task2/Makefile.test +++ b/apps/task2/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for task2 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/tdmdemo1/Makefile b/apps/tdmdemo1/Makefile index eed59f6..11da38e 100644 --- a/apps/tdmdemo1/Makefile +++ b/apps/tdmdemo1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +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/tdmdemo1/Makefile.test b/apps/tdmdemo1/Makefile.test index be52445..3bc6fda 100644 --- a/apps/tdmdemo1/Makefile.test +++ b/apps/tdmdemo1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for tdmdemo1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/tdmdemo2/Makefile b/apps/tdmdemo2/Makefile index f81888b..8a528f6 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +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/tdmdemo2/Makefile.test b/apps/tdmdemo2/Makefile.test index 1063cb7..515597f 100644 --- a/apps/tdmdemo2/Makefile.test +++ b/apps/tdmdemo2/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for tdmdemo2 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/updown1/Makefile b/apps/updown1/Makefile index f9f2052..bfe5c8c 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/updown1/Makefile.test b/apps/updown1/Makefile.test index 2fc0c97..eb2b7c2 100644 --- a/apps/updown1/Makefile.test +++ b/apps/updown1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for updown1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/apps/updown2/Makefile b/apps/updown2/Makefile index 561af95..411c1f2 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. -I../../utils -I../../fonts -I../../drivers -I../../drivers/avr +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/updown2/Makefile.test b/apps/updown2/Makefile.test index 6e16553..3b07986 100644 --- a/apps/updown2/Makefile.test +++ b/apps/updown2/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for updown2 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra DEL = rm diff --git a/etc/Makefile b/etc/Makefile index cdd084e..e8f59c5 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -44,13 +44,13 @@ docs: $(DOCMAKEFILES) ../%/doc/Makefile: Makefile.doc.template Makefile makemake.py README.doc.template mkdir -p $(dir $@) cp -f README.doc.template $(dir $@)/README - (cd $(dir $@)/..; ../../etc/makemake.py --relpath --template ../../etc/Makefile.doc.template . . ../../utils ../../fonts ../../drivers ../../drivers/avr > doc/Makefile) + (cd $(dir $@)/..; ../../etc/makemake.py --relpath --template ../../etc/Makefile.doc.template . . ../../utils ../../fonts ../../drivers ../../drivers/avr ../../extra > doc/Makefile) ../%/Makefile.test: Makefile.test.template Makefile - (cd $(dir $@); ../../etc/makemake.py --cc="gcc" --cflags="" --relpath --objext=-test.o --template ../../etc/Makefile.test.template . . ../../utils ../../drivers ../../drivers/test > Makefile.test) + (cd $(dir $@); ../../etc/makemake.py --cc="gcc" --cflags="" --relpath --objext=-test.o --template ../../etc/Makefile.test.template . . ../../utils ../../drivers ../../drivers/test ../../extra > Makefile.test) ../%/Makefile: Makefile.template Makefile makemake.py - (cd $(dir $@); ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --template ../../etc/Makefile.template . . ../../utils ../../fonts ../../drivers ../../drivers/avr > Makefile) + (cd $(dir $@); ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --template ../../etc/Makefile.template . . ../../utils ../../fonts ../../drivers ../../drivers/avr ../../extra > Makefile) diff --git a/etc/Makefile.doc.template b/etc/Makefile.doc.template index df01ed1..632eb0f 100644 --- a/etc/Makefile.doc.template +++ b/etc/Makefile.doc.template @@ -24,15 +24,15 @@ callgraph.pdf: callgraph.d files.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/files.d) + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) modules.d: ../Makefile - (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils --exclude system > doc/modules.d) + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) callgraph.d: ../Makefile - (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils --exclude system.h > doc/callgraph.d) + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) # Clean: delete derived files. diff --git a/etc/makemake.py b/etc/makemake.py index ee37a6c..60e361a 100755 --- a/etc/makemake.py +++ b/etc/makemake.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -"""makemake V0.08 +"""makemake V0.09 Copyright (c) 2010 Michael P. Hayes, UC ECE, NZ This program tries to make a Makefile from a template. Given a C file @@ -101,14 +101,25 @@ def hfiles_get (cfile, filedeps, options): return unique (hfilelist) -def cfiles_get (filedeps): +def files_get_all (filedeps, ext): - cfilelist = [] + filelist = [] for target in filedeps: - if target[-2:] == '.c': - cfilelist.append (target) + if target[-2:] == ext: + filelist.append (target) - return unique (cfilelist) + return unique (filelist) + + + +def cfiles_get_all (filedeps): + + return files_get_all (filedeps, '.c') + + +def hfiles_get_all (filedeps): + + return files_get_all (filedeps, '.h') def file_parse (pathname, indent, debug): @@ -134,10 +145,10 @@ def file_parse (pathname, indent, debug): return hfilelist -def makefile_print (options, template, maincfilename, filedeps, - search_list): +def makefile_print (options, template, maincfilename, filedeps, + search_list): - cfilelist = cfiles_get (filedeps) + cfilelist = cfiles_get_all (filedeps) cfilelist.sort () basecfilelist = [os.path.basename (cfile) for cfile in cfilelist] @@ -149,8 +160,18 @@ def makefile_print (options, template, maincfilename, filedeps, text = file.read () file.close () - vpath = ' '.join (search_list) - includes = '-I' + ' -I'.join (search_list) + hfilelist = hfiles_get_all (filedeps) + + includedirs = unique ([os.path.dirname (os.path.relpath (path)) for path in hfilelist]) + + moduledirs = unique ([os.path.dirname (os.path.relpath (path)) for path in cfilelist]) + if options.debug: + print >> sys.stderr, includedirs + print >> sys.stderr, moduledirs + + + vpath = ' '.join (moduledirs) + includes = '-I' + ' -I'.join (includedirs) src = ' '.join (basecfilelist) obj = src @@ -514,7 +535,7 @@ def main(argv = None): moduledeps = {} files_find (maincfilename, search_path, filedeps, moduledeps, '', options.debug) - cfilelist = cfiles_get (filedeps) + cfilelist = cfiles_get_all (filedeps) ofilelist = [cfile[:-2] + options.objext for cfile in cfilelist] outfile = maincfilename[:-2] + options.exeext filedeps[outfile] = ofilelist