GNOME.org
 

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

commit ab139c6c8cb1b8544f9ad54494ec44b3592a3dec
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Apr 27 01:59:34 2009 +0200

    Use git.mk from pango to autogenerate .gitignore files
---
 .gitignore                             |   33 ------
 Makefile.am                            |   21 ++++
 applets/.gitignore                     |    2 -
 applets/Makefile.am                    |    2 +
 applets/clock/Makefile.am              |    2 +
 applets/clock/pixmaps/Makefile.am      |    2 +
 applets/fish/Makefile.am               |    2 +
 applets/notification_area/Makefile.am  |    2 +
 applets/wncklet/Makefile.am            |    2 +
 doc/Makefile.am                        |    2 +
 doc/reference/Makefile.am              |    2 +
 doc/reference/panel-applet/Makefile.am |    2 +
 git.mk                                 |  178 ++++++++++++++++++++++++++++++++
 gnome-panel/Makefile.am                |    2 +
 gnome-panel/libpanel-util/Makefile.am  |    2 +
 help/Makefile.am                       |    2 +
 help/clock/Makefile.am                 |    2 +
 help/fish/Makefile.am                  |    2 +
 help/window-list/Makefile.am           |    2 +
 help/workspace-switcher/Makefile.am    |    2 +
 icons/16x16/Makefile.am                |    2 +
 icons/22x22/Makefile.am                |    2 +
 icons/24x24/Makefile.am                |    2 +
 icons/32x32/Makefile.am                |    2 +
 icons/48x48/Makefile.am                |    2 +
 icons/Makefile.am                      |    2 +
 icons/scalable/Makefile.am             |    2 +
 idl/Makefile.am                        |    2 +
 libpanel-applet/Makefile.am            |    2 +
 man/Makefile.am                        |    2 +
 30 files changed, 251 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f2911a2..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-INSTALL
