[libgda] Meson: fixed specs generation for providers

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 3fa9c066f526deaed926b84c5107dab19dd5f10d
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Jul 19 21:06:01 2018 -0500

    Meson: fixed specs generation for providers

 providers/.gitignore                           |  2 +-
 providers/ldap/meson.build                     | 19 ++++------------
 providers/postgres/meson.build                 | 27 +++++-----------------
 providers/skel-implementation/capi/meson.build | 31 +++++---------------------
 providers/sqlite/meson.build                   | 30 +++++--------------------
 5 files changed, 21 insertions(+), 88 deletions(-)
---
diff --git a/providers/.gitignore b/providers/.gitignore
index ebe26ba48..18cb89d8a 100644
--- a/providers/.gitignore
+++ b/providers/.gitignore
@@ -1,4 +1,4 @@
-*.xml
+*.raw.xml
 parser.c
 parser.h
 gen_def
diff --git a/providers/ldap/meson.build b/providers/ldap/meson.build
index e9d391166..72fb58978 100644
--- a/providers/ldap/meson.build
+++ b/providers/ldap/meson.build
@@ -25,6 +25,7 @@ endforeach
 
 ldap_xml_inf = files(ldap_xml_fnamesext)
 
+ldap_xml_res = []
 foreach xt : ldap_xml_fnames
        i18n.merge_file(
                input: xt+'.xml.in',
@@ -32,25 +33,13 @@ foreach xt : ldap_xml_fnames
                type: 'xml',
                po_dir: join_paths(meson.build_root(),'po')
                )
-       osf = configure_file(
-               input: xt+'.xml.in',
-               output: xt+'.xml',
-               configuration: tconf
-               )
-       install_data(osf,
-               install_dir: join_paths(get_option('datadir'), project_package)
-               )
-endforeach
-
-ldap_xml_res = []
-foreach xrp : ldap_xml_fnames
-       ldap_xml_res += custom_target(xrp+'.raw.xml',
+       ldap_xml_res += custom_target(xt+'.raw.xml',
                command: [raw_spec,
                        '-o', meson.current_build_dir(),
                        '@INPUT@'
                        ],
-               input: xrp+'.xml.in',
-               output: xrp+'.raw.xml',
+               input: xt+'.xml.in',
+               output: xt+'.raw.xml',
                )
 endforeach
 
diff --git a/providers/postgres/meson.build b/providers/postgres/meson.build
index 75480b32b..cec5bd131 100644
--- a/providers/postgres/meson.build
+++ b/providers/postgres/meson.build
@@ -20,39 +20,22 @@ postgres_xml_fnames = [
        'postgres_specs_dsn',
        'postgres_specs_rename_table'
        ]
-postgres_xml_fnamesext = []
-foreach fn : postgres_xml_fnames
-       postgres_xml_fnamesext += [fn+'.xml.in']
-endforeach
-
-postgres_xml_inf = files(postgres_xml_fnamesext)
 
+postgres_xml_res = []
 foreach xt : postgres_xml_fnames
        i18n.merge_file(
                input: xt+'.xml.in',
-               output: xt+'.xml.in.h',
+               output: xt+'.xml',
                type: 'xml',
                po_dir: join_paths(meson.build_root(),'po')
                )
-       osf = configure_file(
-               input: xt+'.xml.in',
-               output: xt+'.xml',
-               configuration: tconf
-               )
-       install_data(osf,
-               install_dir: join_paths(get_option('datadir'), project_package)
-               )
-endforeach
-
-postgres_xml_res = []
-foreach xrp : postgres_xml_fnames
-       postgres_xml_res += custom_target(xrp+'.raw.xml',
+       postgres_xml_res += custom_target(xt+'.raw.xml',
                command: [raw_spec,
                        '-o', meson.current_build_dir(),
                        '@INPUT@'
                        ],
-               input: xrp+'.xml.in',
-               output: xrp+'.raw.xml',
+               input: xt+'.xml.in',
+               output: xt+'.raw.xml',
                )
 endforeach
 
diff --git a/providers/skel-implementation/capi/meson.build b/providers/skel-implementation/capi/meson.build
index 4f5064d95..c2bc65d5b 100644
--- a/providers/skel-implementation/capi/meson.build
+++ b/providers/skel-implementation/capi/meson.build
@@ -6,46 +6,25 @@ capi_xml_fnames = [
        'capi_specs_dsn',
        'capi_specs_create_table',
        ]
-capi_xml_fnamesext = []
-foreach fn : capi_xml_fnames
-       capi_xml_fnamesext += [fn+'.xml.in']
-endforeach
-
-capi_xml_inf = files(capi_xml_fnamesext)
-
-foreach xf : capi_xml_fnames
-       oxf = configure_file(
-               input: xf+'.xml.in',
-               output: xf+'.xml',
-               configuration: tconf
-               )
-       install_data(oxf,
-               install_dir: join_paths(get_option('datadir'), project_package)
-               )
-endforeach
 
+capi_xml_res = []
 foreach xt : capi_xml_fnames
        i18n.merge_file(
                input: xt+'.xml.in',
-               output: xt+'.xml.in.h',
+               output: xt+'.xml',
                type: 'xml',
                po_dir: join_paths(meson.build_root(),'po')
                )
-endforeach
-
-capi_xml_res = []
-foreach xrc : capi_xml_fnames
-       capi_xml_res += custom_target(xrc+'.raw.xml',
+       capi_xml_res += custom_target(xt+'.raw.xml',
                command: [raw_spec,
                        '-o', meson.current_build_dir(),
                        '@INPUT@'
                        ],
-               input: xrc+'.xml.in',
-               output: xrc+'.raw.xml',
+               input: xt+'.xml.in',
+               output: xt+'.raw.xml',
                )
 endforeach
 
-
 capi_resourcesc = custom_target('capi_resourcesc',
        command: [compile_resources,
                '--sourcedir='+meson.current_build_dir(),
diff --git a/providers/sqlite/meson.build b/providers/sqlite/meson.build
index 9187bb887..5839de482 100644
--- a/providers/sqlite/meson.build
+++ b/providers/sqlite/meson.build
@@ -1,40 +1,22 @@
 inc_libgda_sqliteh = include_directories ('.')
 inc_libgda_sqliteh_dep = declare_dependency (include_directories : inc_libgda_sqliteh)
 
-sqlite_xml_fnamesextf = []
-foreach fn : sqlite_xml_fnames
-       sqlite_xml_fnamesextf += [fn+'.xml.in']
-endforeach
-
-foreach cfn : sqlite_xml_fnames
-       ocfn = configure_file(
-               input: cfn+'.xml.in',
-               output: cfn+'.xml',
-               configuration: tconf
-               )
-       install_data(ocfn,
-               install_dir: join_paths(get_option('datadir'), project_package)
-               )
-endforeach
-
+xml_res = []
 foreach xt : sqlite_xml_fnames
        i18n.merge_file(
                input: xt+'.xml.in',
                output: xt+'.xml',
                type: 'xml',
-               po_dir: 'po'
+               po_dir: 'po',
+               install_dir: join_paths(get_option('datadir'),project_package)
                )
-endforeach
-
-xml_res = []
-foreach xr : sqlite_xml_fnames
-       xml_res += custom_target(xr+'.raw.xml',
+       xml_res += custom_target(xt+'.raw.xml',
                command: [raw_spec,
                        '-o', meson.current_build_dir(),
                        '@INPUT@'
                        ],
-               input: xr+'.xml.in',
-               output: xr+'.raw.xml',
+               input: xt+'.xml.in',
+               output: xt+'.raw.xml',
                )
 endforeach