From f5ae5e67471d254f78eecef7e4c35aa765dd3630 Mon Sep 17 00:00:00 2001 From: NĂ©lio Laranjeiro Date: Tue, 11 May 2010 01:12:45 +0200 Subject: {tools/trace, avr/module/trace}: remove full url for trace header file Python tool now create the headers and C files to be usable in the current make directory. --- digital/avr/modules/trace/test/Makefile | 3 +-- digital/avr/modules/trace/test/flood.c | 3 +-- digital/avr/modules/trace/test/test-trace.c | 2 +- digital/avr/modules/trace/trace.h | 1 - tools/trace/tcreator/template.c | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/digital/avr/modules/trace/test/Makefile b/digital/avr/modules/trace/test/Makefile index 89dbbf51..07fbfe5c 100644 --- a/digital/avr/modules/trace/test/Makefile +++ b/digital/avr/modules/trace/test/Makefile @@ -2,7 +2,7 @@ BASE = ../../.. TOOLS= $(BASE)/../../tools AVR_PROGS = test_trace flood HOST_PROGS = test_trace flood -EXTRA_CLEAN_FILES=../events.h events.host.c +EXTRA_CLEAN_FILES=events.h events.host.c test_trace_SOURCES = test-trace.c events.host.c flood_SOURCES = flood.c events.host.c @@ -17,6 +17,5 @@ OPTIMIZE = -O2 events: python $(TOOLS)/trace/trace.py -i $(TOOLS)/trace/example/trace.trc -t create -o - mv events.h .. include $(BASE)/make/Makefile.gen diff --git a/digital/avr/modules/trace/test/flood.c b/digital/avr/modules/trace/test/flood.c index 7675808a..5516538a 100644 --- a/digital/avr/modules/trace/test/flood.c +++ b/digital/avr/modules/trace/test/flood.c @@ -26,12 +26,11 @@ #include "io.h" #include "modules/flash/flash.h" #include "modules/trace/trace.h" -#include "modules/trace/events.h" #include "modules/proto/proto.h" #include "modules/utils/utils.h" #include "modules/utils/byte.h" #include "modules/uart/uart.h" - +#include "events.h" void flood (void) diff --git a/digital/avr/modules/trace/test/test-trace.c b/digital/avr/modules/trace/test/test-trace.c index 7bfde18b..49f4199f 100644 --- a/digital/avr/modules/trace/test/test-trace.c +++ b/digital/avr/modules/trace/test/test-trace.c @@ -28,11 +28,11 @@ #include "io.h" #include "modules/flash/flash.h" #include "modules/trace/trace.h" -#include "modules/trace/events.h" #include "modules/proto/proto.h" #include "modules/utils/utils.h" #include "modules/utils/byte.h" #include "modules/uart/uart.h" +#include "events.h" void flood (void) diff --git a/digital/avr/modules/trace/trace.h b/digital/avr/modules/trace/trace.h index 069f5e7c..68894059 100644 --- a/digital/avr/modules/trace/trace.h +++ b/digital/avr/modules/trace/trace.h @@ -28,7 +28,6 @@ * You can find the example on the website : * http://gcc.gnu.org/ml/gcc-patches/2000-11/msg00016.html */ -#include "modules/trace/events.h" #define PASTE_EXPAND(a, b) PASTE(a, b) #define PASTE(a, b) a ## b diff --git a/tools/trace/tcreator/template.c b/tools/trace/tcreator/template.c index d3f4eaec..8c7b38c0 100644 --- a/tools/trace/tcreator/template.c +++ b/tools/trace/tcreator/template.c @@ -22,7 +22,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * }}} */ -#include "modules/trace/events.h" +#include "events.h" char *trace_table[%%NB%%] = { %%DATA%% -- cgit v1.2.3