X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=Makefile;h=7354e47c6836900e51ab7d6f4bcb733e51cb1764;hb=a6a05531716a001b369e018c9d2c87ce532ef163;hp=b033ed1aa6bd2add6656171fed2a7465361b22d5;hpb=8e1b9299e0c8e1731db61955ef756fa92ed8c615;p=SXSI%2Fxpathcomp.git

diff --git a/Makefile b/Makefile
index b033ed1..7354e47 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ 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)
@@ -40,8 +40,8 @@ SXSIINCLUDES = \
 
 CXXINCLUDES= $(CAMLINCLUDES) $(LIBXMLINCLUDES) $(SXSIINCLUDES)
 
-CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -fPIC -std=c++0x -static
-CCFLAGS = -O3 -Wall -fPIC -static
+CXXFLAGS = -O3 -Wall $(INCLUDEDIRS) -std=c++0x -static
+CCFLAGS = -O3 -Wall  -static
 
 ifeq ($(VERBOSE),true)
 HIDE=
@@ -64,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)
 
@@ -74,7 +74,7 @@ OCAMLMKLIB = ocamlmklib
 OCAMLDEP = ocamldep
 #Ugly but seems difficult with a makefile
 
-LINK=$(OCAMLOPT) -linkpkg `ocamlc -version | grep -q "3.11.[01]" && echo dynlink.cmxa` camlp4lib.cmxa
+LINK=$(OCAMLOPT) -linkpkg `ocamlc -version | grep -q "3.1[12].[012]" && echo dynlink.cmxa` camlp4lib.cmxa
 SYNTAX= -syntax camlp4o $(PPINCLUDES) -ppopt pa_macro.cmo $(SYNT_FLAGS) 
 
 
@@ -85,7 +85,7 @@ 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
@@ -108,9 +108,10 @@ 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 -ccopt -gp -p -package "$(OCAMLPACKAGES)"  $(SYNTAX) -c $<
+
 
 .mli.cmi:
 	@echo [OCAMLOPT] $@