X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=Makefile;h=97ac568a6bce48f49ebc1115761ef583b6b8d9d0;hb=d550133ad7afdf65c5e284c2bcf67a5bdde6faa7;hp=1c01ba60e932be6f7546b45d8c717cc80680801f;hpb=2676d5a3bbb1e6f6a5af66477edfe3b4c849f4e7;p=SXSI%2Fxpathcomp.git diff --git a/Makefile b/Makefile index 1c01ba6..97ac568 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ OCAMLPACKAGES = str,unix,ulex,camlp4 PPINCLUDES=$(OCAMLINCLUDES:%=-ppopt %) -CXXSOURCES = XMLDocShredder.cpp SXSIStorageInterface.cpp StorageInterface.cpp OCamlDriver.cpp +CXXSOURCES = XMLDocShredder.cpp OCamlDriver.cpp CXXOBJECTS = $(CXXSOURCES:.cpp=.o) CXXINCLUDES = \ @@ -53,12 +53,12 @@ endif ifeq ($(PROFILE), true) PROFILE_FLAGS = -p -SYNT_PROF = $(SYNT_DEBUG) -ppopt -DPROFILE +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 @@ -67,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) @@ -131,10 +131,8 @@ 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 compute_depend: @echo [DEP]