X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/fna.git/blobdiff_plain/54197623fee233388150a4e908a53b4418894233..fc077880bbc410dabe51a7d57f80809bf1dac4f5:/rules.mk

diff --git a/rules.mk b/rules.mk
index f7567a7..4253dec 100644
--- a/rules.mk
+++ b/rules.mk
@@ -1,17 +1,17 @@
-.PHONY: none clean
+.PHONY: none clean libfna libfrsh
 
 none:
 	@exec echo -e "\nPlease introduce a target, i.e: 'make test_dtm_xxx.exe'";
 
-%.exe: %.c libfna.a $(FRSH_PATH)/lib/libfrsh.a
+%.exe: %.c libfna libfosa libfrsh
 	@exec echo -e "\n>> Building $@: ";
 	@if [ -f $< ]; \
 	then \
- 		$(CC) $(CFLAGS) $< $(LDFLAGS) &> /dev/null; \
-	fi; # -o $@ (fix marte mgcc)
+		$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@; \
+	fi;
 	@exec echo ">> End Building $@";
 
-libfna.a:
+libfna:
 	@exec echo -e "\n>> Compiling FNA library (lib/libfna.a):";
 	@make -C $(FNA_PATH)/src all
 ifeq ($(RTEP_ENABLE),RTEP_FNA_ENABLED)
@@ -20,10 +20,22 @@ endif
 ifeq ($(UNIX_ENABLE),UNIX_FNA_ENABLED)
 		@make -C $(FNA_PATH)/src_unix libunixfna.a
 endif
-	@ar -rc libfna.a $(FNA_PATH)/src/*.o
+ifeq ($(FRESCAN_ENABLE),FRESCAN_FNA_ENABLED)
+		@make -C $(FNA_PATH)/src_frescan libfrescan
+endif
+	@ar -rc libfna.a $(FNA_PATH)/src/*.o $(FNA_PATH)/lib/*.o
 	@mv libfna.a $(FNA_PATH)/lib/
 	@exec echo ">> End Compiling FNA library (lib/libfna.a)"
 
+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' \