factorization of the recursive rule

diff --git a/helm/software/components/Makefile b/helm/software/components/Makefile
index 2968a240512c20633d8a20816f3ba21ae23dca58..c16dc0e714fc20cb27c827d2eec83af70e8378f5 100644 (file)
--- a/helm/software/components/Makefile
+++ b/helm/software/components/Makefile
@@ -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,21 +75,6 @@ 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)/$*\"" >> $@