Add git.mk to generate .gitignore files

Add four new doc templates that were not in repository.

50 files changed, 806 insertions, 1 deletions

diff --git a/Makefile.am b/Makefile.am
index 7264d564c1..090c2fb4ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,6 +118,26 @@ EXTRA_DIST +=			\
 	examples/spinbutton/spinbutton.c  \
 	examples/spinbutton/Makefile  \
 	examples/find-examples.sh
+MAINTAINERCLEANFILES = \
+	$(srcdir)/INSTALL \
+	$(srcdir)/README \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/autoscan.log \
+	$(srcdir)/compile \
+	$(srcdir)/config.guess \
+	$(srcdir)/config.h.in \
+	$(srcdir)/config.sub \
+	$(srcdir)/configure.scan \
+	$(srcdir)/depcomp \
+	$(srcdir)/install-sh \
+	$(srcdir)/ltmain.sh \
+	$(srcdir)/missing \
+	$(srcdir)/mkinstalldirs \
+	$(srcdir)/omf.make \
+	$(srcdir)/xmldocs.make \
+	$(srcdir)/gtk-doc.make \
+	$(srcdir)/ChangeLog \
+	`find "$(srcdir)" -type f -name Makefile.in -print`
 
 GDKTARGET=@gdktarget@
 
@@ -223,3 +243,15 @@ snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds
+
+GITIGNOREFILES = \
+	po-properties/Makefile.in.in \
+	po-properties/Makefile.in \
+	po-properties/Makefile \
+	po-properties/*.gmo \
+	po-properties/*.mo \
+	po-properties/POTFILES \
+	po-properties/stamp-it \
+	po-properties/.intltool-merge-cache
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 3d2ba11ebc..feb4bdbf82 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -4,3 +4,5 @@ SUBDIRS =
 if USE_X11
 SUBDIRS += gdk-pixbuf-xlib
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am
index 328bbe6758..4b89e5172d 100644
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -38,3 +38,5 @@ pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc
 
 EXTRA_DIST += gdk-pixbuf-xlib-2.0.pc.in
+
+-include $(top_srcdir)/git.mk
diff --git a/demos/Makefile.am b/demos/Makefile.am
index fd819543e2..c8c9bbb1c5 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -82,3 +82,5 @@ EXTRA_DIST +=			\
 	gnu-keys.png
 
 DISTCLEANFILES = test-inline-pixbufs.h
+
+-include $(top_srcdir)/git.mk
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 46ebc03a1b..e9c51d0b95 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -96,3 +96,5 @@ IMAGEFILES=	alphatest.png		\
 democode_DATA = $(demos) $(IMAGEFILES) demo.ui
 
 DISTCLEANFILES = demos.h
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 47f80304cd..515a7c100a 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -19,3 +19,5 @@ EXTRA_DIST += \
 	generation.txt			\
 	gtkdocs_fix			\
 	RELEASE-HOWTO
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am
index 5aebcd2b45..9bdaf1284c 100644
--- a/docs/faq/Makefile.am
+++ b/docs/faq/Makefile.am
@@ -38,3 +38,5 @@ dist-hook:
 endif
 
 .PHONY: html
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index f4d7451db1..f780c4f162 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -3,3 +3,6 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = gdk-pixbuf gdk gtk libgail-util
 
+GITIGNOREFILES = */*.1
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index 5beb9259ad..7734e72e8d 100644
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -95,3 +95,5 @@ dist-hook-local: $(BUILT_EXTRA_DIST)
 	for f in $$files; do					\
 	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
 	  cp $$d/$$f $(distdir) || exit 1; done
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index 28d7035e8d..7e21e35fdb 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -152,3 +152,5 @@ include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
 EXTRA_DIST += version.xml.in
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 0c5e059973..d7ffd71bcb 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -377,3 +377,5 @@ dist-hook-local: $(BUILT_EXTRA_DIST)
 	for f in $$files; do					\
 	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
 	  cp $$d/$$f $(distdir) || exit 1; done
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/reference/gtk/tmpl/filesystem.sgml b/docs/reference/gtk/tmpl/filesystem.sgml
new file mode 100644
index 0000000000..15c9de5831
--- /dev/null
+++ b/docs/reference/gtk/tmpl/filesystem.sgml
@@ -0,0 +1,108 @@
+<!-- ##### SECTION Title ##### -->
+Filesystem utilities
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### STRUCT GtkMountOperation ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkMountOperation:is-showing ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMountOperation:parent ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMountOperation:screen ##### -->
+<para>
+
+</para>
+
+<!-- ##### FUNCTION gtk_mount_operation_new ##### -->
+<para>
+
+</para>
+
+@parent:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_mount_operation_is_showing ##### -->
+<para>
+
+</para>
+
+@op:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_mount_operation_set_parent ##### -->
+<para>
+
+</para>
+
+@op:
+@parent:
+
+
+<!-- ##### FUNCTION gtk_mount_operation_get_parent ##### -->
+<para>
+
+</para>
+
+@op:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_mount_operation_set_screen ##### -->
+<para>
+
+</para>
+
+@op:
+@screen:
+
+
+<!-- ##### FUNCTION gtk_mount_operation_get_screen ##### -->
+<para>
+
+</para>
+
+@op:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_show_uri ##### -->
+<para>
+
+</para>
+
+@screen:
+@uri:
+@timestamp:
+@error:
+@Returns:
+
+
diff --git a/docs/reference/gtk/tmpl/gtkactivatable.sgml b/docs/reference/gtk/tmpl/gtkactivatable.sgml
new file mode 100644
index 0000000000..3911672b5b
--- /dev/null
+++ b/docs/reference/gtk/tmpl/gtkactivatable.sgml
@@ -0,0 +1,100 @@
+<!-- ##### SECTION Title ##### -->
+GtkActivatable
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### STRUCT GtkActivatable ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkActivatable:related-action ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkActivatable:use-action-appearance ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GtkActivatableIface ##### -->
+<para>
+
+</para>
+
+@g_iface:
+@update:
+@sync_action_properties:
+
+<!-- ##### FUNCTION gtk_activatable_do_set_related_action ##### -->
+<para>
+
+</para>
+
+@activatable:
+@action:
+
+
+<!-- ##### FUNCTION gtk_activatable_get_related_action ##### -->
+<para>
+
+</para>
+
+@activatable:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_activatable_get_use_action_appearance ##### -->
+<para>
+
+</para>
+
+@activatable:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_activatable_sync_action_properties ##### -->
+<para>
+
+</para>
+
+@activatable:
+@action:
+
+
+<!-- ##### FUNCTION gtk_activatable_set_related_action ##### -->
+<para>
+
+</para>
+
+@activatable:
+@action:
+
+
+<!-- ##### FUNCTION gtk_activatable_set_use_action_appearance ##### -->
+<para>
+
+</para>
+
+@activatable:
+@use_appearance:
+
+
diff --git a/docs/reference/gtk/tmpl/gtkimcontext.sgml b/docs/reference/gtk/tmpl/gtkimcontext.sgml
new file mode 100644
index 0000000000..7257879014
--- /dev/null
+++ b/docs/reference/gtk/tmpl/gtkimcontext.sgml
@@ -0,0 +1,212 @@
+<!-- ##### SECTION Title ##### -->
+GtkIMContext
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### STRUCT GtkIMContext ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SIGNAL GtkIMContext::commit ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+@arg1:
+
+<!-- ##### SIGNAL GtkIMContext::delete-surrounding ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+@arg1:
+@arg2:
+@Returns:
+
+<!-- ##### SIGNAL GtkIMContext::preedit-changed ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+
+<!-- ##### SIGNAL GtkIMContext::preedit-end ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+
+<!-- ##### SIGNAL GtkIMContext::preedit-start ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+
+<!-- ##### SIGNAL GtkIMContext::retrieve-surrounding ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+@Returns:
+
+<!-- ##### STRUCT GtkIMContextClass ##### -->
+<para>
+
+</para>
+
+@preedit_start:
+@preedit_end:
+@preedit_changed:
+@commit:
+@retrieve_surrounding:
+@delete_surrounding:
+@set_client_window:
+@get_preedit_string:
+@filter_keypress:
+@focus_in:
+@focus_out:
+@reset:
+@set_cursor_location:
+@set_use_preedit:
+@set_surrounding:
+@get_surrounding:
+
+<!-- ##### STRUCT GtkIMContextInfo ##### -->
+<para>
+
+</para>
+
+@context_id:
+@context_name:
+@domain:
+@domain_dirname:
+@default_locales:
+
+<!-- ##### FUNCTION gtk_im_context_set_client_window ##### -->
+<para>
+
+</para>
+
+@context:
+@window:
+
+
+<!-- ##### FUNCTION gtk_im_context_get_preedit_string ##### -->
+<para>
+
+</para>
+
+@context:
+@str:
+@attrs:
+@cursor_pos:
+
+
+<!-- ##### FUNCTION gtk_im_context_filter_keypress ##### -->
+<para>
+
+</para>
+
+@context:
+@event:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_im_context_focus_in ##### -->
+<para>
+
+</para>
+
+@context:
+
+
+<!-- ##### FUNCTION gtk_im_context_focus_out ##### -->
+<para>
+
+</para>
+
+@context:
+
+
+<!-- ##### FUNCTION gtk_im_context_reset ##### -->
+<para>
+
+</para>
+
+@context:
+
+
+<!-- ##### FUNCTION gtk_im_context_set_cursor_location ##### -->
+<para>
+
+</para>
+
+@context:
+@area:
+
+
+<!-- ##### FUNCTION gtk_im_context_set_use_preedit ##### -->
+<para>
+
+</para>
+
+@context:
+@use_preedit:
+
+
+<!-- ##### FUNCTION gtk_im_context_set_surrounding ##### -->
+<para>
+
+</para>
+
+@context:
+@text:
+@len:
+@cursor_index:
+
+
+<!-- ##### FUNCTION gtk_im_context_get_surrounding ##### -->
+<para>
+
+</para>
+
+@context:
+@text:
+@cursor_index:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_im_context_delete_surrounding ##### -->
+<para>
+
+</para>
+
+@context:
+@offset:
+@n_chars:
+@Returns:
+
+
diff --git a/docs/reference/gtk/tmpl/gtktoolshell.sgml b/docs/reference/gtk/tmpl/gtktoolshell.sgml
new file mode 100644
index 0000000000..8e31f27684
--- /dev/null
+++ b/docs/reference/gtk/tmpl/gtktoolshell.sgml
@@ -0,0 +1,82 @@
+<!-- ##### SECTION Title ##### -->
+GtkToolShell
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### STRUCT GtkToolShell ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT GtkToolShellIface ##### -->
+<para>
+
+</para>
+
+@get_icon_size:
+@get_orientation:
+@get_style:
+@get_relief_style:
+@rebuild_menu:
+
+<!-- ##### FUNCTION gtk_tool_shell_get_icon_size ##### -->
+<para>
+
+</para>
+
+@shell:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_tool_shell_get_orientation ##### -->
+<para>
+
+</para>
+
+@shell:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_tool_shell_get_relief_style ##### -->
+<para>
+
+</para>
+
+@shell:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_tool_shell_get_style ##### -->
+<para>
+
+</para>
+
+@shell:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_tool_shell_rebuild_menu ##### -->
+<para>
+
+</para>
+
+@shell:
+
+
diff --git a/docs/reference/libgail-util/Makefile.am b/docs/reference/libgail-util/Makefile.am
index 92bdbd870a..e6b4bb96bb 100644
--- a/docs/reference/libgail-util/Makefile.am
+++ b/docs/reference/libgail-util/Makefile.am
@@ -32,3 +32,5 @@ content_files =
 HTML_IMAGES =
 
 include $(top_srcdir)/gtk-doc.make
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index 4b78142645..3b3c09bcc9 100644
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -40,3 +40,5 @@ clean-local:
 	    *) rm -f $$file ;; \
 	  esac ; \
 	done
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am
index 43e6c24413..5448bd2960 100644
--- a/docs/tutorial/Makefile.am
+++ b/docs/tutorial/Makefile.am
@@ -72,3 +72,5 @@ dist-hook:
 	echo "***"
 endif
 
