[evolution/kill-bonobo] Deal with untracked files in git.

[Matthew Barnes <mbarnes src gnome org>]

commit 1b706132cf01c2a42cc9a012472b71675cc0902e
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Aug 25 13:49:58 2009 -0400

    Deal with untracked files in git.

 Makefile.am               |   11 ++++++++++-
 configure.ac              |    1 +
 doc/reference/Makefile.am |    2 ++
 m4/Makefile.am            |    1 +
 4 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6161c2a..f79d67f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ HELP_SUBDIR=help
 endif
 
 SUBDIRS = 			\
+	m4			\
 	win32			\
 	data			\
 	smclient		\
@@ -86,7 +87,15 @@ MAINTAINERCLEANFILES =			\
 	$(srcdir)/missing		\
 	$(srcdir)/mkinstalldirs		\
 	$(srcdir)/gnome-doc-utils.make	\
-	$(srcdir)/gtk-doc.make
+	$(srcdir)/gtk-doc.make		\
+	$(srcdir)/m4/gnome-doc-utils.m4	\
+	$(srcdir)/m4/gtk-doc.m4		\
+	$(srcdir)/m4/intltool.m4	\
+	$(srcdir)/m4/libtool.m4		\
+	$(srcdir)/m4/ltoptions.m4	\
+	$(srcdir)/m4/ltsugar.m4		\
+	$(srcdir)/m4/ltversion.m4	\
+	$(srcdir)/m4/lt~obsolete.m4
 
 # Scrollkeeper must be disabled for distcheck to work because
 # distcheck uses a custom prefix.  See GNOME bug #354357.
diff --git a/configure.ac b/configure.ac
index fc9aec4..efcf254 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2059,6 +2059,7 @@ calendar/gui/Makefile
 calendar/gui/alarm-notify/Makefile
 calendar/gui/dialogs/Makefile
 composer/Makefile
+m4/Makefile
 mail/Makefile
 mail/default/Makefile
 mail/default/C/Makefile
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index d7c539d..48d38ad 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = shell
+
+-include $(top_srcdir)/git.mk
diff --git a/m4/Makefile.am b/m4/Makefile.am
new file mode 100644
index 0000000..ae44c94
--- /dev/null
+++ b/m4/Makefile.am
@@ -0,0 +1 @@
+-include $(top_srcdir)/git.mk