Fix silent-rules alignment in recent Automake.

[upkg.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 70238856f3ea0b6acf4299265aa32efee89e9f2d..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 =
@@ -56,7 +56,7 @@ $(libuobject_la): $(LTDLDEPS)
 moduleflags = -module -avoid-version -export-symbols-regex _LTX_
 
 engine_GOBS = src/engine/palette.gob src/engine/texture.gob \
-       src/engine/music.gob
+       src/engine/music.gob src/engine/sound.gob
 
 MAINTAINERCLEANFILES += $(engine_GOBS:.gob=.gobstamp) \
        $(engine_GOBS:.gob=.c) $(engine_GOBS:.gob=.h)
@@ -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
@@ -111,6 +111,4 @@ STAMP_RECOVER = \
 .gobstamp.h: ; $(STAMP_RECOVER)
 
 include $(top_srcdir)/lib/gnulib.mk
-if BUNDLED_LIBLTDL
 include $(top_srcdir)/libltdl/ltdl.mk
-endif