Restored bottom up run

[SXSI/xpathcomp.git] / Makefile

diff --git a/Makefile b/Makefile
index 1c01ba6..7dfc4d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 \
@@ -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,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]