Bug fixes for RLCSA wrapper

[SXSI/TextCollection.git] / makefile

diff --git a/makefile b/makefile
index fc1c3ca..8c88467 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,25 +1,49 @@
 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
+#CPPFLAGS = -Wall -ansi -g -I$(LIBCDSPATH)/includes/
 LIBCDSA = $(LIBCDSPATH)/lib/libcds.a
+LIBRLCSA = incbwt/rlcsa.a
+LIBLZTRIE = lzindex/lztrie.a
+LIBSWCSA = swcsa/swcsa.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 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 
 
-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
+
+swcsa/swcsa.a:
+       @make -C swcsa
 
-timeTextCollection: $(timeTextCollection_obs)
-       $(CC) -o timeTextCollection $(timeTextCollection_obs)
 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:
-       $(CC) -MM *.cpp *.c > dependencies.mk
+       @make depend -C incbwt
+       $(CC) -MM *.cpp > dependencies.mk
 
 include dependencies.mk