[Spice-devel] [PATCH spice-gtk v2 4/5] git.mk: fix gettext m4 files to ignore
marcandre.lureau at redhat.com
marcandre.lureau at redhat.com
Tue Mar 28 14:48:59 UTC 2017
From: Marc-André Lureau <marcandre.lureau at redhat.com>
See also upstream pull request:
https://github.com/behdad/git.mk/pull/37
Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
---
Makefile.am | 1 +
git.mk | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 54a8a57..30f05f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,6 +39,7 @@ MAINTAINERCLEANFILES = \
$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
+ $(GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT) \
m4/gtk-doc.m4 \
gtk-doc.make \
$(NULL)
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`
--
2.12.0.191.gc5d8de91d
More information about the Spice-devel
mailing list