[gnome-games-extra-data] build: Use git.mk



commit ee65b44da79d3fef270955e304585e70f25672e0
Author: Christian Persch <chpe gnome org>
Date:   Sun Oct 25 21:32:38 2009 +0100

    build: Use git.mk
    
    Remove manual .gitignore, and use git.mk instead.

 .gitignore                  |   29 -------
 Makefile.am                 |   25 ++++++
 cards/Makefile.am           |    2 +
 git.mk                      |  182 +++++++++++++++++++++++++++++++++++++++++++
 glines/Makefile.am          |    2 +
 gnobots2/Makefile.am        |    2 +
 gnometris/Makefile.am       |    2 +
 iagno/Makefile.am           |    2 +
 mahjongg/Makefile.am        |    2 +
 same-gnome/2.10/Makefile.am |    2 +
 same-gnome/Makefile.am      |    2 +
 11 files changed, 223 insertions(+), 29 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 66147ad..790a276 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,29 @@ EXTRA_DIST = \
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-silent-rules
 
+MAINTAINERCLEANFILES = \
+	ChangeLog \
+	$(srcdir)/INSTALL \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/autoscan.log \
+	$(srcdir)/compile \
+	$(srcdir)/config.guess \
+	$(srcdir)/config.h.in \
+	$(srcdir)/config.sub \
+	$(srcdir)/configure \
+	$(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)/po/Makefile.in.in \
+	`find "$(srcdir)" -type f -name Makefile.in -print` \
+	$(NULL)
+
 # Build ChangeLog from GIT or SVN history
 # (SVN r69 was the first ChangeLog-less checkin).
 # Only build this when in a git or svn checkout.
@@ -23,3 +46,5 @@ ChangeLog:
 dist: ChangeLog
 
 .PHONY: ChangeLog
+
+-include $(top_srcdir)/git.mk
diff --git a/cards/Makefile.am b/cards/Makefile.am
index 0e01982..f4e00f4 100644
--- a/cards/Makefile.am
+++ b/cards/Makefile.am
@@ -21,3 +21,5 @@ EXTRA_DIST = \
 	README.ornamental	\
 	README.paris		\
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..4b742b5
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,182 @@
+# 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 $@; \
+	{ \
+		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)" = 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_POFILES) \
+				"*/.xml2po.mo" \
+				"*/*.omf.out" \
+			; 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" \
+				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) \
+			$(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-maybe
+gitignore-recurse-maybe:
+	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
+		$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
+	fi;
+gitignore-recurse:
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse); \
+	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/glines/Makefile.am b/glines/Makefile.am
index 36e9fa1..794122f 100644
--- a/glines/Makefile.am
+++ b/glines/Makefile.am
@@ -2,3 +2,5 @@ pixmapdir = $(datadir)/gnome-games/glines/pixmaps
 pixmap_DATA = classic.png dots.png gumball.png pulse.png
 
 EXTRA_DIST = $(pixmap_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/gnobots2/Makefile.am b/gnobots2/Makefile.am
index bed41d1..7a8903c 100644
--- a/gnobots2/Makefile.am
+++ b/gnobots2/Makefile.am
@@ -2,3 +2,5 @@ themedir = $(datadir)/gnome-games/gnobots2/themes
 theme_DATA = cows.png eggs.png mice.png
 
 EXTRA_DIST = $(theme_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/gnometris/Makefile.am b/gnometris/Makefile.am
index 13a06cc..4680fff 100644
--- a/gnometris/Makefile.am
+++ b/gnometris/Makefile.am
@@ -3,3 +3,5 @@ pixmap_DATA = 5blocks.png 5blocks-tim.png 7stones2-gn.png \
               5blocks-tig.png 7blocks.png 7stones-gn.png
 
 EXTRA_DIST = $(pixmap_DATA) 
+
+-include $(top_srcdir)/git.mk
diff --git a/iagno/Makefile.am b/iagno/Makefile.am
index 5529247..f311272 100644
--- a/iagno/Makefile.am
+++ b/iagno/Makefile.am
@@ -3,3 +3,5 @@ pixmap_DATA = blend.png flipblend.png metal.png metal2.png \
 	      shrink.png sunmoon.png 
 
 EXTRA_DIST = $(pixmap_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mahjongg/Makefile.am b/mahjongg/Makefile.am
index 149a48d..5ad3cfa 100644
--- a/mahjongg/Makefile.am
+++ b/mahjongg/Makefile.am
@@ -2,3 +2,5 @@ pixmapdir = $(datadir)/gnome-games/mahjongg/pixmaps
 pixmap_DATA = default.png maya.png default2.png seta.png greek-letters.png
 
 EXTRA_DIST = $(pixmap_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/same-gnome/2.10/Makefile.am b/same-gnome/2.10/Makefile.am
index 146db5b..153e6be 100644
--- a/same-gnome/2.10/Makefile.am
+++ b/same-gnome/2.10/Makefile.am
@@ -2,3 +2,5 @@ pixmapdir = $(datadir)/gnome-games/same-gnome/themes/2.10
 pixmap_DATA = blink.png glass.png marbles.png matrix.png rotate.svg
 
 EXTRA_DIST = $(pixmap_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/same-gnome/Makefile.am b/same-gnome/Makefile.am
index c9389ac..7fa7d35 100644
--- a/same-gnome/Makefile.am
+++ b/same-gnome/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS= 2.10
+
+-include $(top_srcdir)/git.mk



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]