[cheese/build-system-rewrite: 2/8] Update toplevel Makefile.am to more modern style

[David King <davidk src gnome org>]

commit a7c7e9711a0a0f254029ff02830c890259a583a0
Author: David King <amigadave amigadave com>
Date:   Thu Oct 6 21:35:55 2011 +0200

    Update toplevel Makefile.am to more modern style

 Makefile.am      |   33 +++++++++++++++++++++++++++------
 help/Makefile.am |    2 +-
 2 files changed, 28 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7aee6c8..9264dde 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,22 +2,43 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = libcheese src tests po data help docs
 
-EXTRA_DIST =			\
-	$(cheesedoc_DATA)	\
-	gnome-doc-utils.make\
+dist_noinst_DATA = \
+	build-aux/gnome-doc-utils.make \
 	ChangeLog.pre-git \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in \
 	m4/introspection.m4 \
+
+dist_noinst_SCRIPTS = \
 	autogen.sh
 
-DISTCLEANFILES =		\
-	gnome-doc-utils.make
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-merge \
+	intltool-update
+
+MAINTAINERCLEANFILES = \
+	build-aux/compile \
+	build-aux/config.guess \
+	build-aux/config.sub \
+	build-aux/depcomp \
+	build-aux/gnome-doc-utils.make \
+	build-aux/install-sh \
+	build-aux/ltmain.sh \
+	build-aux/missing \
+	aclocal.m4 \
+	config.h.n \
+	mkinstalldirs \
+	omf.make \
+	xmldocs.make
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-gtk-doc --enable-introspection
 
 CHANGELOG_START = 2.26.0
 
 dist-hook:
-	@if test -d "$(srcdir)/.git"; \
+	$(AM_V_at)if test -d "$(srcdir)/.git"; \
 	then \
 		echo Creating ChangeLog && \
 		( cd "$(top_srcdir)" && \
diff --git a/help/Makefile.am b/help/Makefile.am
index e8a88b5..faea361 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/gnome-doc-utils.make
+include $(top_srcdir)/build-aux/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 
 DOC_ID = cheese