Move Sadakane's bp and Francisco's libcds in their own repository.

[SXSI/XMLTree.git] / Makefile

diff --git a/Makefile b/Makefile
index 0727f78..5cc06f8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,5 @@
-POPCOUNT=$(shell grep -q popcnt /proc/cpuinfo && echo 1)
+INC_FLAGS=-I.. -I../libcds/includes/
 
-ifeq ($(POPCOUNT), 1)
-       POPCOUNT_FLAG=-DHAS_NATIVE_POPCOUNT
-else
-       POPCOUNT_FLAG=-DPOPCOUNT_TABLE
-endif
 
 ifeq ($(VERBOSE), true)
        HIDE=
@@ -18,69 +13,31 @@ else
        OPT_FLAGS=-O4 $(POPCOUNT_FLAG) -fno-PIC -static
 endif
 
-
-
-INC_FLAGS=-I./libcds/includes/ -I.
-CFLAGS= $(INC_FLAGS) $(OPT_FLAGS)
 CXXFLAGS= -std=c++0x $(INC_FLAGS) $(OPT_FLAGS)
-CC=g++
-
-LIBCDS_A=libcds/lib/libcds.a
-OBJECTS_TCO= TextCollection/TextCollection.o \
-             TextCollection/TextCollectionBuilder.o \
-             TextCollection/RLCSABuilder.o \
-             TextCollection/FMIndex.o \
-             TextCollection/FMIndexBuilder.o \
-             TextCollection/Tools.o \
-             TextCollection/TextStorage.o \
-             TextCollection/Query.o \
-             TextCollection/EditDistance.o \
-             TextCollection/ResultSet.o
+CXX=g++
 
-OBJECTS_XMLTREE=XMLTree.o XMLTreeBuilder.o bp.o darray.o bpcore.o
+OBJECTS_XMLTREE=XMLTree.o XMLTreeBuilder.o
+XMLTREE_A=libXMLTree.a
 
-LIBRLCSA_TCA=TextCollection/incbwt/rlcsa.a
-LIBLZTRIE_TCA=TextCollection/lzindex/lztrie.a
-LIBSWCSA_TCA=TextCollection/swcsa/swcsa.a
 
 
+all: depend $(XMLTREE_A)
 
-
-all: depend libcds text_collection XMLTree
-
-XMLTree: $(OBJECTS_XMLTREE) $(LIBCDS_A) $(OBJECTS_TCO) \
-         $(LIBRLCSA_TCA) $(LIBLZTRIE_TCA) $(LIBSWCSA_TCA)
-       @echo [XMLTree]
-       $(HIDE) cp libcds/lib/libcds.a libXMLTree.a
-       $(HIDE) rm -rf .objs
-       $(HIDE) mkdir .objs
-       $(HIDE) (cd .objs; ar x ../$(LIBRLCSA_TCA); ar x ../$(LIBLZTRIE_TCA); ar x ../$(LIBSWCSA_TCA))
-       $(HIDE) ar rcs libXMLTree.a $(OBJECTS_XMLTREE) $(OBJECTS_TCO) .objs/*.o
-       $(HIDE) rm -rf .objs
-
-%o: %c
-       @echo [C] $@
-       $(HIDE) $(CC) -c $(CFLAGS) $< -o $@
+$(XMLTREE_A): $(OBJECTS_XMLTREE)
+       @echo [Link] $@
+       $(HIDE) ar rcs $@ $(OBJECTS_XMLTREE)
 
 %o: %cpp
        @echo [C++] $@
-       $(HIDE) $(CC) -c $(CXXFLAGS)  $< -o $@
+       $(HIDE) $(CXX) -c $(CXXFLAGS)  $< -o $@
 
-text_collection:
-       @echo [DEPENDENCY] $@
-       $(HIDE) make -s -C TextCollection/
-
-libcds:
-       @echo [DEPENDENCY] $@
-       $(HIDE) make -s -C libcds/
 
 depend:
        @echo [DEPEND]
-       $(HIDE) (gcc -MM *.c; g++ -MM -std=c++0x *.cpp) > $@
+       $(HIDE) ($(CXX) -MM $(CXXFLAGS) *.cpp) > $@
 
 clean:
        @echo [CLEAN]
        $(HIDE) rm -f *.[oa] depend
 
 -include depend
-