Fix silent-rules alignment in recent Automake.

Use compatibility helpers in dxcommon to fix the silent-rules output.
Drop support for ancient (pre-1.11) automake versions.

diff --git a/Makefile.am b/Makefile.am
index eb23a83cdf4c233c1b5b23c5e0f03e80c1e0ce9e..74463a40b3df59a1a061ba61561aaedf7f7f5e4f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2009-2012 Nick Bowler
+# Copyright © 2009-2012, 2015 Nick Bowler
 #
 # License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 # This is free software: you are free to do what the fuck you want to.
@@ -94,9 +94,9 @@ TESTS = tests/libupkg-index-decode.sh tests/engine-pcx-rlencode.sh
 EXTRA_DIST += $(TESTS)
 
 # Supporting rules for GObject Builder
-GOB_V   = $(GOB_V_$(V))
-GOB_V_  = $(GOB_V_$(AM_DEFAULT_VERBOSITY))
-GOB_V_0 = @echo "  GOB   " $<;
+GOB_V   = $(GOB_V_@AM_V@)
+GOB_V_  = $(GOB_V_@AM_DEFAULT_V@)
+GOB_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'GOB     ' $<;
 
 # Unfortunately, GOB's output filenames depend on the contents of the gob file,
 # rather than its filename.  This isn't really suitable for use with make, so

diff --git a/configure.ac b/configure.ac
index 21069aa1d3a92aa1fcb453978bf50c5b7d5d56a5..030e9fa9171675765f771da23ccff116126df3e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Copyright © 2009-2011 Nick Bowler
+dnl Copyright © 2009-2012, 2015 Nick Bowler
 dnl
 dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 dnl This is free software: you are free to do what the fuck you want to.
@@ -11,7 +11,8 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
+DX_AUTOMAKE_COMPAT
 
 AC_PROG_CC_C99
 gl_EARLY