X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.common.in;h=2dc345235a59af72613cfc7935b3e1b4cb1c0d7e;hb=ed308fc03be5397081ac0e00bbc73b3f71da1e67;hp=0bae0213f41ac8f2d0eee622a00110167351f37f;hpb=3fbc7a2d1418ace187475939647553ce2b7721f6;p=helm.git

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 0bae0213f..2dc345235 100644
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -1,6 +1,7 @@
+H=@
+
 # This Makefile must be included by another one defining:
 #  $PACKAGE
-#  $REQUIRES
 #  $PREDICATES
 #  $INTERFACE_FILES
 #  $IMPLEMENTATION_FILES
@@ -9,6 +10,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 +18,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 +29,15 @@ 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))
+LIBRARIES_DEPS = \
+	$(foreach X,$(filter-out /usr/lib/ocaml%,$(LIBRARIES)),\
+		$(wildcard \
+			$(shell dirname $(X))/*.mli \
+			$(shell dirname $(X))/*.ml \
+			$(shell dirname $(X))/paramodulation/*.ml \
+			$(shell dirname $(X))/paramodultation/*.mli))
 
 
 ARCHIVE = $(PACKAGE).cma
@@ -38,16 +48,22 @@ OBJECTS_TO_INSTALL = $(ARCHIVE) $(ARCHIVE_OPT) $(ARCHIVE_OPT:%.cmxa=%.a) \
 DEPEND_FILES = $(INTERFACE_FILES) $(IMPLEMENTATION_FILES)
 
 $(ARCHIVE): $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(LIBRARIES)
+	$(H)if [ $(PACKAGE) != dummy ]; then \
+	echo "  OCAMLC -a $@";\
 	$(OCAMLC) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
-		$(IMPLEMENTATION_FILES:%.ml=%.cmo)
+		$(IMPLEMENTATION_FILES:%.ml=%.cmo); fi
 
 $(ARCHIVE_OPT): $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(LIBRARIES_OPT)
+	$(H)if [ $(PACKAGE) != dummy ]; then \
+	echo "  OCAMLOPT -a $@";\
 	$(OCAMLOPT) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
-		$(IMPLEMENTATION_FILES:%.ml=%.cmx)
+		$(IMPLEMENTATION_FILES:%.ml=%.cmx); fi
 
 prereq: $(PREREQ)
 all: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)
+	@echo -n 
 opt: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(ARCHIVE_OPT)
+	@echo -n 
 world: all opt
 test: test.ml $(ARCHIVE)
 	$(OCAMLC) $(ARCHIVE) -linkpkg -o $@ $<
@@ -64,11 +80,14 @@ $(PACKAGE).ps: .dep.dot
 	ocamldot < .depend > $@
 
 %.cmi: %.mli
-	$(OCAMLC) -c $<
+	@echo "  OCAMLC $<"
+	$(H)$(OCAMLC) -c $<
 %.cmo %.cmi: %.ml
-	$(OCAMLC) -c $<
+	@echo "  OCAMLC $<"
+	$(H)$(OCAMLC) -c $<
 %.cmx: %.ml
-	$(OCAMLOPT) -c $<
+	@echo "  OCAMLOPT $<"
+	$(H)$(OCAMLOPT) -c $<
 %.annot: %.ml
 	$(OCAMLC) -dtypes $(PKGS) -c $<
 %.ml %.mli: %.mly
@@ -77,10 +96,11 @@ $(PACKAGE).ps: .dep.dot
 	$(OCAMLLEX) $<
 
 $(IMPLEMENTATION_FILES:%.ml=%.cmo): $(LIBRARIES)
+$(IMPLEMENTATION_FILES:%.ml=%.cmi): $(LIBRARIES_DEPS)
 $(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
 
@@ -101,20 +121,21 @@ 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)
    include .depend   
 endif
 
-ifeq ($(MAKECMDGOALS), all)
-   $(IMPLEMENTATION_FILES:%.ml=%.cmi): $(LIBRARIES)
-endif
-
-ifeq ($(MAKECMDGOALS), opt)
-   $(IMPLEMENTATION_FILES:%.ml=%.cmi): $(LIBRARIES_OPT)
-endif
+NULL =
 
-ifeq ($(MAKECMDGOALS),)
-   $(IMPLEMENTATION_FILES:%.ml=%.cmi): $(LIBRARIES)
-endif