GNOME.org
 

[conglomerate] Add automatic generation of .gitignore files

commit 34e2509b3135aeb2fc9da90e776dcd4fb0e2f826
Author: Philip Chimento <philip chimento gmail com>
Date:   Wed Aug 24 20:56:12 2011 +0200

    Add automatic generation of .gitignore files
    
    Using the canonical copy of git.mk from pango

 Makefile.am                             |   21 +++-
 data/Makefile.am                        |    2 +
 debian/Makefile.am                      |    2 +
 debian/patches/Makefile.am              |    2 +
 dispspecs/Makefile.am                   |    2 +
 doc/Makefile.am                         |    2 +
 doc/devel/Makefile.am                   |    2 +
 doc/reference/Makefile.am               |    2 +
 examples/Makefile.am                    |    2 +
 git.mk                                  |  200 +++++++++++++++++++++++++++++++
 glade/Makefile.am                       |    2 +
 pixmaps/Makefile.am                     |    2 +
 pixmaps/icons/16x16/Makefile.am         |    2 +
 pixmaps/icons/16x16/apps/Makefile.am    |    2 +
 pixmaps/icons/32x32/Makefile.am         |    2 +
 pixmaps/icons/32x32/apps/Makefile.am    |    2 +
 pixmaps/icons/48x48/Makefile.am         |    2 +
 pixmaps/icons/48x48/apps/Makefile.am    |    2 +
 pixmaps/icons/Makefile.am               |    2 +
 pixmaps/icons/scalable/Makefile.am      |    2 +
 pixmaps/icons/scalable/apps/Makefile.am |    2 +
 src/Makefile.am                         |    2 +
 templates/Makefile.am                   |    2 +
 23 files changed, 262 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d67e133..f9a69eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,5 +32,24 @@ DISTCHECK_CONFIGURE_FLAGS = \
   --enable-gtk-doc \
   $(NULL)
 
+# from pango/Makefile.am
+MAINTAINERCLEANFILES = \
+  INSTALL \
+  aclocal.m4 \
+  compile \
+  config.guess \
+  config.h.in \
+  config.sub \
+  depcomp \
+  install-sh \
+  ltmain.sh \
+  missing \
+  mkinstalldirs \
+  omf.make \
+  xmldocs.make \
+  gtk-doc.make \
+  gnome-doc-utils.make
+
 # files to skip during `make dist`
-distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf
\ No newline at end of file
+distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf
+-include $(top_srcdir)/git.mk
diff --git a/data/Makefile.am b/data/Makefile.am
index 88e9b76..f5d1e27 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -51,3 +51,5 @@ DISTCLEANFILES = \
 	$(schema_DATA) \
 	$(keys_DATA)
 
+
+-include $(top_srcdir)/git.mk
diff --git a/debian/Makefile.am b/debian/Makefile.am
index b511b46..3279760 100644
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -35,3 +35,5 @@ pkg_DISTS = \
 EXTRA_DIST = $(debian_DISTS) $(pkg_DISTS)
 
 ## end of Makefile.am
+
+-include $(top_srcdir)/git.mk
diff --git a/debian/patches/Makefile.am b/debian/patches/Makefile.am
index 48f7760..52eb210 100644
--- a/debian/patches/Makefile.am
+++ b/debian/patches/Makefile.am
@@ -20,3 +20,5 @@ EXTRA_DIST = 00list 00patch-opts \
 	sync \
 	$(NULL)
 ## eof
