[dconf] fix distcheck, require automake 1.11

[Ryan Lortie <ryanl src gnome org>]

commit d69bca07e8f031fe240380842732dcdab1c2b4ab
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Sep 15 16:30:31 2009 -0400

    fix distcheck, require automake 1.11

 autogen.sh         |    2 +-
 config/Makefile.am |   14 +++++++++-----
 configure.ac       |    2 ++
 editor/.gitignore  |    2 +-
 editor/Makefile.am |   20 ++------------------
 5 files changed, 15 insertions(+), 25 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 6d2d18e..ec4e643 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,4 +19,4 @@ CFLAGS=${CFLAGS=-ggdb -Werror}
 LDFLAGS=${LDFLAGS=-Wl,-O1}
 export CFLAGS LDFLAGS
 
-./configure --enable-maintainer-mode "$@"
+./configure --enable-maintainer-mode --enable-silent-rules "$@"
diff --git a/config/Makefile.am b/config/Makefile.am
index 44e7906..6e154dc 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -4,11 +4,8 @@ dconfetc_DATA = \
 	default.db	\
 	dconf.conf
 
-system.db: empty-db
-	cp empty-db system.db
-
-default.db: empty-db
-	cp empty-db default.db
+default.db system.db: empty-db
+	cp $< $@
 
 dbusservice_DATA = \
 	ca.desrt.dconf.writer.user.service
@@ -24,3 +21,10 @@ dbussystemservice_DATA = \
 	ca.desrt.dconf.writer.system.service
 
 CLEANFILES = system.db default.db *.service
+
+EXTRA_DIST = \
+	ca.desrt.dconf.writer.default.service.in	\
+	ca.desrt.dconf.writer.system.service.in		\
+	ca.desrt.dconf.writer.user.service.in		\
+	dconf.conf					\
+	empty-db
diff --git a/configure.ac b/configure.ac
index 7303488..36ee449 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,10 @@
 AC_INIT(dconf, alpha)
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
+AM_SILENT_RULES
 
 AC_PROG_LIBTOOL
+AM_PROG_VALAC
 AC_PROG_CC
 
 PKG_CHECK_MODULES(glib, glib-2.0)
diff --git a/editor/.gitignore b/editor/.gitignore
index 644ffc3..f98b75a 100644
--- a/editor/.gitignore
+++ b/editor/.gitignore
@@ -1,5 +1,5 @@
 *.c
 *.h
-*.vala.stamp
+*_vala.stamp
 
 dconf-editor
diff --git a/editor/Makefile.am b/editor/Makefile.am
index 3766d1f..33c05f5 100644
--- a/editor/Makefile.am
+++ b/editor/Makefile.am
@@ -4,22 +4,6 @@ CFLAGS += -Wno-error
 
 bin_PROGRAMS = dconf-editor
 
-dconf_editor_VALASOURCES = \
-	editor.vala
-
-DEFS =
-BUILT_SOURCES = dconf-editor.vala.stamp
-
+AM_VALAFLAGS = --pkg gtk+-2.0 --pkg dconf
 dconf_editor_LDADD = $(gvariant_LIBS) $(gtk_LIBS) ../dconf/libdconf.la
-dconf_editor_SOURCES = \
-	dconf-editor.vala.stamp			\
-	$(dconf_editor_VALASOURCES:.vala=.c)	\
-	$(dconf_editor_VALASOURCES:.vala=.h)
-
-
-dconf-editor.vala.stamp: $(dconf_editor_VALASOURCES)
-	valac -C --pkg gtk+-2.0 --pkg dconf $^
-	touch $@
-
-CLEANFILES = *.c *.h dconf-editor.vala.stamp
-EXTRA_DIST = $(dconf_editor_VALASOURCES)
+dconf_editor_SOURCES = editor.vala