restore the configuration flags and add a CONNECTED flag

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

diff --git a/config.mk_example b/config.mk_example
index fc89f55edd0809a6597e4091d10b5ac7c7ab4476..335b2229a62a837cd1b5d29b4fc553302c4317a8 100644 (file)
--- a/config.mk_example
+++ b/config.mk_example
@@ -22,7 +22,9 @@ CFLAGS = -Wall -g -O1 -Wuninitialized \
         -I$(FNA_PATH)/include \
         -I$(FRSH_PATH)/include \
         -I$(FOSA_PATH)/include \
-        -I$(UTILS_PATH)/include
+        -I$(UTILS_PATH)/include \
+        -I$(FSA_PATH)/include
+
 
 # fna networks configuration
 CONFIG_FNA_RTEP=n
@@ -46,16 +48,34 @@ ifeq ($(CONFIG_FWP),y)
 CFLAGS += -DFWP_FNA_ENABLED
 endif
 
+# fna network connected
+CONFIG_FNA_RTEP_CONNECTED=n
+CONFIG_FNA_UNIX_CONNECTED=n
+CONFIG_FNA_FRESCAN_CONNECTED=n
+CONFIG_FWP_CONNECTED=n
+
+ifeq ($(CONFIG_FNA_RTEP_CONNECTED),y)
+CFLAGS += -DCONFIG_FNA_RTEP_CONNECTED
+endif
+
+ifeq ($(CONFIG_FNA_UNIX_CONNECTED),y)
+CFLAGS += -DCONFIG_FNA_UNIX_CONNECTED
+endif
+
+ifeq ($(CONFIG_FNA_FRESCAN_CONNECTED),y)
+CFLAGS += -DCONFIG_FNA_FRESCAN_CONNECTED
+endif
+
+ifeq ($(CONFIG_FWP_CONNECTED),y)
+CFLAGS += -DCONFIG_FWP_CONNECTED
+endif
+
 # the library flags
 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 \

diff --git a/rules.mk b/rules.mk
index 6dbe7f462c055377e66ddc47cf40491223525c70..7bafc76f5d6d6057b20194ba481ef6e51041e6b1 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -17,13 +17,17 @@ libfna:
        @make -C $(FNA_PATH)/src all
        @mv $(FNA_PATH)/src/*.o $(FNA_PATH)/lib/
 
+ifeq ($(CONFIG_FNA_RTEP),y)
        @make -C $(FNA_PATH)/src_rtep librtepfna.a
+endif
 
 ifeq ($(CONFIG_FNA_UNIX),y)
        @make -C $(FNA_PATH)/src_unix libunixfna.a
 endif
 
+ifeq ($(CONFIG_FNA_FRESCAN),y)
        @make -C $(FNA_PATH)/src_frescan libfrescan
+endif
 
 ifeq ($(CONFIG_FWP),y)
        @make -C $(FNA_PATH)/src_fwp libfwp