Use Behdad's brilliant git.mk to generate .gitignore files.

166 files changed, 502 insertions, 43 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ca64fde61f..0000000000
--- a/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-# for all subdirectories
-Makefile.in
-Makefile
-.libs
-.deps
-*.o
-*.lo
-*.la
-.*.swp
-
-# autofoo stuff here
-aclocal.m4
-autom4te.cache
-compile
-config.*
-configure
-depcomp
-gnome-doc-utils.make
-gtk-doc.make
-install-sh
-intltool-*.in
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-stamp-*
-
-# misc generated stuff
-*.conduit
-*.error
-*.schemas
-*.server
diff --git a/Makefile.am b/Makefile.am
index dfcd9e96e3..f341656a56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,3 +92,5 @@ cde-install: install dtappintegrate
 cde-uninstall: dtappunintegrate uninstall
 
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/a11y/Makefile.am b/a11y/Makefile.am
index a1b0f8c68b..0ccbe4390e 100644
--- a/a11y/Makefile.am
+++ b/a11y/Makefile.am
@@ -32,3 +32,5 @@ libevolution_a11y_la_LIBADD =			\
 	e-table/libgal-a11y-etable.la		\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(GNOME_PLATFORM_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/a11y/addressbook/Makefile.am b/a11y/addressbook/Makefile.am
index a4ccc5e056..81092822f4 100644
--- a/a11y/addressbook/Makefile.am
+++ b/a11y/addressbook/Makefile.am
@@ -31,3 +31,5 @@ libevolution_addressbook_a11y_la_LDFLAGS = $(NO_UNDEFINED)
 libevolution_addressbook_a11y_la_LIBADD =	\
 	$(WIN32_BOOTSTRAP_LIBS)			\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/a11y/calendar/Makefile.am b/a11y/calendar/Makefile.am
index b033eeff17..1bd53787c9 100644
--- a/a11y/calendar/Makefile.am
+++ b/a11y/calendar/Makefile.am
@@ -52,3 +52,5 @@ libevolution_calendar_a11y_la_LIBADD =			\
 	$(WIN32_BOOTSTRAP_LIBS)				\
         $(top_builddir)/a11y/libevolution-a11y.la	\
 	$(EVOLUTION_CALENDAR_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/a11y/e-table/Makefile.am b/a11y/e-table/Makefile.am
index f344d7b8c3..413a37d97e 100644
--- a/a11y/e-table/Makefile.am
+++ b/a11y/e-table/Makefile.am
@@ -40,3 +40,5 @@ libgal_a11y_etable_la_SOURCES =		\
 	gal-a11y-e-table-column-header.h	\
 	gal-a11y-e-table-item-factory.h		\
 	gal-a11y-e-table-factory.h
+
+-include $(top_srcdir)/git.mk
diff --git a/a11y/e-text/Makefile.am b/a11y/e-text/Makefile.am
index 8dc23f50cc..069284a617 100644
--- a/a11y/e-text/Makefile.am
+++ b/a11y/e-text/Makefile.am
@@ -11,3 +11,5 @@ libgal_a11y_etext_la_SOURCES =			\
 	gal-a11y-e-text.c			\
 	gal-a11y-e-text-factory.h		\
 	gal-a11y-e-text.h
+
+-include $(top_srcdir)/git.mk
diff --git a/a11y/widgets/Makefile.am b/a11y/widgets/Makefile.am
index 6fb8c80048..e822094500 100644
--- a/a11y/widgets/Makefile.am
+++ b/a11y/widgets/Makefile.am
@@ -32,3 +32,5 @@ libevolution_widgets_a11y_la_LIBADD =			\
         $(top_builddir)/a11y/libevolution-a11y.la	\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(E_WIDGETS_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 4ee593ecc6..ed0acc92d3 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -19,3 +19,5 @@ dist-hook:
 
 BUILT_SOURCES = $(error_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index adf09eb2f4..de18057981 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -36,3 +36,5 @@ EXTRA_DIST = \
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am
index a737452bd3..64bcd98356 100644
--- a/addressbook/gui/Makefile.am
+++ b/addressbook/gui/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = merging contact-editor contact-list-editor widgets component
+
+-include $(top_srcdir)/git.mk
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 5ebdac4eb4..b7870eddc7 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -126,3 +126,5 @@ evolution-addressbook.pure: evolution-addressbook
 	$(PLINK) $(evolution_addressbook_LDFLAGS) $(evolution_addressbook_OBJECTS) $(evolution_addressbook_LDADD) $(LIBS)
 
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 0b2ec028f5..53ed96fdee 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -40,3 +40,5 @@ glade_DATA = 				\
 	fullname.glade
 
 EXTRA_DIST=	$(glade_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index e0605d534a..8e287f3f3a 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -36,3 +36,5 @@ libecontactlisteditor_la_LIBADD =						\
 glade_DATA  = contact-list-editor.glade
 
 EXTRA_DIST = $(glade_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
index c899d751f4..ebec465d16 100644
--- a/addressbook/gui/merging/Makefile.am
+++ b/addressbook/gui/merging/Makefile.am
@@ -20,3 +20,5 @@ glade_DATA = eab-contact-duplicate-detected.glade				\
 
 EXTRA_DIST = 			\
 	 $(glade_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index e14f274f4e..c3a14d8aeb 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -68,3 +68,5 @@ etspec_DATA= e-addressbook-view.etspec
 EXTRA_DIST = 			\
 	$(etspec_DATA)		\
 	addresstypes.xml
+
+-include $(top_srcdir)/git.mk
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index d49b8b2d8e..2d5b0e50ca 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -23,3 +23,5 @@ libevolution_addressbook_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la 				\
 	$(top_builddir)/addressbook/util/libeabutil.la			\
 	$(IMPORTERS_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 8db1e7d889..c194f2705e 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -46,3 +46,5 @@ contact_print_style_editor_test_LDADD =	\
 
 EXTRA_DIST = 		\
 	$(ecps_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am
index f7df1cb753..bc0cfb808d 100644
--- a/addressbook/tools/Makefile.am
+++ b/addressbook/tools/Makefile.am
@@ -38,3 +38,5 @@ evolution-addressbook-clean: evolution-addressbook-clean.in Makefile
 	    -e 's?\@PERL\@?@PERL@?g' \
            < $(srcdir)/evolution-addressbook-clean.in > evolution-addressbook-clean.tmp \
           && mv evolution-addressbook-clean.tmp evolution-addressbook-clean
+
+-include $(top_srcdir)/git.mk
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
index 0f66310033..0966284060 100644
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -25,3 +25,5 @@ libeabutil_la_LIBADD =					\
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/art/Makefile.am b/art/Makefile.am
index 2a22e6bf8b..1404f37491 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -12,3 +12,5 @@ EXTRA_DIST = 				\
 	empty.xpm			\
 	jump.xpm			\
 	$(images_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index f9a54aff06..87057a4d3a 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -22,3 +22,5 @@ dist-hook:
 BUILT_SOURCES = $(error_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/calendar/common/Makefile.am b/calendar/common/Makefile.am
index ad0b1ca2cf..b8c5d181fb 100644
--- a/calendar/common/Makefile.am
+++ b/calendar/common/Makefile.am
@@ -13,3 +13,5 @@ INCLUDES =						\
 libevolution_calendarprivate_la_SOURCES =	\
 	authentication.c			\
 	authentication.h
+
+-include $(top_srcdir)/git.mk
diff --git a/calendar/conduits/Makefile.am b/calendar/conduits/Makefile.am
index a53bd426d5..430168130f 100644
--- a/calendar/conduits/Makefile.am
+++ b/calendar/conduits/Makefile.am
@@ -1,3 +1,5 @@
 SUBDIRS = common calendar memo todo
 
 
+
+-include $(top_srcdir)/git.mk
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index cb431e9619..4a957633e7 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -39,3 +39,5 @@ EXTRA_DIST = \
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/calendar/conduits/common/Makefile.am b/calendar/conduits/common/Makefile.am
index 2db1df5fca..59e4b5aa1f 100644
--- a/calendar/conduits/common/Makefile.am
+++ b/calendar/conduits/common/Makefile.am
@@ -22,3 +22,5 @@ libecalendar_common_conduit_la_LIBADD = 				\
 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
 
 
+
+-include $(top_srcdir)/git.mk
diff --git a/calendar/conduits/memo/Makefile.am b/calendar/conduits/memo/Makefile.am
index 791af9268f..01a04579f7 100644
--- a/calendar/conduits/memo/Makefile.am
+++ b/calendar/conduits/memo/Makefile.am
@@ -39,3 +39,5 @@ EXTRA_DIST = \
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index bf3a07b23f..5141393c91 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -39,3 +39,5 @@ EXTRA_DIST = \
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index b5dab7aeac..509aff1596 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -280,3 +280,5 @@ endif
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index cd1b638fb6..76c2783fc6 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -67,3 +67,5 @@ CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index c6d61101a8..8e7a1bf916 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -102,3 +102,5 @@ dist-hook:
 
 EXTRA_DIST =			\
 	$(glade_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/calendar/idl/Makefile.am b/calendar/idl/Makefile.am
index dd866141fc..1d393a8f9d 100644
--- a/calendar/idl/Makefile.am
+++ b/calendar/idl/Makefile.am
@@ -3,3 +3,5 @@ idl_DATA = 			\
 
 EXTRA_DIST =		\
 	$(idl_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index d45ad07e41..16a3fee232 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -18,3 +18,5 @@ libevolution_calendar_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la 				\
 	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
 	$(EVOLUTION_CALENDAR_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 5b777f5525..578805cc06 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -62,3 +62,5 @@ CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/Makefile.am b/data/Makefile.am
index f94a1e0bb9..d087e62f38 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -81,3 +81,5 @@ EXTRA_DIST =					\
 	$(noinst_MANS)
 
 
+
+-include $(top_srcdir)/git.mk
diff --git a/data/cde_app_root/Makefile.am b/data/cde_app_root/Makefile.am
index 56b759c9eb..98eb7c244b 100644
--- a/data/cde_app_root/Makefile.am
+++ b/data/cde_app_root/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS = dt
\ No newline at end of file
+SUBDIRS = dt
+-include $(top_srcdir)/git.mk
diff --git a/data/cde_app_root/dt/Makefile.am b/data/cde_app_root/dt/Makefile.am
index 8c9d98022f..b8aa411ebb 100644
--- a/data/cde_app_root/dt/Makefile.am
+++ b/data/cde_app_root/dt/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS = appconfig
\ No newline at end of file
+SUBDIRS = appconfig
+-include $(top_srcdir)/git.mk
diff --git a/data/cde_app_root/dt/appconfig/Makefile.am b/data/cde_app_root/dt/appconfig/Makefile.am
index 3bc34b8d0b..f839980ff8 100644
--- a/data/cde_app_root/dt/appconfig/Makefile.am
+++ b/data/cde_app_root/dt/appconfig/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS = appmanager icons types
\ No newline at end of file
+SUBDIRS = appmanager icons types
+-include $(top_srcdir)/git.mk
diff --git a/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.am b/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.am
index ea9b837cf0..95de369f19 100644
--- a/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.am
+++ b/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS = Ximian
\ No newline at end of file
+SUBDIRS = Ximian
+-include $(top_srcdir)/git.mk
diff --git a/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am b/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am
index 0d3ff391ec..094ed3fd24 100644
--- a/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am
+++ b/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am
@@ -4,3 +4,5 @@ if HAVE_DTAPPINTEGRATE
 cdeappmanagerdir = $(privdatadir)/cde_app_root/dt/appconfig/appmanager/C/Ximian
 cdeappmanager_SCRIPTS = Evolution
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/data/cde_app_root/dt/appconfig/appmanager/Makefile.am b/data/cde_app_root/dt/appconfig/appmanager/Makefile.am
index 9f660cf34e..29295aeb2b 100644
--- a/data/cde_app_root/dt/appconfig/appmanager/Makefile.am
+++ b/data/cde_app_root/dt/appconfig/appmanager/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS = C
\ No newline at end of file
+SUBDIRS = C
+-include $(top_srcdir)/git.mk
diff --git a/data/cde_app_root/dt/appconfig/icons/C/Makefile.am b/data/cde_app_root/dt/appconfig/icons/C/Makefile.am
index 5fa1af0309..bf9df89c42 100644
--- a/data/cde_app_root/dt/appconfig/icons/C/Makefile.am
+++ b/data/cde_app_root/dt/appconfig/icons/C/Makefile.am
@@ -13,3 +13,5 @@ cdeiconsdir = $(privdatadir)/cde_app_root/dt/appconfig/icons/C
 cdeicons_DATA = $(ICONS)
 endif
 
+
+-include $(top_srcdir)/git.mk
diff --git a/data/cde_app_root/dt/appconfig/icons/Makefile.am b/data/cde_app_root/dt/appconfig/icons/Makefile.am
index 9f660cf34e..29295aeb2b 100644
--- a/data/cde_app_root/dt/appconfig/icons/Makefile.am
+++ b/data/cde_app_root/dt/appconfig/icons/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS = C
\ No newline at end of file
+SUBDIRS = C
+-include $(top_srcdir)/git.mk
diff --git a/data/cde_app_root/dt/appconfig/types/C/Makefile.am b/data/cde_app_root/dt/appconfig/types/C/Makefile.am
index 3cda99060e..ca714075fa 100644
--- a/data/cde_app_root/dt/appconfig/types/C/Makefile.am
+++ b/data/cde_app_root/dt/appconfig/types/C/Makefile.am
@@ -4,3 +4,5 @@ if HAVE_DTAPPINTEGRATE
 cdetypesdir = $(privdatadir)/cde_app_root/dt/appconfig/types/C
 cdetypes_DATA = Ximian.dt
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/data/cde_app_root/dt/appconfig/types/Makefile.am b/data/cde_app_root/dt/appconfig/types/Makefile.am
index 42ffacc264..ec240797c0 100644
--- a/data/cde_app_root/dt/appconfig/types/Makefile.am
+++ b/data/cde_app_root/dt/appconfig/types/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = C
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 2035d151bb..23f4d9de09 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -167,3 +167,5 @@ uninstall-icons:
 install-data-local: install-icons update-icon-cache
 
 uninstall-local: uninstall-icons update-icon-cache
+
+-include $(top_srcdir)/git.mk
diff --git a/devel-docs/Makefile.am b/devel-docs/Makefile.am
index 74a5ff5b60..2d3b641afc 100644
--- a/devel-docs/Makefile.am
+++ b/devel-docs/Makefile.am
@@ -1,3 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS=camel
+
+-include $(top_srcdir)/git.mk
diff --git a/devel-docs/camel/Makefile.am b/devel-docs/camel/Makefile.am
index 1c76a6c05e..806a6b4be5 100644
--- a/devel-docs/camel/Makefile.am
+++ b/devel-docs/camel/Makefile.am
@@ -99,3 +99,5 @@ dist-hook:
 
 
 .PHONY : html sgml templates scan
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 965492689a..486263dbd4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1 +1,3 @@
 EXTRA_DIST = ChangeLog.pre-1-4
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/devel/Makefile.am b/doc/devel/Makefile.am
index 7940af73f5..2406f0af02 100644
--- a/doc/devel/Makefile.am
+++ b/doc/devel/Makefile.am
@@ -177,3 +177,5 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 #	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 
 .PHONY : dist-hook-local
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/devel/importer/Makefile.am b/doc/devel/importer/Makefile.am
index 8b5343677a..a186bc770f 100644
--- a/doc/devel/importer/Makefile.am
+++ b/doc/devel/importer/Makefile.am
@@ -193,3 +193,5 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 .PHONY : dist-hook-local
 
 
+
+-include $(top_srcdir)/git.mk
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index e25840087a..367a9c79d7 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -171,3 +171,5 @@ CLEANFILES    = $(BUILT_SOURCES)
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/filter/Makefile.am b/filter/Makefile.am
index 7dc0353ded..8eee6bd5bd 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -57,3 +57,5 @@ errordir = $(privdatadir)/errors
 
 BUILT_SOURCES = $(error_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000000..739ba92a76
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,178 @@
+# 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 $@; \
+	GTKDOCGITIGNOREFILES=; \
+	test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \
+	GTKDOCGITIGNOREFILES=" \
+		$(DOC_MODULE)-decl-list.txt \
+		$(DOC_MODULE)-decl.txt \
+		tmpl/$(DOC_MODULE)-unused.sgml \
+		tmpl/*.bak \
+		xml html \
+		"; \
+	GNOMEDOCUTILSGITIGNOREFILES=; \
+	test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \
+	GNOMEDOCUTILSGITIGNOREFILES=" \
+		$(_DOC_C_DOCS) \
+		$(_DOC_LC_DOCS) \
+		$(_DOC_OMF_ALL) \
+		$(_DOC_DSK_ALL) \
+		$(_DOC_HTML_ALL) \
+		$(_DOC_POFILES) \
+		*/.xml2po.mo \
+		*/*.omf.out \
+		"; \
+	INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \
+	INTLTOOLGITIGNOREFILES=" \
+		po/Makefile.in.in \
+		po/Makefile.in \
+		po/Makefile \
+		po/*.gmo \
+		po/*.mo \
+		po/POTFILES \
+		po/stamp-it \
+		po/.intltool-merge-cache \
+		intltool-extract.in \
+		intltool-merge.in \
+		intltool-update.in \
+		"; \
+	AUTOCONFGITIGNOREFILES=; test -f $(srcdir)/configure && \
+	AUTOCONFGITIGNOREFILES=" \
+		autom4te.cache \
+		configure \
+		config.h \
+		stamp-h1 \
+		libtool \
+		config.lt \
+		"; \
+	for x in \
+		.gitignore \
+		$$GTKDOCGITIGNOREFILES \
+		$$GNOMEDOCUTILSGITIGNOREFILES \
+		$$INTLTOOLGITIGNOREFILES \
+		$$AUTOCONFGITIGNOREFILES \
+		$(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
+gitignore-recurse:
+	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
+		list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+		  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
+		done; \
+	fi;
+maintainer-clean: gitignore-clean
+gitignore-clean:
+	-rm -f $(srcdir)/.gitignore
+.PHONY: gitignore-clean gitignore-recurse
+
diff --git a/help/Makefile.am b/help/Makefile.am
index 6b2f368e5e..7654cee5f7 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -108,3 +108,5 @@ DOC_LINGUAS = cs de el en_GB es eu fr oc ru sv mk
 
 check:
 	xmllint --valid --noout $(top_srcdir)/help/C/evolution.xml
+
+-include $(top_srcdir)/git.mk
diff --git a/help/no/Makefile.am b/help/no/Makefile.am
index 41986fd661..2ab9d5f056 100644
--- a/help/no/Makefile.am
+++ b/help/no/Makefile.am
@@ -34,3 +34,5 @@ include $(top_srcdir)/help/sgmldocs.make
 dist-hook: app-dist-hook
 
 EXTRA_DIST = ChangeLog.pre-1-4
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/C/Makefile.am b/help/quickref/C/Makefile.am
index c7b02ca607..1014bfb7c3 100644
--- a/help/quickref/C/Makefile.am
+++ b/help/quickref/C/Makefile.am
@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
 EXTRA_DIST = 			\
 	$(HELP_FILES)		\
 	quickref.tex
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/Makefile.am b/help/quickref/Makefile.am
index cbc9f7d867..02d5280756 100644
--- a/help/quickref/Makefile.am
+++ b/help/quickref/Makefile.am
@@ -1,3 +1,5 @@
 SUBDIRS = C ca cs de es fr hu it oc pl pt sv sq
 
 EXTRA_DIST = evolution-logo.eps
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/ca/Makefile.am b/help/quickref/ca/Makefile.am
index ef5536ad6b..ee261c9414 100644
--- a/help/quickref/ca/Makefile.am
+++ b/help/quickref/ca/Makefile.am
@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
 EXTRA_DIST = 			\
 	$(HELP_FILES)		\
 	quickref.tex
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/cs/Makefile.am b/help/quickref/cs/Makefile.am
index 0575caee67..ac476a6034 100644
--- a/help/quickref/cs/Makefile.am
+++ b/help/quickref/cs/Makefile.am
@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
 EXTRA_DIST = 			\
 	$(HELP_FILES)		\
 	quickref.tex
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/de/Makefile.am b/help/quickref/de/Makefile.am
index b0d62824f0..ad4ba8ff60 100644
--- a/help/quickref/de/Makefile.am
+++ b/help/quickref/de/Makefile.am
@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
 EXTRA_DIST = 			\
 	$(HELP_FILES)		\
 	quickref.tex
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/es/Makefile.am b/help/quickref/es/Makefile.am
index d4316f6821..9add3ae28b 100644
--- a/help/quickref/es/Makefile.am
+++ b/help/quickref/es/Makefile.am
@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
 EXTRA_DIST = 			\
 	$(HELP_FILES)		\
 	quickref.tex
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/fr/Makefile.am b/help/quickref/fr/Makefile.am
index 08eab5a722..46f8bdd9c6 100644
--- a/help/quickref/fr/Makefile.am
+++ b/help/quickref/fr/Makefile.am
@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
 EXTRA_DIST = 			\
 	$(HELP_FILES)		\
 	quickref.tex
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/hu/Makefile.am b/help/quickref/hu/Makefile.am
index 9b2427b0cc..e8720963af 100644
--- a/help/quickref/hu/Makefile.am
+++ b/help/quickref/hu/Makefile.am
@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
 EXTRA_DIST = 			\
 	$(HELP_FILES)		\
 	quickref.tex
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/it/Makefile.am b/help/quickref/it/Makefile.am
index a61e19066e..305a370de7 100644
--- a/help/quickref/it/Makefile.am
+++ b/help/quickref/it/Makefile.am
@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
 EXTRA_DIST = 			\
 	$(HELP_FILES)		\
 	quickref.tex
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/oc/Makefile.am b/help/quickref/oc/Makefile.am
index 08eab5a722..46f8bdd9c6 100644
--- a/help/quickref/oc/Makefile.am
+++ b/help/quickref/oc/Makefile.am
@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
 EXTRA_DIST = 			\
 	$(HELP_FILES)		\
 	quickref.tex
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/pl/Makefile.am b/help/quickref/pl/Makefile.am
index aea3010e2e..f825d4d021 100644
--- a/help/quickref/pl/Makefile.am
+++ b/help/quickref/pl/Makefile.am
@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
 EXTRA_DIST = 			\
 	$(HELP_FILES)		\
 	quickref.tex
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/pt/Makefile.am b/help/quickref/pt/Makefile.am
index 446640dce9..d9d0db99f4 100644
--- a/help/quickref/pt/Makefile.am
+++ b/help/quickref/pt/Makefile.am
@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
 EXTRA_DIST = 			\
 	$(HELP_FILES)		\
 	quickref.tex
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/sq/Makefile.am b/help/quickref/sq/Makefile.am
index ae0783eabe..089eea9211 100644
--- a/help/quickref/sq/Makefile.am
+++ b/help/quickref/sq/Makefile.am
@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
 EXTRA_DIST = 			\
 	$(HELP_FILES)		\
 	quickref.tex
+
+-include $(top_srcdir)/git.mk
diff --git a/help/quickref/sv/Makefile.am b/help/quickref/sv/Makefile.am
index 8e0b72a415..b1ec92e933 100644
--- a/help/quickref/sv/Makefile.am
+++ b/help/quickref/sv/Makefile.am
@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
 EXTRA_DIST = 			\
 	$(HELP_FILES)		\
 	quickref.tex
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 2a567ec042..96ed893007 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -311,3 +311,5 @@ BUILT_SOURCES = $(MAIL_IDL_GENERATED) $(server_DATA) $(error_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
 DISTCLEANFILES = $(schema_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/C/Makefile.am b/mail/default/C/Makefile.am
index fab3401384..b248d5c5cb 100644
--- a/mail/default/C/Makefile.am
+++ b/mail/default/C/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/Makefile.am b/mail/default/Makefile.am
index 452431d4d1..6efa2e5e2f 100644
--- a/mail/default/Makefile.am
+++ b/mail/default/Makefile.am
@@ -2,3 +2,5 @@
 SUBDIRS=C ca cs zh_CN de es fi fr hu it ja ko lt mk nl pl pt sr sr@latin sv
 
 
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/ca/Makefile.am b/mail/default/ca/Makefile.am
index 3c004f99e1..2da49b656f 100644
--- a/mail/default/ca/Makefile.am
+++ b/mail/default/ca/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/cs/Makefile.am b/mail/default/cs/Makefile.am
index 008ec2588d..df282cfd51 100644
--- a/mail/default/cs/Makefile.am
+++ b/mail/default/cs/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/de/Makefile.am b/mail/default/de/Makefile.am
index 52d46cad20..cf5298a5c6 100644
--- a/mail/default/de/Makefile.am
+++ b/mail/default/de/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/es/Makefile.am b/mail/default/es/Makefile.am
index 57ba7d3bec..f6180ce16b 100644
--- a/mail/default/es/Makefile.am
+++ b/mail/default/es/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/fi/Makefile.am b/mail/default/fi/Makefile.am
index 357d3cb4d8..54baea2ab7 100644
--- a/mail/default/fi/Makefile.am
+++ b/mail/default/fi/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/fr/Makefile.am b/mail/default/fr/Makefile.am
index 7b95be9e52..8b4a3998aa 100644
--- a/mail/default/fr/Makefile.am
+++ b/mail/default/fr/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/hu/Makefile.am b/mail/default/hu/Makefile.am
index b10c23df90..528299adfe 100644
--- a/mail/default/hu/Makefile.am
+++ b/mail/default/hu/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/it/Makefile.am b/mail/default/it/Makefile.am
index f1d367f64a..49304da64f 100644
--- a/mail/default/it/Makefile.am
+++ b/mail/default/it/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/ja/Makefile.am b/mail/default/ja/Makefile.am
index 317cf5c79e..d194b83cc5 100644
--- a/mail/default/ja/Makefile.am
+++ b/mail/default/ja/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/ko/Makefile.am b/mail/default/ko/Makefile.am
index f46c1a3d17..00c021e2aa 100644
--- a/mail/default/ko/Makefile.am
+++ b/mail/default/ko/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/lt/Makefile.am b/mail/default/lt/Makefile.am
index 590d082302..a6ebad28c2 100644
--- a/mail/default/lt/Makefile.am
+++ b/mail/default/lt/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/mk/Makefile.am b/mail/default/mk/Makefile.am
index 261ce30e4e..cc84776dba 100644
--- a/mail/default/mk/Makefile.am
+++ b/mail/default/mk/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/nl/Makefile.am b/mail/default/nl/Makefile.am
index 7734e479f0..18e61ef073 100644
--- a/mail/default/nl/Makefile.am
+++ b/mail/default/nl/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/pl/Makefile.am b/mail/default/pl/Makefile.am
index 91551f884c..505dc2fb3a 100644
--- a/mail/default/pl/Makefile.am
+++ b/mail/default/pl/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/pt/Makefile.am b/mail/default/pt/Makefile.am
index af30930b95..77798eb386 100644
--- a/mail/default/pt/Makefile.am
+++ b/mail/default/pt/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/sr/Makefile.am b/mail/default/sr/Makefile.am
index 7941835475..95f634d270 100644
--- a/mail/default/sr/Makefile.am
+++ b/mail/default/sr/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/sr@latin/Makefile.am b/mail/default/sr@latin/Makefile.am
index c8af647ecd..8ecb807a43 100644
--- a/mail/default/sr@latin/Makefile.am
+++ b/mail/default/sr@latin/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/sv/Makefile.am b/mail/default/sv/Makefile.am
index 629f9a1be4..94b4e31d52 100644
--- a/mail/default/sv/Makefile.am
+++ b/mail/default/sv/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/default/zh_CN/Makefile.am b/mail/default/zh_CN/Makefile.am
index a68e6401f9..775f00659e 100644
--- a/mail/default/zh_CN/Makefile.am
+++ b/mail/default/zh_CN/Makefile.am
@@ -5,3 +5,5 @@ defaultlocal_DATA = \
 	Inbox
 
 EXTRA_DIST = $(defaultlocal_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index ea60c10ff4..25b5648949 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -27,3 +27,5 @@ libevolution_mail_importers_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/filter/libfilter.la			\
 	$(IMPORTERS_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/.gitignore b/plugins/.gitignore
deleted file mode 100644
index f92a4cec77..0000000000
--- a/plugins/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.eplug
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index d78cb63d83..88edda37f0 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = $(plugins_enabled)
 DIST_SUBDIRS = $(all_plugins_base) $(all_plugins_standard) $(all_plugins_experimental) profiler python
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/addressbook-file/Makefile.am b/plugins/addressbook-file/Makefile.am
index 5b6216bb77..b195514b66 100644
--- a/plugins/addressbook-file/Makefile.am
+++ b/plugins/addressbook-file/Makefile.am
@@ -18,3 +18,5 @@ EXTRA_DIST = org-gnome-addressbook-file.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index d6e9fb8809..c6ce86e17e 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -63,3 +63,5 @@ BUILT_SOURCES = org-gnome-evolution-attachment-reminder.eplug \
 CLEANFILES = $(BUILT_SOURCES)
 
 DISTCLEANFILES = $(schema_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index 0780bf0bfc..73e0b988d6 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/Makefile.am
@@ -18,3 +18,5 @@ EXTRA_DIST = org-gnome-audio-inline.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am
index f93a3c7460..ceb6fdb41c 100644
--- a/plugins/backup-restore/Makefile.am
+++ b/plugins/backup-restore/Makefile.am
@@ -40,3 +40,5 @@ EXTRA_DIST = 					\
 BUILT_SOURCES = org-gnome-backup-restore.eplug \
 		org-gnome-backup-restore.error
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index 1f1ddfea46..1987a32efa 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -19,3 +19,5 @@ EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am
index 24eb99fdd5..5dc0cc626c 100644
--- a/plugins/bogo-junk-plugin/Makefile.am
+++ b/plugins/bogo-junk-plugin/Makefile.am
@@ -38,3 +38,5 @@ EXTRA_DIST = \
 	org-gnome-bogo-junk-plugin.eplug.xml	\
 	$(schema_in_files)
 
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am
index d812af7540..cb18c5b0be 100644
--- a/plugins/caldav/Makefile.am
+++ b/plugins/caldav/Makefile.am
@@ -22,3 +22,5 @@ EXTRA_DIST =				\
 	org-gnome-evolution-caldav.eplug.xml
 
 CLEANFILES = org-gnome-evolution-caldav.eplug
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/calendar-file/Makefile.am b/plugins/calendar-file/Makefile.am
index 9f83dd8b48..7d40192c6f 100644
--- a/plugins/calendar-file/Makefile.am
+++ b/plugins/calendar-file/Makefile.am
@@ -18,3 +18,5 @@ EXTRA_DIST = org-gnome-calendar-file.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am
index 69d6ab50a6..4edd28c8a0 100644
--- a/plugins/calendar-http/Makefile.am
+++ b/plugins/calendar-http/Makefile.am
@@ -18,3 +18,5 @@ EXTRA_DIST = org-gnome-calendar-http.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am
index 2e2be150e3..0e43fa1717 100644
--- a/plugins/calendar-weather/Makefile.am
+++ b/plugins/calendar-weather/Makefile.am
@@ -36,3 +36,5 @@ EXTRA_DIST =					\
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/copy-tool/Makefile.am b/plugins/copy-tool/Makefile.am
index d0011ab0fa..5f9e3bb463 100644
--- a/plugins/copy-tool/Makefile.am
+++ b/plugins/copy-tool/Makefile.am
@@ -16,3 +16,5 @@ EXTRA_DIST = org-gnome-copy-tool.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am
index 45f4e29c2b..78766909c5 100644
--- a/plugins/default-mailer/Makefile.am
+++ b/plugins/default-mailer/Makefile.am
@@ -54,3 +54,5 @@ BUILT_SOURCES = org-gnome-default-mailer.eplug	\
 CLEANFILES = $(BUILT_SOURCES)
 
 DISTCLEANFILES = $(schema_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am
index 94f33c7ade..235f615251 100644
--- a/plugins/default-source/Makefile.am
+++ b/plugins/default-source/Makefile.am
@@ -21,3 +21,5 @@ EXTRA_DIST = org-gnome-default-source.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am
index ccc9c787f8..19539907fa 100644
--- a/plugins/email-custom-header/Makefile.am
+++ b/plugins/email-custom-header/Makefile.am
@@ -70,3 +70,5 @@ BUILT_SOURCES = 				\
 
 CLEANFILES = $(BUILT_SOURCES)
 DISTCLEANFILES = $(schema_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/exchange-operations/Makefile.am b/plugins/exchange-operations/Makefile.am
index 38d342452b..2e4a825771 100644
--- a/plugins/exchange-operations/Makefile.am
+++ b/plugins/exchange-operations/Makefile.am
@@ -86,3 +86,5 @@ EXTRA_DIST = 							\
 BUILT_SOURCES = $(error_DATA) org-gnome-exchange-operations.eplug 
 
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 36cba20344..0a39bc41e4 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -61,3 +61,5 @@ BUILT_SOURCES = org-gnome-external-editor.eplug \
 CLEANFILES = $(BUILT_SOURCES)
 
 DISTCLEANFILES = $(schema_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am
index a29c6585ea..2b6bfdb7be 100644
--- a/plugins/face/Makefile.am
+++ b/plugins/face/Makefile.am
@@ -42,3 +42,5 @@ BUILT_SOURCES = 				\
 	org-gnome-face.error
 
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/folder-unsubscribe/Makefile.am b/plugins/folder-unsubscribe/Makefile.am
index 2c11596c51..b3f1ba12bf 100644
--- a/plugins/folder-unsubscribe/Makefile.am
+++ b/plugins/folder-unsubscribe/Makefile.am
@@ -14,3 +14,5 @@ liborg_gnome_mail_folder_unsubscribe_la_LIBADD =	\
 	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-mail-folder-unsubscribe.eplug.xml
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am
index 0d39004593..d8153a9c5b 100644
--- a/plugins/google-account-setup/Makefile.am
+++ b/plugins/google-account-setup/Makefile.am
@@ -25,3 +25,5 @@ EXTRA_DIST =				\
 	org-gnome-evolution-google.eplug.xml
 
 CLEANFILES = org-gnome-evolution-google.eplug
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/groupwise-account-setup/Makefile.am b/plugins/groupwise-account-setup/Makefile.am
index ac0f18f590..9770782d69 100644
--- a/plugins/groupwise-account-setup/Makefile.am
+++ b/plugins/groupwise-account-setup/Makefile.am
@@ -30,3 +30,5 @@ EXTRA_DIST = org-gnome-gw-account-setup.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index eb8c7aeba2..3b0a83021d 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -82,3 +82,5 @@ EXTRA_DIST =						\
 	org-gnome-mail-retract.error.xml
 
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/hula-account-setup/Makefile.am b/plugins/hula-account-setup/Makefile.am
index ce6d3b9bd6..205a3a7d30 100644
--- a/plugins/hula-account-setup/Makefile.am
+++ b/plugins/hula-account-setup/Makefile.am
@@ -27,3 +27,5 @@ EXTRA_DIST = org-gnome-evolution-hula-account-setup.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am
index d84f600702..3b73e2741d 100644
--- a/plugins/imap-features/Makefile.am
+++ b/plugins/imap-features/Makefile.am
@@ -38,3 +38,5 @@ EXTRA_DIST =						\
 	org-gnome-imap-features.eplug.xml		
 
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/ipod-sync/Makefile.am b/plugins/ipod-sync/Makefile.am
index 51acd0db9f..570683442e 100644
--- a/plugins/ipod-sync/Makefile.am
+++ b/plugins/ipod-sync/Makefile.am
@@ -25,3 +25,5 @@ EXTRA_DIST = org-gnome-ipod-sync-evolution.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am
index 32cc7d2f33..cbbc061833 100644
--- a/plugins/itip-formatter/Makefile.am
+++ b/plugins/itip-formatter/Makefile.am
@@ -29,3 +29,5 @@ EXTRA_DIST = \
 	org-gnome-itip-formatter.error.xml
 
 
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/mail-account-disable/Makefile.am b/plugins/mail-account-disable/Makefile.am
index 7ec8a1124e..5616f273ea 100644
--- a/plugins/mail-account-disable/Makefile.am
+++ b/plugins/mail-account-disable/Makefile.am
@@ -19,3 +19,5 @@ EXTRA_DIST = org-gnome-mail-account-disable.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 8915fe92ad..4228a90be5 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -67,3 +67,5 @@ DISTCLEANFILES = $(schema_DATA)
 EXTRA_DIST = 					\
 	org-gnome-mail-notification.eplug.xml	\
 	$(schema_in_files)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index 42e1e6fb65..9a3749d676 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -22,3 +22,5 @@ EXTRA_DIST = org-gnome-mail-to-task.eplug.xml \
 
 BUILT_SOURCES = org-gnome-mail-to-task.eplug
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am
index 7d6560d716..dffd4f1d44 100644
--- a/plugins/mailing-list-actions/Makefile.am
+++ b/plugins/mailing-list-actions/Makefile.am
@@ -28,3 +28,5 @@ EXTRA_DIST = 						\
 	org-gnome-mailing-list-actions.eplug.xml	\
 	org-gnome-mailing-list-actions.error.xml	\
 	org-gnome-mailing-list-actions.xml
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am
index 756e945d00..352c2a0fab 100644
--- a/plugins/mark-all-read/Makefile.am
+++ b/plugins/mark-all-read/Makefile.am
@@ -19,3 +19,5 @@ EXTRA_DIST = org-gnome-mark-all-read.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/mono/Makefile.am b/plugins/mono/Makefile.am
index aa20b100e3..f98e8be2ab 100644
--- a/plugins/mono/Makefile.am
+++ b/plugins/mono/Makefile.am
@@ -18,3 +18,5 @@ EXTRA_DIST = org-gnome-evolution-mono.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/plugin-manager/Makefile.am b/plugins/plugin-manager/Makefile.am
index f9d6642521..645581e11d 100644
--- a/plugins/plugin-manager/Makefile.am
+++ b/plugins/plugin-manager/Makefile.am
@@ -20,3 +20,5 @@ EXTRA_DIST =						\
 BUILT_SOURCES = org-gnome-plugin-manager.eplug
 
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am
index ec597e4d4c..37a49a38e7 100644
--- a/plugins/prefer-plain/Makefile.am
+++ b/plugins/prefer-plain/Makefile.am
@@ -17,3 +17,5 @@ EXTRA_DIST = org-gnome-prefer-plain.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/profiler/Makefile.am b/plugins/profiler/Makefile.am
index e39b4f6642..037219c5ed 100644
--- a/plugins/profiler/Makefile.am
+++ b/plugins/profiler/Makefile.am
@@ -16,3 +16,5 @@ EXTRA_DIST = org-gnome-evolution-profiler.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 9f3061e241..0bb5fe43e1 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -33,3 +33,5 @@ BUILT_SOURCES = org-gnome-pst-import.eplug
 
 CLEANFILES = $(BUILT_SOURCES)
 
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am
index 954333c11c..3c794393b2 100644
--- a/plugins/publish-calendar/Makefile.am
+++ b/plugins/publish-calendar/Makefile.am
@@ -40,3 +40,5 @@ EXTRA_DIST =					\
 	$(glade_DATA)
 
 CLEANFILES = org-gnome-publish-calendar.eplug
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/python/Makefile.am b/plugins/python/Makefile.am
index 7a65c4586a..77441e0e9b 100644
--- a/plugins/python/Makefile.am
+++ b/plugins/python/Makefile.am
@@ -26,3 +26,5 @@ EXTRA_DIST = org-gnome-evolution-python.eplug.xml	\
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/python/example/Makefile.am b/plugins/python/example/Makefile.am
index 5defe418c6..b3530d841c 100644
--- a/plugins/python/example/Makefile.am
+++ b/plugins/python/example/Makefile.am
@@ -28,3 +28,5 @@ EXTRA_DIST =						\
 	org-gnome-hello-python.eplug.xml		
 
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/sa-junk-plugin/Makefile.am b/plugins/sa-junk-plugin/Makefile.am
index 3af1f721c7..4e44fa5c3b 100644
--- a/plugins/sa-junk-plugin/Makefile.am
+++ b/plugins/sa-junk-plugin/Makefile.am
@@ -19,3 +19,5 @@ EXTRA_DIST = \
 	org-gnome-sa-junk-plugin.eplug.xml
 
 
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am
index 461bf0492d..6894e6b21e 100644
--- a/plugins/save-calendar/Makefile.am
+++ b/plugins/save-calendar/Makefile.am
@@ -23,3 +23,5 @@ EXTRA_DIST = org-gnome-save-calendar.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/select-one-source/Makefile.am b/plugins/select-one-source/Makefile.am
index 7bd40ef4f7..8c872f23a5 100644
--- a/plugins/select-one-source/Makefile.am
+++ b/plugins/select-one-source/Makefile.am
@@ -16,3 +16,5 @@ EXTRA_DIST = org-gnome-select-one-source.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am
index a8e4191ebf..fea7f7232f 100644
--- a/plugins/startup-wizard/Makefile.am
+++ b/plugins/startup-wizard/Makefile.am
@@ -27,3 +27,5 @@ EXTRA_DIST = org-gnome-evolution-startup-wizard.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/subject-thread/Makefile.am b/plugins/subject-thread/Makefile.am
index 0ff0fc49a5..751e0eee15 100644
--- a/plugins/subject-thread/Makefile.am
+++ b/plugins/subject-thread/Makefile.am
@@ -16,3 +16,5 @@ EXTRA_DIST = org-gnome-subject-thread.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am
index 5a36917fa2..6b01e15767 100644
--- a/plugins/templates/Makefile.am
+++ b/plugins/templates/Makefile.am
@@ -56,3 +56,5 @@ BUILT_SOURCES = org-gnome-templates.eplug
 CLEANFILES = $(BUILT_SOURCES)
 
 DISTCLEANFILES = $(schema_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index 809d1ed1f4..6ea2ce1f3e 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -28,3 +28,5 @@ EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am
index a979ed08e5..c143b8f667 100644
--- a/plugins/webdav-account-setup/Makefile.am
+++ b/plugins/webdav-account-setup/Makefile.am
@@ -21,3 +21,5 @@ EXTRA_DIST = \
 	org-gnome-evolution-webdav.eplug.xml
 
 CLEANFILES = org-gnome-evolution-webdav.eplug
+
+-include $(top_srcdir)/git.mk
diff --git a/po/.gitignore b/po/.gitignore
deleted file mode 100644
index 98ea2e172c..0000000000
--- a/po/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-POTFILES
-*.gmo
-.intltool-merge-cache
-Makefile.in.in
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 177d9e80be..8a7df1b1ca 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -255,3 +255,5 @@ dist-hook:
 
 noinst_SCRIPTS = evolution-nognome
 
+
+-include $(top_srcdir)/git.mk
diff --git a/shell/importer/Makefile.am b/shell/importer/Makefile.am
index 094df408d1..1aa5d5b484 100644
--- a/shell/importer/Makefile.am
+++ b/shell/importer/Makefile.am
@@ -64,3 +64,5 @@ CLEANFILES = $(BUILT_SOURCES)
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
+
+-include $(top_srcdir)/git.mk
diff --git a/shell/test/Makefile.am b/shell/test/Makefile.am
index 266685064c..74bd509958 100644
--- a/shell/test/Makefile.am
+++ b/shell/test/Makefile.am
@@ -33,3 +33,5 @@ EXTRA_DIST =					\
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILD_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/smime/Makefile.am b/smime/Makefile.am
index bc03fcd4a3..a358fdf7ea 100644
--- a/smime/Makefile.am
+++ b/smime/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = lib gui
+
+-include $(top_srcdir)/git.mk
diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index 44667d88a2..02bfd859f9 100644
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -45,3 +45,5 @@ glade_DATA = smime-ui.glade
 
 EXTRA_DIST =			\
 	$(glade_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index 52ad228baa..c43da4ea10 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -32,3 +32,5 @@ libessmime_la_LIBADD =				\
 	$(CERT_UI_LIBS)
 
 libessmime_la_LDFLAGS = $(NO_UNDEFINED)
+
+-include $(top_srcdir)/git.mk
diff --git a/smime/tests/Makefile.am b/smime/tests/Makefile.am
index 5f8bce6671..da284b0206 100644
--- a/smime/tests/Makefile.am
+++ b/smime/tests/Makefile.am
@@ -14,3 +14,5 @@ TEST_LIBS= \
 	$(GNOME_PLATFORM_LIBS)
 
 import_cert_LDADD=$(TEST_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/sounds/Makefile.am b/sounds/Makefile.am
index e51f7fea97..252fc5d10f 100644
--- a/sounds/Makefile.am
+++ b/sounds/Makefile.am
@@ -3,3 +3,5 @@ sounds_DATA = \
 	default_alarm.wav
 
 EXTRA_DIST = $(sounds_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2dd8b03e76..4860746fd7 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -29,3 +29,5 @@ killev_LDADD =							\
 	$(E_UTIL_LIBS)
 
 CLEANFILES = evolution-addressbook-clean $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 80193355f9..40a5ad2d3e 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -14,3 +14,5 @@ evolutionui_DATA = $(XML_FILES)
 EXTRA_DIST =					\
 	$(XML_FILES)				\
 	ChangeLog.pre-1-4
+
+-include $(top_srcdir)/git.mk
diff --git a/views/Makefile.am b/views/Makefile.am
index bd79b72eb4..9e6adefa6b 100644
--- a/views/Makefile.am
+++ b/views/Makefile.am
@@ -1,3 +1,5 @@
 SUBDIRS = addressbook mail tasks calendar memos
 
 EXTRA_DIST = ChangeLog.pre-1-4
+
+-include $(top_srcdir)/git.mk
diff --git a/views/addressbook/Makefile.am b/views/addressbook/Makefile.am
index db4ef761db..b83bcf2a76 100644
--- a/views/addressbook/Makefile.am
+++ b/views/addressbook/Makefile.am
@@ -1,3 +1,5 @@
 addressviewsdir = $(viewsdir)/addressbook
 addressviews_DATA = Address_Cards.galview By_Company.galview Phone_List.galview galview.xml
 EXTRA_DIST = $(addressviews_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/views/calendar/Makefile.am b/views/calendar/Makefile.am
index 5382e5e5f5..ef82dd7425 100644
--- a/views/calendar/Makefile.am
+++ b/views/calendar/Makefile.am
@@ -3,3 +3,5 @@ calendarviewsdir = $(viewsdir)/calendar
 calendarviews_DATA = List_View.galview galview.xml
 
 EXTRA_DIST = $(calendarviews_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/views/mail/Makefile.am b/views/mail/Makefile.am
index add64a19a9..02c69e5153 100644
--- a/views/mail/Makefile.am
+++ b/views/mail/Makefile.am
@@ -1,3 +1,5 @@
 mailviewsdir = $(viewsdir)/mail
 mailviews_DATA = As_Sent_Folder.galview By_Sender.galview By_Status.galview By_Subject.galview Messages.galview By_Follow_Up_Flag.galview galview.xml Wide_View_Normal.galview Wide_View_Sent.galview
 EXTRA_DIST = $(mailviews_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/views/memos/Makefile.am b/views/memos/Makefile.am
index d11a8c7f08..1385004dc9 100644
--- a/views/memos/Makefile.am
+++ b/views/memos/Makefile.am
@@ -1,3 +1,5 @@
 memosviewsdir = $(viewsdir)/memos
 memosviews_DATA = Memos.galview galview.xml
 EXTRA_DIST = $(memosviews_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/views/tasks/Makefile.am b/views/tasks/Makefile.am
index 7854157f31..eaef1dbd93 100644
--- a/views/tasks/Makefile.am
+++ b/views/tasks/Makefile.am
@@ -1,3 +1,5 @@
 tasksviewsdir = $(viewsdir)/tasks
 tasksviews_DATA = Tasks.galview With_DueDate.galview With_Status.galview galview.xml
 EXTRA_DIST = $(tasksviews_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index 3eb5ea06f7..347c0f7c66 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -8,3 +8,5 @@ SUBDIRS =			\
 
 EXTRA_DIST =			\
 	ChangeLog.pre-1-4
+
+-include $(top_srcdir)/git.mk
diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am
index 4dcb2f014c..64594fd889 100644
--- a/widgets/e-timezone-dialog/Makefile.am
+++ b/widgets/e-timezone-dialog/Makefile.am
@@ -22,3 +22,5 @@ libetimezonedialog_la_LIBADD =				\
 glade_DATA = e-timezone-dialog.glade
 
 EXTRA_DIST = $(glade_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am
index b311296db7..5d0c5ca989 100644
--- a/widgets/menus/Makefile.am
+++ b/widgets/menus/Makefile.am
@@ -52,3 +52,5 @@ icons =
 EXTRA_DIST =			\
 	 $(icons)		\
 	 $(glade_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 3befe12e9d..ce7bb7278a 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -235,3 +235,5 @@ EXTRA_DIST =			\
 dist-hook:
 	-mkdir $(distdir)/pixmaps
 	cp $(srcdir)/pixmaps/*.xpm $(distdir)/pixmaps
+
+-include $(top_srcdir)/git.mk
diff --git a/widgets/misc/pixmaps/Makefile.am b/widgets/misc/pixmaps/Makefile.am
index 5092e20ba3..fa86dee8fb 100644
--- a/widgets/misc/pixmaps/Makefile.am
+++ b/widgets/misc/pixmaps/Makefile.am
@@ -7,3 +7,5 @@ pixmaps = 			\
 
 EXTRA_DIST =			\
 	$(pixmaps)
+
+-include $(top_srcdir)/git.mk
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index 836a1dd570..0dbe1e6fe3 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -164,3 +164,5 @@ icons = 			\
 EXTRA_DIST =			\
 	$(icons)		\
 	$(glade_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am
index 565ec4e521..fbe03c828f 100644
--- a/widgets/text/Makefile.am
+++ b/widgets/text/Makefile.am
@@ -34,3 +34,5 @@ libetext_la_LIBADD = 					\
 	$(E_UTIL_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(REGEX_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 8d4f0859e2..7720d56543 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -62,3 +62,5 @@ libfilter.la: dummy.la libfilter.def
 	$(DLLTOOL) --output-lib=.libs/libfilter.dll.a --dllname=libfilter-0.dll --input-def=libfilter.def
 
 CLEANFILES = $(BOOTSTRAP_LIBS)
+
+-include $(top_srcdir)/git.mk