Use git.mk

23 files changed, 278 insertions, 101 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 487f1a825..000000000
--- a/.gitignore
+++ /dev/null
@@ -1,43 +0,0 @@
-ChangeLog
-INSTALL
-Makefile
-Makefile.in
-*~
-*.a
-*.o
-*.la
-*.lo
-*.exe
-*.tar.xz
-.deps
-.libs
-aclocal.m4
-autom4te.cache
-config.cache
-config.h
-config.h.in
-config.h.win32
-config.log
-config.status
-config.guess
-config.sub
-configure
-libtool
-intltool-*.in
-depcomp
-ltmain.sh
-install-sh
-missing
-mkinstalldirs
-stamp-h1
-core.*
-core
-compile
-gtk-doc.make
-*.pc
-*.desktop
-*.desktop.in
-*.schemas
-*.typelib
-*.gir
-m4
diff --git a/Makefile.am b/Makefile.am
index a6a15456d..58ba20035 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,9 +34,29 @@ EXTRA_DIST=					\
 	$(NULL)
 
 DISTCLEANFILES = \
-  intltool-extract \
-  intltool-merge \
-  intltool-update
+	intltool-extract \
+	intltool-merge \
+	intltool-update
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/INSTALL \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/autoscan.log \
+	$(srcdir)/compile \
+	$(srcdir)/config.guess \
+	$(srcdir)/config.h.in \
+	$(srcdir)/config.sub \
+	$(srcdir)/configure.scan \
+	$(srcdir)/depcomp \
+	$(srcdir)/install-sh \
+	$(srcdir)/ltmain.sh \
+	$(srcdir)/missing \
+	$(srcdir)/mkinstalldirs \
+	$(srcdir)/omf.make \
+	$(srcdir)/xmldocs.make \
+	$(srcdir)/gtk-doc.make \
+	$(srcdir)/ChangeLog \
+	`find "$(srcdir)" -type f -name Makefile.in -print`
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb --enable-gtk-doc
 
@@ -62,3 +82,5 @@ ChangeLog:
 	fi
 
 .PHONY: ChangeLog
+
+-include $(top_srcdir)/git.mk
diff --git a/cut-n-paste-code/Makefile.am b/cut-n-paste-code/Makefile.am
index 80f6abb04..35aa7ed7a 100644
--- a/cut-n-paste-code/Makefile.am
+++ b/cut-n-paste-code/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = libegg
 
+
+-include $(top_srcdir)/git.mk
diff --git a/cut-n-paste-code/libegg/Makefile.am b/cut-n-paste-code/libegg/Makefile.am
index fff263f4b..1a3deb52a 100644
--- a/cut-n-paste-code/libegg/Makefile.am
+++ b/cut-n-paste-code/libegg/Makefile.am
@@ -29,3 +29,5 @@ EGG_TREE_DND_DIR = $(srcdir)/../../../libegg/libegg/treeviewutils
 
 regenerate-built-sources:
 	EGGFILES="$(EGG_TREE_DND_FILES)" EGGDIR="$(EGG_TREE_DND_DIR)" $(srcdir)/update-from-egg.sh
