X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.common.in;h=5e30807819f7a4d2c528f78c4439cbb61d20c857;hb=ac7687ce66526f905874ed99a845223c853c558a;hp=7d9c56d6f126a6fee8eb84f9f668d736d9932da3;hpb=0386e72a92dea47cb86356e71698bab3ecb65c51;p=helm.git

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 7d9c56d6f..5e3080781 100644
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -11,14 +11,21 @@
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
 
 PREPROCOPTIONS = -pp camlp4o
+SYNTAXOPTIONS = -syntax camlp4o
 PREREQ =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS) $(PREPROCOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
-OCAMLDEP = ocamlfind ocamldep $(PREPROCOPTIONS)
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
+OCAMLDEBUGOPTIONS = -g
+OCAMLARCHIVEOPTIONS =
+OCAMLFIND = @OCAMLFIND@
+OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(PREPROCOPTIONS)
+OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
+OCAMLDEP = $(OCAMLFIND) ocamldep -package "camlp4,$(REQUIRES)" $(SYNTAXOPTIONS)
 OCAMLLEX = ocamllex
 OCAMLYACC = ocamlyacc
 
+OCAMLC_P4 = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(SYNTAXOPTIONS)
+OCAMLOPT_P4 = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(SYNTAXOPTIONS)
+
 LIBRARIES = $(shell ocamlfind query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
 LIBRARIES_OPT = $(shell ocamlfind query -recursive -predicates "native $(PREDICATES)" -format "%d/%a" $(REQUIRES))
 
@@ -31,14 +38,17 @@ OBJECTS_TO_INSTALL = $(ARCHIVE) $(ARCHIVE_OPT) $(ARCHIVE_OPT:%.cmxa=%.a) \
 DEPEND_FILES = $(INTERFACE_FILES) $(IMPLEMENTATION_FILES)
 
 $(ARCHIVE): $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(LIBRARIES)
-	$(OCAMLC) -a -linkall -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmo)
+	$(OCAMLC) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
+		$(IMPLEMENTATION_FILES:%.ml=%.cmo)
 
 $(ARCHIVE_OPT): $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(LIBRARIES_OPT)
-	$(OCAMLOPT) -a -linkall -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmx)
+	$(OCAMLOPT) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
+		$(IMPLEMENTATION_FILES:%.ml=%.cmx)
 
 prereq: $(PREREQ)
 all: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)
 opt: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(ARCHIVE_OPT)
+world: all opt
 
 depend: $(DEPEND_FILES)
 	$(OCAMLDEP) $(INTERFACE_FILES) $(IMPLEMENTATION_FILES) > .depend
@@ -49,18 +59,15 @@ $(PACKAGE).ps: .dep.dot
 .dep.dot: .depend
 	ocamldot < .depend > $@
 
-.SUFFIXES: .ml .mli .cmo .cmi .cmx .mll .mly
-.ml.cmo:
+%.cmi: %.mli
 	$(OCAMLC) -c $<
-.mli.cmi:
+%.cmo %.cmi: %.ml
 	$(OCAMLC) -c $<
-.ml.cmx:
+%.cmx: %.ml
 	$(OCAMLOPT) -c $<
-.mly.ml:
-	$(OCAMLYACC) $<
-.mly.mli:
+%.ml %.mli: %.mly
 	$(OCAMLYACC) $<
-.mll.ml:
+%.ml: %.mll
 	$(OCAMLLEX) $<
 
 $(IMPLEMENTATION_FILES:%.ml=%.cmo): $(LIBRARIES)
@@ -77,8 +84,29 @@ uninstall:
 	cd $(OCAMLFIND_DEST_DIR)/$(PACKAGE) && rm -f $(OBJECTS_TO_INSTALL)
 	rmdir $(OCAMLFIND_DEST_DIR)/$(PACKAGE)
 
-.PHONY: all opt depend install uninstall clean
+backup:
+	cd ..; tar cvzf $(PACKAGE)_$(shell date +%s).tar.gz $(PACKAGE)
+
+ocamlinit:
+	echo "#use \"topfind\";;" > .ocamlinit
+	echo "#thread;;" >> .ocamlinit
+	for p in $(REQUIRES); do echo "#require \"$$p\";;" >> .ocamlinit; done
+	echo "#load \"$(PACKAGE).cma\";;" >> .ocamlinit
+
+.PHONY: all opt world backup depend install uninstall clean ocamlinit
 
 ifneq ($(MAKECMDGOALS), depend)
    include .depend   
 endif
+
+ifeq ($(MAKECMDGOALS), all)
+   $(IMPLEMENTATION_FILES:%.ml=%.cmi): $(LIBRARIES)
+endif
+
+ifeq ($(MAKECMDGOALS), opt)
+   $(IMPLEMENTATION_FILES:%.ml=%.cmi): $(LIBRARIES_OPT)
+endif
+
+ifeq ($(MAKECMDGOALS),)
+   $(IMPLEMENTATION_FILES:%.ml=%.cmi): $(LIBRARIES)
+endif