GNOME.org
 

[gnome-terminal] Add git.mk

commit 83349afecddd897c4561d4ca0cc5d092d3d706b9
Author: Behdad Esfahbod <behdad behdad org>
Date:   Fri Apr 17 21:39:09 2009 -0400

    Add git.mk
---
 .gitignore             |   37 ----------
 Makefile.am            |   25 ++++++-
 git.mk                 |  174 ++++++++++++++++++++++++++++++++++++++++++++++++
 help/Makefile.am       |    2 +
 help/bg/Makefile.am    |    2 +
 help/ja/Makefile.am    |    2 +
 help/ro/Makefile.am    |    2 +
 help/zh_CN/Makefile.am |    2 +
 help/zh_TW/Makefile.am |    2 +
 src/Makefile.am        |    2 +
 src/skey/Makefile.am   |    2 +
 11 files changed, 212 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a382198..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,37 +0,0 @@
-*~
-Makefile.in
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h.in
-config.sub
-configure
-depcomp
-gnome-doc-utils.make
-help/Makefile.in
-help/it/Makefile.in
-help/ja/Makefile.in
-help/zh_CN/Makefile.in
-help/zh_TW/Makefile.in
-install-sh
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
-ltmain.sh
-missing
-mkinstalldirs
-pixmaps/Makefile.in
-po/Makefile.in.in
-po/*.pot
-po/*.mo
-po/*.gmo
-po/missing
-po/notexist
-m4/gnome-doc-utils.m4
-m4/gtk-doc.m4
-m4/intltool.m4
-src/*.bak
-src/*.gladep
-omf.make
-xmldocs.make
diff --git a/Makefile.am b/Makefile.am
index 94e6d8d..db58b7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,9 +18,26 @@ EXTRA_DIST = 			\
 	xmldocs.make		\
 	omf.make
 
-DISTCLEANFILES =		\
-	gnome-doc-utils.make	\
-	$(desktop_DATA)
+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)/ChangeLog \
+	$(srcdir)/gnome-doc-utils.make	\
+	$(desktop_DATA) \
+	`find "$(srcdir)" -type f -name Makefile.in -print`
 
 # hack from sound-juicer to get around scrollkeeper's leaving a big
 # mess behind.
@@ -36,3 +53,5 @@ ChangeLog:
 dist: ChangeLog
 
 .PHONY: ChangeLog
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..3809d71
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,174 @@
+# git.mk
+#
+# Copyright 2009 Red Hat, Inc.
+# Written by Behdad Esfahbod
+#
+# 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
+
+.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 | \
+	grep -v '/[.][.]/' | \
+	sed 's@/[.]/@/@g' | \
+	LANG=C sort | uniq > $  tmp && \
+	mv $  tmp $@;
+
+all: .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 .gitignore
+.PHONY: gitignore-clean gitignore-recurse
+
diff --git a/help/Makefile.am b/help/Makefile.am
index 8c26913..1dfc08f 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -13,3 +13,5 @@ DOC_LINGUAS = da de ca cs el en_GB es fr it ko oc pt_BR ru sv uk
 # Move to DOC_LINGUAS in transition to gnome-doc-utils
 
 SUBDIRS = bg ro ja zh_CN zh_TW
+
+-include $(top_srcdir)/git.mk
diff --git a/help/bg/Makefile.am b/help/bg/Makefile.am
index 4ce8719..504dcdd 100644
--- a/help/bg/Makefile.am
+++ b/help/bg/Makefile.am
@@ -6,3 +6,5 @@ entities = legal.xml
 include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
 
+
+-include $(top_srcdir)/git.mk
diff --git a/help/ja/Makefile.am b/help/ja/Makefile.am
index d96a4af..b7fc132 100644
--- a/help/ja/Makefile.am
+++ b/help/ja/Makefile.am
@@ -6,3 +6,5 @@ entities = legal.xml
 include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
 
+
+-include $(top_srcdir)/git.mk
diff --git a/help/ro/Makefile.am b/help/ro/Makefile.am
index b840b39..428ced3 100644
--- a/help/ro/Makefile.am
+++ b/help/ro/Makefile.am
@@ -6,3 +6,5 @@ entities = legal.xml
 include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
 
+
+-include $(top_srcdir)/git.mk
diff --git a/help/zh_CN/Makefile.am b/help/zh_CN/Makefile.am
index 3ef0ffe..741ed14 100644
--- a/help/zh_CN/Makefile.am
+++ b/help/zh_CN/Makefile.am
@@ -6,3 +6,5 @@ entities = legal.xml
 include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
 
+
+-include $(top_srcdir)/git.mk
diff --git a/help/zh_TW/Makefile.am b/help/zh_TW/Makefile.am
index da28a3f..f68e727 100644
--- a/help/zh_TW/Makefile.am
+++ b/help/zh_TW/Makefile.am
@@ -6,3 +6,5 @@ entities = legal.xml
 include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
 
+
+-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index 317bcf7..83aac77 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -197,3 +197,5 @@ endif
 
 %.ui: %.glade
 	$(GTK_BUILDER_CONVERT) $< $@
+
+-include $(top_srcdir)/git.mk
diff --git a/src/skey/Makefile.am b/src/skey/Makefile.am
index a7a6246..0402507 100644
--- a/src/skey/Makefile.am
+++ b/src/skey/Makefile.am
@@ -56,3 +56,5 @@ testskey_LDADD = \
 	$(TERM_LIBS)
 
 TESTS = testskey
+
+-include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]