projects
/
SXSI
/
xpathcomp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from branch stable-succint-refactor
[SXSI/xpathcomp.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
43e5142
..
ab38c4b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-30,7
+30,7
@@
CXXINCLUDES = \
-IXMLTree/libcds/includes \
-IXMLTree/TextCollection
-IXMLTree/libcds/includes \
-IXMLTree/TextCollection
-CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC
+CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC
-std=c++0x
ifeq ($(VERBOSE),true)
HIDE=
else
ifeq ($(VERBOSE),true)
HIDE=
else
@@
-43,7
+43,7
@@
OCAMLOPT = ocamlopt -g -cc "$(CXX)"
SYNT_DEBUG = -ppopt -DDEBUG
else
CXX = g++
SYNT_DEBUG = -ppopt -DDEBUG
else
CXX = g++
-OCAMLOPT = ocamlopt -
cc "$(CXX)" -ccopt -O3 -noassert -inline 1
00
+OCAMLOPT = ocamlopt -
S -cc "$(CXX)" -ccopt -O3 -ccopt -std=c++0x -noassert -inline 10
00
endif
ifeq ($(PROFILE), true)
SYNT_PROF = $(SYNT_DEBUG) -ppopt -DPROFILE
endif
ifeq ($(PROFILE), true)
SYNT_PROF = $(SYNT_DEBUG) -ppopt -DPROFILE
@@
-74,6
+74,7
@@
main: libcamlshredder.a $(MLOBJS)
.cpp.o:
@echo [CPP] $@
$(HIDE) $(CXX) $(CXXINCLUDES) -c $(CXXFLAGS) $<
.cpp.o:
@echo [CPP] $@
$(HIDE) $(CXX) $(CXXINCLUDES) -c $(CXXFLAGS) $<
+
.ml.cmx:
@echo [OCAMLOPT] $@
$(HIDE) $(OCAMLFIND) $(OCAMLOPT) -package "$(OCAMLPACKAGES)" $(SYNTAX) -c $<
.ml.cmx:
@echo [OCAMLOPT] $@
$(HIDE) $(OCAMLFIND) $(OCAMLOPT) -package "$(OCAMLPACKAGES)" $(SYNTAX) -c $<