X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=Makefile;h=0fdc0171f373d18befea3eaf69baa5eccca41db6;hb=95310b9c1cf213f4ba28cab981400678d399717a;hp=1c01ba60e932be6f7546b45d8c717cc80680801f;hpb=2676d5a3bbb1e6f6a5af66477edfe3b4c849f4e7;p=SXSI%2Fxpathcomp.git

diff --git a/Makefile b/Makefile
index 1c01ba6..0fdc017 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-INLINE=1000
+INLINE=100
 DEBUG=false
 PROFILE=false
 VERBOSE=false
@@ -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
+CCFLAGS = -O3 -Wall -fPIC
 
 ifeq ($(VERBOSE),true)
 HIDE=
@@ -45,20 +46,22 @@ 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)
-PROFILE_FLAGS = -p 
-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
 
-OPT_FLAGS = $(DEBUG_FLAGS) $(PROFILE_FLAGS)
-
-OCAMLOPT = ocamlopt  -cc "$(CXX)" $(OPT_FLAGS) -ccopt -O3 -ccopt -std=c++0x -noassert -inline $(INLINE)
+OCAMLOPT = ocamlopt -cc "$(CXX)" $(OPT_FLAGS) -ccopt -O3 -ccopt -std=c++0x -noassert -inline $(INLINE)
 
 
 OCAMLFIND = ocamlfind
@@ -66,8 +69,8 @@ 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
-SYNTAX= -syntax camlp4o $(PPINCLUDES) -ppopt pa_macro.cmo $(SYNT_PROF) 
+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)  $<
@@ -113,7 +120,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
 
 
@@ -131,10 +138,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]