Bug fixes for RLCSA wrapper

[SXSI/TextCollection.git] / makefile

diff --git a/makefile b/makefile
index 43a3211..8c88467 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,12 +1,16 @@
 CC = g++
 LIBCDSPATH = ../libcds
-CPPFLAGS = -Wall -ansi -g -I$(LIBCDSPATH)/includes/ -O2 -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
 
 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 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
@@ -17,13 +21,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