makefile changes in rtep and frescan for current marte version (1.9_5nov2008)

git-svn-id: http://www.frescor.org/private/svn/frescor/fna/trunk@1372 35b4ef3e-fd22-0410-ab77-dab3279adceb

diff --git a/src_rtep/Makefile b/src_rtep/Makefile
index b48ee1579a3fb2b1a8c99e1f558532c68d90c5a3..391cd5df9a872431e0287a5eb2838e73e3f89b39 100644 (file)
--- a/src_rtep/Makefile
+++ b/src_rtep/Makefile
@@ -7,7 +7,7 @@ include ../rules.mk
 SRCS := $(wildcard *.c)
 OBJS := $(patsubst %.c,%.o,$(wildcard *.c))
 HDRS := $(wildcard $(FNA_PATH)/include/*.h)
-CFLAGS += -I$(PLATFORM_PATH)/drivers/rt-ep/
+CFLAGS += -I$(PLATFORM_PATH)/arch/drivers/rt-ep/
 
 objs: $(OBJS)
 
@@ -16,7 +16,7 @@ objs: $(OBJS)
 
 librtepfna.a: objs
        @exec echo -e "\n>> Building RTEP FNA:";
-       @make -C $(PLATFORM_PATH)/drivers/rt-ep librtep
+       @make -C $(PLATFORM_PATH)/arch/drivers/rt-ep librtep
        ld -r -o librtepfna.o *.o
        @mv librtepfna.o $(FNA_PATH)/lib
        @exec echo ">> end Building RTEP FNA  [OK]"

diff --git a/tests/tests_frescan/Makefile b/tests/tests_frescan/Makefile
index 19bbfabc7815529bcd02249c23def07cc84eddae..de7908c3699cc6bfdc985dc7262808451d02f39a 100755 (executable)
--- a/tests/tests_frescan/Makefile
+++ b/tests/tests_frescan/Makefile
@@ -1,10 +1,7 @@
+.PHONY: tests
 include ../../config.mk
 include ../../rules.mk
 
-CFLAGS += -I$(FNA_PATH)/src_frescan/
-LDFLAGS += $(FNA_PATH)/lib/libfrescan.o
-
 EXES := $(patsubst %.c,%.exe,$(wildcard *.c))
 
-.PHONY: tests
-tests: $(EXES)
\ No newline at end of file
+tests: $(EXES)

diff --git a/tests/tests_rtep_fna/Makefile b/tests/tests_rtep_fna/Makefile
index 6b0ea894ac40744f661df41200b2510659bc72fe..14d3e112ef4fd61b8baf09b1e949abc40dde59a4 100755 (executable)
--- a/tests/tests_rtep_fna/Makefile
+++ b/tests/tests_rtep_fna/Makefile
@@ -1,7 +1,8 @@
+.PHONY: tests
 include ../../config.mk
 include ../../rules.mk
 
-CFLAGS += -I$(FNA_PATH)/src_rtep/ -I$(PLATFORM_PATH)/drivers/rt-ep/ \
-       $(PLATFORM_PATH)/misc/logger.o $(PLATFORM_PATH)/misc/time_measurement_hwtime.o
-LDFLAGS += -L$(PLATFORM_PATH)/drivers/rt-ep -lrtep
+EXES := $(patsubst %.c,%.exe,$(wildcard *.c))
+
+tests: $(EXES)