Fix silent-rules alignment in recent Automake.

[upkg.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1fc339f14f00bc238af3d8ceb6cb82270a84b527..74463a40b3df59a1a061ba61561aaedf7f7f5e4f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
-# 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.
 # There is NO WARRANTY, to the extent permitted by law.
 
 AUTOMAKE_OPTIONS = parallel-tests color-tests
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I common/m4
 MAINTAINERCLEANFILES =
 MOSTLYCLEANFILES =
 CLEANFILES =
@@ -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