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

diff --git a/Makefile b/Makefile
index 0fdc017..88620eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-INLINE=100
+INLINE=1000
 DEBUG=false
 PROFILE=false
 VERBOSE=false
 
-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
+BASESRC=uid.ml custom.ml hcons.ml hlist.ml ptset.ml finiteCofinite.ml tag.ml tagSet.ml options.ml tree.ml ata.ml
+BASEMLI=uid.mli sigs.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)
@@ -20,7 +20,9 @@ PPINCLUDES=$(OCAMLINCLUDES:%=-ppopt %)
 CXXSOURCES =  results.c XMLDocShredder.cpp  OCamlDriver.cpp
 CXXOBJECTS1 = $(CXXSOURCES:.cpp=.o)
 CXXOBJECTS = $(CXXOBJECTS1:.c=.o)
-CXXINCLUDES = 	\
+
+CAMLINCLUDES= -I`ocamlc -where`
+LIBXMLINCLUDES= 	\
 	-I/usr/include/libxml++-2.6 \
 	-I/usr/include/libxml2 \
 	-I/usr/include/glibmm-2.4 \
@@ -30,13 +32,16 @@ CXXINCLUDES = 	\
 	-I/usr/lib/glibmm-2.4/include \
 	-I/usr/lib/sigc++-2.0/include \
 	-I/usr/lib/glib-2.0/include\
-	-I`ocamlc -where`\
+
+SXSIINCLUDES = \
 	-IXMLTree \
 	-IXMLTree/libcds/includes \
 	-IXMLTree/TextCollection 
 
-CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC -std=c++0x
-CCFLAGS = -O3 -Wall -fPIC
+CXXINCLUDES= $(CAMLINCLUDES) $(LIBXMLINCLUDES) $(SXSIINCLUDES)
+
+CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -std=c++0x -static
+CCFLAGS = -O3 -Wall  -static
 
 ifeq ($(VERBOSE),true)
 HIDE=
@@ -59,7 +64,7 @@ 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) -nodynlink -fno-PIC
 
 OCAMLOPT = ocamlopt -cc "$(CXX)" $(OPT_FLAGS) -ccopt -O3 -ccopt -std=c++0x -noassert -inline $(INLINE)
 
@@ -103,9 +108,9 @@ unit_test: libcamlshredder.a  $(BASEOBJS) unit_test.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 $<
+ata.cmx: ata.ml
+	@echo [OCAMLOPTPROF] $@
+	$(HIDE) $(OCAMLFIND) $(OCAMLOPT) -S -package "$(OCAMLPACKAGES)"  $(SYNTAX) -c $<
 
 .mli.cmi:
 	@echo [OCAMLOPT] $@
@@ -138,6 +143,15 @@ timeXMLTree: $(CXXOBJECTS) XMLTree/XMLTree.a  timeXMLTree.cpp myTimeXMLTree.cpp
 #	$(LIBS) testXMLTree.cpp
 	rm -rf .libs
 
+timeSXSI: $(CXXOBJECTS) XMLTree/XMLTree.a  timeSXSI.cpp
+	mkdir -p .libs/
+	cd .libs/ && ar x ../XMLTree/XMLTree.a
+	$(CXX) -o timeSXSI $(CXXFLAGS) $(SXSIINCLUDES) -I/usr/include/libxml2 -lxml2 ./.libs/*.o timeSXSI.cpp
+#	$(CXX) -o testXMLTree $(CXXFLAGS) $(CXXINCLUDES) XMLDocShredder.o \
+#	SXSIStorageInterface.o StorageInterface.o ./.libs/*.o \
+#	$(LIBS) testXMLTree.cpp
+	rm -rf .libs
+
 XMLDocShredder.o: XMLDocShredder.h XMLDocShredder.cpp 
 OCamlDriver.o: XMLDocShredder.h
 results.o: results.h