Re: [PATCH 1/2] Documentation/Makefile: make most operations "quiet"

[Chris Johnsen <chris_johnsen@pobox.com>]

On 2009 Mar 24, at 23:28, Jeff King wrote:
> On Tue, Mar 24, 2009 at 11:21:39PM -0500, Chris Johnsen wrote:
>
> >  technical/api-index.txt: technical/api-index-skel.txt \
> > -	technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
> > +	$(QUIET_GEN)technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) && \
> >  	cd technical && sh ./api-index.sh
>
> What's going on here? The line you remove is part of the dependencies,
> but you replace it with a line of build instructions (and make barfs, of
> course).

Yes, I botched that one. The QUIET_GEN should have been on the
next line. Thanks for catching it. I fixed it along with error
propagation and initially-also-botched "&& chaining" for
gitman.texi. I also added QUIET_XSLTPROC for user-manual.html.

I tested the man, html, info, and git-add.texi targets
(previously I only ran man and info targets; git-add.texi
exercises a rule not otherwise used in the usual targets).

An interdiff from "v1" to what I have now follows (it include
parts that would be in 1/2 and 2/2 from "v1").

-- >8 --
 Documentation/Makefile |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git c/Documentation/Makefile w/Documentation/Makefile
index 373a2cc..d145372 100644
--- c/Documentation/Makefile
+++ w/Documentation/Makefile
@@ -92,6 +92,7 @@ ifndef V
 	QUIET_DB2TEXI	= @echo '   ' DB2TEXI $@;
 	QUIET_MAKEINFO	= @echo '   ' MAKEINFO $@;
 	QUIET_DBLATEX	= @echo '   ' DBLATEX $@;
+	QUIET_XSLTPROC	= @echo '   ' XSLTPROC $@;
 	QUIET_GEN	= @echo '   ' GEN $@;
 	QUIET_STDERR	= 2> /dev/null
 	QUIET_SUBDIR0	= +@subdir=
@@ -202,8 +203,8 @@ user-manual.xml: user-manual.txt user-manual.conf
 	$(QUIET_ASCIIDOC)$(ASCIIDOC) -b docbook -d book $<
 
 technical/api-index.txt: technical/api-index-skel.txt \
-	$(QUIET_GEN)technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) && \
-	cd technical && sh ./api-index.sh
+	technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
+	$(QUIET_GEN)cd technical && sh ./api-index.sh
 
 $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt
 	$(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \
@@ -213,7 +214,7 @@ XSLT = docbook.xsl
 XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
 
 user-manual.html: user-manual.xml
-	xsltproc $(XSLTOPTS) -o $@ $(XSLT) $<
+	$(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@ $(XSLT) $<
 
 git.info: user-manual.texi
 	$(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi
@@ -233,7 +234,7 @@ user-manual.pdf: user-manual.xml
 gitman.texi: $(MAN_XML) cat-texi.perl
 	$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
 	($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \
-		--to-stdout $(xml) &&) true) > $@++
+		--to-stdout $(xml) &&) true) > $@++ && \
 	$(PERL_PATH) cat-texi.perl $@ <$@++ >$@+ && \
 	rm $@++ && \
 	mv $@+ $@