+
+-include $(top_srcdir)/git.mk
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index c1ac554383..39b52f3ce2 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -718,3 +718,5 @@ gdk-pixbuf.loaders:
 	echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
 	touch gdk-pixbuf.loaders;
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/gdk-pixbuf/pixops/Makefile.am b/gdk-pixbuf/pixops/Makefile.am
index e4c4e26cbf..fe7775a293 100644
--- a/gdk-pixbuf/pixops/Makefile.am
+++ b/gdk-pixbuf/pixops/Makefile.am
@@ -30,3 +30,5 @@ EXTRA_DIST +=				\
 	DETAILS				\
 	pixbuf-transform-math.ltx	\
 	makefile.msc
+
+-include $(top_srcdir)/git.mk
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index cc0ae0da04..52a5bf0460 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -303,3 +303,5 @@ files:
 	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
 	  echo $$p; \
 	done
+
+-include $(top_srcdir)/git.mk
diff --git a/gdk/directfb/Makefile.am b/gdk/directfb/Makefile.am
index e7b7966eaf..867f470cd9 100644
--- a/gdk/directfb/Makefile.am
+++ b/gdk/directfb/Makefile.am
@@ -56,3 +56,5 @@ libgdkinclude_HEADERS =		\
 
 
 EXTRA_DIST += AUTHORS README TODO 
