From 3eda76a3c2766af9b7ab425b586a5daf79dc4971 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 4 Jul 2017 18:53:21 +0100
Subject: [PATCH] vars.am, math/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 Catacomb now requires Automake 1.11.2 or later to build
from the Git tree.
---
 math/Makefile.am | 6 +++---
 vars.am          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/math/Makefile.am b/math/Makefile.am
index 59bcaea0..ac654d91 100644
--- a/math/Makefile.am
+++ b/math/Makefile.am
@@ -39,9 +39,9 @@ TEST_LIBS		 = libmath.la
 ## The `mpgen' tool for dealing with these things.
 mpgen			 = $(srcdir)/mpgen
 EXTRA_DIST		+= mpgen
-AM_V_MPGEN		 = $(AM_V_MPGEN_$(V))
-AM_V_MPGEN_		 = $(AM_V_MPGEN_$(AM_DEFAULT_VERBOSITY))
-AM_V_MPGEN_0		 = @echo "  MPGEN  $@";
+AM_V_MPGEN		 = $(AM_V_MPGEN_@AM_V@)
+AM_V_MPGEN_		 = $(AM_V_MPGEN_@AM_DEFAULT_V@)
+AM_V_MPGEN_0		 = @echo "  MPGEN    $@";
 MPGEN			 = $(AM_V_MPGEN)$(PYTHON) $(mpgen)
 
 ## The type information collected by `configure'.
diff --git a/vars.am b/vars.am
index 28403905..be1847f5 100644
--- a/vars.am
+++ b/vars.am
@@ -80,9 +80,9 @@ SUBSTITUTIONS = \
 	PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
 	CATACOMB_LIBS="$(CATACOMB_LIBS)"
 
-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)
 
 ###--------------------------------------------------------------------------
-- 
2.11.0