+
+-include $(top_srcdir)/git.mk
diff --git a/data/.gitignore b/data/.gitignore
deleted file mode 100644
index 8a0de67e6..000000000
--- a/data/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-nautilus.xml
-org.freedesktop.FileManager1.service
-org.gnome.Nautilus.service
diff --git a/data/Makefile.am b/data/Makefile.am
index 60520572b..c7a553de9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -73,3 +73,5 @@ uninstall-hook:
 if ENABLE_UPDATE_MIMEDB
 	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 984446c70..a5abe79df 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -22,3 +22,5 @@ EXTRA_DIST = \
 	style-guide.html \
 	key_mouse_navigation.txt \
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/reference/.gitignore b/docs/reference/.gitignore
deleted file mode 100644
index 45c18bb71..000000000
--- a/docs/reference/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-*-decl-list.txt
-*-decl.txt
-*-unused.txt
-*-undocumented.txt
-*-undeclared.txt
-*.args
-*.hierarchy
-*.interfaces
-*.prerequisites
-*.signals
-*.stamp
-html
-xml
-*.bak
-version.xml
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index fd642edea..1d201f723 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = libnautilus-extension
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/reference/libnautilus-extension/.gitignore b/docs/reference/libnautilus-extension/.gitignore
deleted file mode 100644
index 14e485a5b..000000000
--- a/docs/reference/libnautilus-extension/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tmpl
diff --git a/docs/reference/libnautilus-extension/Makefile.am b/docs/reference/libnautilus-extension/Makefile.am
index 1dd88f387..04342435e 100644
--- a/docs/reference/libnautilus-extension/Makefile.am
+++ b/docs/reference/libnautilus-extension/Makefile.am
@@ -81,3 +81,5 @@ include $(top_srcdir)/gtk-doc.make
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST += version.xml.in
+
+-include $(top_srcdir)/git.mk
diff --git a/eel/.gitignore b/eel/.gitignore
deleted file mode 100644
index 289ce673c..000000000
--- a/eel/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-eel-marshal.[ch]
-check-program
-eel-type-builtins-evals.c
-eel-type-builtins-ids.c
-eel-type-builtins-vars.c
-eel-type-builtins.h
-eel-enums.defs
-eel-makeenums-stamp
-eel-stamp
-eel-marshal.list
diff --git a/eel/Makefile.am b/eel/Makefile.am
index ac2d1d6ca..5ffbb0aaf 100644
--- a/eel/Makefile.am
+++ b/eel/Makefile.am
@@ -76,3 +76,5 @@ TESTS = check-eel
 EXTRA_DIST =					\
 	check-eel				\
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 000000000..d5bf7b842
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,227 @@
+# git.mk
+#
+# Copyright 2009, Red Hat, Inc.
+# Copyright 2010,2011 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:
+#   https://raw.github.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.
+#
+# 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.
+#
+
+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"
+
+.PHONY: git-all git-mk-install
+
+
+### .gitignore generation
+
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+	$(AM_V_GEN) \
+	{ \
+		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
+			for x in \
+				$(DOC_MODULE)-decl-list.txt \
+				$(DOC_MODULE)-decl.txt \
+				tmpl/$(DOC_MODULE)-unused.sgml \
+				"tmpl/*.bak" \
+				xml html \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(DOC_MODULE)$(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 -f $(srcdir)/po/Makefile.in.in; then \
+			for x in \
+				po/Makefile.in.in \
+				po/Makefile.in \
+				po/Makefile \
+				po/POTFILES \
+				po/stamp-it \
+				po/.intltool-merge-cache \
+				"po/*.gmo" \
+				"po/*.mo" \
+				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; \
+		for x in \
+			.gitignore \
+			$(GITIGNOREFILES) \
+			$(CLEANFILES) \
+			$(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
+			$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
+			$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_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]" \
+			".dirstamp" \
+		; 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" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse-maybe || echo "Skipping $$subdir");; \
+	  esac; \
+	done
+gitignore-recurse:
+	@for subdir in $(DIST_SUBDIRS); do \
+	    test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || 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/icons/Makefile.am b/icons/Makefile.am
index 3e2a6d788..69464c4e2 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -6,3 +6,5 @@ noinst_DATA =\
 	$(NULL)
 
 EXTRA_DIST = $(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/libnautilus-extension/Makefile.am b/libnautilus-extension/Makefile.am
index 9d8301474..a568e9f4c 100644
--- a/libnautilus-extension/Makefile.am
+++ b/libnautilus-extension/Makefile.am
@@ -86,3 +86,5 @@ typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/libnautilus-private/.gitignore b/libnautilus-private/.gitignore
deleted file mode 100644
index 399be38ca..000000000
--- a/libnautilus-private/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-nautilus-generated.c
-nautilus-generated.h
-org.gnome.nautilus.gschema.valid
-org.gnome.nautilus.gschema.xml
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 95c42191e..7a0483b2c 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -223,3 +223,5 @@ CLEANFILES = \
 
 dist-hook:
 	cd $(distdir); rm -f $(CLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/nautilus-sendto-extension/Makefile.am b/nautilus-sendto-extension/Makefile.am
index ed03a93a4..314369d4b 100644
--- a/nautilus-sendto-extension/Makefile.am
+++ b/nautilus-sendto-extension/Makefile.am
@@ -20,3 +20,5 @@ libnautilus_sendto_la_LDFLAGS = -module -avoid-version -no-undefined
 libnautilus_sendto_la_LIBADD  = \
   $(top_builddir)/libnautilus-extension/libnautilus-extension.la \
   $(BASE_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/po/.gitignore b/po/.gitignore
deleted file mode 100644
index 62a16a545..000000000
--- a/po/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.gmo
-*.mo
-*.pot
-Makefile.in.in
-POTFILES
-po2tbl.sed
-po2tbl.sed.in
-cat-id-tbl.c
-stamp-cat-id
-stamp-it
-messages
-missing
-.intltool-merge-cache
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index edbd22ee0..000000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-nautilus
-nautilus-autorun-software
-nautilus-connect-server
-nautilus-enum-types.[ch]
-nautilus-file-management-properties
-nautilus-convert-metadata
-nautilus-freedesktop-generated.[ch]
-nautilus-resources.[ch]
-stamp-nautilus-enum-types.h
\ No newline at end of file
diff --git a/src/Makefile.am b/src/Makefile.am
index 4f63a5b1d..74f2e5052 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -282,3 +282,5 @@ EXTRA_DIST =					\
 
 dist-hook:
 	cd $(distdir); rm -f $(CLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/test/Makefile.am b/test/Makefile.am
index 32301cc3f..25d980b7c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -34,3 +34,5 @@ test_nautilus_directory_async_SOURCES = test-nautilus-directory-async.c
 EXTRA_DIST = \
 	test.h \
 	$(NULL)
+
+-include $(top_srcdir)/git.mk