Modifications dans Makefile:

make et make world déclenchent maintenant la compilation des
dépendances.



git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9736 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 20 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 77ea852576..0d8c825bca 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,10 @@ help:
 
 
 # build and install the three subsystems: coq, coqide, pcoq
-world: revision coq coqide pcoq
+world: .depend .depend.coq
+	$(MAKE) worldnodep
+
+worldnodep: revision coq coqide pcoq
 
 install: install-coq install-coqide install-pcoq
 #install-manpages: install-coq-manpages install-pcoq-manpages
@@ -1742,9 +1745,14 @@ cleanconfig::
 # Dependencies
 ###########################################################################
 
+.PHONY: alldepend beforedepend dependcoq dependp4 ml4filesml
+
 alldepend: depend dependcoq 
 
-dependcoq:: beforedepend
+dependcoq: beforedepend
+	$(MAKE) .depend.coq
+
+\.depend.coq:
 	$(COQDEP) -coqlib . -R theories Coq -R contrib Coq $(COQINCLUDES) \
 	 $(ALLFSETS:.vo=.v) $(ALLREALS:.vo=.v) $(ALLVO:.vo=.v) > .depend.coq
 
@@ -1753,7 +1761,7 @@ dependcoq:: beforedepend
 # by making scratchdepend, one gets dependencies OK for .ml files and
 # .ml4 files not using fancy parsers. This is sufficient to get beforedepend
 # and depend targets successfully built
-scratchdepend:: dependp4
+scratchdepend: dependp4
 	$(OCAMLDEP) $(DEPFLAGS) */*.mli */*/*.mli */*.ml */*/*.ml > .depend
 	-$(MAKE) -k -f Makefile.dep $(ML4FILESML)
 	$(OCAMLDEP) $(DEPFLAGS) */*.mli */*/*.mli */*.ml */*/*.ml > .depend
@@ -1766,7 +1774,10 @@ scratchdepend:: dependp4
 ML4FILESML = $(ML4FILES:.ml4=.ml)
 
 # Expresses dependencies of the .ml4 files w.r.t their grammars
-dependp4::
+\.depend.camlp4: $(ML4FILES)
+	$(MAKE) dependp4
+
+dependp4:
 	rm -f .depend.camlp4
 	for f in $(ML4FILES); do \
 	  printf "%s" `dirname $$f`/`basename $$f .ml4`".ml: " >> .depend.camlp4; \
@@ -1774,9 +1785,12 @@ dependp4::
 	done
 
 # Produce the .ml files using Makefile.dep
-ml4filesml:: .depend.camlp4
+ml4filesml: .depend.camlp4
 	$(MAKE) -f Makefile.dep $(ML4FILESML)
 
+\.depend: */*.mli */*/*.mli */*.ml */*/*.ml $(ML4FILES) kernel/byterun/*.c
+	$(MAKE) depend
+
 depend: beforedepend dependp4 ml4filesml
 # 1. We express dependencies of the .ml files w.r.t their grammars
 # 2. Then we are able to produce the .ml files using Makefile.dep
@@ -1790,7 +1804,7 @@ depend: beforedepend dependp4 ml4filesml
 	  echo `$(CAMLP4DEPS) $$f` >> .depend; \
 	done
 # 5.  We express dependencies of .o files
-	$(CC) -MM $(CINCLUDES) kernel/byterun/*.c >> .depend
+	$(CC) -MM kernel/byterun/*.c >> .depend
 # 6. Finally, we erase the generated .ml files
 	rm -f $(ML4FILESML)
 # 7. Since .depend contains correct dependencies .depend.devel can be deleted