Some more optimisations

[SXSI/xpathcomp.git] / Makefile

diff --git a/Makefile b/Makefile
index b4461a0..1c01ba6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 INLINE=1000
 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
@@ -36,6 +36,7 @@ CXXINCLUDES =         \
        -IXMLTree/TextCollection 
 
 CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC -std=c++0x
+
 ifeq ($(VERBOSE),true)
 HIDE=
 else
@@ -44,16 +45,22 @@ 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)
+PROFILE_FLAGS = -p 
 SYNT_PROF = $(SYNT_DEBUG) -ppopt -DPROFILE
 endif
 
+OPT_FLAGS = $(DEBUG_FLAGS) $(PROFILE_FLAGS)
+
+OCAMLOPT = ocamlopt  -cc "$(CXX)" $(OPT_FLAGS) -ccopt -O3 -ccopt -std=c++0x -noassert -inline $(INLINE)
+
+
 OCAMLFIND = ocamlfind
 OCAMLMKLIB = ocamlmklib
 OCAMLDEP = ocamldep