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

diff --git a/vars.am b/vars.am
index 0c83837fd67e53a218b7ff66d48d8d3f85d0f568..07735d1da452f718ef6e994d2a8d644e73bbd6f5 100644 (file)
--- a/vars.am
+++ b/vars.am
@@ -70,9 +70,9 @@ SUBSTITUTIONS = \
        srcdir=$(srcdir) \
        PACKAGE=$(PACKAGE) VERSION=$(VERSION) ASDF_VERSION=$(ASDF_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)
 
 ###--------------------------------------------------------------------------
@@ -82,12 +82,12 @@ SUBST = $(V_SUBST)$(confsubst)
 SOD                     = $(top_builddir)/src/sod
 
 ## Silent rules treatment.
-V_SOD_c                         = $(V_SOD_c_$(V))
-V_SOD_c_                = $(V_SOD_c_$(AM_DEFAULT_VERBOSITY))
-V_SOD_c_0               = @echo "  SOD[c] $@";
-V_SOD_h                         = $(V_SOD_h_$(V))
-V_SOD_h_                = $(V_SOD_h_$(AM_DEFAULT_VERBOSITY))
-V_SOD_h_0               = @echo "  SOD[h] $@";
+V_SOD_c                         = $(V_SOD_c_@AM_V@)
+V_SOD_c_                = $(V_SOD_c_@AM_DEFAULT_V@)
+V_SOD_c_0               = @echo "  SOD[c]   $@";
+V_SOD_h                         = $(V_SOD_h_@AM_V@)
+V_SOD_h_                = $(V_SOD_h_@AM_DEFAULT_V@)
+V_SOD_h_0               = @echo "  SOD[h]   $@";
 
 ## Build rules.
 SUFFIXES               += .c .h .sod
@@ -97,12 +97,12 @@ SUFFIXES            += .c .h .sod
 ###--------------------------------------------------------------------------
 ### Silent rules for Lisp.
 
-V_DUMP                  = $(V_DUMP_$(V))
-V_DUMP_                         = $(V_DUMP_$(AM_DEFAULT_VERBOSITY))
-V_DUMP_0                = @echo "  DUMP   $@";
+V_DUMP                  = $(V_DUMP_@AM_V@)
+V_DUMP_                         = $(V_DUMP_@AM_DEFAULT_V@)
+V_DUMP_0                = @echo "  DUMP     $@";
 
-V_TEST                  = $(V_TEST_$(V))
-V_TEST_                         = $(V_TEST_$(AM_DEFAULT_VERBOSITY))
-V_TEST_0                = @echo "  TEST   $@";
+V_TEST                  = $(V_TEST_@AM_V@)
+V_TEST_                         = $(V_TEST_@AM_DEFAULT_V@)
+V_TEST_0                = @echo "  TEST     $@";
 
 ###----- That's all, folks --------------------------------------------------