Fixes

[SXSI/XMLTree.git] / makefile

diff --git a/makefile b/makefile
index a3b0e61..4f06f3b 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,12 +1,13 @@
-FLAGS = -O9 -I./libcds/includes/\r
+FLAGS =-std=c++0x -O3 -I./libcds/includes/\r
 \r
 OBJECTS=libcds/lib/libcds.a\r
+OBJECTS_TC= TextCollection/TextCollection.o TextCollection/CSA.o TextCollection/Tools.o TextCollection/BitRank.o TextCollection/bittree.o TextCollection/rbtree.o TextCollection/dynFMI.o TextCollection/RLWaveletTree.o TextCollection/GapEncode.o TextCollection/BSGAP.o\r
 \r
-all: text_collection XMLTree\r
+all: libcds text_collection XMLTree\r
 \r
 XMLTree: XMLTree.o bp.o darray.o bpcore.o libcds/lib/libcds.a\r
        cp libcds/lib/libcds.a XMLTree.a\r
-       ar vrcs XMLTree.a XMLTree.o bp.o darray.o bpcore.o\r
+       ar vrcs XMLTree.a XMLTree.o bp.o darray.o bpcore.o $(OBJECTS_TC)\r
 \r
 \r
 XMLTree.o: bp.c bp.h bpcore.c XMLTree.cpp XMLTree.h\r
@@ -24,5 +25,8 @@ bpcore.o: bpcore.c
 text_collection:\r
        make -C TextCollection/\r
 \r
+libcds:\r
+       make -C libcds/\r
+\r
 clean:\r
-       rm -f *.o 
\ No newline at end of file
+       rm -f *.o \r