-Makefile
-Makefile.in
-aclocal.m4
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-gnome-doc-utils.make
-gtk-doc.make
-install-sh
-intltool-extract
-intltool-extract.in
-intltool-merge
-intltool-merge.in
-intltool-update
-intltool-update.in
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-omf.make
-stamp-h1
-xmldocs.make
-*.o
-*.lo
-.deps
-.libs
-*~
diff --git a/Makefile.am b/Makefile.am
index 5c3a64e..f45efb4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,3 +39,24 @@ EXTRA_DIST = \
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
 DISTCLEANFILES =		\
 	gnome-doc-utils.make
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/INSTALL \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/compile \
+	$(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/applets/.gitignore b/applets/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/applets/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/applets/Makefile.am b/applets/Makefile.am
index 50b1ae7..28f243d 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -11,3 +11,5 @@ install-data-local:
 	if test -f $(DESTDIR)$(gen_util_server); then \
 		rm -f $(DESTDIR)$(gen_util_server); \
 	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index b4f9126..d8c965e 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -251,3 +251,5 @@ CLEANFILES =			\
 	$(schemas_DATA)		\
 	$(polkit_DATA)		\
 	$(dbus_services_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/applets/clock/pixmaps/Makefile.am b/applets/clock/pixmaps/Makefile.am
index eb49f71..353091d 100644
--- a/applets/clock/pixmaps/Makefile.am
+++ b/applets/clock/pixmaps/Makefile.am
@@ -17,3 +17,5 @@ EXTRA_DIST = 		\
 	$(icon_DATA)
 
 MAINTAINERCLEANFILES = Makefile.in
+
+-include $(top_srcdir)/git.mk
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 29f5d83..5832eae 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -95,3 +95,5 @@ install-data-local:
 else
 install-data-local:
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index 7e7040c..e824e14 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -107,3 +107,5 @@ testtray_SOURCES = \
 testtray_LDADD = \
 	$(X_LIBS)					\
 	$(PANEL_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index 4dbb9d8..382dc46 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -105,3 +105,5 @@ endif
 gladedir   = $(datadir)/gnome-panel/glade
 glade_DATA = workspace-switcher.glade window-list.glade
 
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ef9745d..a37f6cf 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,3 +3,5 @@ SUBDIRS = reference
 EXTRA_DIST=	\
 	panel-session-handling.txt \
 	panel-keynav.txt	
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 23f4f1c..f72e8f5 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = panel-applet
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/reference/panel-applet/Makefile.am b/doc/reference/panel-applet/Makefile.am
index 4091797..78dd716 100644
--- a/doc/reference/panel-applet/Makefile.am
+++ b/doc/reference/panel-applet/Makefile.am
@@ -64,3 +64,5 @@ dist-hook-local:
 #	for f in $(srcdir)/TEXT/* ; do  \
 #	  test -f $$f && cp -p $$f $(distdir)/TEXT; \
 #	done
+
+-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-panel/Makefile.am b/gnome-panel/Makefile.am
index c167c2f..a3ea545 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -279,3 +279,5 @@ CLEANFILES = \
 
 dist-hook:
 	cd $(distdir) ; rm -f $(CLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/gnome-panel/libpanel-util/Makefile.am b/gnome-panel/libpanel-util/Makefile.am
index d7ecca6..1d98983 100644
--- a/gnome-panel/libpanel-util/Makefile.am
+++ b/gnome-panel/libpanel-util/Makefile.am
@@ -41,3 +41,5 @@ libpanel_util_la_SOURCES=	\
 	panel-show.c			\
 	panel-show.h			\
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/help/Makefile.am b/help/Makefile.am
index 469c36e..187dd5c 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = clock fish window-list workspace-switcher
+
+-include $(top_srcdir)/git.mk
diff --git a/help/clock/Makefile.am b/help/clock/Makefile.am
index 9527c06..fdb2314 100644
--- a/help/clock/Makefile.am
+++ b/help/clock/Makefile.am
@@ -5,3 +5,5 @@ DOC_MODULE = clock
 DOC_INCLUDES = legal.xml
 
 DOC_LINGUAS = ar ca cs de el en_GB es eu fi fr it ja ko nl oc pa pt_BR ru sr sv th uk zh_CN zh_TW
+
+-include $(top_srcdir)/git.mk
diff --git a/help/fish/Makefile.am b/help/fish/Makefile.am
index 5e91c7f..49f69d4 100644
--- a/help/fish/Makefile.am
+++ b/help/fish/Makefile.am
@@ -5,3 +5,5 @@ DOC_MODULE = fish
 DOC_INCLUDES = legal.xml
 
 DOC_LINGUAS = ca de el en_GB es eu fi fr it ko oc ru sv th uk zh_CN
+
+-include $(top_srcdir)/git.mk
diff --git a/help/window-list/Makefile.am b/help/window-list/Makefile.am
index 4140024..2e09543 100644
--- a/help/window-list/Makefile.am
+++ b/help/window-list/Makefile.am
@@ -5,3 +5,5 @@ DOC_MODULE = window-list
 DOC_INCLUDES = 
 
 DOC_LINGUAS = ar ca cs da de el en_GB es eu fi fr it ko oc pa pt_BR ru sv uk zh_CN
+
+-include $(top_srcdir)/git.mk
diff --git a/help/workspace-switcher/Makefile.am b/help/workspace-switcher/Makefile.am
index a79756d..11e9ab0 100644
--- a/help/workspace-switcher/Makefile.am
+++ b/help/workspace-switcher/Makefile.am
@@ -5,3 +5,5 @@ DOC_MODULE = workspace-switcher
 DOC_INCLUDES = 
 
 DOC_LINGUAS = ar ca cs da de el en_GB es eu fi fr it ko nl oc pa pt_BR ru sv uk vi zh_CN
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 9350a84..44d350f 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -48,3 +48,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/22x22/Makefile.am b/icons/22x22/Makefile.am
index 9e71258..277efea 100644
--- a/icons/22x22/Makefile.am
+++ b/icons/22x22/Makefile.am
@@ -48,3 +48,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/24x24/Makefile.am b/icons/24x24/Makefile.am
index 98d5f12..8b87467 100644
--- a/icons/24x24/Makefile.am
+++ b/icons/24x24/Makefile.am
@@ -33,3 +33,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/32x32/Makefile.am b/icons/32x32/Makefile.am
index ae3d4a8..4c5f16e 100644
--- a/icons/32x32/Makefile.am
+++ b/icons/32x32/Makefile.am
@@ -48,3 +48,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/48x48/Makefile.am b/icons/48x48/Makefile.am
index 4f5b34d..70b4647 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -28,3 +28,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/Makefile.am b/icons/Makefile.am
index 89d4ff0..eeb8d0b 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -10,3 +10,5 @@ gegl_DATA = 				\
 	$(NULL)
 
 EXTRA_DIST = $(gegl_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
index 9bbc336..a13ca52 100644
--- a/icons/scalable/Makefile.am
+++ b/icons/scalable/Makefile.am
@@ -37,3 +37,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/idl/Makefile.am b/idl/Makefile.am
index e419eb2..7c18d30 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -3,3 +3,5 @@ idldir = $(datadir)/idl/gnome-panel-2.0
 idl_DATA = GNOME_Panel.idl
 
 EXTRA_DIST = $(idl_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/libpanel-applet/Makefile.am b/libpanel-applet/Makefile.am
index 049686b..1b5a68f 100644
--- a/libpanel-applet/Makefile.am
+++ b/libpanel-applet/Makefile.am
@@ -129,3 +129,5 @@ noinst_DATA     = $(server_in_files:.server.in=.server)
 
 dist-hook:
 	cd $(distdir) ; rm -f $(CLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/man/Makefile.am b/man/Makefile.am
index 2a3c575..84d8162 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -2,3 +2,5 @@ man_MANS =				\
 	gnome-panel.1
 
 EXTRA_DIST = $(man_MANS)
+
+-include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]