diff options
author | Javier Jardón <jjardon@gnome.org> | 2016-07-12 00:48:45 +0100 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2016-07-12 01:01:01 +0100 |
commit | 04d39eca02bfe12fa08754d5f3c149e49cfa11f1 (patch) | |
tree | 68f6e50567407cbfc9357f91d4c15c43c48c71b8 | |
parent | 36110deac802f1f60914a51b6ee51d696f31127b (diff) | |
download | libgtop-04d39eca02bfe12fa08754d5f3c149e49cfa11f1.tar.gz |
Use upstream gettext intead intltool/glib-gettext
https://bugzilla.gnome.org/show_bug.cgi?id=768704
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | Makefile.am | 8 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | examples/Makefile.am | 7 | ||||
-rw-r--r-- | po/Makevars | 78 |
5 files changed, 87 insertions, 16 deletions
@@ -79,7 +79,3 @@ examples/timings examples/wd gtk-doc.make install-sh -intltool-extract.in -intltool-merge.in -intltool-update.in - diff --git a/Makefile.am b/Makefile.am index eca41ffd..9cb49392 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,17 +15,9 @@ EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \ features.def libgtopconfig.h.in \ libgtop-sysdeps.m4 README \ libgtop-2.0.pc.in acinclude.m4 \ - intltool-extract.in \ - intltool-merge.in \ libgtop.doap \ - intltool-update.in \ m4/introspection.m4 -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update - dist-hook: cp libgtop.spec $(distdir) diff --git a/configure.ac b/configure.ac index c1f157e2..47ffa116 100644 --- a/configure.ac +++ b/configure.ac @@ -215,16 +215,14 @@ AC_TYPE_SIGNAL AC_FUNC_STRFTIME AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname) -IT_PROG_INTLTOOL([0.35.0]) +AM_GNU_GETTEXT_VERSION([0.19.4]) +AM_GNU_GETTEXT([external]) GETTEXT_PACKAGE=libgtop-2.0 AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the gettext package used by the library]) -AM_GLIB_GNU_GETTEXT -GLIB_DEFINE_LOCALEDIR([GTOPLOCALEDIR]) - AC_PATH_XTRA dnl For Solaris diff --git a/examples/Makefile.am b/examples/Makefile.am index eb7a271a..48ac4849 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,5 +1,12 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/sysdeps/$(sysdeps_dir) \ + -DGTOPLOCALEDIR=\"$(localedir)\" \ + $(GLIB_CFLAGS) + AM_LDFLAGS = $(LIBGTOP_EXTRA_LIBS) noinst_PROGRAMS = first second pprint procargs df netlist \ diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 00000000..579ebd17 --- /dev/null +++ b/po/Makevars @@ -0,0 +1,78 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = Free Software Foundation, 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 = + +# 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 +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = no + +# These options get passed to msgmerge. +# Useful options are in particular: +# --previous to keep previous msgids of translated messages, +# --quiet to reduce the verbosity. +MSGMERGE_OPTIONS = + +# 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 = no + +# 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 = no |