X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=makefile;h=cd4b721107364e8becf192ae3f47f4e99e4961db;hb=fadbf5f42541aa09769cbe406f5756fa042fe2d9;hp=01f68be48665488086eb3be9fbd3152216bc8edc;hpb=950870fc762cf5c4d551db78bc798b540d893b4a;p=SXSI%2FXMLTree.git

diff --git a/makefile b/makefile
index 01f68be..cd4b721 100644
--- a/makefile
+++ b/makefile
@@ -1,17 +1,22 @@
-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/CSA.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 XMLTreeBuilder.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 XMLTreeBuilder.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
+XMLTree.o: bp.c bp.h bpcore.c XMLTree.cpp XMLTree.h basics.h
 	g++ $(FLAGS) -c XMLTree.cpp
 
 bp.o: bp.c bpcore.c darray.c bp.h darray.h
@@ -23,6 +28,9 @@ darray.o: darray.c darray.h bpcore.c
 bpcore.o: bpcore.c
 	g++ $(FLAGS) -c bpcore.c
 
+XMLTreeBuilder.o: XMLTree.h XMLTreeBuilder.h XMLTreeBuilder.cpp basics.h
+	g++ $(FLAGS) -c XMLTreeBuilder.cpp
+
 text_collection:
 	make -C TextCollection/
 
@@ -30,4 +38,4 @@ libcds:
 	make -C libcds/
 
 clean:
-	rm -f *.o 
+	rm -f *.[oa]