From 44814fed275c7adc97301aea7c16d7cbd1b2323e Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Sat, 2 Aug 2008 12:36:41 +0200
Subject: [PATCH] Maintainer's effort: add proper DISTCHECK, DISTCLEANFILES and
 MAINTAINERCLEANFILES options to the Makefile.am files.

---
 Makefile.am                      | 22 ++++++++++++++++++++++
 data/Makefile.am                 |  9 +++++----
 docs/Makefile.am                 |  2 ++
 docs/libmmanager-gtk/Makefile.am |  6 ++++++
 docs/libmmanager/Makefile.am     |  6 ++++++
 libmmanager-gtk/Makefile.am      |  4 ++++
 libmmanager/Makefile.am          |  6 +++++-
 src/Makefile.am                  |  6 +++++-
 8 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f5fcea3..7c93f50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,28 @@ SUBDIRS = po data libmmanager libmmanager-gtk src test docs
 
 ACLOCAL_AMFLAGS = -I m4
 
+DISTCLEANFILES =		\
+	gnome-doc-utils.make	\
+	gtk-doc.make
+
+DISTCHECK_CONFIGURE_FLAGS = 	\
+	--enable-gtk-doc
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	compile			\
+	configure		\
+	install-sh		\
+	missing			\
+	mkinstalldirs		\
+	config.guess		\
+	ltmain.sh		\
+	config.sub		\
+	depcomp			\
+	Makefile.in		\
+	config.h.*		\
+	aclocal.m4
+
 EXTRA_DIST = \
 	ChangeLog
 
diff --git a/data/Makefile.am b/data/Makefile.am
index cc0e357..686576c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,8 +7,9 @@ service_DATA = $(service_in_files:.service.in=.service)
 $(service_DATA): $(service_in_files) Makefile
 	@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
 	
-EXTRA_DIST = \
-  $(service_in_files)
+EXTRA_DIST = $(service_in_files)
 
-DISTCLEANFILES = \
-  $(service_DATA)
+DISTCLEANFILES = $(service_DATA)
+MAINTAINERCLEANFILES =	\
+	*~		\
+	Makefile.in
diff --git a/docs/Makefile.am b/docs/Makefile.am
index fdff953..e896672 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = libmmanager libmmanager-gtk
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/docs/libmmanager-gtk/Makefile.am b/docs/libmmanager-gtk/Makefile.am
index 2082775..735bea4 100644
--- a/docs/libmmanager-gtk/Makefile.am
+++ b/docs/libmmanager-gtk/Makefile.am
@@ -40,3 +40,9 @@ HTML_IMAGES =
 
 include $(top_srcdir)/gtk-doc.make
 
+clean: clean-am
+	rm -rf tmpl
+
+MAINTAINERCLEANFILES =	\
+	*~		\
+	Makefile.in
diff --git a/docs/libmmanager/Makefile.am b/docs/libmmanager/Makefile.am
index a37b7e6..bf1ed93 100644
--- a/docs/libmmanager/Makefile.am
+++ b/docs/libmmanager/Makefile.am
@@ -41,3 +41,9 @@ HTML_IMAGES =
 
 include $(top_srcdir)/gtk-doc.make
 
+clean: clean-am
+	rm -rf tmpl
+
+MAINTAINERCLEANFILES =	\
+	*~		\
+	Makefile.in
diff --git a/libmmanager-gtk/Makefile.am b/libmmanager-gtk/Makefile.am
index b00ea0b..9ec69f3 100644
--- a/libmmanager-gtk/Makefile.am
+++ b/libmmanager-gtk/Makefile.am
@@ -33,6 +33,10 @@ libmmanager_gtk_la_SOURCES =		\
 	mm-gtk-hit-store.c		\
 	mm-gtk-hit-view.c
 
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libmmanager-gtk.pc
 
diff --git a/libmmanager/Makefile.am b/libmmanager/Makefile.am
index f49ed4c..9a43d80 100644
--- a/libmmanager/Makefile.am
+++ b/libmmanager/Makefile.am
@@ -128,7 +128,11 @@ stamp-mm-type-builtins.h: Makefile $(libmmanager_la_headers)
 	
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
-MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = 		\
+	*~			\
+	Makefile.in		\
+	$(stamp_files)		\
+	$(BUILT_SOURCES)
 
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA=libmmanager.pc
diff --git a/src/Makefile.am b/src/Makefile.am
index 752373b..f20cbac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -118,7 +118,11 @@ stamp-mm-dbus-module-client-bindings.h: mm-dbus-module-info.xml Makefile
 
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
-MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in		\
+	$(stamp_files) 		\
+	$(BUILT_SOURCES)
 
 EXTRA_DIST =				\
 	mm-dbus-manager-info.xml	\
-- 
2.11.4.GIT