X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=makefile;h=2ba354927dd23ce6b11534a91f26ec15abba9802;hb=b443dd155b926655d84a3eadef5be09907d6c5eb;hp=4f555a49f405e07066fef732f8e0219ded46ff26;hpb=a238dbf87dacd2730cd79586c727f1f8ff775eb3;p=SXSI%2FXMLTree.git

diff --git a/makefile b/makefile
index 4f555a4..2ba3549 100644
--- a/makefile
+++ b/makefile
@@ -1,21 +1,25 @@
-FLAGS =-std=c++0x -O3 -I./libcds/includes/
+FLAGS =-std=c++0x -O9 -I./libcds/includes/ -I. -fno-PIC
 
 LIBCDS_A=libcds/lib/libcds.a 
-OBJECTS_TCO= TextCollection/TextCollection.o TextCollection/TextCollectionBuilder.o TextCollection/TCImplementation.o TextCollection/Tools.o TextCollection/BitRank.o TextCollection/BSGAP.o 
-OBJECTS_TCA=TextCollection/incbwt/rlcsa.a
+OBJECTS_TCO= TextCollection/TextCollection.o TextCollection/TextCollectionBuilder.o TextCollection/TCImplementation.o TextCollection/Tools.o TextCollection/BitRank.o TextCollection/TextStorage.o
+
+LIBRLCSA_TCA=TextCollection/incbwt/rlcsa.a
+LIBLZTRIE_TCA=TextCollection/lzindex/lztrie.a
 
 
 all: libcds text_collection XMLTree
 
-XMLTree: XMLTree.o bp.o darray.o bpcore.o $(LIBCDS_A) $(OBJECTS_TCO) $(OBJECTS_TCA)
+XMLTree: XMLTree.o XMLTreeBuilder.o bp.o darray.o bpcore.o\
+ $(LIBCDS_A) $(OBJECTS_TCO) $(LIBRLCSA_TCA) $(LIBLZTRIE_TCA)
 	cp libcds/lib/libcds.a XMLTree.a
 	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
+	cd .objs; ar x ../$(LIBRLCSA_TCA)
+	cd .objs; ar x ../$(LIBLZTRIE_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
@@ -27,6 +31,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/