X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=makefile;h=bf2106348ccac06b5d2f795d214586f4c1866e4f;hb=c98bef6022866ccc30bbd4816080978f32227211;hp=c3a7e94c338c4df302534455e12b4315790693ad;hpb=1c3300373a43062be9bb8d23faf3c8446f9aa6c5;p=SXSI%2FXMLTree.git

diff --git a/makefile b/makefile
index c3a7e94..bf21063 100644
--- a/makefile
+++ b/makefile
@@ -1,15 +1,19 @@
-FLAGS = -O3 -I./libcds/includes/
+FLAGS =-std=c++0x -O3 -I./libcds/includes/
 
-OBJECTS=libcds/lib/libcds.a
-OBJECTS_TC= TextCollection/BitRank.o TextCollection/dynFMI.o TextCollection/rbtree.o TextCollection/Tools.o TextCollection/bittree.o TextCollection/handle.o TextCollection/CSA.o TextCollection/pos.o TextCollection/TextCollection.o
+LIBCDS_A=libcds/lib/libcds.a 
+OBJECTS_TCO= TextCollection/TextCollection.o TextCollection/TextCollectionBuilder.o TextCollection/TCImplementation.o TextCollection/Tools.o TextCollection/BitRank.o  
+OBJECTS_TCA=TextCollection/incbwt/rlcsa.a
 
 
 all: libcds text_collection XMLTree
 
-XMLTree: XMLTree.o bp.o darray.o bpcore.o libcds/lib/libcds.a
+XMLTree: XMLTree.o bp.o darray.o bpcore.o $(LIBCDS_A) $(OBJECTS_TCO) $(OBJECTS_TCA)
 	cp libcds/lib/libcds.a XMLTree.a
-	ar vrcs XMLTree.a XMLTree.o bp.o darray.o bpcore.o $(OBJECTS_TC)
-
+	rm -rf .objs
+	mkdir .objs
+	cd .objs; ar x ../$(OBJECTS_TCA)
+	ar rvcs XMLTree.a XMLTree.o bp.o darray.o bpcore.o $(OBJECTS_TCO) .objs/*.o
+	rm -rf .objs
 
 XMLTree.o: bp.c bp.h bpcore.c XMLTree.cpp XMLTree.h
 	g++ $(FLAGS) -c XMLTree.cpp
@@ -30,4 +34,4 @@ libcds:
 	make -C libcds/
 
 clean:
-	rm -f *.o 
+	rm -f *.[oa]