GNOME.org
 

[gnome-session] Use git.mk from pango to autogenerate .gitignore files

commit bfeb69db2ee8bd08a5184a35fa17b78072e65975
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Apr 24 04:41:57 2009 +0200

    Use git.mk from pango to autogenerate .gitignore files
---
 Makefile.am                     |   20 +++++
 capplet/Makefile.am             |    2 +
 compat/Makefile.am              |    2 +
 data/Makefile.am                |    2 +
 data/icons/16x16/Makefile.am    |    2 +
 data/icons/22x22/Makefile.am    |    2 +
 data/icons/24x24/Makefile.am    |    2 +
 data/icons/32x32/Makefile.am    |    2 +
 data/icons/48x48/Makefile.am    |    2 +
 data/icons/Makefile.am          |    2 +
 data/icons/scalable/Makefile.am |    2 +
 doc/Makefile.am                 |    2 +
 doc/dbus/Makefile.am            |    4 +-
 doc/man/Makefile.am             |    2 +
 egg/Makefile.am                 |    2 +
 git.mk                          |  178 +++++++++++++++++++++++++++++++++++++++
 gnome-session/Makefile.am       |    2 +
 splash/Makefile.am              |    2 +
 tools/Makefile.am               |    2 +
 19 files changed, 233 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8274cdd..c2ebd55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,3 +8,23 @@ SUBDIRS =			\
 	po			\
 	doc			\
 	data
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/INSTALL \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/config.guess \
+	$(srcdir)/config.h.in \
+	$(srcdir)/config.sub \
+	$(srcdir)/depcomp \
+	$(srcdir)/install-sh \
+	$(srcdir)/ltmain.sh \
+	$(srcdir)/missing \
+	$(srcdir)/mkinstalldirs \
+	`find "$(srcdir)" -type f -name Makefile.in -print` \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in \
+	`find "$(srcdir)" -type f -name .gitignore -print` \
+	$(srcdir)/m4/intltool.m4
+
+-include $(top_srcdir)/git.mk
diff --git a/capplet/Makefile.am b/capplet/Makefile.am
index e655c2e..a45d0dc 100644
--- a/capplet/Makefile.am
+++ b/capplet/Makefile.am
@@ -27,3 +27,5 @@ gnome_session_properties_SOURCES =			\
 	gsm-app-dialog.h				\
 	gsm-app-dialog.c				\
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/compat/Makefile.am b/compat/Makefile.am
index 171efe0..fd5de47 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -49,3 +49,5 @@ CLEANFILES =					\
 
 DISTCLEANFILES =					\
 	$(default_session_in_in_files)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/Makefile.am b/data/Makefile.am
index a267e52..f0568d7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -51,3 +51,5 @@ CLEANFILES =					\
 
 DISTCLEANFILES =				\
 	$(settings_in_files)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index 49d023a..cac74c5 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -19,3 +19,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/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index 9c35c0b..6732cb3 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -19,3 +19,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/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index a31b663..bc01924 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -19,3 +19,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/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index ea8d34a..a74146c 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -19,3 +19,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/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 5859e0d..6592923 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -17,3 +17,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/icons/Makefile.am b/data/icons/Makefile.am
index 31513f3..014b2e4 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index 68cac52..d43139f 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -18,3 +18,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/doc/Makefile.am b/doc/Makefile.am
index bdc5630..04f4e97 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = dbus man
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am
index e826874..0f5744c 100644
--- a/doc/dbus/Makefile.am
+++ b/doc/dbus/Makefile.am
@@ -52,4 +52,6 @@ MAINTAINERCLEANFILES =		\
 clean-local:
 	rm -f *~
 	rm -f gnome-session.html
-	rm -f *.ref.xml
+
+GITIGNOREFILES = gnome-session.html
+-include $(top_srcdir)/git.mk
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index ef737db..8b66899 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -6,3 +6,5 @@ man_MANS =				\
 
 EXTRA_DIST =			\
 	$(man_MANS)
+
+-include $(top_srcdir)/git.mk
diff --git a/egg/Makefile.am b/egg/Makefile.am
index 79ea3ea..a9a7a62 100644
--- a/egg/Makefile.am
+++ b/egg/Makefile.am
@@ -46,3 +46,5 @@ libeggdesktopfile_la_LIBADD =            \
 libeggdesktopfile_la_SOURCES =           \
 	eggdesktopfile.c                 \
 	eggdesktopfile.h
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..9cfce1c
--- /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 stat" shows untracked files still), send
+# me the output of "git stat" 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" \
+		"*~" \
+		".*.swp" \
+	; 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-local: gitignore-clean
+gitignore-clean:
+	rm -f $(srcdir)/.gitignore
+.PHONY: gitignore-clean gitignore-recurse
+
diff --git a/gnome-session/Makefile.am b/gnome-session/Makefile.am
index 7b0c9a3..ab9cedb 100644
--- a/gnome-session/Makefile.am
+++ b/gnome-session/Makefile.am
@@ -158,3 +158,5 @@ EXTRA_DIST =						\
 MAINTAINERCLEANFILES =                  \
         *~                              \
         Makefile.in
+
+-include $(top_srcdir)/git.mk
diff --git a/splash/Makefile.am b/splash/Makefile.am
index a4a606d..21873b7 100644
--- a/splash/Makefile.am
+++ b/splash/Makefile.am
@@ -45,3 +45,5 @@ CLEANFILES =					\
 
 DISTCLEANFILES =					\
 	$(default_session_in_in_files)
+
+-include $(top_srcdir)/git.mk
diff --git a/tools/Makefile.am b/tools/Makefile.am
index fbef67d..6d3813f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -17,3 +17,5 @@ gnome_session_save_LDADD =			\
 
 gnome_session_save_SOURCES =			\
 	gnome-session-save.c
+
+-include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]