From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 13 Aug 2017 00:41:20 +0000 (+0100)
Subject: Makefile.am: Tweak `silent-rules' machinery.
X-Git-Tag: 1.6.1~2
X-Git-Url: https://git.distorted.org.uk/~mdw/xtoys/commitdiff_plain/a2cfea891e714d4b10878318949639c3a2007331

Makefile.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 xtoys now requires Automake 1.11.2 or later to build
from the Git tree.
---

diff --git a/Makefile.am b/Makefile.am
index 676c52b..825e8fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,9 +32,9 @@ CLEANFILES		 =
 confsubst		 = $(srcdir)/config/confsubst
 EXTRA_DIST		+= config/confsubst
 
-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)
 
 SUBSTITUTIONS		 = \
@@ -113,7 +113,6 @@ dist-hook::
 
 EXTRA_DIST		+= config/auto-version
 
-
 ###--------------------------------------------------------------------------
 ### Debian.