X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Focaml%2FMakefile.common.in;h=9dff7894208c365a65473fd681eab2bbebf6cd3c;hb=9e612ad41b3231db504079c6e13fdd8951f3c695;hp=5e30807819f7a4d2c528f78c4439cbb61d20c857;hpb=c3f0611d0c3ba648773a3ceec5b68e6c51dd4bac;p=helm.git

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 5e3080781..9dff78942 100644
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -1,6 +1,5 @@
 # This Makefile must be included by another one defining:
 #  $PACKAGE
-#  $REQUIRES
 #  $PREDICATES
 #  $INTERFACE_FILES
 #  $IMPLEMENTATION_FILES
@@ -9,6 +8,7 @@
 # and put in a directory where there is a .depend file.
 
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
+OCAMLPATH = @OCAMLFIND_META_DIR@
 
 PREPROCOPTIONS = -pp camlp4o
 SYNTAXOPTIONS = -syntax camlp4o
@@ -16,7 +16,8 @@ PREREQ =
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
 OCAMLDEBUGOPTIONS = -g
 OCAMLARCHIVEOPTIONS =
-OCAMLFIND = @OCAMLFIND@
+OCAMLFIND = OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH @OCAMLFIND@
+REQUIRES := $(shell $(OCAMLFIND) -query -format '%(requires)' helm-$(PACKAGE))
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(PREPROCOPTIONS)
 OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
 OCAMLDEP = $(OCAMLFIND) ocamldep -package "camlp4,$(REQUIRES)" $(SYNTAXOPTIONS)
@@ -26,8 +27,8 @@ 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))
+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))
 
 
 ARCHIVE = $(PACKAGE).cma
@@ -38,17 +39,23 @@ OBJECTS_TO_INSTALL = $(ARCHIVE) $(ARCHIVE_OPT) $(ARCHIVE_OPT:%.cmxa=%.a) \
 DEPEND_FILES = $(INTERFACE_FILES) $(IMPLEMENTATION_FILES)
 
 $(ARCHIVE): $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(LIBRARIES)
+	if [ $(PACKAGE) != dummy ]; then \
 	$(OCAMLC) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
-		$(IMPLEMENTATION_FILES:%.ml=%.cmo)
+		$(IMPLEMENTATION_FILES:%.ml=%.cmo); fi
 
 $(ARCHIVE_OPT): $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(LIBRARIES_OPT)
+	if [ $(PACKAGE) != dummy ]; then \
 	$(OCAMLOPT) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
-		$(IMPLEMENTATION_FILES:%.ml=%.cmx)
+		$(IMPLEMENTATION_FILES:%.ml=%.cmx); fi
 
 prereq: $(PREREQ)
 all: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)
 opt: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(ARCHIVE_OPT)
 world: all opt
+test: test.ml $(ARCHIVE)
+	$(OCAMLC) $(ARCHIVE) -linkpkg -o $@ $<
+test.opt: test.ml $(ARCHIVE_OPT)
+	$(OCAMLOPT) $(ARCHIVE_OPT) -linkpkg -o $@ $<
 
 depend: $(DEPEND_FILES)
 	$(OCAMLDEP) $(INTERFACE_FILES) $(IMPLEMENTATION_FILES) > .depend
@@ -65,6 +72,8 @@ $(PACKAGE).ps: .dep.dot
 	$(OCAMLC) -c $<
 %.cmx: %.ml
 	$(OCAMLOPT) -c $<
+%.annot: %.ml
+	$(OCAMLC) -dtypes $(PKGS) -c $<
 %.ml %.mli: %.mly
 	$(OCAMLYACC) $<
 %.ml: %.mll
@@ -74,7 +83,9 @@ $(IMPLEMENTATION_FILES:%.ml=%.cmo): $(LIBRARIES)
 $(IMPLEMENTATION_FILES:%.ml=%.cmx): $(LIBRARIES_OPT)
 
 clean:
-	rm -f *.cm[ioax] *.cmxa *.o *.a $(EXTRA_OBJECTS_TO_CLEAN)
+	rm -f *.cm[ioax] *.cmxa *.o *.a *.annot $(EXTRA_OBJECTS_TO_CLEAN)
+	if [ -f test ]; then rm -f test; else true; fi
+	if [ -f test.opt ]; then rm -f test.opt; else true; fi
 
 install:
 	mkdir $(OCAMLFIND_DEST_DIR)/$(PACKAGE)
@@ -93,6 +104,16 @@ ocamlinit:
 	for p in $(REQUIRES); do echo "#require \"$$p\";;" >> .ocamlinit; done
 	echo "#load \"$(PACKAGE).cma\";;" >> .ocamlinit
 
+# $(STATS_EXCLUDE) may be defined in libraries' Makefile to exclude some file
+# from statistics collection
+STATS_FILES = \
+	$(shell find . -maxdepth 1 -type f -name \*.ml $(foreach f,$(STATS_EXCLUDE),-not -name $(f))) \
+	$(shell find . -maxdepth 1 -type f -name \*.mli $(foreach f,$(STATS_EXCLUDE),-not -name $(f)))
+.stats: $(STATS_FILES)
+	rm -f .stats
+	echo -n "LOC:" >> .stats
+	wc -l $(STATS_FILES) | tail -1 | awk '{ print $$1 }' >> .stats
+
 .PHONY: all opt world backup depend install uninstall clean ocamlinit
 
 ifneq ($(MAKECMDGOALS), depend)
@@ -110,3 +131,6 @@ endif
 ifeq ($(MAKECMDGOALS),)
    $(IMPLEMENTATION_FILES:%.ml=%.cmi): $(LIBRARIES)
 endif
+
+NULL =
+