+
+-include $(top_srcdir)/git.mk
diff --git a/dispspecs/Makefile.am b/dispspecs/Makefile.am
index 45dff13..fb0dbbb 100644
--- a/dispspecs/Makefile.am
+++ b/dispspecs/Makefile.am
@@ -49,3 +49,5 @@ DISTCLEANFILES = \
 	$(NULL)
 
 ## end of this Makefile.am
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e2643f0..22fe0a4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -72,3 +72,5 @@ figures/tip.png \
 figures/warning.png
 
 DOC_LINGUAS = C de es fr sl
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/devel/Makefile.am b/doc/devel/Makefile.am
index e0573db..28603c7 100644
--- a/doc/devel/Makefile.am
+++ b/doc/devel/Makefile.am
@@ -6,3 +6,5 @@ developers_docs =        \
   VersionNumbering
 
 EXTRA_DIST = $(developers_docs)
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index e424419..7794679 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -58,3 +58,5 @@ DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
+
+-include $(top_srcdir)/git.mk
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 3e67ceb..61da96a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -16,3 +16,5 @@ example_DATA 	 = \
 # INTLTOOL_XML_RULE@
 
 EXTRA_DIST = $(example_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..abd6c0a
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,200 @@
+# 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, mallard, intltool, gsettings.
+#
+#
+# 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.
+#
+# ChangeLog
+#
+# - 2010-12-06 Add support for Mallard docs
+# - 2010-12-06 Start this change log
+
+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
+	$(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 x in \
+				$(_DOC_C_DOCS) \
+				$(_DOC_LC_DOCS) \
+				$(_DOC_OMF_ALL) \
+				$(_DOC_DSK_ALL) \
+				$(_DOC_HTML_ALL) \
+				$(_DOC_MOFILES) \
+				$(_DOC_POFILES) \
+				$(DOC_H_FILE) \
+				"*/.xml2po.mo" \
+				"*/*.omf.out" \
+			; do echo /$$x; 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; \
+		for x in \
+			.gitignore \
+			$(GITIGNOREFILES) \
+			$(CLEANFILES) \
+			$(PROGRAMS) \
+			$(check_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]" \
+			".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-recurse-maybe:
+	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
+		$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
+	fi;
+gitignore-recurse:
+	@for subdir in $(DIST_SUBDIRS); do \
+	  case " $(SUBDIRS) " in \
+	    *" $$subdir "*) :;; \
+	    *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
+	  esac; \
+	done
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
+maintainer-clean: gitignore-clean
+gitignore-clean:
+	-rm -f $(srcdir)/.gitignore
+
+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/glade/Makefile.am b/glade/Makefile.am
index 184eaaf..a25b892 100644
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -13,3 +13,5 @@ glade_DATA 	 = docbook-common-properties.glade \
 
 EXTRA_DIST = $(glade_DATA)
 
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 209669d..252e0a0 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -63,3 +63,5 @@ update-icon-cache:
 	        echo "***   $(gtk_update_icon_cache)"; \
 	        fi
 
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/icons/16x16/Makefile.am b/pixmaps/icons/16x16/Makefile.am
index ebbd145..906a50e 100644
--- a/pixmaps/icons/16x16/Makefile.am
+++ b/pixmaps/icons/16x16/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = apps
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/icons/16x16/apps/Makefile.am b/pixmaps/icons/16x16/apps/Makefile.am
index bd2567d..dd96771 100644
--- a/pixmaps/icons/16x16/apps/Makefile.am
+++ b/pixmaps/icons/16x16/apps/Makefile.am
@@ -12,3 +12,5 @@ noinst_DATA =
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/icons/32x32/Makefile.am b/pixmaps/icons/32x32/Makefile.am
index be70ac5..237e209 100644
--- a/pixmaps/icons/32x32/Makefile.am
+++ b/pixmaps/icons/32x32/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = apps
 
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/icons/32x32/apps/Makefile.am b/pixmaps/icons/32x32/apps/Makefile.am
index a4b47e1..166ff94 100644
--- a/pixmaps/icons/32x32/apps/Makefile.am
+++ b/pixmaps/icons/32x32/apps/Makefile.am
@@ -12,3 +12,5 @@ noinst_DATA =
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/icons/48x48/Makefile.am b/pixmaps/icons/48x48/Makefile.am
index be70ac5..237e209 100644
--- a/pixmaps/icons/48x48/Makefile.am
+++ b/pixmaps/icons/48x48/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = apps
 
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/icons/48x48/apps/Makefile.am b/pixmaps/icons/48x48/apps/Makefile.am
index 7cddb38..95841a4 100644
--- a/pixmaps/icons/48x48/apps/Makefile.am
+++ b/pixmaps/icons/48x48/apps/Makefile.am
@@ -12,3 +12,5 @@ noinst_DATA =
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/icons/Makefile.am b/pixmaps/icons/Makefile.am
index 6bb2d1b..1e7ae26 100644
--- a/pixmaps/icons/Makefile.am
+++ b/pixmaps/icons/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = 16x16 32x32 48x48 scalable
 
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/icons/scalable/Makefile.am b/pixmaps/icons/scalable/Makefile.am
index ebbd145..906a50e 100644
--- a/pixmaps/icons/scalable/Makefile.am
+++ b/pixmaps/icons/scalable/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = apps
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/icons/scalable/apps/Makefile.am b/pixmaps/icons/scalable/apps/Makefile.am
index c717dcc..79d1d4a 100644
--- a/pixmaps/icons/scalable/apps/Makefile.am
+++ b/pixmaps/icons/scalable/apps/Makefile.am
@@ -12,3 +12,5 @@ noinst_DATA =
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index d6d21f0..4a3f822 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -349,3 +349,5 @@ conglomerate_LDADD  = $(CONGLOMERATE_LIBS) \
 EXTRA_DIST = Makefile.win cong.marshal marshal.make
 
 ## Last Line
+
+-include $(top_srcdir)/git.mk
diff --git a/templates/Makefile.am b/templates/Makefile.am
index ddde076..c4513cf 100644
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -8,3 +8,5 @@ template_DATA 	 = \
 	$(NULL)
 
 EXTRA_DIST = $(template_DATA)
+
+-include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]