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

diff --git a/Makefile b/Makefile
index 26f4e45..1c01ba6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 INLINE=1000
 DEBUG=false
-PROFILE=true
+PROFILE=false
 VERBOSE=false
 
-BASESRC=custom.ml ptset.ml finiteCofinite.ml tag.ml tagSet.ml options.ml tree.ml ata.ml
-BASEMLI=sigs.mli ptset.mli finiteCofinite.mli tag.mli tagSet.mli options.mli tree.mli  ata.mli
+BASESRC=custom.ml memoizer.ml hcons.ml hlist.ml ptset.ml finiteCofinite.ml tag.ml tagSet.ml options.ml tree.ml ata.ml
+BASEMLI=sigs.mli memoizer.mli hcons.mli hlist.mli ptset.mli finiteCofinite.mli tag.mli tagSet.mli options.mli tree.mli  ata.mli
 MLSRCS = memory.ml $(BASESRC)   ulexer.ml  xPath.ml main.ml
 MLISRCS = memory.mli $(BASEMLI)  ulexer.mli xPath.mli
 BASEOBJS= $(BASESRC:.ml=.cmx)
@@ -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
@@ -110,7 +117,7 @@ clean:
 	$(HIDE) rm -rf .libs
 
 
-timeXMLTree: $(CXXOBJECTS) XMLTree/XMLTree.a  timeXMLTree.cpp testXMLTree.cpp
+timeXMLTree: $(CXXOBJECTS) XMLTree/XMLTree.a  timeXMLTree.cpp myTimeXMLTree.cpp
 	mkdir -p .libs/
 	cd .libs/ && ar x ../XMLTree/XMLTree.a
 	$(CXX) -o timeXMLTree $(CXXFLAGS) $(CXXINCLUDES) XMLDocShredder.o \
@@ -119,9 +126,9 @@ timeXMLTree: $(CXXOBJECTS) XMLTree/XMLTree.a  timeXMLTree.cpp testXMLTree.cpp
 	$(CXX) -o myTimeXMLTree $(CXXFLAGS) $(CXXINCLUDES) XMLDocShredder.o \
 	SXSIStorageInterface.o StorageInterface.o ./.libs/*.o \
 	$(LIBS) myTimeXMLTree.cpp
-	$(CXX) -o testXMLTree $(CXXFLAGS) $(CXXINCLUDES) XMLDocShredder.o \
-	SXSIStorageInterface.o StorageInterface.o ./.libs/*.o \
-	$(LIBS) testXMLTree.cpp
+#	$(CXX) -o testXMLTree $(CXXFLAGS) $(CXXINCLUDES) XMLDocShredder.o \
+#	SXSIStorageInterface.o StorageInterface.o ./.libs/*.o \
+#	$(LIBS) testXMLTree.cpp
 	rm -rf .libs
 
 SXSIStorageInterface.o: SXSIStorageInterface.h SXSIStorageInterface.cpp StorageInterface.h