X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=makefile;h=53e9fadcec7d524c6ecd2b506dfc59c512355ae6;hb=8cf42d24d87813ecf494bd2e12e66a5a78f155c0;hp=a3b0e611349521a87f2fad18689a982c6fe8b085;hpb=06260768333318ea4689855ba3e2580ef254ea3a;p=SXSI%2FXMLTree.git

diff --git a/makefile b/makefile
index a3b0e61..53e9fad 100644
--- a/makefile
+++ b/makefile
@@ -1,13 +1,15 @@
-FLAGS = -O9 -I./libcds/includes/
+FLAGS =-std=c++0x -O3 -I./libcds/includes/
 
-OBJECTS=libcds/lib/libcds.a
+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
 
-all: text_collection XMLTree
 
-XMLTree: XMLTree.o bp.o darray.o bpcore.o libcds/lib/libcds.a
-	cp libcds/lib/libcds.a XMLTree.a
-	ar vrcs XMLTree.a XMLTree.o bp.o darray.o bpcore.o
+all: libcds text_collection XMLTree
 
+XMLTree: XMLTree.o bp.o darray.o bpcore.o $(LIBCDS_A) $(OBJECTS_TCO) $(OBJECTS_TCA)
+	ar rvcs XMLTree.a XMLTree.o bp.o darray.o bpcore.o $(OBJECTS_TCO)
+	echo -e "OPEN XMLTree.a\n ADDLIB " $(OBJECTS_TCA) "\n ADDLIB " $(LIBCDS_A) "\n SAVE" | ar -M
 
 XMLTree.o: bp.c bp.h bpcore.c XMLTree.cpp XMLTree.h
 	g++ $(FLAGS) -c XMLTree.cpp
@@ -24,5 +26,8 @@ bpcore.o: bpcore.c
 text_collection:
 	make -C TextCollection/
 
+libcds:
+	make -C libcds/
+
 clean:
-	rm -f *.o 
\ No newline at end of file
+	rm -f *.[oa]