[metacity] update git.mk to latest version



commit 94950da425ad9e170b05e5ae1c7941d3559d7a48
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Feb 22 18:50:10 2018 +0200

    update git.mk to latest version

 Makefile.am |    1 +
 git.mk      |   43 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e72507c..8857717 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@ MAINTAINERCLEANFILES = \
        $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
        $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
        $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT) \
        `find "$(srcdir)/m4" -type f -name "*.m4" -print` \
        $(srcdir)/ABOUT-NLS \
        $(srcdir)/INSTALL \
diff --git a/git.mk b/git.mk
index facca55..90de80f 100644
--- a/git.mk
+++ b/git.mk
@@ -121,6 +121,47 @@ GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
                        lt~obsolete.m4 \
                ; do echo "$$MACRO_DIR/$$x"; done; \
         fi`
+#
+# Modules that use gettext and use  AC_CONFIG_MACRO_DIR() may also include this,
+# though it's harmless to include regardless.
+GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT = \
+       `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                                \
+                       codeset.m4                      \
+                       extern-inline.m4                \
+                       fcntl-o.m4                      \
+                       gettext.m4                      \
+                       glibc2.m4                       \
+                       glibc21.m4                      \
+                       iconv.m4                        \
+                       intdiv0.m4                      \
+                       intl.m4                         \
+                       intldir.m4                      \
+                       intlmacosx.m4                   \
+                       intmax.m4                       \
+                       inttypes-pri.m4                 \
+                       inttypes_h.m4                   \
+                       lcmessage.m4                    \
+                       lib-ld.m4                       \
+                       lib-link.m4                     \
+                       lib-prefix.m4                   \
+                       lock.m4                         \
+                       longlong.m4                     \
+                       nls.m4                          \
+                       po.m4                           \
+                       printf-posix.m4                 \
+                       progtest.m4                     \
+                       size_max.m4                     \
+                       stdint_h.m4                     \
+                       threadlib.m4                    \
+                       uintmax_t.m4                    \
+                       visibility.m4                   \
+                       wchar_t.m4                      \
+                       wint_t.m4                       \
+                       xsize.m4                        \
+               ; do echo "$$MACRO_DIR/$$x"; done; \
+       fi`
 
 
 
@@ -163,7 +204,7 @@ git-mk-update:
 # Actual .gitignore generation:
 ###############################################################################
 
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(top_srcdir)/configure.ac
        @echo "git.mk: Generating $@"
        @{ \
                if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]