X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=Makefile;h=97f33527eb92b4058674b4bda9f366d38652d7ec;hb=70ff0bfc463882ecf233f1b1a7ac4a8007fa4cc2;hp=956e51d4510983941169783dc5ffe10485a2c512;hpb=497ac3f74338faede9a844f5940857f55c0e9b64;p=SXSI%2Fxpathcomp.git

diff --git a/Makefile b/Makefile
index 956e51d..97f3352 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 INLINE=1000
 DEBUG=false
-PROFILE=true
+PROFILE=false
 VERBOSE=false
 
-BASESRC=custom.ml ptset.ml finiteCofinite.ml tag.ml tagSet.ml options.ml tree.ml ata.ml
-BASEMLI=sigs.mli ptset.mli finiteCofinite.mli tag.mli tagSet.mli options.mli tree.mli  ata.mli
+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
 MLSRCS = memory.ml $(BASESRC)   ulexer.ml  xPath.ml main.ml
 MLISRCS = memory.mli $(BASEMLI)  ulexer.mli xPath.mli
 BASEOBJS= $(BASESRC:.ml=.cmx)
@@ -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 
+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)