GNOME.org
 

[gnome-system-tools] Use Behdad's git.mk to generate .gitignore files

commit ba6bcfbabdaf2146a8641d1b0b6b1bde47611693
Author: Luca Ferretti <elle uca libero it>
Date:   Wed Aug 26 09:37:37 2009 +0200

    Use Behdad's git.mk to generate .gitignore files

 Makefile.am                      |    2 +
 doc/Makefile.am                  |    2 +
 doc/network/Makefile.am          |    2 +
 doc/services/Makefile.am         |    2 +
 doc/services/nl/Makefile.am      |    2 +
 doc/shares/Makefile.am           |    2 +
 doc/time/Makefile.am             |    2 +
 doc/time/nl/Makefile.am          |    2 +
 doc/users/Makefile.am            |    2 +
 git.mk                           |  183 ++++++++++++++++++++++++++++++++++++++
 icons/16x16/Makefile.am          |    2 +
 icons/16x16/apps/Makefile.am     |    2 +
 icons/22x22/Makefile.am          |    2 +
 icons/22x22/apps/Makefile.am     |    2 +
 icons/24x24/Makefile.am          |    2 +
 icons/24x24/apps/Makefile.am     |    2 +
 icons/32x32/Makefile.am          |    2 +
 icons/32x32/apps/Makefile.am     |    2 +
 icons/48x48/Makefile.am          |    2 +
 icons/48x48/apps/Makefile.am     |    2 +
 icons/48x48/devices/Makefile.am  |    2 +
 icons/Makefile.am                |    2 +
 icons/scalable/Makefile.am       |    2 +
 icons/scalable/apps/Makefile.am  |    2 +
 interfaces/Makefile.am           |    2 +
 pixmaps/Makefile.am              |    2 +
 src/Makefile.am                  |    2 +
 src/common/Makefile.am           |    2 +
 src/disks/Makefile.am            |    2 +
 src/network/Makefile.am          |    2 +
 src/services/Makefile.am         |    2 +
 src/shares/Makefile.am           |    2 +
 src/shares/nautilus/Makefile.am  |    2 +
 src/time/Makefile.am             |    2 +
 src/time/e-map/Makefile.am       |    2 +
 src/users/Makefile.am            |    2 +
 src/users/search-bar/Makefile.am |    2 +
 37 files changed, 255 insertions(+), 0 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d627c3c..1f94633 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,3 +41,5 @@ DISTCLEANFILES = \
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
 
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 73b75ef..3bff0dd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = network services shares time users
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/network/Makefile.am b/doc/network/Makefile.am
index a4c670f..3c14a23 100644
--- a/doc/network/Makefile.am
+++ b/doc/network/Makefile.am
@@ -8,3 +8,5 @@ DOC_FIGURES = figures/network-tool.png
 
 DOC_LINGUAS = ca cs de el en_GB es fr oc sv it zh_CN
 
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/services/Makefile.am b/doc/services/Makefile.am
index 07fe5c2..d0dcdbe 100644
--- a/doc/services/Makefile.am
+++ b/doc/services/Makefile.am
@@ -12,3 +12,5 @@ DOC_LINGUAS = ca cs de el en_GB es fr oc pt_BR sv it zh_CN
 
 # this isn't still ported to gnome-doc-utils
 SUBDIRS = nl 
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/services/nl/Makefile.am b/doc/services/nl/Makefile.am
index c7e9549..07eb319 100644
--- a/doc/services/nl/Makefile.am
+++ b/doc/services/nl/Makefile.am
@@ -8,3 +8,5 @@ include $(top_srcdir)/xmldocs.make
 
 dist-hook: app-dist-hook
 
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/shares/Makefile.am b/doc/shares/Makefile.am
index d260d31..2cc4562 100644
--- a/doc/shares/Makefile.am
+++ b/doc/shares/Makefile.am
@@ -6,3 +6,5 @@ DOC_ENTITIES = legal.xml
 DOC_INCLUDES = 
 DOC_FIGURES = figures/shares-tool.png
 DOC_LINGUAS = ca cs de el en_GB fr oc pt_BR sv es it zh_CN
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/time/Makefile.am b/doc/time/Makefile.am
index c60873d..f5666ea 100644
--- a/doc/time/Makefile.am
+++ b/doc/time/Makefile.am
@@ -14,3 +14,5 @@ DOC_LINGUAS = ca cs de el en_GB es fr it oc pt_BR ru sv zh_CN
 
 # This isn't still ported to gnome-doc-utils
 SUBDIRS = nl
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/time/nl/Makefile.am b/doc/time/nl/Makefile.am
index e2849ab..cfb4ab5 100644
--- a/doc/time/nl/Makefile.am
+++ b/doc/time/nl/Makefile.am
@@ -8,3 +8,5 @@ include $(top_srcdir)/xmldocs.make
 
 dist-hook: app-dist-hook
 
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/users/Makefile.am b/doc/users/Makefile.am
index 67307b0..fe1d64b 100644
--- a/doc/users/Makefile.am
+++ b/doc/users/Makefile.am
@@ -8,3 +8,5 @@ DOC_FIGURES = figures/users-tool.png	\
 	       figures/groups.png
 
 DOC_LINGUAS = ca cs de el en_GB es fr oc pt_BR ru sv it zh_CN
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..d88d409
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,183 @@
+# 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) \
+			$(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]" \
+		; 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 || echo "Skipping $$subdir"); \
+	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/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index be70ac5..237e209 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = apps
 
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/16x16/apps/Makefile.am b/icons/16x16/apps/Makefile.am
index 3013790..ddb6425 100644
--- a/icons/16x16/apps/Makefile.am
+++ b/icons/16x16/apps/Makefile.am
@@ -13,3 +13,5 @@ noinst_DATA = \
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am
index be70ac5..237e209 100644
--- a/icons/22x22/Makefile.am
+++ b/icons/22x22/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = apps
 
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/22x22/apps/Makefile.am b/icons/22x22/apps/Makefile.am
index 7c10fcc..eb658db 100644
--- a/icons/22x22/apps/Makefile.am
+++ b/icons/22x22/apps/Makefile.am
@@ -13,3 +13,5 @@ noinst_DATA = \
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am
index be70ac5..237e209 100644
--- a/icons/24x24/Makefile.am
+++ b/icons/24x24/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = apps
 
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/24x24/apps/Makefile.am b/icons/24x24/apps/Makefile.am
index 8e4f97d..46efb67 100644
--- a/icons/24x24/apps/Makefile.am
+++ b/icons/24x24/apps/Makefile.am
@@ -9,3 +9,5 @@ icons_DATA = \
 
 EXTRA_DIST =		\
 	$(icons_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/32x32/Makefile.am b/icons/32x32/Makefile.am
index be70ac5..237e209 100644
--- a/icons/32x32/Makefile.am
+++ b/icons/32x32/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = apps
 
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/32x32/apps/Makefile.am b/icons/32x32/apps/Makefile.am
index d71cd5f..15a5f6a 100644
--- a/icons/32x32/apps/Makefile.am
+++ b/icons/32x32/apps/Makefile.am
@@ -13,3 +13,5 @@ noinst_DATA = \
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index b23c45c..eb00566 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = apps devices
 
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/48x48/apps/Makefile.am b/icons/48x48/apps/Makefile.am
index a8e3bda..7b359fc 100644
--- a/icons/48x48/apps/Makefile.am
+++ b/icons/48x48/apps/Makefile.am
@@ -10,3 +10,5 @@ icons_DATA = \
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/48x48/devices/Makefile.am b/icons/48x48/devices/Makefile.am
index 21d1bb0..2b224ae 100644
--- a/icons/48x48/devices/Makefile.am
+++ b/icons/48x48/devices/Makefile.am
@@ -11,3 +11,5 @@ icons_DATA = \
 EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 0287384..123b8e3 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -12,3 +12,5 @@ update-icon-cache:
 		echo "*** Icon cache not updated.  After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
index be70ac5..237e209 100644
--- a/icons/scalable/Makefile.am
+++ b/icons/scalable/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = apps
 
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/scalable/apps/Makefile.am b/icons/scalable/apps/Makefile.am
index ac6124d..de79fc4 100644
--- a/icons/scalable/apps/Makefile.am
+++ b/icons/scalable/apps/Makefile.am
@@ -13,3 +13,5 @@ EXTRA_DIST =		\
 	$(icons_DATA)	\
 	$(noinst_DATA)
 
+
+-include $(top_srcdir)/git.mk
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index 97b8fa7..1885f7f 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -11,3 +11,5 @@ interfaces = \
 interfaces_DATA = $(interfaces)
 
 EXTRA_DIST = $(interfaces)
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index c9c703e..d6339c8 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -3,3 +3,5 @@ pixmap_DATA = \
 	world_map-960.png 
 
 EXTRA_DIST = $(pixmap_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index e62c515..d881a81 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,3 +25,5 @@ SUBDIRS = \
 	$(shares_SUBDIR)	\
 	$(time_SUBDIR)		\
 	$(users_SUBDIR)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 5cfbd69..9da4113 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -20,3 +20,5 @@ libsetuptool_a_SOURCES = \
 	gst.h
 
 EXTRA_DIST = CommonMakefile $(headers)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/disks/Makefile.am b/src/disks/Makefile.am
index 7d18c44..4ae00d6 100644
--- a/src/disks/Makefile.am
+++ b/src/disks/Makefile.am
@@ -37,3 +37,5 @@ disks_admin_SOURCES = \
 	callbacks.c		  callbacks.h
 
 toolpixmaps =
+
+-include $(top_srcdir)/git.mk
diff --git a/src/network/Makefile.am b/src/network/Makefile.am
index f860b8c..cb9e5fc 100644
--- a/src/network/Makefile.am
+++ b/src/network/Makefile.am
@@ -36,3 +36,5 @@ network_admin_SOURCES = \
 	main.c
 
 toolpixmaps =
+
+-include $(top_srcdir)/git.mk
diff --git a/src/services/Makefile.am b/src/services/Makefile.am
index 9789aab..c8a735c 100644
--- a/src/services/Makefile.am
+++ b/src/services/Makefile.am
@@ -26,3 +26,5 @@ services_admin_SOURCES = \
 	services-tool.c		services-tool.h
 
 toolpixmaps =
+
+-include $(top_srcdir)/git.mk
diff --git a/src/shares/Makefile.am b/src/shares/Makefile.am
index cee41e2..471b3ac 100644
--- a/src/shares/Makefile.am
+++ b/src/shares/Makefile.am
@@ -31,3 +31,5 @@ shares_admin_SOURCES = \
 	main.c 
 
 toolpixmaps =
+
+-include $(top_srcdir)/git.mk
diff --git a/src/shares/nautilus/Makefile.am b/src/shares/nautilus/Makefile.am
index 6017081..f1b94ee 100644
--- a/src/shares/nautilus/Makefile.am
+++ b/src/shares/nautilus/Makefile.am
@@ -15,3 +15,5 @@ libnautilus_gst_shares_la_SOURCES =     		\
 libnautilus_gst_shares_la_LDFLAGS = -module -avoid-version
 libnautilus_gst_shares_la_LIBADD  = $(NAUTILUS_LIBS)
 
+
+-include $(top_srcdir)/git.mk
diff --git a/src/time/Makefile.am b/src/time/Makefile.am
index fb21a20..e9adaf4 100644
--- a/src/time/Makefile.am
+++ b/src/time/Makefile.am
@@ -25,3 +25,5 @@ time_admin_SOURCES = \
 	main.c
 
 toolpixmaps =
+
+-include $(top_srcdir)/git.mk
diff --git a/src/time/e-map/Makefile.am b/src/time/e-map/Makefile.am
index d6eebfd..5828690 100644
--- a/src/time/e-map/Makefile.am
+++ b/src/time/e-map/Makefile.am
@@ -29,3 +29,5 @@ BUILT_SOURCES= e-map-marshal.c e-map-marshal.h
 libemap_a_SOURCES = \
 	e-map.c e-map.h \
 	$(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/users/Makefile.am b/src/users/Makefile.am
index 1b034bf..a171870 100644
--- a/src/users/Makefile.am
+++ b/src/users/Makefile.am
@@ -33,3 +33,5 @@ users_admin_SOURCES = \
 	test-battery.c		test-battery.h
 
 toolpixmaps =
+
+-include $(top_srcdir)/git.mk
diff --git a/src/users/search-bar/Makefile.am b/src/users/search-bar/Makefile.am
index 2cc0ad0..daf9ca9 100644
--- a/src/users/search-bar/Makefile.am
+++ b/src/users/search-bar/Makefile.am
@@ -28,3 +28,5 @@ libsearchbar_a_SOURCES =   \
 	search-bar-marshal.c \
 	search-bar-marshal.h 
 
+
+-include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]