From: Bruno Haible Date: Tue, 23 Oct 2018 22:41:09 +0000 (+0200) Subject: examples: Upgrade to newest Makevars. X-Git-Tag: v0.20~294 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1675722cc4cfaf90ccbf8ecaa4db843bf1212b1c;p=thirdparty%2Fgettext.git examples: Upgrade to newest Makevars. * gettext-tools/examples/hello-*/po/Makevars (PACKAGE_GNU, MSGINIT_OPTIONS, PO_DEPENDS_ON_POT, DIST_DEPENDS_ON_UPDATE_PO): New variables. * gettext-tools/examples/hello-*/configure.* (AM_GNU_GETTEXT_VERSION): Require version 0.19.8. * gettext-tools/examples/po/xsmallpot.sh (hello-c++-kde): Likewise. * gettext-tools/examples/hello-*/m4/Makefile.am (EXTRA_DIST): Update list of .m4 files. * gettext-tools/examples/hello-*/autoclean.sh: Likewise. * gettext-tools/examples/check-examples (func_check_maintainerclean, func_check_maintainerclean_vpath): Allow left-over .po~ files. --- diff --git a/gettext-tools/examples/check-examples b/gettext-tools/examples/check-examples index 87852f276..d29b4dd9f 100755 --- a/gettext-tools/examples/check-examples +++ b/gettext-tools/examples/check-examples @@ -245,7 +245,8 @@ func_check_maintainerclean () fi func_maintainerclean "$sample" # TODO: Remove .pot files workaround. - LC_ALL=C diff -r -q "$sample.bak" "$sample" | sed -n -e 's/^Only in //p' | sed -e 's|: |/|' | grep "^${sample}/" | grep -v '\.pot$' > "$sample.out" + # TODO: Remove .po~ files workaround. + LC_ALL=C diff -r -q "$sample.bak" "$sample" | sed -n -e 's/^Only in //p' | sed -e 's|: |/|' | grep "^${sample}/" | grep -v '\.pot$' | grep -v '\.po~$' > "$sample.out" func_autoclean "$sample" if ! test -s "$sample.out"; then rm -f "$sample.out" @@ -317,7 +318,8 @@ func_check_maintainerclean_vpath () fi func_maintainerclean "$sample" build # TODO: Remove .pot files workaround. - find "$sample"/build -type f | LC_ALL=C sort | grep -v '\.pot$' > "$sample.out" + # TODO: Remove .po~ files workaround. + find "$sample"/build -type f | LC_ALL=C sort | grep -v '\.pot$' | grep -v '\.po~$' > "$sample.out" rm -rf "$sample"/build func_autoclean "$sample" if ! test -s "$sample.out"; then diff --git a/gettext-tools/examples/hello-c++-gnome/autoclean.sh b/gettext-tools/examples/hello-c++-gnome/autoclean.sh index fbb016c7f..6aac818eb 100755 --- a/gettext-tools/examples/hello-c++-gnome/autoclean.sh +++ b/gettext-tools/examples/hello-c++-gnome/autoclean.sh @@ -11,6 +11,8 @@ rm -rf autom4te.cache rm -f ABOUT-NLS rm -f config.rpath rm -f m4/codeset.m4 +rm -f m4/extern-inline.m4 +rm -f m4/fcntl-o.m4 rm -f m4/gettext.m4 rm -f m4/glibc2.m4 rm -f m4/glibc21.m4 @@ -21,7 +23,6 @@ rm -f m4/intldir.m4 rm -f m4/intlmacosx.m4 rm -f m4/intmax.m4 rm -f m4/inttypes-pri.m4 -rm -f m4/inttypes-h.m4 rm -f m4/inttypes_h.m4 rm -f m4/lcmessage.m4 rm -f m4/lib-ld.m4 @@ -37,6 +38,7 @@ rm -f m4/progtest.m4 rm -f m4/signed.m4 rm -f m4/size_max.m4 rm -f m4/stdint_h.m4 +rm -f m4/threadlib.m4 rm -f m4/uintmax_t.m4 rm -f m4/ulonglong.m4 rm -f m4/visibility.m4 diff --git a/gettext-tools/examples/hello-c++-gnome/configure.ac b/gettext-tools/examples/hello-c++-gnome/configure.ac index cf1c010ab..285363f6b 100644 --- a/gettext-tools/examples/hello-c++-gnome/configure.ac +++ b/gettext-tools/examples/hello-c++-gnome/configure.ac @@ -17,7 +17,7 @@ AC_SUBST([GTKMM_LIBS]) AC_CHECK_HEADERS([unistd.h]) AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.15) +AM_GNU_GETTEXT_VERSION([0.19.8]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([m4/Makefile]) diff --git a/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am b/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am index f0fbda6cb..8ace41b22 100644 --- a/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am +++ b/gettext-tools/examples/hello-c++-gnome/m4/Makefile.am @@ -1,8 +1,8 @@ EXTRA_DIST = \ - codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \ - intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \ - lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \ - nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \ - uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 \ + codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \ + iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \ + inttypes-pri.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 \ gnome.m4 gnome-gnorba-check.m4 gnome-orbit-check.m4 \ gtk.m4 gtk--.m4 diff --git a/gettext-tools/examples/hello-c++-gnome/po/Makevars b/gettext-tools/examples/hello-c++-gnome/po/Makevars index 7b158ff9b..1b1b2ac82 100644 --- a/gettext-tools/examples/hello-c++-gnome/po/Makevars +++ b/gettext-tools/examples/hello-c++-gnome/po/Makevars @@ -34,6 +34,13 @@ XGETTEXT_OPTIONS = \ # their copyright. COPYRIGHT_HOLDER = Yoyodyne, Inc. +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -65,3 +72,21 @@ USE_MSGCTXT = no # --previous to keep previous msgids of translated messages, # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = --quiet + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes diff --git a/gettext-tools/examples/hello-c++-kde/autoclean.sh b/gettext-tools/examples/hello-c++-kde/autoclean.sh index b0ecd50c1..4d871431d 100755 --- a/gettext-tools/examples/hello-c++-kde/autoclean.sh +++ b/gettext-tools/examples/hello-c++-kde/autoclean.sh @@ -17,6 +17,8 @@ fi # Brought in by autopoint. rm -f ABOUT-NLS rm -f m4/codeset.m4 +rm -f m4/extern-inline.m4 +rm -f m4/fcntl-o.m4 rm -f m4/gettext.m4 rm -f m4/glibc2.m4 rm -f m4/glibc21.m4 @@ -27,7 +29,6 @@ rm -f m4/intldir.m4 rm -f m4/intlmacosx.m4 rm -f m4/intmax.m4 rm -f m4/inttypes-pri.m4 -rm -f m4/inttypes-h.m4 rm -f m4/inttypes_h.m4 rm -f m4/lcmessage.m4 rm -f m4/lib-ld.m4 @@ -43,6 +44,7 @@ rm -f m4/progtest.m4 rm -f m4/signed.m4 rm -f m4/size_max.m4 rm -f m4/stdint_h.m4 +rm -f m4/threadlib.m4 rm -f m4/uintmax_t.m4 rm -f m4/ulonglong.m4 rm -f m4/visibility.m4 diff --git a/gettext-tools/examples/hello-c++-kde/configure.in.in b/gettext-tools/examples/hello-c++-kde/configure.in.in index 21d5a9671..c36f355d4 100644 --- a/gettext-tools/examples/hello-c++-kde/configure.in.in +++ b/gettext-tools/examples/hello-c++-kde/configure.in.in @@ -2,5 +2,5 @@ AC_CHECK_HEADERS([unistd.h]) AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.15) +AM_GNU_GETTEXT_VERSION([0.19.8]) AC_CONFIG_FILES([po/Makefile.in]) diff --git a/gettext-tools/examples/hello-c++-kde/m4/Makefile.am b/gettext-tools/examples/hello-c++-kde/m4/Makefile.am index c0447f4ec..bf8e1fff6 100644 --- a/gettext-tools/examples/hello-c++-kde/m4/Makefile.am +++ b/gettext-tools/examples/hello-c++-kde/m4/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = \ - codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \ - intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \ - lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \ - nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \ - uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 + codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \ + iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \ + inttypes-pri.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 diff --git a/gettext-tools/examples/hello-c++-kde/po/Makevars b/gettext-tools/examples/hello-c++-kde/po/Makevars index b5477ea09..2846bdbdc 100644 --- a/gettext-tools/examples/hello-c++-kde/po/Makevars +++ b/gettext-tools/examples/hello-c++-kde/po/Makevars @@ -30,6 +30,13 @@ XGETTEXT_OPTIONS = \ # their copyright. COPYRIGHT_HOLDER = Yoyodyne, Inc. +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -61,3 +68,21 @@ USE_MSGCTXT = no # --previous to keep previous msgids of translated messages, # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = --quiet + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes diff --git a/gettext-tools/examples/hello-c++/autoclean.sh b/gettext-tools/examples/hello-c++/autoclean.sh index e58a26d8d..7c964f8d0 100755 --- a/gettext-tools/examples/hello-c++/autoclean.sh +++ b/gettext-tools/examples/hello-c++/autoclean.sh @@ -14,6 +14,8 @@ rm -f gettext.h rm -f ABOUT-NLS rm -f config.rpath rm -f m4/codeset.m4 +rm -f m4/extern-inline.m4 +rm -f m4/fcntl-o.m4 rm -f m4/gettext.m4 rm -f m4/glibc2.m4 rm -f m4/glibc21.m4 @@ -24,7 +26,6 @@ rm -f m4/intldir.m4 rm -f m4/intlmacosx.m4 rm -f m4/intmax.m4 rm -f m4/inttypes-pri.m4 -rm -f m4/inttypes-h.m4 rm -f m4/inttypes_h.m4 rm -f m4/lcmessage.m4 rm -f m4/lib-ld.m4 @@ -40,6 +41,7 @@ rm -f m4/progtest.m4 rm -f m4/signed.m4 rm -f m4/size_max.m4 rm -f m4/stdint_h.m4 +rm -f m4/threadlib.m4 rm -f m4/uintmax_t.m4 rm -f m4/ulonglong.m4 rm -f m4/visibility.m4 diff --git a/gettext-tools/examples/hello-c++/configure.ac b/gettext-tools/examples/hello-c++/configure.ac index ae7e2aeee..6f825c843 100644 --- a/gettext-tools/examples/hello-c++/configure.ac +++ b/gettext-tools/examples/hello-c++/configure.ac @@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE([1.11]) AC_PROG_CXX AC_CHECK_HEADERS([unistd.h]) AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.15) +AM_GNU_GETTEXT_VERSION([0.19.8]) AC_LIB_LINKFLAGS([asprintf]) AC_CONFIG_FILES([Makefile]) diff --git a/gettext-tools/examples/hello-c++/m4/Makefile.am b/gettext-tools/examples/hello-c++/m4/Makefile.am index c0447f4ec..bf8e1fff6 100644 --- a/gettext-tools/examples/hello-c++/m4/Makefile.am +++ b/gettext-tools/examples/hello-c++/m4/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = \ - codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \ - intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \ - lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \ - nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \ - uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 + codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \ + iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \ + inttypes-pri.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 diff --git a/gettext-tools/examples/hello-c++/po/Makevars b/gettext-tools/examples/hello-c++/po/Makevars index 929ab5380..bcacc8c49 100644 --- a/gettext-tools/examples/hello-c++/po/Makevars +++ b/gettext-tools/examples/hello-c++/po/Makevars @@ -23,6 +23,13 @@ XGETTEXT_OPTIONS = \ # their copyright. COPYRIGHT_HOLDER = Yoyodyne, Inc. +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -54,3 +61,21 @@ USE_MSGCTXT = no # --previous to keep previous msgids of translated messages, # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = --quiet + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes diff --git a/gettext-tools/examples/hello-c-gnome/autoclean.sh b/gettext-tools/examples/hello-c-gnome/autoclean.sh index fbb016c7f..6aac818eb 100755 --- a/gettext-tools/examples/hello-c-gnome/autoclean.sh +++ b/gettext-tools/examples/hello-c-gnome/autoclean.sh @@ -11,6 +11,8 @@ rm -rf autom4te.cache rm -f ABOUT-NLS rm -f config.rpath rm -f m4/codeset.m4 +rm -f m4/extern-inline.m4 +rm -f m4/fcntl-o.m4 rm -f m4/gettext.m4 rm -f m4/glibc2.m4 rm -f m4/glibc21.m4 @@ -21,7 +23,6 @@ rm -f m4/intldir.m4 rm -f m4/intlmacosx.m4 rm -f m4/intmax.m4 rm -f m4/inttypes-pri.m4 -rm -f m4/inttypes-h.m4 rm -f m4/inttypes_h.m4 rm -f m4/lcmessage.m4 rm -f m4/lib-ld.m4 @@ -37,6 +38,7 @@ rm -f m4/progtest.m4 rm -f m4/signed.m4 rm -f m4/size_max.m4 rm -f m4/stdint_h.m4 +rm -f m4/threadlib.m4 rm -f m4/uintmax_t.m4 rm -f m4/ulonglong.m4 rm -f m4/visibility.m4 diff --git a/gettext-tools/examples/hello-c-gnome/configure.ac b/gettext-tools/examples/hello-c-gnome/configure.ac index a3d691f49..a9d745fa5 100644 --- a/gettext-tools/examples/hello-c-gnome/configure.ac +++ b/gettext-tools/examples/hello-c-gnome/configure.ac @@ -11,7 +11,7 @@ AC_PROG_CC GNOME_INIT AC_CHECK_HEADERS([unistd.h]) AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.15) +AM_GNU_GETTEXT_VERSION([0.19.8]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([m4/Makefile]) diff --git a/gettext-tools/examples/hello-c-gnome/m4/Makefile.am b/gettext-tools/examples/hello-c-gnome/m4/Makefile.am index f9141ad72..4463cadfe 100644 --- a/gettext-tools/examples/hello-c-gnome/m4/Makefile.am +++ b/gettext-tools/examples/hello-c-gnome/m4/Makefile.am @@ -1,7 +1,7 @@ EXTRA_DIST = \ - codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \ - intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \ - lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \ - nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \ - uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 \ + codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \ + iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \ + inttypes-pri.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 \ gnome.m4 gnome-gnorba-check.m4 gnome-orbit-check.m4 diff --git a/gettext-tools/examples/hello-c-gnome/po/Makevars b/gettext-tools/examples/hello-c-gnome/po/Makevars index 7b158ff9b..1b1b2ac82 100644 --- a/gettext-tools/examples/hello-c-gnome/po/Makevars +++ b/gettext-tools/examples/hello-c-gnome/po/Makevars @@ -34,6 +34,13 @@ XGETTEXT_OPTIONS = \ # their copyright. COPYRIGHT_HOLDER = Yoyodyne, Inc. +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -65,3 +72,21 @@ USE_MSGCTXT = no # --previous to keep previous msgids of translated messages, # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = --quiet + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes diff --git a/gettext-tools/examples/hello-c-gnome3/configure.ac b/gettext-tools/examples/hello-c-gnome3/configure.ac index 113644bdc..91c22f15b 100644 --- a/gettext-tools/examples/hello-c-gnome3/configure.ac +++ b/gettext-tools/examples/hello-c-gnome3/configure.ac @@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE([1.11]) AC_PROG_CC AC_CHECK_HEADERS([unistd.h]) AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.19) +AM_GNU_GETTEXT_VERSION([0.19.8]) dnl Check GNOME specific stuff. dnl diff --git a/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am b/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am index c0447f4ec..bf8e1fff6 100644 --- a/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am +++ b/gettext-tools/examples/hello-c-gnome3/m4/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = \ - codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \ - intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \ - lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \ - nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \ - uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 + codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \ + iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \ + inttypes-pri.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 diff --git a/gettext-tools/examples/hello-c-gnome3/po/Makevars b/gettext-tools/examples/hello-c-gnome3/po/Makevars index 7b158ff9b..1b1b2ac82 100644 --- a/gettext-tools/examples/hello-c-gnome3/po/Makevars +++ b/gettext-tools/examples/hello-c-gnome3/po/Makevars @@ -34,6 +34,13 @@ XGETTEXT_OPTIONS = \ # their copyright. COPYRIGHT_HOLDER = Yoyodyne, Inc. +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -65,3 +72,21 @@ USE_MSGCTXT = no # --previous to keep previous msgids of translated messages, # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = --quiet + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes diff --git a/gettext-tools/examples/hello-c/autoclean.sh b/gettext-tools/examples/hello-c/autoclean.sh index e58a26d8d..7c964f8d0 100755 --- a/gettext-tools/examples/hello-c/autoclean.sh +++ b/gettext-tools/examples/hello-c/autoclean.sh @@ -14,6 +14,8 @@ rm -f gettext.h rm -f ABOUT-NLS rm -f config.rpath rm -f m4/codeset.m4 +rm -f m4/extern-inline.m4 +rm -f m4/fcntl-o.m4 rm -f m4/gettext.m4 rm -f m4/glibc2.m4 rm -f m4/glibc21.m4 @@ -24,7 +26,6 @@ rm -f m4/intldir.m4 rm -f m4/intlmacosx.m4 rm -f m4/intmax.m4 rm -f m4/inttypes-pri.m4 -rm -f m4/inttypes-h.m4 rm -f m4/inttypes_h.m4 rm -f m4/lcmessage.m4 rm -f m4/lib-ld.m4 @@ -40,6 +41,7 @@ rm -f m4/progtest.m4 rm -f m4/signed.m4 rm -f m4/size_max.m4 rm -f m4/stdint_h.m4 +rm -f m4/threadlib.m4 rm -f m4/uintmax_t.m4 rm -f m4/ulonglong.m4 rm -f m4/visibility.m4 diff --git a/gettext-tools/examples/hello-c/configure.ac b/gettext-tools/examples/hello-c/configure.ac index d1d9f6522..f50d60b18 100644 --- a/gettext-tools/examples/hello-c/configure.ac +++ b/gettext-tools/examples/hello-c/configure.ac @@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE([1.11]) AC_PROG_CC AC_CHECK_HEADERS([unistd.h]) AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.15) +AM_GNU_GETTEXT_VERSION([0.19.8]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([m4/Makefile]) diff --git a/gettext-tools/examples/hello-c/m4/Makefile.am b/gettext-tools/examples/hello-c/m4/Makefile.am index c0447f4ec..bf8e1fff6 100644 --- a/gettext-tools/examples/hello-c/m4/Makefile.am +++ b/gettext-tools/examples/hello-c/m4/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = \ - codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \ - intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \ - lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \ - nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \ - uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 + codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \ + iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \ + inttypes-pri.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 diff --git a/gettext-tools/examples/hello-c/po/Makevars b/gettext-tools/examples/hello-c/po/Makevars index 6b3a68c68..af3b60b40 100644 --- a/gettext-tools/examples/hello-c/po/Makevars +++ b/gettext-tools/examples/hello-c/po/Makevars @@ -22,6 +22,13 @@ XGETTEXT_OPTIONS = \ # their copyright. COPYRIGHT_HOLDER = Yoyodyne, Inc. +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -53,3 +60,21 @@ USE_MSGCTXT = no # --previous to keep previous msgids of translated messages, # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = --quiet + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes diff --git a/gettext-tools/examples/hello-objc-gnome/autoclean.sh b/gettext-tools/examples/hello-objc-gnome/autoclean.sh index fbb016c7f..6aac818eb 100755 --- a/gettext-tools/examples/hello-objc-gnome/autoclean.sh +++ b/gettext-tools/examples/hello-objc-gnome/autoclean.sh @@ -11,6 +11,8 @@ rm -rf autom4te.cache rm -f ABOUT-NLS rm -f config.rpath rm -f m4/codeset.m4 +rm -f m4/extern-inline.m4 +rm -f m4/fcntl-o.m4 rm -f m4/gettext.m4 rm -f m4/glibc2.m4 rm -f m4/glibc21.m4 @@ -21,7 +23,6 @@ rm -f m4/intldir.m4 rm -f m4/intlmacosx.m4 rm -f m4/intmax.m4 rm -f m4/inttypes-pri.m4 -rm -f m4/inttypes-h.m4 rm -f m4/inttypes_h.m4 rm -f m4/lcmessage.m4 rm -f m4/lib-ld.m4 @@ -37,6 +38,7 @@ rm -f m4/progtest.m4 rm -f m4/signed.m4 rm -f m4/size_max.m4 rm -f m4/stdint_h.m4 +rm -f m4/threadlib.m4 rm -f m4/uintmax_t.m4 rm -f m4/ulonglong.m4 rm -f m4/visibility.m4 diff --git a/gettext-tools/examples/hello-objc-gnome/configure.ac b/gettext-tools/examples/hello-objc-gnome/configure.ac index 89756c777..593fbea40 100644 --- a/gettext-tools/examples/hello-objc-gnome/configure.ac +++ b/gettext-tools/examples/hello-objc-gnome/configure.ac @@ -21,7 +21,7 @@ AC_SUBST([OBGNOME_INCLUDES]) AC_CHECK_HEADERS([unistd.h]) AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.15) +AM_GNU_GETTEXT_VERSION([0.19.8]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([m4/Makefile]) diff --git a/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am b/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am index f9141ad72..4463cadfe 100644 --- a/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am +++ b/gettext-tools/examples/hello-objc-gnome/m4/Makefile.am @@ -1,7 +1,7 @@ EXTRA_DIST = \ - codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \ - intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \ - lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \ - nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \ - uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 \ + codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \ + iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \ + inttypes-pri.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 \ gnome.m4 gnome-gnorba-check.m4 gnome-orbit-check.m4 diff --git a/gettext-tools/examples/hello-objc-gnome/po/Makevars b/gettext-tools/examples/hello-objc-gnome/po/Makevars index 7b158ff9b..1b1b2ac82 100644 --- a/gettext-tools/examples/hello-objc-gnome/po/Makevars +++ b/gettext-tools/examples/hello-objc-gnome/po/Makevars @@ -34,6 +34,13 @@ XGETTEXT_OPTIONS = \ # their copyright. COPYRIGHT_HOLDER = Yoyodyne, Inc. +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -65,3 +72,21 @@ USE_MSGCTXT = no # --previous to keep previous msgids of translated messages, # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = --quiet + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes diff --git a/gettext-tools/examples/hello-objc/autoclean.sh b/gettext-tools/examples/hello-objc/autoclean.sh index e58a26d8d..7c964f8d0 100755 --- a/gettext-tools/examples/hello-objc/autoclean.sh +++ b/gettext-tools/examples/hello-objc/autoclean.sh @@ -14,6 +14,8 @@ rm -f gettext.h rm -f ABOUT-NLS rm -f config.rpath rm -f m4/codeset.m4 +rm -f m4/extern-inline.m4 +rm -f m4/fcntl-o.m4 rm -f m4/gettext.m4 rm -f m4/glibc2.m4 rm -f m4/glibc21.m4 @@ -24,7 +26,6 @@ rm -f m4/intldir.m4 rm -f m4/intlmacosx.m4 rm -f m4/intmax.m4 rm -f m4/inttypes-pri.m4 -rm -f m4/inttypes-h.m4 rm -f m4/inttypes_h.m4 rm -f m4/lcmessage.m4 rm -f m4/lib-ld.m4 @@ -40,6 +41,7 @@ rm -f m4/progtest.m4 rm -f m4/signed.m4 rm -f m4/size_max.m4 rm -f m4/stdint_h.m4 +rm -f m4/threadlib.m4 rm -f m4/uintmax_t.m4 rm -f m4/ulonglong.m4 rm -f m4/visibility.m4 diff --git a/gettext-tools/examples/hello-objc/configure.ac b/gettext-tools/examples/hello-objc/configure.ac index 0838c137f..98341d29e 100644 --- a/gettext-tools/examples/hello-objc/configure.ac +++ b/gettext-tools/examples/hello-objc/configure.ac @@ -11,7 +11,7 @@ AC_PROG_CC AC_SUBST(OBJC,["$CC"]) AC_CHECK_HEADERS([unistd.h]) AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.15) +AM_GNU_GETTEXT_VERSION([0.19.8]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([m4/Makefile]) diff --git a/gettext-tools/examples/hello-objc/m4/Makefile.am b/gettext-tools/examples/hello-objc/m4/Makefile.am index c0447f4ec..bf8e1fff6 100644 --- a/gettext-tools/examples/hello-objc/m4/Makefile.am +++ b/gettext-tools/examples/hello-objc/m4/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = \ - codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 \ - intmax.m4 inttypes-h.m4 inttypes_h.m4 inttypes-pri.m4 lcmessage.m4 \ - lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \ - nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \ - uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 + codeset.m4 extern-inline.m4 fcntl-o.m4 gettext.m4 glibc2.m4 glibc21.m4 \ + iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 \ + inttypes-pri.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 diff --git a/gettext-tools/examples/hello-objc/po/Makevars b/gettext-tools/examples/hello-objc/po/Makevars index 6b3a68c68..af3b60b40 100644 --- a/gettext-tools/examples/hello-objc/po/Makevars +++ b/gettext-tools/examples/hello-objc/po/Makevars @@ -22,6 +22,13 @@ XGETTEXT_OPTIONS = \ # their copyright. COPYRIGHT_HOLDER = Yoyodyne, Inc. +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -53,3 +60,21 @@ USE_MSGCTXT = no # --previous to keep previous msgids of translated messages, # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = --quiet + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes diff --git a/gettext-tools/examples/po/xsmallpot.sh b/gettext-tools/examples/po/xsmallpot.sh index 8dc8acdec..bf7c21b3f 100755 --- a/gettext-tools/examples/po/xsmallpot.sh +++ b/gettext-tools/examples/po/xsmallpot.sh @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR(admin) AM_INIT_AUTOMAKE([$directory], 0) AC_PROG_CXX AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.15) +AM_GNU_GETTEXT_VERSION([0.19.8]) AC_CONFIG_FILES([po/Makefile.in]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([m4/Makefile])