now all will be included in libfna.a, the rest will be relocatable linked objects

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

diff --git a/rules.mk b/rules.mk
index 363e2971ea49474e0422730a85a5ec2dc012a87e..54da884e77d36ae654451e5b40c3f26738448c86 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -21,9 +21,9 @@ ifeq ($(UNIX_ENABLE),UNIX_FNA_ENABLED)
                @make -C $(FNA_PATH)/src_unix libunixfna.a
 endif
 ifeq ($(FRESCAN_ENABLE),FRESCAN_FNA_ENABLED)
-               @make -C $(FNA_PATH)/src_frescan libfrescan.a
+               @make -C $(FNA_PATH)/src_frescan libfrescan
 endif
-       @ar -rc libfna.a $(FNA_PATH)/src/*.o
+       @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)"