[sound-juicer] Use a build-aux directory

[Phillip Wood <pwood src gnome org>]

commit 098034a96134cee61c3f7c8e31875b98ed0a31e4
Author: Phillip Wood <phillip wood dunelm org uk>
Date:   Tue Dec 2 19:09:27 2014 +0000

    Use a build-aux directory
    
    This saves cluttering the root directory with so many files.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741288

 Makefile.am                |   18 +++++++++---------
 git.mk => build-aux/git.mk |    4 ++--
 configure.ac               |    3 +++
 data/Makefile.am           |    2 +-
 help/Makefile.am           |    2 +-
 libjuicer/Makefile.am      |    2 +-
 src/Makefile.am            |    2 +-
 tests/Makefile.am          |    2 +-
 8 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 831f1c6..062e0de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,15 +8,15 @@ EXTRA_DIST = \
 
 MAINTAINERCLEANFILES = \
        $(srcdir)/aclocal.m4 \
-       $(srcdir)/compile \
-       $(srcdir)/config.guess \
+       $(srcdir)/build-aux/compile \
+       $(srcdir)/build-aux/config.guess \
        $(srcdir)/config.h.in \
-       $(srcdir)/config.sub \
-       $(srcdir)/depcomp \
-       $(srcdir)/install-sh \
-       $(srcdir)/ltmain.sh \
-       $(srcdir)/missing \
-       $(srcdir)/mkinstalldirs
+       $(srcdir)/build-aux/config.sub \
+       $(srcdir)/build-aux/depcomp \
+       $(srcdir)/build-aux/install-sh \
+       $(srcdir)/build-aux/ltmain.sh \
+       $(srcdir)/build-aux/missing \
+       $(srcdir)/build-aux/mkinstalldirs
 
 DISTCLEANFILES = po/.intltool-merge-cache
 
@@ -36,4 +36,4 @@ dev-release: distcheck tag upload
 release: dev-release
        gcq $(WEBROOT)/blosxom/computers/sound-juicer/body.txt
 
--include $(top_srcdir)/git.mk
+-include $(top_srcdir)/build-aux/git.mk
diff --git a/git.mk b/build-aux/git.mk
similarity index 97%
rename from git.mk
rename to build-aux/git.mk
index d086a3a..1e510db 100644
--- a/git.mk
+++ b/build-aux/git.mk
@@ -65,7 +65,7 @@ git-mk-install:
                        echo "Updating $$x"; \
                        { cat $$x; \
                          echo ''; \
-                         echo '-include $$(top_srcdir)/git.mk'; \
+                         echo '-include $$(top_srcdir)/build-aux/git.mk'; \
                        } > $$x.tmp || failed=1; \
                        if test x$$failed = x; then \
                                mv $$x.tmp $$x || failed=1; \
@@ -81,7 +81,7 @@ git-mk-install:
 
 ### .gitignore generation
 
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/build-aux/git.mk
        $(AM_V_GEN) \
        { \
                if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
diff --git a/configure.ac b/configure.ac
index 4f3cfc4..66cd48b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,10 @@ AC_INIT([Sound Juicer],[3.14.0],[http://bugzilla.gnome.org/enter_bug.cgi?product
 
 AC_PREREQ(2.52)
 
+AC_CONFIG_AUX_DIR([build-aux])
+
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz check-news])
+
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([libjuicer/sj-extractor.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/data/Makefile.am b/data/Makefile.am
index 7d83d70..62373af 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -89,4 +89,4 @@ EXTRA_DIST = \
 
 MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
 
--include $(top_srcdir)/git.mk
+-include $(top_srcdir)/build-aux/git.mk
diff --git a/help/Makefile.am b/help/Makefile.am
index fdc6fdb..e54e9c2 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -12,4 +12,4 @@ HELP_MEDIA = \
 
 HELP_LINGUAS = ar ca cs de el en_GB es eu fr ja nl oc pl pt_BR ru sl sv uk zh_CN
 
--include $(top_srcdir)/git.mk
+-include $(top_srcdir)/build-aux/git.mk
diff --git a/libjuicer/Makefile.am b/libjuicer/Makefile.am
index ff9da32..0ed1a8a 100644
--- a/libjuicer/Makefile.am
+++ b/libjuicer/Makefile.am
@@ -47,4 +47,4 @@ libjuicer_la_LIBADD += $(MUSICBRAINZ5_LIBS)
 libjuicer_la_CFLAGS += $(MUSICBRAINZ5_CFLAGS)
 
 
--include $(top_srcdir)/git.mk
+-include $(top_srcdir)/build-aux/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index bff1baa..9baac6b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,4 +51,4 @@ sound_juicer_LDADD = \
 sound_juicer_LDFLAGS = \
        $(AM_LDFLAGS)
 
--include $(top_srcdir)/git.mk
+-include $(top_srcdir)/build-aux/git.mk
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dbb1c13..0ef798b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,4 +26,4 @@ mb_test_LDFLAGS = \
        -export-dynamic \
        $(AM_LDFLAGS)
 
--include $(top_srcdir)/git.mk
+-include $(top_srcdir)/build-aux/git.mk