X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;ds=inline;f=makefile;h=6a8e1594551fccac3a8812b65daa447e89748719;hb=e4b6bdc7cc2a1372e4d4dae50acac55cebcc7e9b;hp=ecf0ff153809c04708a4384ad209501f5738ae05;hpb=40ddf9aca842bdc081b6350a4ebfe36b066c94c9;p=SXSI%2FTextCollection.git

diff --git a/makefile b/makefile
index ecf0ff1..6a8e159 100644
--- a/makefile
+++ b/makefile
@@ -1,12 +1,15 @@
 CC = g++
-LIBCDSPATH = ../XMLTree/libcds
-CPPFLAGS = -Wall -ansi -g -I$(LIBCDSPATH)/includes/ -O2 -DNDEBUG
+LIBCDSPATH = ../libcds
+CPPFLAGS = -Wall -ansi -g -I$(LIBCDSPATH)/includes/ -O3 -DNDEBUG
 LIBCDSA = $(LIBCDSPATH)/lib/libcds.a
+LIBRLCSA = incbwt/rlcsa.a
+LIBLZTRIE = lzindex/lztrie.a
+LIBSWCSA = swcsa/swcsa.a
 
 dcover_obs = dcover/difference_cover.o
 
-TextCollection_obs = TextCollection.o TextCollectionBuilder.o TCImplementation.o Tools.o BitRank.o \
-                     BSGAP.o incbwt/rlcsa.a ${LIBCDSA} ${dcover_obs}
+TextCollection_obs = TextCollection.o TextCollectionBuilder.o FMIndexBuilder.o FMIndex.o Tools.o \
+                     TextStorage.o ${LIBRLCSA} ${LIBCDSA} ${LIBLZTRIE} ${LIBSWCSA}
 TCDebug_obs =  bittree.o rbtree.o dynFMI.o 
 
 all: testTextCollection
@@ -17,13 +20,27 @@ testTextCollection: testTextCollection.o $(TextCollection_obs) $(TCDebug_obs) He
 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
+
+swcsa/swcsa.a:
+	@make -C swcsa
+
 clean:
 	@make clean -C incbwt
+	@make clean -C lzindex
+	@make clean -C swcsa
 	rm -f core *.o *~ testTextCollection timeTextCollection dcover/*.o dcover/*~
 
+shallow_clean:
+	rm -f core *.o *~ testTextCollection timeTextCollection
+
 depend:
 	@make depend -C incbwt
 	$(CC) -MM *.cpp > dependencies.mk