- ensure simplify_deps exists when invoked

- added a SIMPLIFYDEPS variable to change its location

diff --git a/helm/software/components/Makefile b/helm/software/components/Makefile
index 718c14b911537694710a3f5df227ae3c54bcabfc..686fa74d71ed14bd79a7c20a384ac64a698ff111 100644 (file)
--- a/helm/software/components/Makefile
+++ b/helm/software/components/Makefile
@@ -78,12 +78,16 @@ distclean: clean clean_metas
 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