X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=Makefile;h=154c166565481badd956ff7d814db149b04e8a5e;hb=cad5e2e2831477cba1f6211c57b9a4cc5b58bd55;hp=b4461a096b6fc19bc50111b03e9b360ee4f7dce7;hpb=b8aa8e7f1036cf00d0fadc75ccbe0264bae6c1b2;p=SXSI%2Fxpathcomp.git

diff --git a/Makefile b/Makefile
index b4461a0..154c166 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-INLINE=1000
+INLINE=10000
 DEBUG=false
-PROFILE=true
+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
@@ -17,9 +17,9 @@ OCAMLPACKAGES = str,unix,ulex,camlp4
 
 PPINCLUDES=$(OCAMLINCLUDES:%=-ppopt %)
 
-CXXSOURCES =  XMLDocShredder.cpp SXSIStorageInterface.cpp StorageInterface.cpp OCamlDriver.cpp
-CXXOBJECTS = $(CXXSOURCES:.cpp=.o)
-
+CXXSOURCES =  results.c XMLDocShredder.cpp  OCamlDriver.cpp
+CXXOBJECTS1 = $(CXXSOURCES:.cpp=.o)
+CXXOBJECTS = $(CXXOBJECTS1:.c=.o)
 CXXINCLUDES = 	\
 	-I/usr/include/libxml++-2.6 \
 	-I/usr/include/libxml2 \
@@ -36,6 +36,7 @@ CXXINCLUDES = 	\
 	-IXMLTree/TextCollection 
 
 CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC -std=c++0x
+
 ifeq ($(VERBOSE),true)
 HIDE=
 else
@@ -44,15 +45,21 @@ endif
 
 ifeq ($(DEBUG), true)
 CXX = g++ -DDEBUG
-OCAMLOPT = ocamlopt -g -cc "$(CXX)" 
+DEBUG_FLAGS = -g
 SYNT_DEBUG = -ppopt -DDEBUG
 else
-CXX = g++  
-OCAMLOPT = ocamlopt  -cc "$(CXX)" -ccopt -O3 -ccopt -std=c++0x -noassert -inline $(INLINE)
+CXX = g++
 endif
+
 ifeq ($(PROFILE), true)
-SYNT_PROF = $(SYNT_DEBUG) -ppopt -DPROFILE
+PROFILE_FLAGS = -p -S
+SYNT_PROF = -ppopt -DPROFILE
 endif
+SYNT_FLAGS = $(SYNT_DEBUG) $(SYNT_PROF)
+OPT_FLAGS = $(DEBUG_FLAGS) $(PROFILE_FLAGS) -nodynlink
+
+OCAMLOPT = ocamlopt -cc "$(CXX)" $(OPT_FLAGS) -ccopt -O3 -ccopt -std=c++0x -noassert -inline $(INLINE)
+
 
 OCAMLFIND = ocamlfind
 OCAMLMKLIB = ocamlmklib
@@ -60,7 +67,7 @@ OCAMLDEP = ocamldep
 #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) 
+SYNTAX= -syntax camlp4o $(PPINCLUDES) -ppopt pa_macro.cmo $(SYNT_FLAGS) 
 
 
 
@@ -106,7 +113,7 @@ libcamlshredder.a: $(CXXOBJECTS) XMLTree/XMLTree.a
 
 clean:
 	@echo [CLEAN]
-	$(HIDE) rm -f *~ *.cm* *.[oa] *.so main 
+	$(HIDE) rm -f *~ *.cm* *.[oa] *.so main *.s
 	$(HIDE) rm -rf .libs
 
 
@@ -124,10 +131,9 @@ timeXMLTree: $(CXXOBJECTS) XMLTree/XMLTree.a  timeXMLTree.cpp myTimeXMLTree.cpp
 #	$(LIBS) testXMLTree.cpp
 	rm -rf .libs
 
-SXSIStorageInterface.o: SXSIStorageInterface.h SXSIStorageInterface.cpp StorageInterface.h
-StorageInterface.o: StorageInterface.h
-XMLDocShredder.o: XMLDocShredder.h XMLDocShredder.cpp SXSIStorageInterface.h StorageInterface.h
-OCamlDriver.o: XMLDocShredder.h StorageInterface.h
+XMLDocShredder.o: XMLDocShredder.h XMLDocShredder.cpp 
+OCamlDriver.o: XMLDocShredder.h
+results.o: results.h
 
 compute_depend:
 	@echo [DEP]