[libgda] Fixed build translated xml for libgda-ui/data-entries

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 80bf1fd0b6bdaf6eb0075aeffd9b47eca198abdb
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Jun 28 19:34:28 2018 -0500

    Fixed build translated xml for libgda-ui/data-entries

 libgda-ui/data-entries/meson.build | 15 +++++++++------
 libgda-ui/meson.build              |  5 +++--
 meson.build                        |  3 +++
 po/meson.build                     |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/libgda-ui/data-entries/meson.build b/libgda-ui/data-entries/meson.build
index 54011abf8..615e5caaa 100644
--- a/libgda-ui/data-entries/meson.build
+++ b/libgda-ui/data-entries/meson.build
@@ -90,14 +90,17 @@ foreach xf : data_entries_xmlin_names
                )
 endforeach
 
-
-
+int_xmlf = []
 foreach xt : data_entries_xmlin_names
-       i18n.merge_file(
+       int_xmlf += custom_target(xt+'.xml',
+               command: [intlmerge,
+                       '-u', '-x',
+                       join_paths(meson.source_root(),'po'),
+                       '@INPUT@', '@OUTPUT@'
+                       ],
                input: xt+'.xml.in',
-               output: xt+'.xml.in.h',
-               type: 'xml',
-               po_dir: join_paths(meson.build_root(),'po')
+               output: xt+'.xml',
+               install: false
                )
 endforeach
 
diff --git a/libgda-ui/meson.build b/libgda-ui/meson.build
index 5bd7ab971..2b3dab517 100644
--- a/libgda-ui/meson.build
+++ b/libgda-ui/meson.build
@@ -73,6 +73,7 @@ libgda_ui_sources += libgda_ui_internal_sources
 libgda_ui_resourcesc = custom_target('libgdaui_resourcesc',
        command: [compile_resources,
                '--sourcedir='+meson.current_build_dir(),
+               '--sourcedir='+join_paths(meson.build_root(),'libgda-ui'),
                '--sourcedir='+join_paths(meson.source_root(),'libgda-ui'),
                '--generate-source',
                '--target', '@OUTPUT@',
@@ -82,7 +83,7 @@ libgda_ui_resourcesc = custom_target('libgdaui_resourcesc',
                ],
        input: 'gdaui.gresource.xml',
        output: 'gdaui-resources.c',
-       depends: xml_res,
+       depends: int_xmlf,
        install: false
        )
 
@@ -97,7 +98,7 @@ libgda_ui_resourcesh = custom_target('libgdaui_resourcesh',
                ],
        input: 'gdaui.gresource.xml',
        output: 'gdaui-resources.h',
-       depends: xml_res,
+       depends: int_xmlf,
        install: false
        )
 libgda_ui_resources = []
diff --git a/meson.build b/meson.build
index 89d96014a..0de96be98 100644
--- a/meson.build
+++ b/meson.build
@@ -164,6 +164,9 @@ endforeach
 
 sqlite_xml_inf = files(sqlite_xml_fnamesext)
 
+
+intlmerge = find_program('intltool-merge')
+
 subdir('po')
 subdir('libgda')
 subdir('providers')
diff --git a/po/meson.build b/po/meson.build
index 3e12eb868..d7fd3d803 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,2 +1,2 @@
 i18n = import('i18n')
-i18n.gettext(project_package, preset : 'glib')
\ No newline at end of file
+i18n.gettext(project_package, preset : 'glib')