X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=Makefile;h=024552f4235ac84809756456e1beef260524cd64;hb=92455238a637876bec18bfdaed4f5342f4cbbd1f;hp=ffc996c0249dd15fc77912ef5337ed386d22b4bf;hpb=d64e3a3a9ef6329caafdba848ef78427fce0d689;p=SXSI%2Fxpathcomp.git

diff --git a/Makefile b/Makefile
index ffc996c..024552f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,14 @@
+INLINE=10
 DEBUG=false
 PROFILE=true
 VERBOSE=false
 
-MLSRCS = memory.ml custom.ml ptset.ml finiteCofinite.ml tag.ml tagSet.ml options.ml tree.ml ata.ml ulexer.ml  xPath.ml main.ml
-MLISRCS = memory.mli sigs.mli ptset.mli finiteCofinite.ml options.mli  tag.mli tagSet.mli tree.mli ata.mli ulexer.mli xPath.mli
+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
+MLSRCS = memory.ml $(BASESRC)   ulexer.ml  xPath.ml main.ml
+MLISRCS = memory.mli $(BASEMLI)  ulexer.mli xPath.mli
+BASEOBJS= $(BASESRC:.ml=.cmx)
+BASEINT= $(BASEMLI:.ml=.cmi)
 MLOBJS = $(MLSRCS:.ml=.cmx)
 MLCINT = $(MLISRCS:.mli=.cmi)
 
@@ -30,7 +35,7 @@ CXXINCLUDES = 	\
 	-IXMLTree/libcds/includes \
 	-IXMLTree/TextCollection 
 
-CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC
+CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC -std=c++0x
 ifeq ($(VERBOSE),true)
 HIDE=
 else
@@ -42,10 +47,9 @@ CXX = g++ -DDEBUG
 OCAMLOPT = ocamlopt -g -cc "$(CXX)" 
 SYNT_DEBUG = -ppopt -DDEBUG
 else
-CXX = g++
-OCAMLOPT = ocamlopt -cc "$(CXX)" -noassert -inline 100
+CXX = g++  
+OCAMLOPT = ocamlopt  -cc "$(CXX)" -ccopt -O3 -ccopt -std=c++0x -noassert -inline $(INLINE)
 endif
-
 ifeq ($(PROFILE), true)
 SYNT_PROF = $(SYNT_DEBUG) -ppopt -DPROFILE
 endif
@@ -63,21 +67,32 @@ SYNTAX= -syntax camlp4o $(PPINCLUDES) -ppopt pa_macro.cmo $(SYNT_PROF)
 LIBS=-lxml2 -lxml++-2.6 -lglibmm-2.4 -lgobject-2.0 -lglib-2.0 -lsigc-2.0 
 
 all: main
-
+#-ccopt -gp -p
 main: libcamlshredder.a  $(MLOBJS)
 	@echo [LINK] $@
-	$(HIDE) $(OCAMLFIND) $(LINK) -o main -package "$(OCAMLPACKAGES)" $(SYNTAX) -cclib \
+	$(HIDE) $(OCAMLFIND) $(LINK) -o main  -package "$(OCAMLPACKAGES)" $(SYNTAX) -cclib \
 	"$(LIBS) ./libcamlshredder.a"  $(MLOBJS)
 
+unit_test: libcamlshredder.a  $(BASEOBJS) unit_test.cmx
+	@echo [LINK] $@	
+	$(HIDE) $(OCAMLFIND) $(LINK) -o unit_test -package "$(OCAMLPACKAGES)" $(SYNTAX) -cclib \
+	"$(LIBS) ./libcamlshredder.a"  $(BASEOBJS) unit_test.cmx
+
 .SUFFIXES: .ml .mli .cmx .cmi .cpp
 .PHONY:compute_depend version
 
 .cpp.o:
 	@echo [CPP] $@
 	$(HIDE) $(CXX) $(CXXINCLUDES) -c $(CXXFLAGS)  $<
+
 .ml.cmx:
 	@echo [OCAMLOPT] $@
 	$(HIDE) $(OCAMLFIND) $(OCAMLOPT) -package "$(OCAMLPACKAGES)"  $(SYNTAX) -c $<
+
+#ata.cmx: ata.ml
+#	@echo [OCAMLOPTPROF] $@
+#	$(HIDE) $(OCAMLFIND) $(OCAMLOPT) -ccopt -gp -p -package "$(OCAMLPACKAGES)"  $(SYNTAX) -c $<
+
 .mli.cmi:
 	@echo [OCAMLOPT] $@
 	$(HIDE) $(OCAMLFIND) $(OCAMLOPT) -package "$(OCAMLPACKAGES)"  $(SYNTAX) -c $<
@@ -94,12 +109,12 @@ clean:
 	$(HIDE) rm -f *~ *.cm* *.[oa] *.so main .libs
 
 
-testSuccint: $(CXXOBJECTS) XMLTree/XMLTree.a
+timeXMLTree: $(CXXOBJECTS) XMLTree/XMLTree.a  timeXMLTree.cpp
 	mkdir -p .libs/
 	cd .libs/ && ar x ../XMLTree/XMLTree.a
-	$(CXX) -o testSuccint $(CXXFLAGS) $(CXXINCLUDES) XMLDocShredder.o \
-SXSIStorageInterface.o StorageInterface.o ./.libs/*.o \
-$(LIBS) testSuccint.cpp
+	$(CXX) -o timeXMLTree $(CXXFLAGS) $(CXXINCLUDES) XMLDocShredder.o \
+	SXSIStorageInterface.o StorageInterface.o ./.libs/*.o \
+	$(LIBS) timeXMLTree.cpp
 	rm -rf .libs
 
 SXSIStorageInterface.o: SXSIStorageInterface.h SXSIStorageInterface.cpp StorageInterface.h