X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2FMakefile;h=686fa74d71ed14bd79a7c20a384ac64a698ff111;hb=ee3f8d6fa92b051394a2ff7c71c03ac33a05182b;hp=2968a240512c20633d8a20816f3ba21ae23dca58;hpb=55b82bd235d82ff7f0a40d980effe1efde1f5073;p=helm.git

diff --git a/helm/software/components/Makefile b/helm/software/components/Makefile
index 2968a2405..686fa74d7 100644
--- a/helm/software/components/Makefile
+++ b/helm/software/components/Makefile
@@ -20,11 +20,11 @@ MODULES =			\
 	cic			\
 	cic_proof_checking	\
 	cic_acic		\
+	metadata		\
+	library			\
 	acic_content		\
 	content_pres		\
 	grafite			\
-	metadata		\
-	library			\
 	cic_unification		\
 	whelp			\
 	tactics			\
@@ -37,18 +37,27 @@ MODULES =			\
 
 METAS = $(filter-out %/paramodulation,$(MODULES:%=METAS/META.helm-%))
 
-all: metas $(MODULES:%=%.all) 
-opt: metas $(MODULES:%=%.opt)
+all: metas $(MODULES:%=rec@all@%) 
+opt: metas $(MODULES:%=rec@opt@%)
+ifeq ($(HAVE_OCAMLOPT),yes)
 world: all opt
-depend: $(MODULES:%=%.depend)
-install: $(MODULES:%=%.install)
-uninstall: $(MODULES:%=%.uninstall)
-clean: $(MODULES:%=%.clean) clean_metas
-
-.stats: $(MODULES:%=%.stats)
+else
+world: all
+endif
+depend: $(MODULES:%=rec@depend@%)
+install: $(MODULES:%=rec@install@%)
+uninstall: $(MODULES:%=rec@uninstall@%)
+clean: $(MODULES:%=rec@clean@%) clean_metas
+
+.stats: $(MODULES:%=rec@.stats@%)
 	(for m in $(MODULES); do echo -n "$$m:"; cat $$m/.stats; done) \
 	 | sort -t : -k 2 -n -r > .stats
 
+rec@%@tactics/paramodulation:
+	$(MAKE) -C tactics/paramodulation $*
+rec@%:
+	$(MAKE) -C $(word 2, $(subst @, ,$*)) $(word 1, $(subst @, ,$*))
+
 EXTRA_DIST_CLEAN = \
 	libraries-clusters.ps 	\
 	libraries-clusters.pdf 	\
@@ -66,30 +75,19 @@ distclean: clean clean_metas
 
 .PHONY: all opt world metas depend install uninstall clean clean_metas distclean
 
-%.all:
-	$(MAKE) -C $* all 
-%.opt:
-	$(MAKE) -C $* opt
-%.clean:
-	$(MAKE) -C $* clean 
-%.depend:
-	$(MAKE) -C $* depend 
-%.stats:
-	@$(MAKE) -C $* .stats
-%.install:
-	$(MAKE) -C $* install 
-%.uninstall:
-	$(MAKE) -C $* uninstall 
-
 METAS/META.helm-%: METAS/meta.helm-%.src
 	cp $< $@ && echo "directory=\"$(shell pwd)/$*\"" >> $@
 
+SIMPLIFYDEPS = ../daemons/graphs/tools/simplify_deps/simplify_deps
+$(SIMPLIFYDEPS):
+	$(MAKE) -C $(dir $(SIMPLIFYDEPS))
+
 .PHONY: .dep.dot
-.dep.dot:
+.dep.dot: $(SIMPLIFYDEPS)
 	echo "digraph G {" > $@
 	echo "   rankdir = TB ;" >> $@
 	for i in $(MODULES); do $(OCAMLFIND) query helm-$$i -recursive -p-format | grep helm | sed "s/^helm-/ \"$$i\" -> \"/g" | sed "s/$$/\";/g" >> $@ ; done
-	mv $@ $@.old ; ./simplify_deps/simplify_deps.opt < $@.old > $@ ; rm $@.old
+	mv $@ $@.old ; $(SIMPLIFYDEPS) < $@.old > $@ ; rm $@.old
 	echo "}" >> $@
 
 .PHONY: .alldep.dot