On Mon, Oct 29, 2012 at 04:43:52PM +0200, Zeeshan Ali (Khattak) wrote:
> From: "Zeeshan Ali (Khattak)" <zeeshanak@xxxxxxxxx>
>
> Note that we are calling bindtextdomain() from Loader's class init.
> AFAICT, its a common practice in libraries without any main _init()
> function to make this call in init of the most common/useful class (e.g
> gdk-pixbuf and gdbus).
> ---
> .gitignore | 15 +++++++++++++++
> Makefile.am | 28 +++++++++++++++++++++++++++-
> autogen.sh | 1 +
> configure.ac | 10 ++++++++++
> osinfo/Makefile.am | 1 +
> osinfo/osinfo_loader.c | 4 ++++
> tools/Makefile.am | 1 +
> tools/osinfo-db-validate.c | 7 +++++++
> tools/osinfo-detect.c | 7 +++++++
> tools/osinfo-install-script.c | 7 +++++++
> tools/osinfo-query.c | 7 +++++++
> 11 files changed, 87 insertions(+), 1 deletion(-)
> create mode 100644 po/POTFILES.in
>
> diff --git a/.gitignore b/.gitignore
> index ab30e42..4383a35 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -20,6 +20,9 @@ config.h.in
> config.log
> config.status
> configure
> +intltool-extract.in
> +intltool-merge.in
> +intltool-update.in
> libtool
> m4
> stamp-h1
> @@ -71,3 +74,15 @@ tools/osinfo-install-script
> tools/osinfo-install-script.exe
> tools/osinfo-install-script.1
> docs/reference/Libosinfo.types
> +po/Makefile.in.in
> +po/POTFILES
> +po/libosinfo.pot
> +po/stamp-it
> +po/Makevars.template
> +po/Rules-quot
> +po/boldquot.sed
> +po/en@boldquot.header
> +po/en@quot.header
> +po/insert-header.sin
> +po/quot.sed
> +po/remove-potcdate.sin
> diff --git a/Makefile.am b/Makefile.am
> index d605152..3d27bae 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,5 +1,18 @@
>
> -SUBDIRS = osinfo test data tools docs examples
> +SUBDIRS = osinfo test data tools docs po examples
> +
> +INTLTOOL_FILES = \
> + intltool-extract.in \
> + intltool-merge.in \
> + intltool-update.in \
> + $(NULL)
> +
> +DISTCLEANFILES = \
> + intltool-extract \
> + intltool-merge \
> + intltool-update \
> + po/.intltool-merge-cache \
This file is missing from .gitignore and was generated for me during a
build. I also get an ABOUT-NLS file now.
> + $(NULL)
>
> EXTRA_DIST = \
> COPYING.LIB \
> @@ -10,8 +23,21 @@ EXTRA_DIST = \
> cfg.mk \
> GNUmakefile \
> maint.mk \
> + $(INTLTOOL_FILES) \
> $(NULL)
>
> +MAINTAINERCLEANFILES = \
> + po/Makefile.in.in \
> + po/Makevars.template \
> + po/Rules-quot \
> + po/boldquot.sed \
> + po/en@boldquot.header \
> + po/en@quot.header \
> + po/insert-header.sin \
> + po/quot.sed \
> + po/remove-potcdate.sin \
> + $(NULL)
> +
> DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
>
> ACLOCAL_AMFLAGS = -I m4
> diff --git a/autogen.sh b/autogen.sh
> index b5997e6..3255713 100755
> --- a/autogen.sh
> +++ b/autogen.sh
> @@ -18,3 +18,4 @@ which gnome-autogen.sh || {
> }
>
> ACLOCAL_FLAGS="$ACLOCAL_FLAGS" USE_GNOME2_MACROS=1 . gnome-autogen.sh --enable-gtk-doc "$@"
> +intltoolize -f
Is it really needed? gnome-autogen.sh is supposed to be calling that for
you.
Christophe
Attachment:
pgpeb_5rVOC7X.pgp
Description: PGP signature
