X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=makefile;h=8c88467a2348458d972a8d54706369fe87d3fbcf;hb=362c485f3a3cb6e32a77baeacb28c8832f96c879;hp=04c5f6454ed52457bee2b298524f5b96529f46eb;hpb=95fded64d90aca79f7179f147a5184e9ba3176af;p=SXSI%2FTextCollection.git

diff --git a/makefile b/makefile
index 04c5f64..8c88467 100644
--- a/makefile
+++ b/makefile
@@ -1,24 +1,49 @@
 CC = g++
 LIBCDSPATH = ../libcds
-CPPFLAGS = -Wall -ansi -g -O2 -I$(LIBCDSPATH)/includes/ -DNDEBUG
+CPPFLAGS = -Wall -ansi -g -I$(LIBCDSPATH)/includes/ -O3 -DNDEBUG
+#CPPFLAGS = -Wall -ansi -g -I$(LIBCDSPATH)/includes/
 LIBCDSA = $(LIBCDSPATH)/lib/libcds.a
+LIBRLCSA = incbwt/rlcsa.a
+LIBLZTRIE = lzindex/lztrie.a
+LIBSWCSA = swcsa/swcsa.a
 
-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 = dcover/difference_cover.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}
+TextCollection_obs = TextCollection.o TextCollectionBuilder.o FMIndexBuilder.o RLCSABuilder.o FMIndex.o Tools.o \
+                     TextStorage.o Query.o EditDistance.o ResultSet.o ${LIBRLCSA} ${LIBCDSA} ${LIBLZTRIE} ${LIBSWCSA}
+TCDebug_obs =  bittree.o rbtree.o dynFMI.o 
 
+all: testTextCollection
 
-all: $(testTextCollection_obs)
+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
+
+swcsa/swcsa.a:
+	@make -C swcsa
 
-timeTextCollection: $(timeTextCollection_obs)
-	$(CC) -o timeTextCollection $(timeTextCollection_obs)
 clean:
-	rm -f core *.o *~ testTextCollection
+	@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:
-	$(CC) -MM *.cpp *.c > dependencies.mk
+	@make depend -C incbwt
+	$(CC) -MM *.cpp > dependencies.mk
 
 include dependencies.mk