Makefile.am cleanups.

Makefile.am

@@ -28,6 +28,7 @@ EXTRA_DIST = 			\
 	intltool-extract.in	\
 	evolution-zip.in	\
 	gnome-doc-utils.make    \
+	gtk-doc.make		\
 	$(pkgconfig_DATA:.pc=.pc.in)
 
 if ENABLE_SMIME
@@ -102,7 +103,8 @@ MAINTAINERCLEANFILES =			\
 	$(srcdir)/ltmain.sh		\
 	$(srcdir)/missing		\
 	$(srcdir)/mkinstalldirs		\
-	$(srcdir)/gnome-doc-utils.make
+	$(srcdir)/gnome-doc-utils.make	\
+	$(srcdir)/gtk-doc.make
 
 # Scrollkeeper must be disabled for distcheck to work because
 # distcheck uses a custom prefix.  See GNOME bug #354357.

doc/reference/shell/.gitignore

@@ -1,15 +0,0 @@
-*-decl-list.txt
-*-decl.txt
-*-unused.txt
-*-undocumented.txt
-*-undeclared.txt
-*.args
-*.hierarchy
-*.interfaces
-*.prerequisites
-*.signals
-*.stamp
-html
-xml
-*.bak
-version.xml

doc/reference/shell/Makefile.am

@@ -149,3 +149,4 @@ EXTRA_DIST +=
 # Comment this out if you want your docs-status tested during 'make check'
 #TESTS = $(GTKDOC_CHECK)
 
+-include $(top_srcdir)/git.mk