[dconf] cleanup automake

[Ryan Lortie <ryanl src gnome org>]

commit 2648289c652c12f7fc831d8c3922456d4a285ae5
Author: Ryan Lortie <desrt desrt ca>
Date:   Mon Jul 19 23:49:36 2010 -0400

    cleanup automake

 .gitignore    |   12 ++++--------
 autogen.sh    |    6 +++---
 configure.ac  |    1 +
 m4/.gitignore |    6 ------
 4 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e64fee1..3b2a7b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,14 +11,10 @@ Makefile
 *.typelib
 
 # autofoo stuff here
-/compile
+/m4/
+/aux/
+/libtool
 /config.*
 /configure
-/depcomp
-/aclocal.m4
 /autom4te.cache
-/libtool
-/ltmain.sh
-/missing
-/install-sh
-/mkinstalldirs
+/aclocal.m4
diff --git a/autogen.sh b/autogen.sh
index 6685786..08d6b97 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,9 +3,8 @@
 set -e
 
 if [ "$1" = "clean" ]; then
-  rm -f aclocal.m4 configure missing install-sh depcomp ltmain.sh \
-        config.* `find . -name Makefile.in` compile libtool
-  rm -rf autom4te.cache
+  rm -f aclocal.m4 configure config.* `find . -name Makefile.in` libtool
+  rm -rf autom4te.cache m4 aux
   exit
 fi
 
@@ -15,6 +14,7 @@ else
   automake=automake
 fi
 
+mkdir -p m4
 gtkdocize --docdir docs --flavour no-tmpl
 libtoolize --automake
 aclocal ${ACLOCAL_FLAGS}
diff --git a/configure.ac b/configure.ac
index 1994903..30510b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AC_INIT([dconf],
 
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([aux])
 
 AM_INIT_AUTOMAKE([1.11 -Wno-portability])
 AM_SILENT_RULES([yes])