Changed building of tag tables and format.

[SXSI/xpathcomp.git] / Makefile

diff --git a/Makefile b/Makefile
index 0fdc017..5f225f1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ DEBUG=false
 PROFILE=false
 VERBOSE=false
 
-BASESRC=custom.ml memoizer.ml hcons.ml hlist.ml ptset.ml finiteCofinite.ml tag.ml tagSet.ml options.ml tree.ml ata.ml
-BASEMLI=sigs.mli memoizer.mli hcons.mli hlist.mli ptset.mli finiteCofinite.mli tag.mli tagSet.mli options.mli tree.mli  ata.mli
+BASESRC=uid.ml custom.ml hcons.ml hlist.ml ptset.ml finiteCofinite.ml tag.ml tagSet.ml options.ml tree.ml ata.ml
+BASEMLI=uid.mli sigs.mli hcons.mli hlist.mli ptset.mli finiteCofinite.mli tag.mli tagSet.mli options.mli tree.mli  ata.mli
 MLSRCS = memory.ml $(BASESRC)   ulexer.ml  xPath.ml main.ml
 MLISRCS = memory.mli $(BASEMLI)  ulexer.mli xPath.mli
 BASEOBJS= $(BASESRC:.ml=.cmx)
@@ -20,7 +20,9 @@ PPINCLUDES=$(OCAMLINCLUDES:%=-ppopt %)
 CXXSOURCES =  results.c XMLDocShredder.cpp  OCamlDriver.cpp
 CXXOBJECTS1 = $(CXXSOURCES:.cpp=.o)
 CXXOBJECTS = $(CXXOBJECTS1:.c=.o)
-CXXINCLUDES =  \
+
+CAMLINCLUDES= -I`ocamlc -where`
+LIBXMLINCLUDES=        \
        -I/usr/include/libxml++-2.6 \
        -I/usr/include/libxml2 \
        -I/usr/include/glibmm-2.4 \
@@ -30,13 +32,16 @@ CXXINCLUDES =       \
        -I/usr/lib/glibmm-2.4/include \
        -I/usr/lib/sigc++-2.0/include \
        -I/usr/lib/glib-2.0/include\
-       -I`ocamlc -where`\
+
+SXSIINCLUDES = \
        -IXMLTree \
        -IXMLTree/libcds/includes \
        -IXMLTree/TextCollection 
 
-CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC -std=c++0x
-CCFLAGS = -O3 -Wall -fPIC
+CXXINCLUDES= $(CAMLINCLUDES) $(LIBXMLINCLUDES) $(SXSIINCLUDES)
+
+CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -std=c++0x -static
+CCFLAGS = -O3 -Wall  -static
 
 ifeq ($(VERBOSE),true)
 HIDE=
@@ -59,7 +64,7 @@ PROFILE_FLAGS = -p -S
 SYNT_PROF = -ppopt -DPROFILE
 endif
 SYNT_FLAGS = $(SYNT_DEBUG) $(SYNT_PROF)
-OPT_FLAGS = $(DEBUG_FLAGS) $(PROFILE_FLAGS) -nodynlink
+OPT_FLAGS = $(DEBUG_FLAGS) $(PROFILE_FLAGS) -nodynlink -fno-PIC -unsafe
 
 OCAMLOPT = ocamlopt -cc "$(CXX)" $(OPT_FLAGS) -ccopt -O3 -ccopt -std=c++0x -noassert -inline $(INLINE)
 
@@ -69,8 +74,8 @@ OCAMLMKLIB = ocamlmklib
 OCAMLDEP = ocamldep
 #Ugly but seems difficult with a makefile
 
-LINK=$(OCAMLOPT) -linkpkg `ocamlc -version | grep -q "3.11.[01]" && echo dynlink.cmxa` camlp4lib.cmxa
-SYNTAX= -syntax camlp4o $(PPINCLUDES) -ppopt pa_macro.cmo $(SYNT_FLAGS) 
+LINK=$(OCAMLOPT) -linkpkg `ocamlc -version | grep -q "3.1[12].[012]" && echo dynlink.cmxa` camlp4lib.cmxa
+SYNTAX= -syntax camlp4o $(PPINCLUDES) -ppopt -printer -ppopt auto -ppopt pa_macro.cmo $(SYNT_FLAGS) 
 
 
 
