[tor-commits] [tor/master] add $(AM_V_GEN) to documentation generation Makefile targets.

[nickm at torproject.org]

commit c9aafa09627305e4aed5ef6871776b0b144ccff7
Author: Stewart Smith <stewart at flamingspork.com>
Date:   Thu Aug 2 10:05:36 2012 -0400

    add $(AM_V_GEN) to documentation generation Makefile targets.
    
    This makes the V=1 or V=0 automake silent build options display (or hide)
    the full command line used.
    
      GEN foo.bar
    
    will be seen rather than the full command.
    
    As with all automake silent rules, "make V=1" will output the full command.
---
 doc/Makefile.am |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6cdd66d..51a3b57 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -47,7 +47,7 @@ asciidoc_product = $(nodist_man_MANS) $(doc_DATA)
 # Generate the html documentation from asciidoc, but don't do
 # machine-specific replacements yet
 $(html_in) :
-	$(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/doc/$@
+	$(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/doc/$@
 
 tor.html.in : tor.1.txt
 torify.html.in : torify.1.txt
@@ -58,7 +58,7 @@ tor-fw-helper.html.in : tor-fw-helper.1.txt
 # Generate the manpage from asciidoc, but don't do
 # machine-specific replacements yet
 $(man_in) :
-	$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/doc/$@
+	$(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/doc/$@
 
 tor.1.in : tor.1.txt
 torify.1.in : torify.1.txt
@@ -69,10 +69,10 @@ tor-fw-helper.1.in : tor-fw-helper.1.txt
 # use ../config.status to swap all machine-specific magic strings
 # in the asciidoc with their replacements.
 $(asciidoc_product) :
-	if test -e $(top_srcdir)/doc/$@.in && ! test -e ./$@.in ; then \
+	$(AM_V_GEN)if test -e $(top_srcdir)/doc/$@.in && ! test -e ./$@.in ; then \
 		cp $(top_srcdir)/doc/$@.in .; \
 	fi
-	../config.status --file=$@;
+	$(AM_V_GEN)../config.status --file=$@;
 
 tor.1 : tor.1.in
 torify.1 : torify.1.in