vars.am: Tweak `silent-rules' machinery.
authorMark Wooding <mdw@distorted.org.uk>
Thu, 6 Jul 2017 08:56:44 +0000 (09:56 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 6 Jul 2017 08:56:44 +0000 (09:56 +0100)
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 mLib now requires Automake 1.11.2 or later to build from
the Git tree.

vars.am

diff --git a/vars.am b/vars.am
index c7c2d37..fceef07 100644 (file)
--- a/vars.am
+++ b/vars.am
@@ -89,9 +89,9 @@ SUBSTITUTIONS = \
        bindir=$(bindir) sbindir=$(sbindir) \
        PACKAGE=$(PACKAGE) VERSION=$(VERSION)
 
-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)
 
 ###--------------------------------------------------------------------------