From 41753645bcaf84f4647bc93aff70ef36a9446fb2 Mon Sep 17 00:00:00 2001 From: sangorrin Date: Wed, 4 Feb 2009 09:58:50 +0000 Subject: [PATCH] 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 --- config.mk_example | 30 +++++++++++++++++++++++++----- rules.mk | 4 ++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/config.mk_example b/config.mk_example index fc89f55..335b222 100644 --- 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 6dbe7f4..7bafc76 100644 --- 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 -- 2.39.2