X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=Makefile;h=4b37144dced75c36beb7ec3571f0969b66afc96a;hb=24fdea81b5506233d139bd7d72364a190bef35b8;hp=d0510b95de0ef7fafd0e0959479490717f1503d6;hpb=3623eefccfb5fc69e19ad975a3669f51a2a8b276;p=SXSI%2Fxpathcomp.git

diff --git a/Makefile b/Makefile
index d0510b9..4b37144 100644
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,11 @@ MLOBJS = $(MLSRCS:.ml=.cmx)
 MLCINT = $(MLISRCS:.mli=.cmi)
 
 
-OCAMLPACKAGES = unix,ulex,camlp4
+OCAMLPACKAGES = str,unix,ulex,camlp4
 
 PPINCLUDES=$(OCAMLINCLUDES:%=-ppopt %)
 
-CXXSOURCES =  XMLDocShredder.cpp OCamlStorageInterface.cpp StorageInterface.cpp OCamlDriver.cpp
+CXXSOURCES =  XMLDocShredder.cpp SXSIStorageInterface.cpp StorageInterface.cpp OCamlDriver.cpp
 CXXOBJECTS = $(CXXSOURCES:.cpp=.o)
 
 CXXINCLUDES = 	\
@@ -24,39 +24,45 @@ 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`
+	-I`ocamlc -where`\
+	-IXMLTree \
+	-IXMLTree/libcds/includes \
+	-IXMLTree/TextCollection 
 
 CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC -std=c++0x
-CXX = g++
 
 ifeq ($(DEBUG), true)
+CXX = g++ -DDEBUG
 OCAMLOPT = ocamlopt -g -cc "$(CXX)" 
 SYNT_DEBUG = -ppopt -DDEBUG
 else
+CXX = g++
 OCAMLOPT = ocamlopt -cc "$(CXX)" -noassert -inline 10000
 endif
+
 ifeq ($(PROFILE), true)
 SYNT_PROF = $(SYNT_DEBUG) -ppopt -DPROFILE
 endif
 
-
 OCAMLFIND = ocamlfind
 OCAMLMKLIB = ocamlmklib
 OCAMLDEP = ocamldep
-LINK=$(OCAMLOPT) -linkpkg camlp4lib.cmxa
+#Ugly but seems difficult with a makefile
+
+LINK=$(OCAMLOPT) -linkpkg `ocamlc -version | grep -q "3.11.0" && echo dynlink.cmxa` camlp4lib.cmxa
 SYNTAX= -syntax camlp4o $(PPINCLUDES) -ppopt pa_macro.cmo $(SYNT_PROF) 
 
 
 
-LIBS= -lxml2 -lxml++-2.6 -lglibmm-2.4 -lgobject-2.0 -lglib-2.0 -lsigc-2.0
+LIBS=-lxml2 -lxml++-2.6 -lglibmm-2.4 -lgobject-2.0 -lglib-2.0 -lsigc-2.0 
+
+all: version libcamlshredder.a  $(MLOBJS)
 
-all: libcamlshredder.a  $(MLOBJS)
 	$(OCAMLFIND) $(LINK) -o main -package "$(OCAMLPACKAGES)" $(SYNTAX) -cclib \
 	"$(LIBS) ./libcamlshredder.a"  $(MLOBJS)
 
 .SUFFIXES: .ml .mli .cmx .cmi .cpp
-.PHONY:compute_depend
-
+.PHONY:compute_depend version
 .cpp.o:
 	$(CXX) $(CXXINCLUDES) -c $(CXXFLAGS)  $<
 .ml.cmx:
@@ -64,14 +70,25 @@ all: libcamlshredder.a  $(MLOBJS)
 .mli.cmi:
 	$(OCAMLFIND) $(OCAMLOPT) -package "$(OCAMLPACKAGES)"  $(SYNTAX) -c $<
 
-libcamlshredder.a: $(CXXOBJECTS)
-	$(OCAMLMKLIB) -o camlshredder -custom $(CXXOBJECTS) $(LIBS)
+libcamlshredder.a: $(CXXOBJECTS) XMLTree/XMLTree.a
+	mkdir -p .libs/
+	cd .libs/ && ar x ../XMLTree/XMLTree.a
+	$(OCAMLMKLIB) -o camlshredder -custom $(CXXOBJECTS) ./.libs/*.o $(LIBS)
+	rm -rf .libs
 
 clean:
-	rm -f *~ *.cm* *.[oa] *.so main
+	rm -f *~ *.cm* *.[oa] *.so main .libs
+
 
+testSuccint: $(CXXOBJECTS) XMLTree/XMLTree.a
+	mkdir -p .libs/
+	cd .libs/ && ar x ../XMLTree/XMLTree.a
+	$(CXX) -o testSuccint $(CXXFLAGS) $(CXXINCLUDES) XMLDocShredder.o \
+SXSIStorageInterface.o StorageInterface.o ./.libs/*.o \
+$(LIBS) testSuccint.cpp
+	rm -rf .libs
 
-OCamlStorageInterface.o: OCamlStorageInterface.h OCamlStorageInterface.cpp StorageInterface.h
+SXSIStorageInterface.o: SXSIStorageInterface.h SXSIStorageInterface.cpp StorageInterface.h
 StorageInterface.o: StorageInterface.h
 XMLDocShredder.o: XMLDocShredder.h XMLDocShredder.cpp OCamlStorageInterface.h StorageInterface.h
 OCamlDriver.o: XMLDocShredder.h StorageInterface.h