improve a bit some error messages

[frescor/fna.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index 363e2971ea49474e0422730a85a5ec2dc012a87e..7bafc76f5d6d6057b20194ba481ef6e51041e6b1 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 libfrsh
+%.exe: %.c libfna libfosa libfrsh libfosa libfsa libutils dependencies
        @exec echo -e "\n>> Building $@: ";
        @if [ -f $< ]; \
        then \
@@ -13,18 +13,29 @@ none:
 
 libfna:
        @exec echo -e "\n>> Compiling FNA library (lib/libfna.a):";
+       @rm -f $(FNA_PATH)/lib/*.o
        @make -C $(FNA_PATH)/src all
-ifeq ($(RTEP_ENABLE),RTEP_FNA_ENABLED)
-               @make -C $(FNA_PATH)/src_rtep librtepfna.a
+       @mv $(FNA_PATH)/src/*.o $(FNA_PATH)/lib/
+
+ifeq ($(CONFIG_FNA_RTEP),y)
+       @make -C $(FNA_PATH)/src_rtep librtepfna.a
 endif
-ifeq ($(UNIX_ENABLE),UNIX_FNA_ENABLED)
-               @make -C $(FNA_PATH)/src_unix libunixfna.a
+
+ifeq ($(CONFIG_FNA_UNIX),y)
+       @make -C $(FNA_PATH)/src_unix libunixfna.a
 endif
-ifeq ($(FRESCAN_ENABLE),FRESCAN_FNA_ENABLED)
-               @make -C $(FNA_PATH)/src_frescan libfrescan.a
+
+ifeq ($(CONFIG_FNA_FRESCAN),y)
+       @make -C $(FNA_PATH)/src_frescan libfrescan
+endif
+
+ifeq ($(CONFIG_FWP),y)
+       @make -C $(FNA_PATH)/src_fwp libfwp
 endif
-       @ar -rc libfna.a $(FNA_PATH)/src/*.o
+
+       @ar -rc libfna.a $(FNA_PATH)/lib/*.o
        @mv libfna.a $(FNA_PATH)/lib/
+       @rm -f $(FNA_PATH)/lib/*.o
        @exec echo ">> End Compiling FNA library (lib/libfna.a)"
 
 libfrsh:
@@ -36,8 +47,16 @@ libfosa:
 libutils:
        make -C $(UTILS_PATH) libutils
 
+libfsa:
+       make -C $(FSA_PATH) libfsa
+
+dependencies:
+ifeq ($(PLATFORM),MARTE_OS)
+       make -C $(PLATFORM_PATH)/misc/ all
+endif
+
 clean:
        @exec echo -e "\n>> Cleaning... ";
        @find \( -name '*.[oa]' -or -name '*~*' -or -name 'lib*.a' \
                -or -name '*.exe' -or -name 'mprogram' -or -name 'a.out' \) -print -delete
-       @exec echo ">> End Cleaning"
\ No newline at end of file
+       @exec echo ">> End Cleaning"