Fix compilation issues:

    bpcore.c: remove duplicat definition of blog
    makefile: update to the latest version of textCollection

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/XMLTree@775 3cdefd35-fc62-479d-8e8d-bae585ffb9ca

diff --git a/bpcore.c b/bpcore.c
index 6bc12bd..18e9cc9 100644 (file)
--- a/bpcore.c
+++ b/bpcore.c
@@ -15,19 +15,6 @@
 #define MBfirst(i) ((i) & (~(MB-1)))
 #define MBlast(i) ((i) | (MB-1))
 
-
-int blog(int x)
-{
-int l;
-  l = 0;
-  while (x>0) {
-    x>>=1;
-    l++;
-  }
-  return l;
-}
-
-
 pb getpat_preorder(pb *b)
 {
   return *b;

diff --git a/makefile b/makefile
index cd4b721..2ba3549 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,18 +1,21 @@
-FLAGS =-std=c++0x -O3 -I./libcds/includes/\r
+FLAGS =-std=c++0x -O9 -I./libcds/includes/ -I. -fno-PIC\r
 \r
 LIBCDS_A=libcds/lib/libcds.a \r
-OBJECTS_TCO= TextCollection/TextCollection.o TextCollection/TextCollectionBuilder.o TextCollection/TCImplementation.o TextCollection/Tools.o TextCollection/BitRank.o  \r
-OBJECTS_TCA=TextCollection/incbwt/rlcsa.a\r
+OBJECTS_TCO= TextCollection/TextCollection.o TextCollection/TextCollectionBuilder.o TextCollection/TCImplementation.o TextCollection/Tools.o TextCollection/BitRank.o TextCollection/TextStorage.o\r
+\r
+LIBRLCSA_TCA=TextCollection/incbwt/rlcsa.a\r
+LIBLZTRIE_TCA=TextCollection/lzindex/lztrie.a\r
 \r
 \r
 all: libcds text_collection XMLTree\r
 \r
 XMLTree: XMLTree.o XMLTreeBuilder.o bp.o darray.o bpcore.o\\r
- $(LIBCDS_A) $(OBJECTS_TCO) $(OBJECTS_TCA)\r
+ $(LIBCDS_A) $(OBJECTS_TCO) $(LIBRLCSA_TCA) $(LIBLZTRIE_TCA)\r
        cp libcds/lib/libcds.a XMLTree.a\r
        rm -rf .objs\r
        mkdir .objs\r
-       cd .objs; ar x ../$(OBJECTS_TCA)\r
+       cd .objs; ar x ../$(LIBRLCSA_TCA)\r
+       cd .objs; ar x ../$(LIBLZTRIE_TCA)\r
        ar rvcs XMLTree.a XMLTree.o XMLTreeBuilder.o  bp.o darray.o bpcore.o $(OBJECTS_TCO) .objs/*.o\r
        rm -rf .objs\r
 \r