[gnome-chess] Update git.mk

[Michael Catanzaro <mcatanzaro src gnome org>]

commit a89f8f5a9b0c522cd4ea2b79de98ba9526dab129
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Nov 29 10:57:44 2014 -0600

    Update git.mk
    
    It puts test-driver in MAINTAINERCLEANFILES

 Makefile.am |    2 --
 git.mk      |   54 +++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 39 insertions(+), 17 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 66c3e32..f9d5374 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,6 @@ ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = autogen.sh NEWS
 
-DISTCLEANFILES = test-driver
-
 MAINTAINERCLEANFILES = \
        $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
        $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
diff --git a/git.mk b/git.mk
index 5467b86..af15798 100644
--- a/git.mk
+++ b/git.mk
@@ -45,7 +45,8 @@
 # build dir.
 #
 # This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
+# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata,
+# appstream.
 #
 # This makefile provides the following targets:
 #
@@ -77,7 +78,7 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
        $(srcdir)/aclocal.m4 \
        $(srcdir)/autoscan.log \
        $(srcdir)/configure.scan \
-       `AUX_DIR=$(srcdir)/$$($(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' $(srcdir)/configure.ac); \
+       `AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
         test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
         for x in \
                ar-lib \
@@ -89,27 +90,34 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
                ltmain.sh \
                missing \
                mkinstalldirs \
+               test-driver \
+               ylwrap \
         ; do echo "$$AUX_DIR/$$x"; done` \
-       `$(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' $(srcdir)/configure.ac | \
+       `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
        head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
 #
 # All modules should also be fine including the following variable, which
 # removes automake-generated Makefile.in files:
 GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
-       `$(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' $(srcdir)/configure.ac | \
+       `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \
        while read f; do \
          case $$f in Makefile|*/Makefile) \
            test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
        done`
 #
-# Modules that use libtool /and/ use  AC_CONFIG_MACRO_DIR([m4]) may also
-# include this:
+# Modules that use libtool and use  AC_CONFIG_MACRO_DIR() may also include this,
+# though it's harmless to include regardless.
 GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
-       $(srcdir)/m4/libtool.m4 \
-       $(srcdir)/m4/ltoptions.m4 \
-       $(srcdir)/m4/ltsugar.m4 \
-       $(srcdir)/m4/ltversion.m4 \
-       $(srcdir)/m4/lt~obsolete.m4
+       `MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' 
./configure.ac); \
+        if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \
+               for x in \
+                       libtool.m4 \
+                       ltoptions.m4 \
+                       ltsugar.m4 \
+                       ltversion.m4 \
+                       lt~obsolete.m4 \
+               ; do echo "$$MACRO_DIR/$$x"; done; \
+        fi`
 
 
 
@@ -160,6 +168,8 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                                "tmpl/*.bak" \
                                xml html \
                        ; do echo "/$$x"; done; \
+                       FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
+                       case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
                fi; \
                if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
                        for lc in $(DOC_LINGUAS); do \
@@ -194,6 +204,16 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                                $(gsettings__enum_file) \
                        ; do echo "/$$x"; done; \
                fi; \
+               if test "x$(appdata_XML)" = x; then :; else \
+                       for x in \
+                               $(appdata_XML:.xml=.valid) \
+                       ; do echo "/$$x"; done; \
+               fi; \
+               if test "x$(appstream_XML)" = x; then :; else \
+                       for x in \
+                               $(appstream_XML:.xml=.valid) \
+                       ; do echo "/$$x"; done; \
+               fi; \
                if test -f $(srcdir)/po/Makefile.in.in; then \
                        for x in \
                                po/Makefile.in.in \
@@ -235,7 +255,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                if test "x$(am__dirstamp)" = x; then :; else \
                        echo "$(am__dirstamp)"; \
                fi; \
-               if test "x$(LTCOMPILE)" = x; then :; else \
+               if test "x$(LTCOMPILE)" = x -a "x$(LTCXXCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
                        for x in \
                                "*.lo" \
                                ".libs" "_libs" \
@@ -253,7 +273,8 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                        $(TEST_LOGS) \
                        $(TEST_LOGS:.log=.trs) \
                        $(TEST_SUITE_LOG) \
-                       "*.$(OBJEXT)" \
+                       "*.gcda" \
+                       "*.gcno" \
                        $(DISTCLEANFILES) \
                        $(am__CONFIG_DISTCLEAN_FILES) \
                        $(CONFIG_CLEAN_FILES) \
@@ -261,11 +282,10 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                        "*.tab.c" \
                        $(MAINTAINERCLEANFILES) \
                        $(BUILT_SOURCES) \
-                       $(DEPDIR) \
                        $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
                        $(filter %_vala.stamp,$(DIST_COMMON)) \
                        $(filter %.vapi,$(DIST_COMMON)) \
-                       $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))) \
+                       $(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter 
%.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \
                        Makefile \
                        Makefile.in \
                        "*.orig" \
@@ -275,6 +295,10 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                        ".*.sw[nop]" \
                        ".dirstamp" \
                ; do echo "/$$x"; done; \
+               for x in \
+                       "*.$(OBJEXT)" \
+                       $(DEPDIR) \
+               ; do echo "$$x"; done; \
        } | \
        sed "s ^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
        sed 's@/[.]/@/@g' | \