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

diff --git a/makefile b/makefile
index cd4b721..2ba3549 100644
--- a/makefile
+++ b/makefile
@@ -1,18 +1,21 @@
-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  
-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 XMLTreeBuilder.o bp.o darray.o bpcore.o\
- $(LIBCDS_A) $(OBJECTS_TCO) $(OBJECTS_TCA)
+ $(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)
+	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