[gnome-video-arcade] Update git.mk.

[Matthew Barnes <mbarnes src gnome org>]

commit b3ef37e80b2df26939669f1190fd5f6fc3110f2c
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Aug 3 00:07:34 2013 +0200

    Update git.mk.

 git.mk |   74 ++++++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 51 insertions(+), 23 deletions(-)
---
diff --git a/git.mk b/git.mk
index f244116..4da8fe2 100644
--- a/git.mk
+++ b/git.mk
@@ -1,18 +1,20 @@
 # 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 canonical source for this file is 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,7 +24,7 @@
 #
 # 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".
@@ -30,18 +32,24 @@
 # 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.
+# 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, GSettings.
+# 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 +65,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 \
@@ -93,20 +102,33 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                                xml html \
                        ; do echo /$$x; done; \
                fi; \
-               if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+               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_C_DOCS) \
-                               $(_DOC_LC_DOCS) \
                                $(_DOC_OMF_ALL) \
                                $(_DOC_DSK_ALL) \
                                $(_DOC_HTML_ALL) \
-                               $(_DOC_POFILES) \
                                $(_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) \
@@ -139,14 +161,19 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                                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) \
-                       $(LTLIBRARIES) \
+                       $(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
+                       $(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
+                       $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
                        so_locations \
                        .libs _libs \
                        $(MOSTLYCLEANFILES) \
@@ -176,18 +203,19 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
        mv $  tmp $@;
 
 all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
 gitignore-recurse-maybe:
-       @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
-               $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
-       fi;
-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");; \
+           *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore 
gitignore-recurse-maybe || echo "Skipping $$subdir");; \
          esac; \
        done
-gitignore: $(srcdir)/.gitignore gitignore-recurse
+gitignore-recurse:
+       @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: