[eog] Use git.mk for .gitignore generation

From: Felix Riemann <friemann src gnome org>
To: svn-commits-list gnome org
Subject: [eog] Use git.mk for .gitignore generation
Date: Sat, 2 May 2009 11:49:45 -0400 (EDT)
commit 29046f2d7d32e3788cc5eb75d880dca931b6b5e1
Author: Felix Riemann <friemann svn gnome org>
Date:   Sat May 2 17:48:43 2009 +0200

    Use git.mk for .gitignore generation
    
    Add Behdad's git.mk script to generate .gitignore files.
---
 ChangeLog                                 |    4 +
 Makefile.am                               |   16 +++
 bindings/Makefile.am                      |    2 +
 bindings/python/.gitignore                |    3 -
 bindings/python/Makefile.am               |    2 +
 cut-n-paste/Makefile.am                   |    2 +
 cut-n-paste/toolbar-editor/Makefile.am    |    2 +
 cut-n-paste/totem-screensaver/Makefile.am |    2 +
 data/.gitignore                           |    5 -
 data/Makefile.am                          |    2 +
 data/icons/16x16/Makefile.am              |    2 +
 data/icons/16x16/actions/Makefile.am      |    2 +
 data/icons/16x16/apps/Makefile.am         |    2 +
 data/icons/22x22/Makefile.am              |    2 +
 data/icons/22x22/actions/Makefile.am      |    2 +
 data/icons/22x22/apps/Makefile.am         |    2 +
 data/icons/24x24/Makefile.am              |    2 +
 data/icons/24x24/actions/Makefile.am      |    2 +
 data/icons/24x24/apps/Makefile.am         |    2 +
 data/icons/32x32/Makefile.am              |    2 +
 data/icons/32x32/actions/Makefile.am      |    2 +
 data/icons/32x32/apps/Makefile.am         |    2 +
 data/icons/48x48/Makefile.am              |    2 +
 data/icons/48x48/actions/Makefile.am      |    2 +
 data/icons/Makefile.am                    |    2 +
 data/icons/scalable/Makefile.am           |    2 +
 data/icons/scalable/actions/Makefile.am   |    2 +
 data/icons/scalable/apps/Makefile.am      |    2 +
 data/pixmaps/Makefile.am                  |    2 +
 doc/Makefile.am                           |    2 +
 doc/reference/.gitignore                  |   14 ---
 doc/reference/Makefile.am                 |    2 +
 git.mk                                    |  178 +++++++++++++++++++++++++++++
 help/.gitignore                           |    3 -
 help/Makefile.am                          |    2 +
 help/bg/Makefile.am                       |    2 +
 jpegutils/Makefile.am                     |    2 +
 plugins/Makefile.am                       |    2 +
 plugins/fullscreen/Makefile.am            |    2 +
 plugins/reload/Makefile.am                |    2 +
 plugins/statusbar-date/Makefile.am        |    2 +
 po/.gitignore                             |    7 -
 src/Makefile.am                           |    2 +
 43 files changed, 268 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e63aea..041aac6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-05-02  Felix Riemann  <friemann svn gnome org>
 
+	* git.mk: Add Behdad's git.mk script to generate .gitignore files.
+
+2009-05-02  Felix Riemann  <friemann svn gnome org>
+
 	* src/Makefile.am:
 	* src/eog-pixbuf-cell-renderer.c:
 	* src/eog-pixbuf-cell-renderer.h:
diff --git a/Makefile.am b/Makefile.am
index cf2d671..40aea26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,3 +21,19 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --e
 
 # Ignore scrollkeeper issues for now.  @#*$& scrollkeeper
 distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/config.guess \
+	$(srcdir)/config.h.in \
+	$(srcdir)/config.sub \
+	$(srcdir)/depcomp \
+	$(srcdir)/gtk-doc.make \
+	$(srcdir)/install-sh \
+	$(srcdir)/ltmain.sh \
+	$(srcdir)/missing \
+	$(srcdir)/mkinstalldirs \
+	$(srcdir)/omf.make \
+	$(srcdir)/xmldocs.make
+
+-include $(top_srcdir)/git.mk
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 0f47450..8f1fc83 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -3,3 +3,5 @@ SUBDIRS =
 if ENABLE_PYTHON
 SUBDIRS += python
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/bindings/python/.gitignore b/bindings/python/.gitignore
deleted file mode 100644
index 83b3994..0000000
--- a/bindings/python/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-eog.c
-eog.la
-eog_la-eog.lo
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 60d39bf..8d4bce6 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -73,3 +73,5 @@ CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/cut-n-paste/Makefile.am b/cut-n-paste/Makefile.am
index ae4c242..177f5ef 100644
--- a/cut-n-paste/Makefile.am
+++ b/cut-n-paste/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = toolbar-editor totem-screensaver
+
+-include $(top_srcdir)/git.mk
diff --git a/cut-n-paste/toolbar-editor/Makefile.am b/cut-n-paste/toolbar-editor/Makefile.am
index 338d569..f8411ca 100644
--- a/cut-n-paste/toolbar-editor/Makefile.am
+++ b/cut-n-paste/toolbar-editor/Makefile.am
@@ -105,3 +105,5 @@ regenerate-built-sources:
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/cut-n-paste/totem-screensaver/Makefile.am b/cut-n-paste/totem-screensaver/Makefile.am
index 4bbd4fd..3f71bf5 100644
--- a/cut-n-paste/totem-screensaver/Makefile.am
+++ b/cut-n-paste/totem-screensaver/Makefile.am
@@ -8,3 +8,5 @@ libtotemscrsaver_la_CFLAGS = \
 	-I$(top_srcdir)/src	\
 	$(EOG_CFLAGS)		\
 	$(WARN_CFLAGS)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/.gitignore b/data/.gitignore
