Changed Makefiles, rules and config files because of change in location

of marte_non_local_jumps

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

diff --git a/rules.mk b/rules.mk
index 4018569e2fb8a790e7d9ef254e405d72173c2b05..3b1783d62206192b3ac53c1d8162297acd922438 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -14,11 +14,6 @@ CFLAGS += -D$(PLATFORM) \
 # This prevents mgcc from removing the debug information (stripping)
 LDFLAGS += -g
 
-ifeq ($(PLATFORM), MARTE_OS)
-       CFLAGS += -I$(FOSA_PATH)/marte_non_local_jump
-endif
-
-
 none:
        @exec echo -e "\nPlease introduce a target, i.e: 'make test'";
 
@@ -41,10 +36,6 @@ $(FOSA_PATH)/lib/libfosa_$(PLATFORM).a:
        @exec echo ">> [OK]"
 
 
-$(FOSA_PATH)/marte_non_local_jump/non_local_jump.o:
-       make -C $(FOSA_PATH)/marte_non_local_jump
-
-
 clean:
        @exec echo -e "\n>> Cleaning... ";
        @find \( -name '*.[oa]' -or -name '*~*' -or -name 'libfosa.a' \

diff --git a/src_marte_os/tests/test_non_local_jump/Makefile b/src_marte_os/tests/test_non_local_jump/Makefile
index 5704ca8360e0db81bdc0e53f440aa2501b95737f..6fff43782f31b2676acaeaae2c74ace7eb82c65e 100644 (file)
--- a/src_marte_os/tests/test_non_local_jump/Makefile
+++ b/src_marte_os/tests/test_non_local_jump/Makefile
@@ -1,13 +1,9 @@
 include ../../../config.mk
 include ../../../rules.mk
 
-LDFLAGS += $(FOSA_PATH)/marte_non_local_jump/non_local_jump.o
-
 testbench_long_jump.exe:  testbench_long_jump.c libfosa
 
 test_fosa_long_jump.exe:  test_fosa_long_jump.c libfosa
 
-fosa_long_jump_calibrate.exe:  fosa_long_jump_calibrate.c libfosa
-
 
 

diff --git a/src_marte_os/tests/test_non_local_jump/simple_test_non_local_jump.c b/src_marte_os/tests/test_non_local_jump/simple_test_non_local_jump.c
index 826be27465fce7bf5d7870d927d7f37cfec05910..be2a59c7926a9e6f7587600e739e00e8d49d2f9b 100644 (file)
--- a/src_marte_os/tests/test_non_local_jump/simple_test_non_local_jump.c
+++ b/src_marte_os/tests/test_non_local_jump/simple_test_non_local_jump.c
@@ -70,7 +70,7 @@
 
 #include "fosa.h"
 
-#include "marte_non_local_jmp.h"
+#include "misc/marte_non_local_jmp.h"
 
 /************************/
 /** Constants and types */