X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Focaml%2FMakefile.in;h=7ab72ed248e92a87909210f66dd8b20ca7397834;hb=782253ebe87375f52c07899c1501db5a665a457f;hp=2b1783b3ce852202bcebdef260a8ae7279f37ea6;hpb=c051f623926cdc3b744c38ba393c0a9c7622d299;p=helm.git

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index 2b1783b3c..7ab72ed24 100644
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -1,3 +1,6 @@
+
+export SHELL=/bin/bash
+
 # Warning: the modules must be in compilation order
 NULL =
 MODULES =			\
@@ -27,7 +30,7 @@ MODULES =			\
 	lexicon			\
 	grafite_engine          \
 	grafite_parser          \
-	tactics/paramodulation \
+	tactics/paramodulation 	\
 	$(NULL)
 
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
@@ -43,33 +46,39 @@ metas: $(METAS)
 depend: $(MODULES:%=%.depend)
 install: $(MODULES:%=%.install)
 uninstall: $(MODULES:%=%.uninstall)
-clean: $(MODULES:%=%.clean)
+clean: $(MODULES:%=%.clean) clean_metas
 
 .stats: $(MODULES:%=%.stats)
 	(for m in $(MODULES); do echo -n "$$m:"; cat $$m/.stats; done) \
 	 | sort -t : -k 2 -n -r > .stats
 
+EXTRA_DIST_CLEAN = \
+	libraries-clusters.ps 	\
+	libraries-clusters.pdf 	\
+	libraries-ext.ps 	\
+	libraries.ps 		\
+	.dep.dot 		\
+	.extdep.dot 		\
+	.clustersdep.dot 	\
+	$(NULL)
+
 clean_metas:
 	rm -f $(METAS)
 distclean: clean clean_metas
-	rm -f Makefile Makefile.common configure config.log config.cache config.status
+	rm -f configure config.log config.cache config.status
+	rm -f Makefile Makefile.common $(EXTRA_DIST_CLEAN)
 
 .PHONY: all opt world metas depend install uninstall clean clean_metas distclean
 
 %.all:
-	@echo building module: $*
-	@OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* all --no-print-directory
+	@OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* all 
 %.opt:
-	@echo building module: $*
-	@OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* opt --no-print-directory
+	@OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* opt
 %.clean:
-	@echo cleaning module: $*
-	@OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* clean --no-print-directory
+	@OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* clean 
 %.depend:
-	@echo calculating dependencies for module: $*
-	@OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* depend --no-print-directory
+	@OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* depend 
 %.stats:
-	@echo generating stats for module: $*
 	@$(MAKE) -C $* .stats
 
 $(MODULES:%=%.install):
@@ -101,9 +110,9 @@ METAS/META.helm-%: METAS/meta.helm-%.src
 	echo "}" >> $@
 
 .extdep.dot: .dep.dot
-	./patch_deps.sh $< $@
+	STATS/patch_deps.sh $< $@
 .clustersdep.dot: .dep.dot
-	USE_CLUSTERS=yes ./patch_deps.sh $< $@
+	USE_CLUSTERS=yes STATS/patch_deps.sh $< $@
 
 libraries.ps: .dep.dot
 	dot -Tps -o $@ $<