Makefile: fix ignored errors, several attempts to clarify things

 * I encountered error messages during compilation, for instance
 ocamlopt complaining about non-existing coq_config.cmi when compiling
 coq_config.ml. Moreover, make was _not_ stopping at these errors
 (WTF?!). After some debug, it turned out to be (indirectly) my fault:
 I placed earlier the inclusion of the new .mllib.d in
 Makefile.stage1, but this is too early, coqdep, which is used to
 compute these files, isn't built yet. Due to the semantics of
 "-include", make tries to build it, fails with the above error,
 and goes on happily. Arrgh. After moving the inclusion of these
 .mllib.d to Makefile.stage2, everything seems to work ok now.

 * Since we're using such "nice" non-trivial features of make, I've
 started a small FAQ section about them at the beginning of Makefile

 * Recursive calls to make are now done with two options:
 --no-builtin-rules : let's avoid builtin rules like "%:%.o" ...
 --warn-undefined-variable : using a non-defined variable isn't
  necessarily bad, but I found a few bugs with this option, and
  I suggest we keep it.

 * Clarified the rules about stage* in Makefile and their
 STAGE*_TARGETS variables in Makefile.common. Now a newcomer _might_
 have a chance to grasp in less than a day what's going on ...

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

1 files changed, 9 insertions, 13 deletions

diff --git a/Makefile.build b/Makefile.build
index 5d5ff8533a..364ea3503c 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -34,14 +34,12 @@ endif
 NOARG: world
 
 # build and install the three subsystems: coq, coqide, pcoq
-ifeq ($(WITHDOC),all)
-world: revision coq coqide pcoq doc
-
-install: install-coq install-coqide install-pcoq install-doc
-else
 world: revision coq coqide pcoq
-
 install: install-coq install-coqide install-pcoq
+
+ifeq ($(WITHDOC),all)
+world: doc
+install: install-doc
 endif
 
 #install-manpages: install-coq-manpages install-pcoq-manpages
@@ -54,7 +52,7 @@ endif
 # or only abbreviated versions. 
 # Quiet mode is ON by default except if VERBOSE=1 option is given to make
 
-ifeq ($(VERBOSE),1)
+ifdef VERBOSE
  SHOW = @true ""
  HIDE = 
 else 
@@ -110,7 +108,9 @@ ifdef VALIDATE
 endif
 ifdef NO_RECOMPILE_LIB
  VO_TOOLS_ORDER_ONLY:=$(VO_TOOLS_DEP)
+ VO_TOOLS_STRICT:=
 else
+ VO_TOOLS_ORDER_ONLY:=
  VO_TOOLS_STRICT:=$(VO_TOOLS_DEP)
 endif
 
@@ -163,8 +163,6 @@ coqlight: theories-light tools coqbinaries
 
 states:: states/initial.coq
 
-plugins: $(PLUGINSOPT) $(PLUGINS)
-
 $(COQTOPOPT): $(COQMKTOP) $(LINKCMX) $(LIBCOQRUN)
 	$(SHOW)'COQMKTOP -o $@'	
 	$(HIDE)$(COQMKTOP) -boot -opt $(OPTFLAGS) -o $@
@@ -530,8 +528,7 @@ field: $(FIELDVO) $(FIELDCMA)
 fourier: $(FOURIERVO) $(FOURIERCMA)
 funind: $(FUNINDCMA) $(FUNINDVO)
 cc: $(CCVO) $(CCCMA)
-programs: $(PROGRAMSVO)
-subtac: $(SUBTACVO) $(SUBTACCMA)
+subtac: $(SUBTACCMA)
 rtauto: $(RTAUTOVO) $(RTAUTOCMA)
 
 ###########################################################################
@@ -720,8 +717,7 @@ install-latex:
 
 source-doc:
 	if !(test -d $(SOURCEDOCDIR)); then mkdir $(SOURCEDOCDIR); fi
-	$(OCAMLDOC) -html -rectypes $(LOCALINCLUDES) -d $(SOURCEDOCDIR) \
-	  `find . $(FIND_VCS_CLAUSE) '(' -name '*.ml' ')' -print`
+	$(OCAMLDOC) -html -rectypes $(LOCALINCLUDES) -d $(SOURCEDOCDIR) $(MLFILES)
 
 
 ###########################################################################