[gxml] Meson: Fixes on GI and localization installation

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 56c3c67dd8716f3e0942af59aa6bd4db1bc43268
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu May 11 10:44:56 2017 -0500

    Meson: Fixes on GI and localization installation

 gxml/meson.build |   17 ++++++++---------
 po/meson.build   |    2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/gxml/meson.build b/gxml/meson.build
index db6dc15..ea57279 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -22,17 +22,18 @@ configure_file(input : 'gxml.deps.in',
        install : true,
        install_dir : vapidir)
 
-conf = configuration_data()
-conf.set_quoted('PACKAGE_LOCALE_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
-conf.set_quoted('GETTEXT_PACKAGE', 'gxml')
-configure_file(output : 'config.h',
-       configuration : conf)
-
 nsinfo = configure_file(input : 'namespace-info.vala.in',
        output : 'namespace-info.vala',
        configuration : conf)
 namespaceinfo_dep = declare_dependency (sources : nsinfo)
 
+confh = configuration_data ()
+confh.set_quoted('PACKAGE_LOCALE_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
+confh.set_quoted('GETTEXT_PACKAGE', 'GXml')
+configure_file(output : 'config.h',
+       configuration : confh)
+
+
 valasources = files ([
        'Attribute.vala',
        'CDATA.vala',
@@ -118,8 +119,6 @@ valasources = files ([
 ])
 
 sources = files ([
-       'xlibxml.c',
-       'xlibxml.h'
 ])
 
 inc_gxmlh = include_directories ('.')
@@ -148,7 +147,7 @@ g_ir_compiler = find_program('g-ir-compiler')
 custom_target('gxml-typelib',
        command: [
                g_ir_compiler,
-               '--shared-library', 'libgxml-@0@.so.@1@'.format (API_VERSION, GXML_VERSION),
+               '--shared-library', 'libgxml-@0@.so'.format (API_VERSION),
                '--output', '@OUTPUT@',
                join_paths(meson.current_build_dir(), 'GXml-@0@.gir'.format(API_VERSION))
        ],
diff --git a/po/meson.build b/po/meson.build
index ff9525c..fd8855b 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,2 +1,2 @@
 i18n = import('i18n')
-i18n.gettext('gxml-@0@'.format (API_VERSION), preset : 'glib')
+i18n.gettext('GXml', preset : 'glib')