From: mgh <mgh@35b4ef3e-fd22-0410-ab77-dab3279adceb>
Date: Tue, 27 Jan 2009 12:49:18 +0000 (+0000)
Subject: Changed Makefiles, rules and config files because of change in location
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/fosa.git/commitdiff_plain/d138b763ecc0170a40f890bcce460016d90c03f8

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 4018569..3b1783d 100644
--- 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 5704ca8..6fff437 100644
--- 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 826be27..be2a59c 100644
--- 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 */