From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 9 Jul 2017 18:38:31 +0000 (+0100)
Subject: vars.am: Tweak `silent-rules' machinery.
X-Git-Tag: 1.5.0~154
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/7c2c451738f6bfb8e8db78bfa7af0f0c9c021842

vars.am: Tweak `silent-rules' machinery.

Since Automake 1.11, the advice for setting up custom silent-rules
recipes has changed, so use the new machinery.

Also, I'm no longer mainly working on wheezy, and Automake has made the
operation field two spaces wider while I wasn't looking, so make the
output line up properly.

This means that tripe now requires Automake 1.11.2 or later to build from
the Git tree.
---

diff --git a/vars.am b/vars.am
index fc00b875..28a5e50e 100644
--- a/vars.am
+++ b/vars.am
@@ -66,9 +66,9 @@ SUBSTITUTIONS = \
 	PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
 	PYTHON=$(PYTHON)
 
-V_SUBST			 = $(V_SUBST_$(V))
-V_SUBST_		 = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
-V_SUBST_0		 = @echo "  SUBST  $@";
+V_SUBST			 = $(V_SUBST_@AM_V@)
+V_SUBST_		 = $(V_SUBST_@AM_DEFAULT_V@)
+V_SUBST_0		 = @echo "  SUBST    $@";
 SUBST			 = $(V_SUBST)$(confsubst)
 
 ###--------------------------------------------------------------------------
@@ -82,9 +82,9 @@ SUFFIXES		+= .8tripe .8.in
 mandefs			 = $(top_srcdir)/common/defs.man
 makesummary		 = $(top_srcdir)/common/make-summary
 
-V_MAN			 = $(V_MAN_$(V))
-V_MAN_			 = $(V_MAN_$(AM_DEFAULT_VERBOSITY))
-V_MAN_0			 = @echo "  MAN    $@";
+V_MAN			 = $(V_MAN_@AM_V@)
+V_MAN_			 = $(V_MAN_@AM_DEFAULT_V@)
+V_MAN_0			 = @echo "  MAN      $@";
 
 .1.in.1 .1.in.1tripe .5.in.5tripe .7.in.7tripe .8.in.8tripe:
 	$(V_MAN)