deleted file mode 100644
index 6ae27bf..0000000
--- a/data/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-eog.desktop
-eog.desktop.in
-eog.gladep
-eog.pc
-eog.schemas
diff --git a/data/Makefile.am b/data/Makefile.am
index a59b9f7..5a0622c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -51,3 +51,5 @@ EXTRA_DIST =			\
 DISTCLEANFILES = 		\
         $(DESKTOP_FILES)        \
         $(schemas_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index a9d435c..58b8e6a 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = apps actions
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am
index 7628b64..5958c3f 100644
--- a/data/icons/16x16/actions/Makefile.am
+++ b/data/icons/16x16/actions/Makefile.am
@@ -16,3 +16,5 @@ noinst_DATA =              \
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
index bb3df70..6dfca42 100644
--- a/data/icons/16x16/apps/Makefile.am
+++ b/data/icons/16x16/apps/Makefile.am
@@ -13,3 +13,5 @@ noinst_DATA = \
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index a9d435c..58b8e6a 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = apps actions
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am
index 3fb74a5..15d1c11 100644
--- a/data/icons/22x22/actions/Makefile.am
+++ b/data/icons/22x22/actions/Makefile.am
@@ -16,3 +16,5 @@ noinst_DATA =              \
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
index 36b2188..ca9984f 100644
--- a/data/icons/22x22/apps/Makefile.am
+++ b/data/icons/22x22/apps/Makefile.am
@@ -13,3 +13,5 @@ noinst_DATA = \
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index a9d435c..58b8e6a 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = apps actions
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am
index 1ef6be7..cbe4906 100644
--- a/data/icons/24x24/actions/Makefile.am
+++ b/data/icons/24x24/actions/Makefile.am
@@ -11,3 +11,5 @@ icons_DATA = 			  \
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am
index 49a0642..bfe406a 100644
--- a/data/icons/24x24/apps/Makefile.am
+++ b/data/icons/24x24/apps/Makefile.am
@@ -12,3 +12,5 @@ noinst_DATA =
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index a9d435c..58b8e6a 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = apps actions
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/actions/Makefile.am b/data/icons/32x32/actions/Makefile.am
index c54b149..aa85900 100644
--- a/data/icons/32x32/actions/Makefile.am
+++ b/data/icons/32x32/actions/Makefile.am
@@ -17,3 +17,5 @@ noinst_DATA = 			  \
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/apps/Makefile.am b/data/icons/32x32/apps/Makefile.am
index e010d96..f860f31 100644
--- a/data/icons/32x32/apps/Makefile.am
+++ b/data/icons/32x32/apps/Makefile.am
@@ -13,3 +13,5 @@ noinst_DATA = \
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 0224d45..6b7db23 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = actions
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/actions/Makefile.am b/data/icons/48x48/actions/Makefile.am
index f76490e..972b335 100644
--- a/data/icons/48x48/actions/Makefile.am
+++ b/data/icons/48x48/actions/Makefile.am
@@ -10,3 +10,5 @@ icons_DATA = 		   \
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 0287384..123b8e3 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -12,3 +12,5 @@ update-icon-cache:
 		echo "*** Icon cache not updated.  After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index ddce5ef..ae03308 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = actions apps
 
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am
index 3886464..9ec02c5 100644
--- a/data/icons/scalable/actions/Makefile.am
+++ b/data/icons/scalable/actions/Makefile.am
@@ -15,3 +15,5 @@ EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
 
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am
index f5c72e1..f3f3d56 100644
--- a/data/icons/scalable/apps/Makefile.am
+++ b/data/icons/scalable/apps/Makefile.am
@@ -23,3 +23,5 @@ install-data-hook:
 		echo "*** Icon cache not updated.  After install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index b0e7d15..e1ba2dd 100644
--- a/data/pixmaps/Makefile.am
+++ b/data/pixmaps/Makefile.am
@@ -5,3 +5,5 @@ pixmaps_DATA = \
 
 EXTRA_DIST = \
 	$(pixmaps_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 74e86fd..989a5c6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = \
 	reference
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/reference/.gitignore b/doc/reference/.gitignore
deleted file mode 100644
index 765c8bd..0000000
--- a/doc/reference/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-eog.args
-eog.hierarchy
-eog.interfaces
-eog.prerequisites
-eog.signals
-eog.types
-eog-docs.sgml
-html
-tmpl
-version.xml
-xml
-*.stamp
-eog-*.txt
-!eog-sections.txt
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index c49302d..b46c39e 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -123,3 +123,5 @@ DISTCLEANFILES = $(DOC_MODULE).types
 
 # Comment this out if you want your docs-status tested during 'make check'
 #TESTS = $(GTKDOC_CHECK)
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..739ba92
--- /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/.gitignore b/help/.gitignore
deleted file mode 100644
index d170b0a..0000000
--- a/help/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.xml2po.mo
-eog.xml
-eog-*.omf
diff --git a/help/Makefile.am b/help/Makefile.am
index 9f74ca2..1bdb288 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -10,3 +10,5 @@ DOC_FIGURES = 					\
 	figures/eog_toolbar_editor_window.png
 
 DOC_LINGUAS = ar ca da de el en_GB es eu fr it ja ko oc pa pl pt_BR ru sv th uk zh_CN zh_TW
+
+-include $(top_srcdir)/git.mk
diff --git a/help/bg/Makefile.am b/help/bg/Makefile.am
index c91673b..6c9e854 100644
--- a/help/bg/Makefile.am
+++ b/help/bg/Makefile.am
@@ -6,3 +6,5 @@ entities = legal.xml
 include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
 
+
+-include $(top_srcdir)/git.mk
diff --git a/jpegutils/Makefile.am b/jpegutils/Makefile.am
index 5493464..354be11 100644
--- a/jpegutils/Makefile.am
+++ b/jpegutils/Makefile.am
@@ -8,3 +8,5 @@ libeog_jpegutils_la_SOURCES =		\
 	transupp.h
 
 EXTRA_DIST = README
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 175e715..11dcf1f 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -9,3 +9,5 @@ plugindir = $(libdir)/eog/plugins
 DISTCLEANFILES =
 
 EXTRA_DIST =
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/fullscreen/Makefile.am b/plugins/fullscreen/Makefile.am
index 763813f..4107a00 100644
--- a/plugins/fullscreen/Makefile.am
+++ b/plugins/fullscreen/Makefile.am
@@ -30,3 +30,5 @@ EXTRA_DIST = $(plugin_in_files)
 
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/reload/Makefile.am b/plugins/reload/Makefile.am
index f1af67a..b516d94 100644
--- a/plugins/reload/Makefile.am
+++ b/plugins/reload/Makefile.am
@@ -30,3 +30,5 @@ EXTRA_DIST = $(plugin_in_files)
 
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/statusbar-date/Makefile.am b/plugins/statusbar-date/Makefile.am
index da1f570..250e3cb 100644
--- a/plugins/statusbar-date/Makefile.am
+++ b/plugins/statusbar-date/Makefile.am
@@ -29,3 +29,5 @@ EXTRA_DIST = $(plugin_in_files)
 
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/po/.gitignore b/po/.gitignore
deleted file mode 100644
index 31808ee..0000000
--- a/po/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.gmo
-*.mo
-*.pot
-.intltool-merge-cache
-Makefile.in.in
-POTFILES
-stamp-it
diff --git a/src/Makefile.am b/src/Makefile.am
index 46b364d..9fd5403 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -223,3 +223,5 @@ CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]