GNOME.org
 

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

commit c42e29b6e79d55e50f0f5f70b305ad0d2747339c
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Apr 27 01:07:32 2009 +0200

    Use git.mk from pango to autogenerate .gitignore files
---
 Makefile.am                              |   19 +++
 desktop-docs/Makefile.am                 |    2 +
 desktop-docs/fdl/Makefile.am             |    2 +
 desktop-docs/gpl/Makefile.am             |    2 +
 desktop-docs/lgpl/Makefile.am            |    2 +
 docs/Makefile.am                         |    2 +
 docs/reference/Makefile.am               |    2 +
 docs/reference/gnome-desktop/Makefile.am |    2 +
 git.mk                                   |  178 ++++++++++++++++++++++++++++++
 gnome-about/Makefile.am                  |    5 +
 gnome-about/headers/Makefile.am          |    2 +
 libgnome-desktop/Makefile.am             |    2 +
 libgnome-desktop/libgnome/Makefile.am    |    2 +
 libgnome-desktop/libgnomeui/Makefile.am  |    2 +
 man/Makefile.am                          |    2 +
 pixmaps/Makefile.am                      |    2 +
 16 files changed, 228 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 19a3cf7..0f7b6ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,3 +26,22 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
 CLEANFILES = $(version_DATA)
 DISTCLEANFILES = \
   gnome-doc-utils.make
+
+MAINTAINERCLEANFILES = \
+	$(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` \
+	$(srcdir)/configure \
+	$(srcdir)/gtk-doc.make \
+	$(srcdir)/m4/gnome-doc-utils.m4 \
+	$(srcdir)/m4/gtk-doc.m4 \
+	$(srcdir)/m4/intltool.m4
+
+-include $(top_srcdir)/git.mk
diff --git a/desktop-docs/Makefile.am b/desktop-docs/Makefile.am
index 37a5bab..ec7a3e9 100644
--- a/desktop-docs/Makefile.am
+++ b/desktop-docs/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = fdl gpl lgpl
+
+-include $(top_srcdir)/git.mk
diff --git a/desktop-docs/fdl/Makefile.am b/desktop-docs/fdl/Makefile.am
index fdf11b7..220de93 100644
--- a/desktop-docs/fdl/Makefile.am
+++ b/desktop-docs/fdl/Makefile.am
@@ -6,3 +6,5 @@ DOC_ENTITIES =
 DOC_INCLUDES = 
 
 DOC_LINGUAS = ar es eu fr hu ko oc sv uk vi de
+
+-include $(top_srcdir)/git.mk
diff --git a/desktop-docs/gpl/Makefile.am b/desktop-docs/gpl/Makefile.am
index f13cb28..d8be3df 100644
--- a/desktop-docs/gpl/Makefile.am
+++ b/desktop-docs/gpl/Makefile.am
@@ -6,3 +6,5 @@ DOC_ENTITIES =
 DOC_INCLUDES = 
 
 DOC_LINGUAS = ar ca cs el es eu fi fr hu ko oc pa uk vi zh_CN sv de
+
+-include $(top_srcdir)/git.mk
diff --git a/desktop-docs/lgpl/Makefile.am b/desktop-docs/lgpl/Makefile.am
index 235db12..341fbae 100644
--- a/desktop-docs/lgpl/Makefile.am
+++ b/desktop-docs/lgpl/Makefile.am
@@ -6,3 +6,5 @@ DOC_ENTITIES =
 DOC_INCLUDES = 
 
 DOC_LINGUAS = ar de el es eu fi fr hu ko oc pa sv uk vi zh_CN
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f3ddc22..034926c 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = reference
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index e781070..949cd31 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = gnome-desktop
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/reference/gnome-desktop/Makefile.am b/docs/reference/gnome-desktop/Makefile.am
index e2af26a..0be2b77 100644
--- a/docs/reference/gnome-desktop/Makefile.am
+++ b/docs/reference/gnome-desktop/Makefile.am
@@ -76,3 +76,5 @@ include $(top_srcdir)/gtk-doc.make
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST += 
+
+-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/gnome-about/Makefile.am b/gnome-about/Makefile.am
index de935ec..c50d034 100644
--- a/gnome-about/Makefile.am
+++ b/gnome-about/Makefile.am
@@ -31,3 +31,8 @@ CLEANFILES = gnome-about.desktop gnome-about
 
 check:
 	test -s $(top_srcdir)/gnome-about/foundation-members.list
+
+MAINTAINERCLEANFILES = \
+	foundation-members.list
+
+-include $(top_srcdir)/git.mk
diff --git a/gnome-about/headers/Makefile.am b/gnome-about/headers/Makefile.am
index 4a77dff..7820003 100644
--- a/gnome-about/headers/Makefile.am
+++ b/gnome-about/headers/Makefile.am
@@ -11,3 +11,5 @@ headers_DATA =				\
 	header-bg-sunset01.png
 
 EXTRA_DIST = $(headers_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/libgnome-desktop/Makefile.am b/libgnome-desktop/Makefile.am
index 86c08b9..918378e 100644
--- a/libgnome-desktop/Makefile.am
+++ b/libgnome-desktop/Makefile.am
@@ -50,3 +50,5 @@ pkgconfig_DATA = gnome-desktop-2.0.pc
 EXTRA_DIST = \
 	gnome-desktop-2.0.pc.in                \
 	gnome-desktop-2.0-uninstalled.pc.in
+
+-include $(top_srcdir)/git.mk
diff --git a/libgnome-desktop/libgnome/Makefile.am b/libgnome-desktop/libgnome/Makefile.am
index 863f506..537a045 100644
--- a/libgnome-desktop/libgnome/Makefile.am
+++ b/libgnome-desktop/libgnome/Makefile.am
@@ -2,3 +2,5 @@ libgnome_desktopdir = $(includedir)/gnome-desktop-2.0/libgnome
 libgnome_desktop_HEADERS = \
 	gnome-desktop-utils.h \
 	gnome-desktop-item.h
+
+-include $(top_srcdir)/git.mk
diff --git a/libgnome-desktop/libgnomeui/Makefile.am b/libgnome-desktop/libgnomeui/Makefile.am
index 578f09a..6e3c7c7 100644
--- a/libgnome-desktop/libgnomeui/Makefile.am
+++ b/libgnome-desktop/libgnomeui/Makefile.am
@@ -6,3 +6,5 @@ libgnomeui_desktop_HEADERS =	\
 	gnome-rr.h		\
 	gnome-rr-config.h	\
 	gnome-rr-labeler.h
+
+-include $(top_srcdir)/git.mk
diff --git a/man/Makefile.am b/man/Makefile.am
index 6ce9850..7d4f825 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,3 +1,5 @@
 man_MANS = gnome-about.1
 
 EXTRA_DIST = $(man_MANS)
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 5e13aea..5581155 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -74,3 +74,5 @@ pixmap_DATA =					\
 	gnome-set-time.png
 
 EXTRA_DIST = $(pixmap_DATA)
+
+-include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]