@@ -80,9 +85,14 @@ all: main
 #-ccopt -gp -p
 main: libcamlshredder.a  $(MLOBJS)
        @echo [LINK] $@
-       $(HIDE) $(OCAMLFIND) $(LINK) -o main  -package "$(OCAMLPACKAGES)" $(SYNTAX) -cclib \
+       $(HIDE) $(OCAMLFIND) $(LINK) -o main -package "$(OCAMLPACKAGES)" $(SYNTAX) -cclib \
        "$(LIBS) ./libcamlshredder.a"  $(MLOBJS)
 
+sxsi_test: libcamlshredder.a uid.cmx custom.cmx hcons.cmx ptset.cmx finiteCofinite.cmx tag.cmx tagSet.cmx options.cmx tree.cmx
+       @echo [LINK] $@ 
+       $(HIDE) $(OCAMLFIND) $(LINK) -o sxsi_test -package "$(OCAMLPACKAGES)" $(SYNTAX) -cclib \
+       "$(LIBS) ./libcamlshredder.a"  uid.cmx custom.cmx hcons.cmx ptset.cmx finiteCofinite.cmx tag.cmx tagSet.cmx options.cmx tree.cmx sxsi_test.ml
+
 unit_test: libcamlshredder.a  $(BASEOBJS) unit_test.cmx
        @echo [LINK] $@ 
        $(HIDE) $(OCAMLFIND) $(LINK) -o unit_test -package "$(OCAMLPACKAGES)" $(SYNTAX) -cclib \
@@ -103,9 +113,10 @@ unit_test: libcamlshredder.a  $(BASEOBJS) unit_test.cmx
        @echo [OCAMLOPT] $@
        $(HIDE) $(OCAMLFIND) $(OCAMLOPT) -package "$(OCAMLPACKAGES)"  $(SYNTAX) -c $<
 
-#ata.cmx: ata.ml
-#      @echo [OCAMLOPTPROF] $@
-#      $(HIDE) $(OCAMLFIND) $(OCAMLOPT) -ccopt -gp -p -package "$(OCAMLPACKAGES)"  $(SYNTAX) -c $<
+# ata.cmx: ata.ml
+#      @echo [OCAMLOPTPROF] $@
+#      $(HIDE) $(OCAMLFIND) $(OCAMLOPT) -S -ccopt -gp -p -package "$(OCAMLPACKAGES)"  $(SYNTAX) -c $<
+
 
 .mli.cmi:
        @echo [OCAMLOPT] $@
@@ -120,7 +131,7 @@ libcamlshredder.a: $(CXXOBJECTS) XMLTree/XMLTree.a
 
 clean:
        @echo [CLEAN]
-       $(HIDE) rm -f *~ *.cm* *.[oa] *.so main *.s
+       $(HIDE) rm -f *~ *.cm* *.[oa] *.so main *.s sxsi_test
        $(HIDE) rm -rf .libs
 
 
@@ -138,6 +149,15 @@ timeXMLTree: $(CXXOBJECTS) XMLTree/XMLTree.a  timeXMLTree.cpp myTimeXMLTree.cpp
 #      $(LIBS) testXMLTree.cpp
        rm -rf .libs
 
+timeSXSI: $(CXXOBJECTS) XMLTree/XMLTree.a  timeSXSI.cpp
+       mkdir -p .libs/
+       cd .libs/ && ar x ../XMLTree/XMLTree.a
+       $(CXX) -o timeSXSI $(CXXFLAGS) $(SXSIINCLUDES) -I/usr/include/libxml2 -lxml2 ./.libs/*.o timeSXSI.cpp
+#      $(CXX) -o testXMLTree $(CXXFLAGS) $(CXXINCLUDES) XMLDocShredder.o \
+#      SXSIStorageInterface.o StorageInterface.o ./.libs/*.o \
+#      $(LIBS) testXMLTree.cpp
+       rm -rf .libs
+
 XMLDocShredder.o: XMLDocShredder.h XMLDocShredder.cpp 
 OCamlDriver.o: XMLDocShredder.h
 results.o: results.h