+
+-include $(top_srcdir)/git.mk
diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 2e2fbc888f..2c3e621c59 100644
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -57,3 +57,5 @@ libgdk_quartz_la_SOURCES =    	\
 libgdkinclude_HEADERS = 	\
 	gdkquartz.h
 
+
+-include $(top_srcdir)/git.mk
diff --git a/gdk/tests/Makefile.am b/gdk/tests/Makefile.am
index 7417229992..423a353d61 100644
--- a/gdk/tests/Makefile.am
+++ b/gdk/tests/Makefile.am
@@ -25,3 +25,5 @@ check_gdk_cairo_LDADD=\
 CLEANFILES = \
 	cairosurface.png	\
 	gdksurface.png
+
+-include $(top_srcdir)/git.mk
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 02f8c2f7aa..17d048edde 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -63,3 +63,5 @@ libgdk_win32_la_SOURCES = \
 
 libgdkinclude_HEADERS =		\
 	gdkwin32.h
+
+-include $(top_srcdir)/git.mk
diff --git a/gdk/win32/rc/Makefile.am b/gdk/win32/rc/Makefile.am
index 4253b5a523..91719233cc 100644
--- a/gdk/win32/rc/Makefile.am
+++ b/gdk/win32/rc/Makefile.am
@@ -11,3 +11,5 @@ endif
 
 gdk-win32-res.o : gdk.rc gtk.ico
 	$(WINDRES) gdk.rc $@
