changes in configuration file

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

diff --git a/config.mk_example b/config.mk_example
index 1ae12cd9e4f3a178be63421a8a9374027b53ea29..dcff0f05bccc004fba41b54b8f7efc7a7545731d 100644 (file)
--- a/config.mk_example
+++ b/config.mk_example
@@ -1,4 +1,4 @@
-# the plaform
+# Platform:  MARTE_OS, DUMMY_OS, RT_LINUX, OSE, AQuoSA
 PLATFORM      = MARTE_OS
 PLATFORM_PATH = $(HOME)/marte
 EXPORT_PATH   = $(HOME)/export
@@ -23,9 +23,12 @@ CFLAGS = -Wall -g -O1 -Wuninitialized \
         -I$(FRSH_PATH)/include \
         -I$(FOSA_PATH)/include \
         -I$(UTILS_PATH)/include \
-        -I$(FOSA_PATH)/marte_non_local_jump \
         -I$(FSA_PATH)/include
 
+ifeq ($(PLATFORM), MARTE_OS)
+       CFLAGS += -I$(FOSA_PATH)/marte_non_local_jump
+endif
+
 # fna networks configuration
 CONFIG_FNA_RTEP=n
 CONFIG_FNA_UNIX=n
@@ -49,22 +52,20 @@ CFLAGS += -DFWP_FNA_ENABLED
 endif
 
 # the library flags
-LDFLAGS = -L$(FRSH_PATH)/lib -lfrsh -L$(FSA_PATH)/lib -lfsa_$(SA_VERSION)   \
-          -L$(FOSA_PATH)/lib -lfosa_$(PLATFORM) -L$(UTILS_PATH)/lib -lutils \
-          -L$(FNA_PATH)/lib -lfna -lm
+LDFLAGS = -L$(FRSH_PATH)/lib -L$(FSA_PATH)/lib -L$(FOSA_PATH)/lib \
+           -L$(UTILS_PATH)/lib -L$(FNA_PATH)/lib
+
+LDFLAGS += -Wl,--start-group -lfrsh -lfsa_$(SA_VERSION) -lfosa_$(PLATFORM) -lutils -lfna -lm
+
+ifeq ($(CONFIG_FNA_RTEP),y)
+LDFLAGS += -lrtep
+endif
 
 ifeq ($(PLATFORM),MARTE_OS)
 LDFLAGS += $(PLATFORM_PATH)/misc/logger.o \
           $(PLATFORM_PATH)/misc/time_measurement_hwtime.o \
           $(PLATFORM_PATH)/misc/time_measurement_posix.o \
           $(PLATFORM_PATH)/misc/freelist.o
-
-# in marte i have to repeat this for the moment
-LDFLAGS += -L$(FRSH_PATH)/lib -lfrsh -L$(FSA_PATH)/lib -lfsa_$(SA_VERSION)   \
-           -L$(FOSA_PATH)/lib -lfosa_$(PLATFORM) -L$(UTILS_PATH)/lib -lutils \
-           -L$(FNA_PATH)/lib -lfna -lm
 endif
 
-ifeq ($(CONFIG_FNA_RTEP),y)
-LDFLAGS += -L$(PLATFORM_PATH)/arch/drivers/rt-ep -lrtep
-endif
+LDFLAGS += -Wl,--end-group