changes in makefiles

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

diff --git a/rules.mk b/rules.mk
index 4253dec9cca433b793b4f43566f748a6b3827840..8261552020c62e2a017fae6046d084a52f78571b 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -1,9 +1,9 @@
-.PHONY: none clean libfna libfrsh
+.PHONY: none clean libfna libfrsh libfosa libfsa libutils
 
 none:
        @exec echo -e "\nPlease introduce a target, i.e: 'make test_dtm_xxx.exe'";
 
-%.exe: %.c libfna libfosa libfrsh
+%.exe: %.c libfna libfosa libfrsh libfosa libfsa libutils
        @exec echo -e "\n>> Building $@: ";
        @if [ -f $< ]; \
        then \
@@ -36,6 +36,9 @@ libfosa:
 libutils:
        make -C $(UTILS_PATH) libutils
 
+libfsa:
+       make -C $(FSA_PATH) libfsa
+
 clean:
        @exec echo -e "\n>> Cleaning... ";
        @find \( -name '*.[oa]' -or -name '*~*' -or -name 'lib*.a' \

diff --git a/src_frescan/frescan_bwres_analysis.c b/src_frescan/frescan_bwres_analysis.c
index 70ec94939620cfc586fbb692d1fa0c15714b9bdb..c8d86552ea4683e82ca49619c21e317e07b44476 100644 (file)
--- a/src_frescan/frescan_bwres_analysis.c
+++ b/src_frescan/frescan_bwres_analysis.c
@@ -285,7 +285,7 @@ int frescan_sa_sched_test(frescan_sa_scenario_t *scenario,
                 sa_contract->final_values.server_prio = sa_contract->contract.prio;
 
                 budget = (double)sa_contract->contract.min_values.budget *
-                         (double)FRESCAN_FRAME_TX_TIME;
+                         (double)FRESCAN_FRAME_TX_TIME_US;
 
                 period = timespec_to_double
                                 (&sa_contract->contract.min_values.period);

diff --git a/src_frescan/frescan_config.h b/src_frescan/frescan_config.h
index 12a72e5ec44a55a450f1f06699acbadfe2a7e287..6b13eea60ddb3c20380dcd3f0dcea9dd6890b359 100644 (file)
--- a/src_frescan/frescan_config.h
+++ b/src_frescan/frescan_config.h
@@ -94,7 +94,8 @@
 #define FRESCAN_MX_NODES          2
 #define FRESCAN_MX_CONTRACTS      (FRESCAN_MX_NODES*FRESCAN_MX_IDS)
 #define FRESCAN_MX_REPL_OPS       FRESCAN_MX_IDS*10
-#define FRESCAN_FRAME_TX_TIME     0.000200  // measured transmission time of an 8byte frame
+
+#define FRESCAN_FRAME_TX_TIME_US     200  // measured transmission time of an 8byte frame
 
 #define FRESCAN_MLOCK_T            unsigned
 #define FRESCAN_CREATE_LOCK(l)

diff --git a/src_rtep/Makefile b/src_rtep/Makefile
index 6d84981bd9287f269b0511705c9559a12574f68f..b48ee1579a3fb2b1a8c99e1f558532c68d90c5a3 100644 (file)
--- a/src_rtep/Makefile
+++ b/src_rtep/Makefile
@@ -17,6 +17,7 @@ objs: $(OBJS)
 librtepfna.a: objs
        @exec echo -e "\n>> Building RTEP FNA:";
        @make -C $(PLATFORM_PATH)/drivers/rt-ep librtep
-       @ar -rc librtepfna.a *.o
-       @mv librtepfna.a $(FNA_PATH)/lib
+       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 eaca9996c9e0ffe2cbe88417b3d5e76916cd9680..19bbfabc7815529bcd02249c23def07cc84eddae 100755 (executable)
--- a/tests/tests_frescan/Makefile
+++ b/tests/tests_frescan/Makefile
@@ -2,7 +2,7 @@ include ../../config.mk
 include ../../rules.mk
 
 CFLAGS += -I$(FNA_PATH)/src_frescan/
-LDFLAGS += $(FNA_PATH)/lib/libfrescan.o -L$(FOSA_PATH)/lib -lfosa_$(PLATFORM) -lm
+LDFLAGS += $(FNA_PATH)/lib/libfrescan.o
 
 EXES := $(patsubst %.c,%.exe,$(wildcard *.c))
 

diff --git a/tests/tests_rtep_fna/Makefile b/tests/tests_rtep_fna/Makefile
index 368285976b3a53fb17b6c6a04ba87bf912c9800d..6b0ea894ac40744f661df41200b2510659bc72fe 100755 (executable)
--- a/tests/tests_rtep_fna/Makefile
+++ b/tests/tests_rtep_fna/Makefile
@@ -3,6 +3,5 @@ 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$(FNA_PATH)/lib -lrtepfna -L$(PLATFORM_PATH)/drivers/rt-ep -lrtep \
-       -L$(FRSH_PATH)/lib -lfrsh -L$(FOSA_PATH)/lib -lfosa_$(PLATFORM) \
-       -L$(UTILS_PATH)/lib -lutils -lm -lfna
+LDFLAGS += -L$(PLATFORM_PATH)/drivers/rt-ep -lrtep
+