+
+-include $(top_srcdir)/git.mk
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 0b6d5ec5d5..5d41ec8f3f 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -82,3 +82,5 @@ EXTRA_DIST += 			\
 	gdkinput-xfree.c	\
 	gdkinput-none.c		\
 	gdksettings.c
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000000..4b742b5a07
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,182 @@
+# git.mk
+#
+# Copyright 2009, Red Hat, Inc.
+# Written by Behdad Esfahbod
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#
+# The canonical source for this file is pango/git.mk, or whereever the
+# header of pango/git.mk suggests in the future.
+#
+# To use in your project, import this file in your git repo's toplevel,
+# then do "make -f git.mk".  This modifies all Makefile.am files in
+# your project to include git.mk.
+#
+# This enables automatic .gitignore generation.  If you need to ignore
+# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
+# But think twice before doing that.  If a file has to be in .gitignore,
+# chances are very high that it's a generated file and should be in one
+# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
+#
+# The only case that you need to manually add a file to GITIGNOREFILES is
+# when remove files in one of mostlyclean-local, clean-local, distclean-local,
+# or maintainer-clean-local.
+#
+# Note that for files like editor backup, etc, there are better places to
+# ignore them.  See "man gitignore".
+#
+# If "make maintainer-clean" removes the files but they are not recognized
+# by this script (that is, if "git status" shows untracked files still), send
+# me the output of "git status" as well as your Makefile.am and Makefile for
+# the directories involved.
+#
+# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
+# pango/Makefile.am.
+#
+# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
+# not tarballs.  It serves no useful purpose in tarballs and clutters the
+# build dir.
+#
+# This file knows how to handle autoconf, automake, libtool, gtk-doc,
+# gnome-doc-utils, intltool.
+#
+#
+# KNOWN ISSUES:
+#
+# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
+#   submodule doesn't find us.  If you have configure.{in,ac} files in
+#   subdirs, add a proxy git.mk file in those dirs that simply does:
+#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
+#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
+#   example.
+#
+
+git-all: git-mk-install
+
+git-mk-install:
+	@echo Installing git makefile
+	@any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \
+		if grep 'include .*/git.mk' $$x >/dev/null; then \
+			echo $$x already includes git.mk; \
+		else \
+			failed=; \
+			echo "Updating $$x"; \
+			{ cat $$x; \
+			  echo ''; \
+			  echo '-include $$(top_srcdir)/git.mk'; \
+			} > $$x.tmp || failed=1; \
+			if test x$$failed = x; then \
+				mv $$x.tmp $$x || failed=1; \
+			fi; \
+			if test x$$failed = x; then : else \
+				echo Failed updating $$x; >&2 \
+				any_failed=1; \
+			fi; \
+	fi; done; test -z "$$any_failed"
+
+.PHONY: git-all git-mk-install
+
+
+### .gitignore generation
+
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+	@echo Generating $@; \
+	{ \
+		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
+			for x in \
+				$(DOC_MODULE)-decl-list.txt \
+				$(DOC_MODULE)-decl.txt \
+				tmpl/$(DOC_MODULE)-unused.sgml \
+				"tmpl/*.bak" \
+				xml html \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+			for x in \
+				$(_DOC_C_DOCS) \
+				$(_DOC_LC_DOCS) \
+				$(_DOC_OMF_ALL) \
+				$(_DOC_DSK_ALL) \
+				$(_DOC_HTML_ALL) \
+				$(_DOC_POFILES) \
+				"*/.xml2po.mo" \
+				"*/*.omf.out" \
+			; do echo /$$x; done; \
+		fi; \
+		if test -f $(srcdir)/po/Makefile.in.in; then \
+			for x in \
+				po/Makefile.in.in \
+				po/Makefile.in \
+				po/Makefile \
+				po/POTFILES \
+				po/stamp-it \
+				po/.intltool-merge-cache \
+				"po/*.gmo" \
+				"po/*.mo" \
+				intltool-extract.in \
+				intltool-merge.in \
+				intltool-update.in \
+			; do echo /$$x; done; \
+		fi; \
+		if test -f $(srcdir)/configure; then \
+			for x in \
+				autom4te.cache \
+				configure \
+				config.h \
+				stamp-h1 \
+				libtool \
+				config.lt \
+			; do echo /$$x; done; \
+		fi; \
+		for x in \
+			.gitignore \
+			$(GITIGNOREFILES) \
+			$(CLEANFILES) \
+			$(PROGRAMS) \
+			$(EXTRA_PROGRAMS) \
+			$(LTLIBRARIES) \
+			so_locations \
+			.libs _libs \
+			$(MOSTLYCLEANFILES) \
+			"*.$(OBJEXT)" \
+			"*.lo" \
+			$(DISTCLEANFILES) \
+			$(am__CONFIG_DISTCLEAN_FILES) \
+			$(CONFIG_CLEAN_FILES) \
+			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
+			"*.tab.c" \
+			$(MAINTAINERCLEANFILES) \
+			$(BUILT_SOURCES) \
+			$(DEPDIR) \
+			Makefile \
+			Makefile.in \
+			"*.orig" \
+			"*.rej" \
+			"*.bak" \
+			"*~" \
+			".*.sw[nop]" \
+		; do echo /$$x; done; \
+	} | \
+	sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
+	sed 's@/[.]/@/@g' | \
+	LANG=C sort | uniq > $@.tmp && \
+	mv $@.tmp $@;
+
+all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore-recurse-maybe:
+	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
+		$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
+	fi;
+gitignore-recurse:
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse); \
+	done
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
+maintainer-clean: gitignore-clean
+gitignore-clean:
+	-rm -f $(srcdir)/.gitignore
+
+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2339a86543..a0dc9a984e 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -778,7 +778,7 @@ gtk_extra_sources =				\
 #
 # setup GTK+ sources and their dependencies
 #
-MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS)
+MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) stock-icons/icon-theme.cache
 EXTRA_HEADERS =
 EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
 EXTRA_DIST += $(gtk_built_sources)
@@ -1286,3 +1286,5 @@ EXTRA_DIST +=                   \
 
 
 install-data-local:
+
+-include $(top_srcdir)/git.mk
diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index f36d5e5383..4c8ff1f1a6 100644
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -77,3 +77,5 @@ defaultvalue_LDADD 		 = $(progs_ldadd)
 TEST_PROGS			+= textbuffer
 textbuffer_SOURCES		 = textbuffer.c pixbuf-init.c
 textbuffer_LDADD		 = $(progs_ldadd)
+
+-include $(top_srcdir)/git.mk
diff --git a/gtk/theme-bits/Makefile.am b/gtk/theme-bits/Makefile.am
index eb24bfc76c..4ad04978a4 100644
--- a/gtk/theme-bits/Makefile.am
+++ b/gtk/theme-bits/Makefile.am
@@ -11,3 +11,5 @@ decompose_bits_SOURCES = decompose-bits.c
 decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
 
 EXTRA_DIST += check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png
+
+-include $(top_srcdir)/git.mk
diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am
index ad797d84cb..82cd07ea66 100644
--- a/m4macros/Makefile.am
+++ b/m4macros/Makefile.am
@@ -6,3 +6,5 @@ EXTRA_DIST += $(installed_m4)
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = $(installed_m4)
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 86a89af3c7..40d5fa5fd1 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -5,3 +5,5 @@ SUBDIRS = input engines other
 if OS_UNIX
 SUBDIRS += printbackends
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/engines/Makefile.am b/modules/engines/Makefile.am
index eb8a899e75..7f65239551 100644
--- a/modules/engines/Makefile.am
+++ b/modules/engines/Makefile.am
@@ -5,3 +5,5 @@ wimp = ms-windows
 endif
 
 SUBDIRS = $(wimp) pixbuf
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am
index 975d061c00..541bf9e8b2 100644
--- a/modules/engines/ms-windows/Makefile.am
+++ b/modules/engines/ms-windows/Makefile.am
@@ -36,3 +36,5 @@ libwimp_la_LDFLAGS = \
 	-avoid-version -module -no-undefined -export-dynamic
 
 libwimp_la_LIBADD = $(LDADDS) -lgdi32
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/engines/ms-windows/Theme/Makefile.am b/modules/engines/ms-windows/Theme/Makefile.am
index 59f4176450..e7fad20372 100644
--- a/modules/engines/ms-windows/Theme/Makefile.am
+++ b/modules/engines/ms-windows/Theme/Makefile.am
@@ -1,3 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
 SUBDIRS=gtk-2.0
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am
index 8957184ee4..a03371f4a7 100644
--- a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am
+++ b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am
@@ -4,3 +4,5 @@ themedir = $(datadir)/themes/MS-Windows/gtk-2.0
 theme_DATA=gtkrc
 
 EXTRA_DIST += $(theme_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am
index df50cba67a..f90bdd5532 100644
--- a/modules/engines/pixbuf/Makefile.am
+++ b/modules/engines/pixbuf/Makefile.am
@@ -33,3 +33,5 @@ libpixmap_la_SOURCES = 		\
 libpixmap_la_LDFLAGS =  -avoid-version -module $(no_undefined)
 libpixmap_la_LIBADD = $(LDADDS)
 
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 0613d049a0..9a1bf2e861 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -248,3 +248,5 @@ if CROSS_COMPILING
 else
 all-local: gtk.immodules
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/other/Makefile.am b/modules/other/Makefile.am
index a4fd2c92f8..5b647d66d1 100644
--- a/modules/other/Makefile.am
+++ b/modules/other/Makefile.am
@@ -1,3 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = gail
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/other/gail/Makefile.am b/modules/other/gail/Makefile.am
index 24d0d58ffc..6ffe591db2 100644
--- a/modules/other/gail/Makefile.am
+++ b/modules/other/gail/Makefile.am
@@ -168,3 +168,5 @@ libgail_la_LDFLAGS =    \
 	-rpath $(moduledir) -module -avoid-version \
 	$(no_undefined) \
         $(LDFLAGS)
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/other/gail/libgail-util/Makefile.am b/modules/other/gail/libgail-util/Makefile.am
index 856a6c01a9..3145719b56 100644
--- a/modules/other/gail/libgail-util/Makefile.am
+++ b/modules/other/gail/libgail-util/Makefile.am
@@ -80,3 +80,5 @@ gailutil.lib: libgailutil.la gailutil.def
 install-data-local: install-ms-lib install-def-file
 
 uninstall-local: uninstall-ms-lib uninstall-def-file
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/other/gail/tests/Makefile.am b/modules/other/gail/tests/Makefile.am
index aaa6389396..993249558a 100644
--- a/modules/other/gail/tests/Makefile.am
+++ b/modules/other/gail/tests/Makefile.am
@@ -269,3 +269,5 @@ libtestvalues_la_LDFLAGS =	\
 	$(top_builddir)/gdk/$(gdktargetlib) \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/printbackends/Makefile.am b/modules/printbackends/Makefile.am
index 5b8981932c..11d2423850 100644
--- a/modules/printbackends/Makefile.am
+++ b/modules/printbackends/Makefile.am
@@ -11,3 +11,5 @@ SUBDIRS += test
 endif
 
 DIST_SUBDIRS = cups file lpr test
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am
index 22c0f349f3..463199e829 100644
--- a/modules/printbackends/cups/Makefile.am
+++ b/modules/printbackends/cups/Makefile.am
@@ -36,3 +36,5 @@ noinst_HEADERS =			\
 
 libprintbackend_cups_la_LDFLAGS =  -avoid-version -module $(no_undefined)
 libprintbackend_cups_la_LIBADD = $(LDADDS) $(CUPS_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am
index 3bc1407e06..904f7687d4 100644
--- a/modules/printbackends/file/Makefile.am
+++ b/modules/printbackends/file/Makefile.am
@@ -34,3 +34,5 @@ libprintbackend_file_la_LIBADD = \
 
 noinst_HEADERS =			\
 	gtkprintbackendfile.h
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am
index fbe10afb39..12b7fcefd6 100644
--- a/modules/printbackends/lpr/Makefile.am
+++ b/modules/printbackends/lpr/Makefile.am
@@ -30,3 +30,5 @@ noinst_HEADERS =			\
 
 libprintbackend_lpr_la_LDFLAGS =  -avoid-version -module $(no_undefined)
 libprintbackend_lpr_la_LIBADD = $(LDADDS)
+
+-include $(top_srcdir)/git.mk
diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am
index fd0839e826..20904fa517 100644
--- a/modules/printbackends/test/Makefile.am
+++ b/modules/printbackends/test/Makefile.am
@@ -33,3 +33,5 @@ libprintbackend_test_la_LIBADD = \
 
 noinst_HEADERS =			\
 	gtkprintbackendtest.h
+
+-include $(top_srcdir)/git.mk
diff --git a/perf/Makefile.am b/perf/Makefile.am
index 9fcf418951..934cf24da9 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -96,3 +96,5 @@ distclean-local:
 	if test $(srcdir) != .; then \
 	  rm -f $(MAINTAINERCLEANFILES); \
 	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 426dea30e9..924ac99842 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -341,3 +341,5 @@ EXTRA_DIST += 			\
 	file-chooser-test-dir/empty \
 	file-chooser-test-dir/text.txt
 
+
+-include $(top_srcdir)/git.mk