X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=Makefile;h=5f225f14149bda1a292b842a97c3898074bece48;hb=1b4d4c7a0537d30e21068f06535c5d3a1af92f88;hp=2dc0dfa9f6bdd1370cac9d2be520275b24c5e4ee;hpb=92fa1dfd894ed2903541d665bd40919ae154f285;p=SXSI%2Fxpathcomp.git

diff --git a/Makefile b/Makefile
index 2dc0dfa..5f225f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-INLINE=1000
+INLINE=100
 DEBUG=false
 PROFILE=false
 VERBOSE=false
@@ -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 -unsafe
 
 OCAMLOPT = ocamlopt -cc "$(CXX)" $(OPT_FLAGS) -ccopt -O3 -ccopt -std=c++0x -noassert -inline $(INLINE)
 
@@ -74,8 +74,8 @@ 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
-SYNTAX= -syntax camlp4o $(PPINCLUDES) -ppopt pa_macro.cmo $(SYNT_FLAGS) 
+LINK=$(OCAMLOPT) -linkpkg `ocamlc -version | grep -q "3.1[12].[012]" && echo dynlink.cmxa` camlp4lib.cmxa
+SYNTAX= -syntax camlp4o $(PPINCLUDES) -ppopt -printer -ppopt auto -ppopt pa_macro.cmo $(SYNT_FLAGS) 
 
 
 
@@ -85,9 +85,14 @@ 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)
 
+sxsi_test: libcamlshredder.a uid.cmx custom.cmx hcons.cmx ptset.cmx finiteCofinite.cmx tag.cmx tagSet.cmx options.cmx tree.cmx
+	@echo [LINK] $@	
+	$(HIDE) $(OCAMLFIND) $(LINK) -o sxsi_test -package "$(OCAMLPACKAGES)" $(SYNTAX) -cclib \
+	"$(LIBS) ./libcamlshredder.a"  uid.cmx custom.cmx hcons.cmx ptset.cmx finiteCofinite.cmx tag.cmx tagSet.cmx options.cmx tree.cmx sxsi_test.ml
+
 unit_test: libcamlshredder.a  $(BASEOBJS) unit_test.cmx
 	@echo [LINK] $@	
 	$(HIDE) $(OCAMLFIND) $(LINK) -o unit_test -package "$(OCAMLPACKAGES)" $(SYNTAX) -cclib \
@@ -108,9 +113,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] $@
@@ -125,7 +131,7 @@ libcamlshredder.a: $(CXXOBJECTS) XMLTree/XMLTree.a
 
 clean:
 	@echo [CLEAN]
-	$(HIDE) rm -f *~ *.cm* *.[oa] *.so main *.s
+	$(HIDE) rm -f *~ *.cm* *.[oa] *.so main *.s sxsi_test
 	$(HIDE) rm -rf .libs