X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=makefile;h=6d071a61ded05d4ec4db1f5c7740ca6b60630e06;hb=d660b6ec5cd55019d17188810b783a2e3a94fa49;hp=fc1c3cadaba736c02877cdea18b54311c52c6c88;hpb=0c6f8d3fc20c0ee00ac6d4978164e712ac75e79a;p=SXSI%2FTextCollection.git

diff --git a/makefile b/makefile
index fc1c3ca..6d071a6 100644
--- a/makefile
+++ b/makefile
@@ -1,25 +1,40 @@
 CC = g++
-LIBCDSPATH = ../XMLTree/libcds
+LIBCDSPATH = ../libcds
 CPPFLAGS = -Wall -ansi -g -I$(LIBCDSPATH)/includes/ -O2 -DNDEBUG
 LIBCDSA = $(LIBCDSPATH)/lib/libcds.a
+LIBRLCSA = incbwt/rlcsa.a
+LIBLZTRIE = lzindex/lztrie.a
 
 dcover_obs = dcover/difference_cover.o
 
-testTextCollection_obs = testTextCollection.o TextCollection.o CSA.o Tools.o BitRank.o bittree.o rbtree.o dynFMI.o RLWaveletTree.o GapEncode.o BSGAP.o ${LIBCDSA} ${dcover_obs}
+TextCollection_obs = TextCollection.o TextCollectionBuilder.o TCImplementation.o Tools.o BitRank.o \
+                     TextStorage.o ${LIBRLCSA} ${LIBCDSA} ${LIBLZTRIE}
+TCDebug_obs =  bittree.o rbtree.o dynFMI.o 
 
-timeTextCollection_obs = timeTextCollection.o TextCollection.o CSA.o Tools.o BitRank.o bittree.o rbtree.o dynFMI.o RLWaveletTree.o GapEncode.o BSGAP.o ${LIBCDSA} ${dcover_obs}
+all: testTextCollection
 
-all: $(testTextCollection_obs) testTextCollection
+testTextCollection: testTextCollection.o $(TextCollection_obs) $(TCDebug_obs) HeapProfiler.o
+	$(CC) -o testTextCollection testTextCollection.o $(TextCollection_obs) $(TCDebug_obs) HeapProfiler.o
 
-testTextCollection: $(testTextCollection_obs) HeapProfiler.o
-	$(CC) -o testTextCollection $(testTextCollection_obs) HeapProfiler.o
+timeTextCollection: timeTextCollection.o $(TextCollection_obs) $(TCDebug_obs)
+	$(CC) -o timeTextCollection timeTextCollection.o $(TextCollection_obs) $(TCDebug_obs)
+
+test2dRange: test2dRange.o ${LIBCDSA}
+	$(CC) -o test2dRange test2dRange.o ${LIBCDSA}
+
+incbwt/rlcsa.a:
+	@make -C incbwt
+
+lzindex/lztrie.a:
+	@make -C lzindex
 
-timeTextCollection: $(timeTextCollection_obs)
-	$(CC) -o timeTextCollection $(timeTextCollection_obs)
 clean:
+	@make clean -C incbwt
+	@make clean -C lzindex
 	rm -f core *.o *~ testTextCollection timeTextCollection dcover/*.o dcover/*~
 
 depend:
-	$(CC) -MM *.cpp *.c > dependencies.mk
+	@make depend -C incbwt
+	$(CC) -MM *.cpp > dependencies.mk
 
 include dependencies.mk