[gtk-doc] make: fix silent builds even more

[Stefan Kost <stefkost src gnome org>]

commit 55a6ccc5a9c969575b2bb3494e51bbee2850ae92
Author: Stefan Sauer <ensonic users sf net>
Date:   Tue Nov 13 23:27:37 2012 +0100

    make: fix silent builds even more
    
    There were the trailing underscores missing on the 2nd macros.

 gtk-doc.make        |   48 ++++++++++++++++++++++++------------------------
 gtk-doc.notmpl.make |   42 +++++++++++++++++++++---------------------
 2 files changed, 45 insertions(+), 45 deletions(-)
---
diff --git a/gtk-doc.make b/gtk-doc.make
index ea6bd70..734ee97 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -74,9 +74,9 @@ $(REPORT_FILES): sgml-build.stamp
 
 #### setup ####
 
-GTK_DOC_V_SETUP=$(GTK_DOC__v_SETUP_$(V))
-GTK_DOC__v_SETUP_=$(GTK_DOC__v_SETUP_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_SETUP_0= echo "  DOC   Preparing build";
+GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0= echo "  DOC   Preparing build";
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
@@ -95,13 +95,13 @@ setup-build.stamp:
 
 #### scan ####
 
-GTK_DOC_V_SCAN=$(GTK_DOC__v_SCAN_$(V))
-GTK_DOC__v_SCAN=$(GTK_DOC__v_SCAN_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_SCAN_0= echo "  DOC   Scanning header files";
+GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0= echo "  DOC   Scanning header files";
 
-GTK_DOC_V_INTROSPECT=$(GTK_DOC__v_INTROSPECT_$(V))
-GTK_DOC__v_INTROSPECT=$(GTK_DOC__v_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_INTROSPECT_0= echo "  DOC   Introspecting gobjects";
+GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0= echo "  DOC   Introspecting gobjects";
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_SCAN)_source_dir='' ; \
@@ -131,9 +131,9 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 
 #### templates ####
 
-GTK_DOC_V_TMPL=$(GTK_DOC__v_TMPL_$(V))
-GTK_DOC__v_TMPL=$(GTK_DOC__v_TMPL_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_TMPL_0= echo "  DOC   Rebuilding template files";
+GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V))
+GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_TMPL_0= echo "  DOC   Rebuilding template files";
 
 tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
 	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
@@ -152,9 +152,9 @@ $(srcdir)/tmpl/*.sgml:
 
 #### xml ####
 
-GTK_DOC_V_XML=$(GTK_DOC__v_XML_$(V))
-GTK_DOC__v_XML=$(GTK_DOC__v_XML_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_XML_0= echo "  DOC   Building XML":
+GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0= echo "  DOC   Building XML":
 
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	$(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \
@@ -169,13 +169,13 @@ sgml.stamp: sgml-build.stamp
 
 #### html ####
 
-GTK_DOC_V_HTML=$(GTK_DOC__v_HTML_$(V))
-GTK_DOC__v_HTML=$(GTK_DOC__v_HTML_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_HTML_0= echo "  DOC   Building HTML";
+GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0= echo "  DOC   Building HTML";
 
-GTK_DOC_V_XREF=$(GTK_DOC__v_XREF_$(V))
-GTK_DOC__v_XREF=$(GTK_DOC__v_XREF_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_XREF_0= echo "  DOC   Fixing cross-references";
+GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0= echo "  DOC   Fixing cross-references";
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
@@ -205,9 +205,9 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 
 #### pdf ####
 
-GTK_DOC_V_PDF=$(GTK_DOC__v_PDF_$(V))
-GTK_DOC__v_PDF=$(GTK_DOC__v_PDF_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_PDF_0= echo "  DOC   Building PDF";
+GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0= echo "  DOC   Building PDF";
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
diff --git a/gtk-doc.notmpl.make b/gtk-doc.notmpl.make
index 7eebba9..441035b 100644
--- a/gtk-doc.notmpl.make
+++ b/gtk-doc.notmpl.make
@@ -74,9 +74,9 @@ $(REPORT_FILES): sgml-build.stamp
 
 #### setup ####
 
-GTK_DOC_V_SETUP=$(GTK_DOC__v_SETUP_$(V))
-GTK_DOC__v_SETUP_=$(GTK_DOC__v_SETUP_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_SETUP_0= echo "  DOC   Preparing build";
+GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0= echo "  DOC   Preparing build";
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
@@ -93,13 +93,13 @@ setup-build.stamp:
 
 #### scan ####
 
-GTK_DOC_V_SCAN=$(GTK_DOC__v_SCAN_$(V))
-GTK_DOC__v_SCAN=$(GTK_DOC__v_SCAN_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_SCAN_0= echo "  DOC   Scanning header files";
+GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0= echo "  DOC   Scanning header files";
 
-GTK_DOC_V_INTROSPECT=$(GTK_DOC__v_INTROSPECT_$(V))
-GTK_DOC__v_INTROSPECT=$(GTK_DOC__v_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_INTROSPECT_0= echo "  DOC   Introspecting gobjects";
+GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0= echo "  DOC   Introspecting gobjects";
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_SCAN)_source_dir='' ; \
@@ -129,9 +129,9 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 
 #### xml ####
 
-GTK_DOC_V_XML=$(GTK_DOC__v_XML_$(V))
-GTK_DOC__v_XML=$(GTK_DOC__v_XML_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_XML_0= echo "  DOC   Building XML":
+GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0= echo "  DOC   Building XML":
 
 sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
 	$(GTK_DOC_V_XML)_source_dir='' ; \
@@ -146,13 +146,13 @@ sgml.stamp: sgml-build.stamp
 
 #### html ####
 
-GTK_DOC_V_HTML=$(GTK_DOC__v_HTML_$(V))
-GTK_DOC__v_HTML=$(GTK_DOC__v_HTML_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_HTML_0= echo "  DOC   Building HTML";
+GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0= echo "  DOC   Building HTML";
 
-GTK_DOC_V_XREF=$(GTK_DOC__v_XREF_$(V))
-GTK_DOC__v_XREF=$(GTK_DOC__v_XREF_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_XREF_0= echo "  DOC   Fixing cross-references";
+GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0= echo "  DOC   Fixing cross-references";
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
@@ -182,9 +182,9 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 
 #### pdf ####
 
-GTK_DOC_V_PDF=$(GTK_DOC__v_PDF_$(V))
-GTK_DOC__v_PDF=$(GTK_DOC__v_PDF_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC__v_PDF_0= echo "  DOC   Building PDF";
+GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0= echo "  DOC   Building PDF";
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \