projects
/
SXSI
/
xpathcomp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further optimisations, changed the prototype of Tree.mli
[SXSI/xpathcomp.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
bcd3f92
..
97f3352
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,10
+1,10
@@
INLINE=1000
DEBUG=false
INLINE=1000
DEBUG=false
-PROFILE=
tru
e
+PROFILE=
fals
e
VERBOSE=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)
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
-IXMLTree/TextCollection
CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC -std=c++0x
+
ifeq ($(VERBOSE),true)
HIDE=
else
ifeq ($(VERBOSE),true)
HIDE=
else
@@
-44,15
+45,21
@@
endif
ifeq ($(DEBUG), true)
CXX = g++ -DDEBUG
ifeq ($(DEBUG), true)
CXX = g++ -DDEBUG
-OCAMLOPT = ocamlopt -g -cc "$(CXX)"
+DEBUG_FLAGS = -g
SYNT_DEBUG = -ppopt -DDEBUG
else
SYNT_DEBUG = -ppopt -DDEBUG
else
-CXX = g++
-OCAMLOPT = ocamlopt -cc "$(CXX)" -ccopt -O3 -ccopt -std=c++0x -noassert -inline $(INLINE)
+CXX = g++
endif
endif
+
ifeq ($(PROFILE), true)
ifeq ($(PROFILE), true)
-SYNT_PROF = $(SYNT_DEBUG) -ppopt -DPROFILE
+PROFILE_FLAGS = -p
+SYNT_PROF = -ppopt -DPROFILE
endif
endif
+SYNT_FLAGS = $(SYNT_DEBUG) $(SYNT_PROF)
+OPT_FLAGS = $(DEBUG_FLAGS) $(PROFILE_FLAGS) -nodynlink
+
+OCAMLOPT = ocamlopt -cc "$(CXX)" $(OPT_FLAGS) -ccopt -O3 -ccopt -std=c++0x -noassert -inline $(INLINE)
+
OCAMLFIND = ocamlfind
OCAMLMKLIB = ocamlmklib
OCAMLFIND = ocamlfind
OCAMLMKLIB = ocamlmklib
@@
-60,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
#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
)
@@
-110,7
+117,7
@@
clean:
$(HIDE) rm -rf .libs
$(HIDE) rm -rf .libs
-timeXMLTree: $(CXXOBJECTS) XMLTree/XMLTree.a timeXMLTree.cpp
test
XMLTree.cpp
+timeXMLTree: $(CXXOBJECTS) XMLTree/XMLTree.a timeXMLTree.cpp
myTime
XMLTree.cpp
mkdir -p .libs/
cd .libs/ && ar x ../XMLTree/XMLTree.a
$(CXX) -o timeXMLTree $(CXXFLAGS) $(CXXINCLUDES) XMLDocShredder.o \
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 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
rm -rf .libs
SXSIStorageInterface.o: SXSIStorageInterface.h SXSIStorageInterface.cpp StorageInterface.h