Added -O3 for gonzalo's result sets

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/xpathcomp@557 3cdefd35-fc62-479d-8e8d-bae585ffb9ca

diff --git a/Makefile b/Makefile
index 154c166..0fdc017 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-INLINE=10000
+INLINE=100
 DEBUG=false
 PROFILE=false
 VERBOSE=false
@@ -36,6 +36,7 @@ CXXINCLUDES =         \
        -IXMLTree/TextCollection 
 
 CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC -std=c++0x
+CCFLAGS = -O3 -Wall -fPIC
 
 ifeq ($(VERBOSE),true)
 HIDE=
@@ -45,10 +46,12 @@ endif
 
 ifeq ($(DEBUG), true)
 CXX = g++ -DDEBUG
+CC = gcc -DDEBUG
 DEBUG_FLAGS = -g
 SYNT_DEBUG = -ppopt -DDEBUG
 else
 CXX = g++
+CC = gcc -DDEBUG
 endif
 
 ifeq ($(PROFILE), true)
@@ -66,7 +69,7 @@ OCAMLMKLIB = ocamlmklib
 OCAMLDEP = ocamldep
 #Ugly but seems difficult with a makefile
 
-LINK=$(OCAMLOPT) -linkpkg `ocamlc -version | grep -q "3.11.0" && echo dynlink.cmxa` camlp4lib.cmxa
+LINK=$(OCAMLOPT) -linkpkg `ocamlc -version | grep -q "3.11.[01]" && echo dynlink.cmxa` camlp4lib.cmxa
 SYNTAX= -syntax camlp4o $(PPINCLUDES) -ppopt pa_macro.cmo $(SYNT_FLAGS) 
 
 
@@ -88,6 +91,10 @@ unit_test: libcamlshredder.a  $(BASEOBJS) unit_test.cmx
 .SUFFIXES: .ml .mli .cmx .cmi .cpp
 .PHONY:compute_depend version
 
+.c.o:
+       @echo [CC] $@
+       $(HIDE) $(CC) -c $(CCFLAGS) $<
+
 .cpp.o:
        @echo [CPP] $@
        $(HIDE) $(CXX) $(CXXINCLUDES) -c $(CXXFLAGS)  $<