build: Add git.mk support instead of manual .gitignore files

This makes maintenance of the .gitignore lists a lot easier.

https://bugzilla.gnome.org/show_bug.cgi?id=749063

48 files changed, 422 insertions, 81 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e1713c5..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,46 +0,0 @@
-*.la
-*.lo
-*.o
-.deps
-.libs
-Makefile
-Makefile.in
-TAGS
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h
-config.h.in
-config.h.in~
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-omf.make
-stamp-h1
-test-driver
-xmldocs.make
-
-/m4/*.m4
-!/m4/grilo.m4
-
-/po/*.gmo
-/po/*.header
-/po/*.sed
-/po/*.sin
-/po/.intltool-merge-cache
-/po/Makefile.in.in
-/po/Makevars.template
-/po/POTFILES
-/po/Rules-quot
-/po/grilo-plugins.pot
-/po/stamp-it
-
-.*.sw?
-.gdb_history
diff --git a/Makefile.am b/Makefile.am
index 3113453..6857ae2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,23 +13,11 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src help po tests
 
 MAINTAINERCLEANFILES = \
-        aclocal.m4 \
-        compile \
-	config.guess \
-        config.sub \
-        configure \
-	depcomp \
-	install-sh \
-	ltmain.sh \
-	missing \
-	libtool \
-	stamp-h1 \
-	Makefile.in \
-	*.make \
-	mkinstalldirs \
-	*~
-
-DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
+	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
+	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
+	m4/intltool.m4 \
+	$(NULL)
 
 EXTRA_DIST += ./m4/grilo.m4
 
@@ -76,3 +64,5 @@ lcov:
 	@lcov --compat-libtool --directory src --capture --output-file coverage/grilo.info
 	@genhtml -o coverage/ coverage/grilo.info
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..9d4bf25
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,333 @@
+# git.mk, a small Makefile to autogenerate .gitignore files
+# for autotools-based projects.
+#
+# Copyright 2009, Red Hat, Inc.
+# Copyright 2010,2011,2012,2013 Behdad Esfahbod
+# Written by Behdad Esfahbod
+#
+# Copying and distribution of this file, with or without modification,
+# is permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#
+# The latest version of this file can be downloaded from:
+GIT_MK_URL = https://raw.githubusercontent.com/behdad/git.mk/master/git.mk
+#
+# Bugs, etc, should be reported upstream at:
+#   https://github.com/behdad/git.mk
+#
+# 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.  Remember to add that line to new
+# Makefile.am files you create in your project, or just rerun the
+# "make -f 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 make targets.
+#
+# 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 and I'll diagnose.
+#
+# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
+# Makefile.am.sample in the git.mk git repo.
+#
+# 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, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata,
+# appstream.
+#
+# This makefile provides the following targets:
+#
+# - all: "make all" will build all gitignore files.
+# - gitignore: makes all gitignore files in the current dir and subdirs.
+# - .gitignore: make gitignore file for the current dir.
+# - gitignore-recurse: makes all gitignore files in the subdirs.
+#
+# 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.
+#
+
+
+
+###############################################################################
+# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES:
+###############################################################################
+
+#
+# Most autotools-using modules should be fine including this variable in their
+# toplevel MAINTAINERCLEANFILES:
+GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/autoscan.log \
+	$(srcdir)/configure.scan \
+	`AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
+	 test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
+	 for x in \
+		ar-lib \
+		compile \
+		config.guess \
+		config.sub \
+		depcomp \
+		install-sh \
+		ltmain.sh \
+		missing \
+		mkinstalldirs \
+		test-driver \
+		ylwrap \
+	 ; do echo "$$AUX_DIR/$$x"; done` \
+	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
+	head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
+#
+# All modules should also be fine including the following variable, which
+# removes automake-generated Makefile.in files:
+GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
+	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \
+	while read f; do \
+	  case $$f in Makefile|*/Makefile) \
+	    test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
+	done`
+#
+# Modules that use libtool and use  AC_CONFIG_MACRO_DIR() may also include this,
+# though it's harmless to include regardless.
+GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
+	`MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \
+	 if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \
+		for x in \
+			libtool.m4 \
+			ltoptions.m4 \
+			ltsugar.m4 \
+			ltversion.m4 \
+			lt~obsolete.m4 \
+		; do echo "$$MACRO_DIR/$$x"; done; \
+	 fi`
+
+
+
+###############################################################################
+# Default rule is to install ourselves in all Makefile.am files:
+###############################################################################
+
+git-all: git-mk-install
+
+git-mk-install:
+	@echo "Installing git makefile"
+	@any_failed=; \
+		find "`test -z "$(top_srcdir)" && echo . || echo "$(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"
+
+git-mk-update:
+	wget $(GIT_MK_URL) -O $(top_srcdir)/git.mk
+
+.PHONY: git-all git-mk-install git-mk-update
+
+
+
+###############################################################################
+# Actual .gitignore generation:
+###############################################################################
+
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+	@echo "git.mk: 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; \
+			FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
+			case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
+		fi; \
+		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+			for lc in $(DOC_LINGUAS); do \
+				for x in \
+					$(if $(DOC_MODULE),$(DOC_MODULE).xml) \
+					$(DOC_PAGES) \
+					$(DOC_INCLUDES) \
+				; do echo "/$$lc/$$x"; done; \
+			done; \
+			for x in \
+				$(_DOC_OMF_ALL) \
+				$(_DOC_DSK_ALL) \
+				$(_DOC_HTML_ALL) \
+				$(_DOC_MOFILES) \
+				$(DOC_H_FILE) \
+				"*/.xml2po.mo" \
+				"*/*.omf.out" \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
+			for lc in $(HELP_LINGUAS); do \
+				for x in \
+					$(HELP_FILES) \
+					"$$lc.stamp" \
+					"$$lc.mo" \
+				; do echo "/$$lc/$$x"; done; \
+			done; \
+		fi; \
+		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
+			for x in \
+				$(gsettings_SCHEMAS:.xml=.valid) \
+				$(gsettings__enum_file) \
+			; do echo "/$$x"; done; \
+		fi; \
+		if test "x$(appdata_XML)" = x; then :; else \
+			for x in \
+				$(appdata_XML:.xml=.valid) \
+			; do echo "/$$x"; done; \
+		fi; \
+		if test "x$(appstream_XML)" = x; then :; else \
+			for x in \
+				$(appstream_XML:.xml=.valid) \
+			; do echo "/$$x"; done; \
+		fi; \
+		if test -f $(srcdir)/po/Makefile.in.in; then \
+			for x in \
+				po/Makefile.in.in \
+				po/Makefile.in.in~ \
+				po/Makefile.in \
+				po/Makefile \
+				po/Makevars.template \
+				po/POTFILES \
+				po/Rules-quot \
+				po/stamp-it \
+				po/.intltool-merge-cache \
+				"po/*.gmo" \
+				"po/*.header" \
+				"po/*.mo" \
+				"po/*.sed" \
+				"po/*.sin" \
+				po/$(GETTEXT_PACKAGE).pot \
+				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; \
+		if test "x$(DEJATOOL)" = x; then :; else \
+			for x in \
+				$(DEJATOOL) \
+			; do echo "/$$x.sum"; echo "/$$x.log"; done; \
+			echo /site.exp; \
+		fi; \
+		if test "x$(am__dirstamp)" = x; then :; else \
+			echo "$(am__dirstamp)"; \
+		fi; \
+		if test "x$(LTCOMPILE)" = x -a "x$(LTCXXCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
+			for x in \
+				"*.lo" \
+				".libs" "_libs" \
+			; do echo "$$x"; done; \
+		fi; \
+		for x in \
+			.gitignore \
+			$(GITIGNOREFILES) \
+			$(CLEANFILES) \
+			$(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
+			$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
+			$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
+			so_locations \
+			$(MOSTLYCLEANFILES) \
+			$(TEST_LOGS) \
+			$(TEST_LOGS:.log=.trs) \
+			$(TEST_SUITE_LOG) \
+			$(TESTS:=.test) \
+			"*.gcda" \
+			"*.gcno" \
+			$(DISTCLEANFILES) \
+			$(am__CONFIG_DISTCLEAN_FILES) \
+			$(CONFIG_CLEAN_FILES) \
+			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
+			"*.tab.c" \
+			$(MAINTAINERCLEANFILES) \
+			$(BUILT_SOURCES) \
+			$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
+			$(filter %_vala.stamp,$(DIST_COMMON)) \
+			$(filter %.vapi,$(DIST_COMMON)) \
+			$(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \
+			Makefile \
+			Makefile.in \
+			"*.orig" \
+			"*.rej" \
+			"*.bak" \
+			"*~" \
+			".*.sw[nop]" \
+			".dirstamp" \
+		; do echo "/$$x"; done; \
+		for x in \
+			"*.$(OBJEXT)" \
+			$(DEPDIR) \
+		; do echo "$$x"; done; \
+	} | \
+	sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
+	sed 's@/[.]/@/@g' | \
+	LC_ALL=C sort | uniq > $@.tmp && \
+	mv $@.tmp $@;
+
+all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
+gitignore-recurse-maybe:
+	@for subdir in $(DIST_SUBDIRS); do \
+	  case " $(SUBDIRS) " in \
+	    *" $$subdir "*) :;; \
+	    *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \
+	  esac; \
+	done
+gitignore-recurse:
+	@for subdir in $(DIST_SUBDIRS); do \
+	    test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \
+	done
+
+maintainer-clean: gitignore-clean
+gitignore-clean:
+	-rm -f $(srcdir)/.gitignore
+
+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/help/.gitignore b/help/.gitignore
deleted file mode 100644
index cf7cb60..0000000
--- a/help/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-html/*
diff --git a/help/Makefile.am b/help/Makefile.am
index 244f366..6795bff 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -13,3 +13,5 @@ HELP_LINGUAS =
 XMLLINT = xmllint
 validate: $(srcdir)/C/grilo-plugins.xml
 	$(XMLLINT) --xinclude --postvalid --noout $<
+
+-include $(top_srcdir)/git.mk
diff --git a/help/examples/.gitignore b/help/examples/.gitignore
deleted file mode 100644
index 2f189aa..0000000
--- a/help/examples/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-example-tmdb
diff --git a/help/examples/Makefile.am b/help/examples/Makefile.am
index 04689b7..aa8a71f 100644
--- a/help/examples/Makefile.am
+++ b/help/examples/Makefile.am
@@ -13,3 +13,5 @@ LDADD = $(DEPS_LIBS)
 noinst_PROGRAMS = example-tmdb
 
 example_tmdb_SOURCES = example-tmdb.c
+
+-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index 67be649..9f77dc6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -124,3 +124,5 @@ MAINTAINERCLEANFILES =	\
         *~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/apple-trailers/Makefile.am b/src/apple-trailers/Makefile.am
index e367456..7aa4f6a 100644
--- a/src/apple-trailers/Makefile.am
+++ b/src/apple-trailers/Makefile.am
@@ -54,3 +54,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/bliptv/Makefile.am b/src/bliptv/Makefile.am
index b846a83..4535baf 100644
--- a/src/bliptv/Makefile.am
+++ b/src/bliptv/Makefile.am
@@ -57,3 +57,5 @@ MAINTAINERCLEANFILES =	\
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
 
 CLEANFILES = bliptvresources.h bliptvresources.c
+
+-include $(top_srcdir)/git.mk
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index aa633d3..d97e9ff 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -39,3 +39,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/dleyna/.gitignore b/src/dleyna/.gitignore
deleted file mode 100644
index 499de87..0000000
--- a/src/dleyna/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/grl-dleyna-proxy-manager.[ch]
-/grl-dleyna-proxy-mediadevice.[ch]
-/grl-dleyna-proxy-mediaserver2.[ch]
diff --git a/src/dleyna/Makefile.am b/src/dleyna/Makefile.am
index 7131c57..5a480c6 100644
--- a/src/dleyna/Makefile.am
+++ b/src/dleyna/Makefile.am
@@ -88,3 +88,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/dmap/Makefile.am b/src/dmap/Makefile.am
index 6a959fc..d08494e 100644
--- a/src/dmap/Makefile.am
+++ b/src/dmap/Makefile.am
@@ -43,3 +43,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/filesystem/Makefile.am b/src/filesystem/Makefile.am
index a1c6e08..55ccdf9 100644
--- a/src/filesystem/Makefile.am
+++ b/src/filesystem/Makefile.am
@@ -35,3 +35,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/flickr/Makefile.am b/src/flickr/Makefile.am
index f1a2918..5f34970 100644
--- a/src/flickr/Makefile.am
+++ b/src/flickr/Makefile.am
@@ -41,3 +41,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/freebox/Makefile.am b/src/freebox/Makefile.am
index c2fa72d..90c3932 100644
--- a/src/freebox/Makefile.am
+++ b/src/freebox/Makefile.am
@@ -50,3 +50,5 @@ MAINTAINERCLEANFILES =	\
 CLEANFILES = freeboxresources.h freeboxresources.c
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/gravatar/Makefile.am b/src/gravatar/Makefile.am
index 2c791f6..816e4b3 100644
--- a/src/gravatar/Makefile.am
+++ b/src/gravatar/Makefile.am
@@ -35,3 +35,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/jamendo/Makefile.am b/src/jamendo/Makefile.am
index 49c324b..d72aac8 100644
--- a/src/jamendo/Makefile.am
+++ b/src/jamendo/Makefile.am
@@ -37,3 +37,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/lastfm-albumart/Makefile.am b/src/lastfm-albumart/Makefile.am
index cfaaca5..ee1f829 100644
--- a/src/lastfm-albumart/Makefile.am
+++ b/src/lastfm-albumart/Makefile.am
@@ -44,3 +44,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/local-metadata/Makefile.am b/src/local-metadata/Makefile.am
index 1168844..4de5771 100644
--- a/src/local-metadata/Makefile.am
+++ b/src/local-metadata/Makefile.am
@@ -44,3 +44,5 @@ MAINTAINERCLEANFILES	 = \
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/lua-factory/Makefile.am b/src/lua-factory/Makefile.am
index d6c6d13..98c87c4 100644
--- a/src/lua-factory/Makefile.am
+++ b/src/lua-factory/Makefile.am
@@ -52,3 +52,5 @@ DIST_SUBDIRS = sources
 
 MAINTAINERCLEANFILES =	*.in *~
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/lua-factory/sources/Makefile.am b/src/lua-factory/sources/Makefile.am
index 0f9e12b..f1ce263 100644
--- a/src/lua-factory/sources/Makefile.am
+++ b/src/lua-factory/sources/Makefile.am
@@ -43,3 +43,5 @@ EXTRA_DIST +=						\
 MAINTAINERCLEANFILES = *.in *~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/magnatune/Makefile.am b/src/magnatune/Makefile.am
index 861bb90..4675cbc 100644
--- a/src/magnatune/Makefile.am
+++ b/src/magnatune/Makefile.am
@@ -35,3 +35,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/metadata-store/Makefile.am b/src/metadata-store/Makefile.am
index e5f86ce..36d40e0 100644
--- a/src/metadata-store/Makefile.am
+++ b/src/metadata-store/Makefile.am
@@ -35,3 +35,5 @@ MAINTAINERCLEANFILES	 = \
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/opensubtitles/Makefile.am b/src/opensubtitles/Makefile.am
index a3a9fbd..e0463f9 100644
--- a/src/opensubtitles/Makefile.am
+++ b/src/opensubtitles/Makefile.am
@@ -37,3 +37,5 @@ MAINTAINERCLEANFILES	 = \
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/optical-media/Makefile.am b/src/optical-media/Makefile.am
index 60e2892..e0a8985 100644
--- a/src/optical-media/Makefile.am
+++ b/src/optical-media/Makefile.am
@@ -37,3 +37,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/pocket/Makefile.am b/src/pocket/Makefile.am
index 450cb0c..9a24096 100644
--- a/src/pocket/Makefile.am
+++ b/src/pocket/Makefile.am
@@ -50,3 +50,5 @@ MAINTAINERCLEANFILES =	\
 CLEANFILES = pocketresources.h pocketresources.c
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/podcasts/Makefile.am b/src/podcasts/Makefile.am
index e3b63f3..a31f52e 100644
--- a/src/podcasts/Makefile.am
+++ b/src/podcasts/Makefile.am
@@ -35,3 +35,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/raitv/Makefile.am b/src/raitv/Makefile.am
index 008da32..b8d9c0c 100644
--- a/src/raitv/Makefile.am
+++ b/src/raitv/Makefile.am
@@ -45,3 +45,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/shoutcast/Makefile.am b/src/shoutcast/Makefile.am
index 8dc8753..7e616b3 100644
--- a/src/shoutcast/Makefile.am
+++ b/src/shoutcast/Makefile.am
@@ -35,3 +35,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/thetvdb/Makefile.am b/src/thetvdb/Makefile.am
index afc51d6..f60c266 100644
--- a/src/thetvdb/Makefile.am
+++ b/src/thetvdb/Makefile.am
@@ -46,3 +46,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/tmdb/Makefile.am b/src/tmdb/Makefile.am
index 717ca86..a306ef0 100644
--- a/src/tmdb/Makefile.am
+++ b/src/tmdb/Makefile.am
@@ -44,3 +44,5 @@ MAINTAINERCLEANFILES	 = \
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/tracker/Makefile.am b/src/tracker/Makefile.am
index a3657a9..31c816b 100644
--- a/src/tracker/Makefile.am
+++ b/src/tracker/Makefile.am
@@ -50,3 +50,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/vimeo/Makefile.am b/src/vimeo/Makefile.am
index 391557c..ddc097a 100644
--- a/src/vimeo/Makefile.am
+++ b/src/vimeo/Makefile.am
@@ -56,3 +56,5 @@ MAINTAINERCLEANFILES =	\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/youtube/Makefile.am b/src/youtube/Makefile.am
index ca38a65..ecf7981 100644
--- a/src/youtube/Makefile.am
+++ b/src/youtube/Makefile.am
@@ -42,3 +42,5 @@ MAINTAINERCLEANFILES	 = \
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index ba30ff2..0000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-test
-test_apple_trailers
-test_bliptv
-test_local_metadata
-test_dleyna
-test_tmdb_preconditions
-test_tmdb_missing_configuration
-test_tmdb_fast_resolution
-test_tmdb_fast_resolution_by_id
-test_tmdb_full_resolution
-/dleyna/dbusmock/dleyna-server-mock.service
-*.pyc
-__pycache__
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 58ff889..0114850 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -61,3 +61,5 @@ MAINTAINERCLEANFILES =  \
    *~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/apple-trailers/Makefile.am b/tests/apple-trailers/Makefile.am
index 02e39de..b8e0e8f 100644
--- a/tests/apple-trailers/Makefile.am
+++ b/tests/apple-trailers/Makefile.am
@@ -36,3 +36,5 @@ MAINTAINERCLEANFILES =  \
    *~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/bliptv/Makefile.am b/tests/bliptv/Makefile.am
index c6bf3f7..9f881e4 100644
--- a/tests/bliptv/Makefile.am
+++ b/tests/bliptv/Makefile.am
@@ -39,3 +39,5 @@ MAINTAINERCLEANFILES =  \
    *~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/dleyna/Makefile.am b/tests/dleyna/Makefile.am
index 18db4dd..e2a94f2 100644
--- a/tests/dleyna/Makefile.am
+++ b/tests/dleyna/Makefile.am
@@ -62,3 +62,5 @@ clean-local:
 
 CLEANFILES = \
 	dbusmock/*.pyc
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/lastfm-albumart/Makefile.am b/tests/lastfm-albumart/Makefile.am
index d5fc2b7..b987f52 100644
--- a/tests/lastfm-albumart/Makefile.am
+++ b/tests/lastfm-albumart/Makefile.am
@@ -37,3 +37,5 @@ MAINTAINERCLEANFILES =  \
    *~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/local-metadata/Makefile.am b/tests/local-metadata/Makefile.am
index 668673b..9e61965 100644
--- a/tests/local-metadata/Makefile.am
+++ b/tests/local-metadata/Makefile.am
@@ -32,3 +32,5 @@ MAINTAINERCLEANFILES =  \
    *~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/lua-factory/Makefile.am b/tests/lua-factory/Makefile.am
index e7cf96e..818142e 100644
--- a/tests/lua-factory/Makefile.am
+++ b/tests/lua-factory/Makefile.am
@@ -17,3 +17,5 @@ MAINTAINERCLEANFILES =  \
    *~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/lua-factory/sources/Makefile.am b/tests/lua-factory/sources/Makefile.am
index b975a84..0b46945 100644
--- a/tests/lua-factory/sources/Makefile.am
+++ b/tests/lua-factory/sources/Makefile.am
@@ -53,3 +53,5 @@ MAINTAINERCLEANFILES = 	\
 EXTRA_DIST = $(metrolyrics_resources_files) test_lua_metrolyrics.gresource.xml
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/thetvdb/Makefile.am b/tests/thetvdb/Makefile.am
index 8749bb1..3da4769 100644
--- a/tests/thetvdb/Makefile.am
+++ b/tests/thetvdb/Makefile.am
@@ -69,3 +69,5 @@ MAINTAINERCLEANFILES = 	\
    *~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/tmdb/Makefile.am b/tests/tmdb/Makefile.am
index 8b6b25d..2e74059 100644
--- a/tests/tmdb/Makefile.am
+++ b/tests/tmdb/Makefile.am
@@ -106,3 +106,5 @@ MAINTAINERCLEANFILES =		\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/vimeo/Makefile.am b/tests/vimeo/Makefile.am
index 58c4099..50c3b94 100644
--- a/tests/vimeo/Makefile.am
+++ b/tests/vimeo/Makefile.am
@@ -37,3 +37,5 @@ MAINTAINERCLEANFILES =  \
    *~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
+-include $(top_srcdir)/git.mk