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

diff --git a/Makefile b/Makefile
index d0510b9..ffc996c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,18 @@
 DEBUG=false
 PROFILE=true
+VERBOSE=false
 
-MLSRCS = memory.ml tag.ml tagSet.ml  tree.ml automaton.ml ulexer.ml  xPath.ml main.ml
-MLISRCS = memory.mli automaton.mli  tag.mli tagSet.mli tree.mli ulexer.mli xPath.mli
+MLSRCS = memory.ml custom.ml ptset.ml finiteCofinite.ml tag.ml tagSet.ml options.ml tree.ml ata.ml ulexer.ml  xPath.ml main.ml
+MLISRCS = memory.mli sigs.mli ptset.mli finiteCofinite.ml options.mli  tag.mli tagSet.mli tree.mli ata.mli ulexer.mli xPath.mli
 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,61 +25,90 @@ 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`
-
-CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC -std=c++0x
-CXX = g++
+	-I`ocamlc -where`\
+	-IXMLTree \
+	-IXMLTree/libcds/includes \
+	-IXMLTree/TextCollection 
+
+CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC
+ifeq ($(VERBOSE),true)
+HIDE=
+else
+HIDE=@
+endif
 
 ifeq ($(DEBUG), true)
+CXX = g++ -DDEBUG
 OCAMLOPT = ocamlopt -g -cc "$(CXX)" 
 SYNT_DEBUG = -ppopt -DDEBUG
 else
-OCAMLOPT = ocamlopt -cc "$(CXX)" -noassert -inline 10000
+CXX = g++
+OCAMLOPT = ocamlopt -cc "$(CXX)" -noassert -inline 100
 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: main
 
-all: libcamlshredder.a  $(MLOBJS)
-	$(OCAMLFIND) $(LINK) -o main -package "$(OCAMLPACKAGES)" $(SYNTAX) -cclib \
+main: libcamlshredder.a  $(MLOBJS)
+	@echo [LINK] $@
+	$(HIDE) $(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)  $<
+	@echo [CPP] $@
+	$(HIDE) $(CXX) $(CXXINCLUDES) -c $(CXXFLAGS)  $<
 .ml.cmx:
-	$(OCAMLFIND) $(OCAMLOPT) -package "$(OCAMLPACKAGES)"  $(SYNTAX) -c $<
+	@echo [OCAMLOPT] $@
+	$(HIDE) $(OCAMLFIND) $(OCAMLOPT) -package "$(OCAMLPACKAGES)"  $(SYNTAX) -c $<
 .mli.cmi:
-	$(OCAMLFIND) $(OCAMLOPT) -package "$(OCAMLPACKAGES)"  $(SYNTAX) -c $<
+	@echo [OCAMLOPT] $@
+	$(HIDE) $(OCAMLFIND) $(OCAMLOPT) -package "$(OCAMLPACKAGES)"  $(SYNTAX) -c $<
 
-libcamlshredder.a: $(CXXOBJECTS)
-	$(OCAMLMKLIB) -o camlshredder -custom $(CXXOBJECTS) $(LIBS)
+libcamlshredder.a: $(CXXOBJECTS) XMLTree/XMLTree.a
+	@echo [LIB] $@
+	$(HIDE) mkdir -p .libs/
+	$(HIDE) cd .libs/ && ar x ../XMLTree/XMLTree.a
+	$(HIDE) $(OCAMLMKLIB) -o camlshredder -custom $(CXXOBJECTS) ./.libs/*.o $(LIBS)
+	$(HIDE) rm -rf .libs
 
 clean:
-	rm -f *~ *.cm* *.[oa] *.so main
+	@echo [CLEAN]
+	$(HIDE) rm -f *~ *.cm* *.[oa] *.so main .libs
 
 
-OCamlStorageInterface.o: OCamlStorageInterface.h OCamlStorageInterface.cpp StorageInterface.h
+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
+
+SXSIStorageInterface.o: SXSIStorageInterface.h SXSIStorageInterface.cpp StorageInterface.h
 StorageInterface.o: StorageInterface.h
-XMLDocShredder.o: XMLDocShredder.h XMLDocShredder.cpp OCamlStorageInterface.h StorageInterface.h
+XMLDocShredder.o: XMLDocShredder.h XMLDocShredder.cpp SXSIStorageInterface.h StorageInterface.h
 OCamlDriver.o: XMLDocShredder.h StorageInterface.h
 
 compute_depend:
-	$(OCAMLFIND) $(OCAMLDEP) -package "$(OCAMLPACKAGES)" $(SYNTAX)  $(MLSRCS) $(MLISRCS) >depend
-
-
+	@echo [DEP]
+	$(HIDE) $(OCAMLFIND) $(OCAMLDEP) -package "$(OCAMLPACKAGES)" $(SYNTAX)  $(MLSRCS) $(MLISRCS) >depend
 
 include depend