[anjuta] git.mk: update to the latest version

[Carl-Anton Ingmarsson <carlantoni src gnome org>]

commit 8e9ee4c16aaa902c4208edd81934a7c42ea54ef5
Author: Carl-Anton Ingmarsson <ca ingmarsson gmail com>
Date:   Tue Feb 19 00:31:44 2013 +0100

    git.mk: update to the latest version

 git.mk |  245 ++++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 147 insertions(+), 98 deletions(-)
---
diff --git a/git.mk b/git.mk
index 9cfce1c..d5bf7b8 100644
--- a/git.mk
+++ b/git.mk
@@ -1,18 +1,23 @@
 # git.mk
 #
 # Copyright 2009, Red Hat, Inc.
+# Copyright 2010,2011 Behdad Esfahbod
 # Written by Behdad Esfahbod
 #
 # Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
+# is 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.
+# The latest version of this file can be downloaded from:
+#   https://raw.github.com/behdad/git.mk/master/git.mk
+# Bugs, etc, should be reported upstream at:
+#   https://github.com/behdad/git.mk
 #
 # 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.
+# your project to -include git.mk.  Remember to add that line to new
+# Makefile.am files you create in your project, or just rerun the
+# "make -f git.mk".
 #
 # This enables automatic .gitignore generation.  If you need to ignore
 # more files, add them to the GITIGNOREFILES variable in your Makefile.am.
@@ -22,26 +27,32 @@
 #
 # 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.
+# or maintainer-clean-local make targets.
 #
 # 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.
+# 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 and I'll diagnose.
 #
 # For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
-# pango/Makefile.am.
+# Makefile.am.sample in the git.mk git repo.
 #
 # 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.
+# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
 #
+# This makefile provides the following targets:
+#
+# - all: "make all" will build all gitignore files.
+# - gitignore: makes all gitignore files in the current dir and subdirs.
+# - .gitignore: make gitignore file for the current dir.
+# - gitignore-recurse: makes all gitignore files in the subdirs.
 #
 # KNOWN ISSUES:
 #
@@ -57,7 +68,8 @@ git-all: git-mk-install
 
 git-mk-install:
        @echo Installing git makefile
-       @any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \
+       @any_failed=; \
+               find "`test -z "$(top_srcdir)" && echo . || echo "$(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 \
@@ -82,97 +94,134 @@ 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)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+                       for lc in $(DOC_LINGUAS); do \
+                               for x in \
+                                       $(if $(DOC_MODULE),$(DOC_MODULE).xml) \
+                                       $(DOC_PAGES) \
+                                       $(DOC_INCLUDES) \
+                               ; do echo /$$lc/$$x; done; \
+                       done; \
+                       for x in \
+                               $(_DOC_OMF_ALL) \
+                               $(_DOC_DSK_ALL) \
+                               $(_DOC_HTML_ALL) \
+                               $(_DOC_MOFILES) \
+                               $(DOC_H_FILE) \
+                               "*/.xml2po.mo" \
+                               "*/*.omf.out" \
+                       ; do echo /$$x; done; \
+               fi; \
+               if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
+                       for lc in $(HELP_LINGUAS); do \
+                               for x in \
+                                       $(HELP_FILES) \
+                                       "$$lc.stamp" \
+                                       "$$lc.mo" \
+                               ; do echo /$$lc/$$x; done; \
+                       done; \
+               fi; \
+               if test "x$(gsettings_SCHEMAS)" = x; then :; else \
+                       for x in \
+                               $(gsettings_SCHEMAS:.xml=.valid) \
+                               $(gsettings__enum_file) \
+                       ; 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; \
+               if test "x$(DEJATOOL)" = x; then :; else \
+                       for x in \
+                               $(DEJATOOL) \
+                       ; do echo /$$x.sum; echo /$$x.log; done; \
+                       echo /site.exp; \
+               fi; \
+               for x in \
+                       .gitignore \
+                       $(GITIGNOREFILES) \
+                       $(CLEANFILES) \
+                       $(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
+                       $(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
+                       $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_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]" \
+                       ".dirstamp" \
+               ; 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
+all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
+gitignore-recurse-maybe:
+       @for subdir in $(DIST_SUBDIRS); do \
+         case " $(SUBDIRS) " in \
+           *" $$subdir "*) :;; \
+           *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore 
gitignore-recurse-maybe || echo "Skipping $$subdir");; \
+         esac; \
+       done
 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
+       @for subdir in $(DIST_SUBDIRS); do \
+           test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || 
echo "Skipping $$subdir"); \
+       done
+
+maintainer-clean: gitignore-clean
 gitignore-clean:
-       rm -f $(srcdir)/.gitignore
-.PHONY: gitignore-clean gitignore-recurse
+       -rm -f $(srcdir)/.gitignore
 
+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe