[evolution-rss] update git.mk and list of ignored files

[Lucian Langa <lucilanga src gnome org>]

commit c6c53a2bfa7d6cc032291e99463b838865f22dfc
Author: Lucian Langa <lucilanga gnome org>
Date:   Wed Jan 26 17:38:18 2011 +0200

    update git.mk and list of ignored files

 Makefile.am |   78 +++++++++++++++++++++----
 git.mk      |  186 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 164 insertions(+), 100 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c96801d..1203a4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = pixmaps po src
-
 ACLOCAL_AMFLAGS = -I m4
 
 INTLTOOL =                      \
@@ -21,15 +19,73 @@ DISTCLEANFILES = \
 	intltool-merge \
 	intltool-update
 
-GITIGNOREFILES= 	aclocal.m4				\
-			compile					\
-			config.guess				\
-			config.h.in				\
-			config.sub				\
-			ltmain.sh				\
-			m4/libtool.m4				\
-			m4/lt*.m4				\
-			src/GNOME_Evolution_RSS_2.*.server
+SUBDIRS = pixmaps po src
+
+MAINTAINERCLEANFILES = 						\
+        $(srcdir)/ABOUT-NLS             \
+        $(srcdir)/INSTALL               \
+        $(srcdir)/aclocal.m4            \
+        $(srcdir)/autoscan.log          \
+        $(srcdir)/compile               \
+        $(srcdir)/config.guess          \
+        $(srcdir)/config.h.in           \
+        $(srcdir)/config.rpath          \
+        $(srcdir)/config.sub            \
+        $(srcdir)/configure.scan        \
+        $(srcdir)/depcomp               \
+        $(srcdir)/install-sh            \
+        $(srcdir)/ltmain.sh             \
+        $(srcdir)/missing               \
+        $(srcdir)/mkinstalldirs         \
+        $(srcdir)/gnome-doc-utils.make  \
+        $(srcdir)/gtk-doc.make          \
+        $(srcdir)/m4/codeset.m4         \
+        $(srcdir)/m4/gettext.m4         \
+        $(srcdir)/m4/glibc2.m4          \
+        $(srcdir)/m4/glibc21.m4         \
+        $(srcdir)/m4/gnome-doc-utils.m4 \
+        $(srcdir)/m4/gtk-doc.m4         \
+        $(srcdir)/m4/iconv.m4           \
+        $(srcdir)/m4/intdiv0.m4         \
+        $(srcdir)/m4/intl.m4            \
+        $(srcdir)/m4/intldir.m4         \
+        $(srcdir)/m4/intlmacosx.m4      \
+        $(srcdir)/m4/intltool.m4        \
+        $(srcdir)/m4/intmax.m4          \
+        $(srcdir)/m4/inttypes-pri.m4    \
+        $(srcdir)/m4/inttypes_h.m4      \
+        $(srcdir)/m4/lcmessage.m4       \
+        $(srcdir)/m4/lib-ld.m4          \
+        $(srcdir)/m4/lib-link.m4        \
+        $(srcdir)/m4/lib-prefix.m4      \
+        $(srcdir)/m4/libtool.m4         \
+        $(srcdir)/m4/lock.m4            \
+        $(srcdir)/m4/longlong.m4        \
+        $(srcdir)/m4/ltoptions.m4       \
+        $(srcdir)/m4/ltsugar.m4         \
+        $(srcdir)/m4/ltversion.m4       \
+        $(srcdir)/m4/lt~obsolete.m4     \
+        $(srcdir)/m4/nls.m4             \
+        $(srcdir)/m4/po.m4              \
+        $(srcdir)/m4/printf-posix.m4    \
+        $(srcdir)/m4/progtest.m4        \
+        $(srcdir)/m4/size_max.m4        \
+        $(srcdir)/m4/stdint_h.m4        \
+        $(srcdir)/m4/uintmax_t.m4       \
+        $(srcdir)/m4/visibility.m4      \
+        $(srcdir)/m4/wchar_t.m4         \
+        $(srcdir)/m4/wint_t.m4          \
+        $(srcdir)/m4/xsize.m4           \
+        $(srcdir)/po/Makefile.in.in~    \
+        $(srcdir)/po/Makevars.template  \
+        $(srcdir)/po/Rules-quot         \
+        $(srcdir)/po/boldquot.sed       \
+        $(srcdir)/po/en boldquot header \
+        $(srcdir)/po/en quot header     \
+        $(srcdir)/po/insert-header.sin  \
+        $(srcdir)/po/quot.sed           \
+        $(srcdir)/po/remove-potcdate.sin \
+	$(srcdir)/GNOME_Evolution_RSS_2.*.server
 
 
 # Generate a ChangeLog file from 'git log'
diff --git a/git.mk b/git.mk
index b19dc5a..5ab41ba 100644
--- a/git.mk
+++ b/git.mk
@@ -28,8 +28,8 @@
 # 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
+# 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
@@ -82,98 +82,106 @@ 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" \
-		"*~" \
-		".*.swp" \
-	; do echo /$$x; done | \
+	$(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)" = 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" \
+				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]" \
+		; do echo /$$x; done; \
+	} | \
 	sed "s ^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
 	sed 's@/[.]/@/@g' | \
-	LANG=C sort | uniq > $  tmp && \
+	LC_ALL=C sort | uniq > $  tmp && \
 	mv $  tmp $@;
 
-all: $(srcdir)/.gitignore gitignore-recurse
-gitignore-recurse:
+all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore-recurse-maybe:
 	@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; \
+		$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
 	fi;
-maintainer-clean-local: gitignore-clean
-gitignore-clean:
-	rm -f $(srcdir)/.gitignore
-.PHONY: gitignore-clean gitignore-recurse
+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