From a4133335fab05bcfbccd24e363993a4baa9bc32d Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Tue, 11 Oct 2011 21:36:38 +0000 Subject: [PATCH] Tweak deps --- apps/bounce1/Makefile.test | 49 +++++++++++++++++++++++++++++++++++++ apps/hello5/Makefile | 2 +- apps/hello5/Makefile.test | 2 +- apps/hello5/doc/callgraph.d | 10 +++++--- apps/scribble1/scribble1.c | 1 - 5 files changed, 57 insertions(+), 7 deletions(-) diff --git a/apps/bounce1/Makefile.test b/apps/bounce1/Makefile.test index e69de29..7baac90 100644 --- a/apps/bounce1/Makefile.test +++ b/apps/bounce1/Makefile.test @@ -0,0 +1,49 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 11 Sep 2010 +# Descr: Makefile for bounce1 + +CC = gcc +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../utils + +DEL = rm + + +# Default target. +all: bounce1 + + +# Compile: create object files from C source files. +bounce1-test.o: bounce1.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h ../../utils/pacer.h + $(CC) -c $(CFLAGS) $< -o $@ + +mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h + $(CC) -c $(CFLAGS) $< -o $@ + +pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h + $(CC) -c $(CFLAGS) $< -o $@ + +system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h + $(CC) -c $(CFLAGS) $< -o $@ + +timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h + $(CC) -c $(CFLAGS) $< -o $@ + +pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h + $(CC) -c $(CFLAGS) $< -o $@ + + + + +# Link: create executable file from object files. +bounce1: bounce1-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o + $(CC) $(CFLAGS) $^ -o $@ -lrt + + +# Clean: delete derived files. +.PHONY: clean +clean: + -$(DEL) bounce1 bounce1-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o + + + diff --git a/apps/hello5/Makefile b/apps/hello5/Makefile index adf2198..f9b1c0c 100644 --- a/apps/hello5/Makefile +++ b/apps/hello5/Makefile @@ -16,7 +16,7 @@ all: hello5.out # Compile: create object files from C source files. -hello5.o: hello5.c ../../drivers/avr/system.h ../../drivers/display.h ../../drivers/navswitch.h ../../fonts/font5x7_1.h ../../utils/font.h ../../utils/pacer.h ../../utils/tinygl.h +hello5.o: hello5.c ../../drivers/avr/system.h ../../drivers/display.h ../../drivers/navswitch.h ../../fonts/font3x5_1.h ../../utils/font.h ../../utils/pacer.h ../../utils/tinygl.h $(CC) -c $(CFLAGS) $< -o $@ pio.o: ../../drivers/avr/pio.c ../../drivers/avr/pio.h ../../drivers/avr/system.h diff --git a/apps/hello5/Makefile.test b/apps/hello5/Makefile.test index 1c4dd15..1fcd392 100644 --- a/apps/hello5/Makefile.test +++ b/apps/hello5/Makefile.test @@ -14,7 +14,7 @@ all: hello5 # Compile: create object files from C source files. -hello5-test.o: hello5.c ../../drivers/display.h ../../drivers/navswitch.h ../../drivers/test/system.h ../../fonts/font5x7_1.h ../../utils/font.h ../../utils/pacer.h ../../utils/tinygl.h +hello5-test.o: hello5.c ../../drivers/display.h ../../drivers/navswitch.h ../../drivers/test/system.h ../../fonts/font3x5_1.h ../../utils/font.h ../../utils/pacer.h ../../utils/tinygl.h $(CC) -c $(CFLAGS) $< -o $@ display-test.o: ../../drivers/display.c ../../drivers/display.h ../../drivers/ledmat.h ../../drivers/test/system.h diff --git a/apps/hello5/doc/callgraph.d b/apps/hello5/doc/callgraph.d index 829855f..ffbc8b2 100644 --- a/apps/hello5/doc/callgraph.d +++ b/apps/hello5/doc/callgraph.d @@ -26,9 +26,9 @@ tinygl_text_mode_set@tinygl.c: tinygl_text_dir_set@tinygl.c: -tinygl_point@tinygl.c: +tinygl_draw_message@tinygl.c: strncpy strlen -tinygl_text@tinygl.c: strncpy +tinygl_text@tinygl.c: tinygl_draw_message timer_init@timer.c: @@ -40,6 +40,8 @@ timer_wait_until@timer.c: timer_get pacer_wait@pacer.c: timer_wait_until +tinygl_point@tinygl.c: + font_pixel_get@font.c: tinygl_font_pixel_get@tinygl.c: font_pixel_get @@ -52,7 +54,7 @@ tinygl_draw_char@tinygl.c: tinygl_point tinygl_font_pixel_get tinygl_draw_point tinygl_draw_string@tinygl.c: tinygl_draw_char -tinygl_text_advance@tinygl.c: tinygl_draw_char tinygl_draw_string +tinygl_text_advance@tinygl.c: tinygl_draw_string tinygl_draw_string pio_output_high@pio.c: @@ -74,5 +76,5 @@ navswitch_update@navswitch.c: pio_config_get pio_config_set pio_config_set _dela navswitch_push_event_p@navswitch.c: -main@hello5.c: system_init tinygl_init navswitch_init tinygl_font_set tinygl_text_speed_set tinygl_text_mode_set tinygl_text_dir_set tinygl_point tinygl_text pacer_init pacer_wait tinygl_update navswitch_update navswitch_push_event_p tinygl_text_mode_set navswitch_push_event_p tinygl_text_mode_set +main@hello5.c: system_init tinygl_init navswitch_init tinygl_font_set tinygl_text_speed_set tinygl_text_mode_set tinygl_text_dir_set tinygl_text pacer_init pacer_wait tinygl_update navswitch_update navswitch_push_event_p tinygl_text_mode_set navswitch_push_event_p tinygl_text_mode_set diff --git a/apps/scribble1/scribble1.c b/apps/scribble1/scribble1.c index 5dadaa6..e9138db 100644 --- a/apps/scribble1/scribble1.c +++ b/apps/scribble1/scribble1.c @@ -9,7 +9,6 @@ #include "led.h" #include "tinygl.h" #include "pacer.h" -#include "../fonts/font5x7_1.h" /* Define polling rate in Hz. */