[eog] Update git.mk to recognize the gettext .m4s



commit 0c97d1c7da1af7e6dfd4f822fcf3363a1ae79ff0
Author: Felix Riemann <friemann gnome org>
Date:   Sun Jun 4 16:20:36 2017 +0200

    Update git.mk to recognize the gettext .m4s
    
    Revision d6caf0d1 from https://github.com/behdad/git.mk

 Makefile.am |   13 ++++---------
 git.mk      |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a523d4d..4297d42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,16 +19,11 @@ DISTCLEANFILES =
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-installed-tests
 
 MAINTAINERCLEANFILES = \
-       $(srcdir)/aclocal.m4 \
-       $(srcdir)/config.guess \
+       $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT) \
        $(srcdir)/config.h.in \
-       $(srcdir)/config.sub \
-       $(srcdir)/depcomp \
-       $(srcdir)/gtk-doc.make \
-       $(srcdir)/install-sh \
-       $(srcdir)/ltmain.sh \
-       $(srcdir)/missing \
-       $(srcdir)/mkinstalldirs
+       $(srcdir)/gtk-doc.make
 
 @BEHAVE_INSTALLED_TESTS_RULE@
 INSTALLED_TESTS=about undo sidepane fullscreen wallpaper screenshot_tour1 screenshot_tour2
diff --git a/git.mk b/git.mk
index facca55..6e2708f 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`
 
 
 


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