utils

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

diff --git a/config.mk_example b/config.mk_example
index fddf5f423c7c60a4ec3934adad057b6a3fafd184..8e9feab0dd6f28d2adef5edbf136acccf682bfbf 100644 (file)
--- a/config.mk_example
+++ b/config.mk_example
@@ -6,20 +6,25 @@ PLATFORM_PATH = $(HOME)/marte
 EXPORT_PATH = $(HOME)/export
 
 # enable networks with their flag (change DISABLED<->ENABLED)
-RTEP_ENABLE = RTEP_FNA_DISABLED
+RTEP_ENABLE = RTEP_FNA_ENABLED
 UNIX_ENABLE = UNIX_FNA_DISABLED
-FRESCAN_ENABLE = FRESCAN_FNA_ENABLED
+FRESCAN_ENABLE = FRESCAN_FNA_DISABLED
 
 # the gcc to use
 CC = mgcc
+
+FRESCOR_ROOT = $(HOME)/frescor
 # the path to the FRSH directory.
-FRSH_PATH = $(HOME)/frescor/frsh
+FRSH_PATH = $(FRESCOR_ROOT)/frsh
 # the path to the FOSA directory.
-FOSA_PATH = $(HOME)/frescor/fosa
+FOSA_PATH = $(FRESCOR_ROOT)/fosa
 # the path to the FNA directory.
-FNA_PATH = $(HOME)/frescor/fna
+FNA_PATH = $(FRESCOR_ROOT)/fna
+# the path to the UTILS directory
+UTILS_PATH = $(FRESCOR_ROOT)/utils
+
 # the compilation flags
 CFLAGS = -Wall -g -D$(PLATFORM) -D$(RTEP_ENABLE) -D$(UNIX_ENABLE) -I$(FNA_PATH)/include -I$(FRSH_PATH)/include \
-       -I$(FOSA_PATH)/include -I$(FOSA_PATH)/marte_non_local_jump
+       -I$(FOSA_PATH)/include -I$(UTILS_PATH)/include -I$(FOSA_PATH)/marte_non_local_jump
 # the library flags
 LDFLAGS = -L$(FNA_PATH)/lib -lfna

diff --git a/rules.mk b/rules.mk
index 80d99b2a940bbbb3cbaad9680a15796848325d0c..363e2971ea49474e0422730a85a5ec2dc012a87e 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -30,6 +30,12 @@ endif
 libfrsh:
        make -C $(FRSH_PATH) libfrsh
 
+libfosa:
+       make -C $(FOSA_PATH) libfosa
+
+libutils:
+       make -C $(UTILS_PATH) libutils
+
 clean:
        @exec echo -e "\n>> Cleaning... ";
        @find \( -name '*.[oa]' -or -name '*~*' -or -name 'lib*.a' \