[pango] [git.mk] Update

[Behdad Esfahbod <behdad src gnome org>]

commit 922e4973475db9420c8de9e3f634271738ce920f
Author: Behdad Esfahbod <behdad behdad org>
Date:   Tue Dec 3 16:22:02 2013 -0500

    [git.mk] Update

 Makefile.am |   17 +++--------------
 git.mk      |   21 +++++++++++++--------
 2 files changed, 16 insertions(+), 22 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1ac018a..9986f81 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,24 +35,13 @@ EXTRA_DIST =                        \
        pango.doap
 
 MAINTAINERCLEANFILES = \
+       $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
        $(srcdir)/INSTALL \
-       $(srcdir)/aclocal.m4 \
-       $(srcdir)/autoscan.log \
-       $(srcdir)/compile \
-       $(srcdir)/config.guess \
-       $(srcdir)/config.h.in \
-       $(srcdir)/config.sub \
-       $(srcdir)/configure.scan \
-       $(srcdir)/depcomp \
-       $(srcdir)/install-sh \
-       $(srcdir)/ltmain.sh \
-       $(srcdir)/missing \
-       $(srcdir)/mkinstalldirs \
        $(srcdir)/omf.make \
        $(srcdir)/xmldocs.make \
        $(srcdir)/gtk-doc.make \
-       $(srcdir)/ChangeLog \
-       `find "$(srcdir)" -type f -name Makefile.in -print`
+       $(srcdir)/ChangeLog
 
 ### ChangeLog generation
 
diff --git a/git.mk b/git.mk
index 6f41f1d..18c07f6 100644
--- a/git.mk
+++ b/git.mk
@@ -103,14 +103,19 @@ GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
            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`
 
 
 
@@ -268,7 +273,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                        $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
                        $(filter %_vala.stamp,$(DIST_COMMON)) \
                        $(filter %.vapi,$(DIST_COMMON)) \
-                       $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))) \
+                       $(filter %$(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))),$(DIST_COMMON)) \
                        Makefile \
                        Makefile.in \
                        "*.orig" \