[libgda/wip/meson] Meson: removed unnecesary libraries build

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit ad9e229e28a85400b2f4d7e24cae0747622ac61a
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Jun 15 09:55:53 2018 -0500

    Meson: removed unnecesary libraries build

 libgda/meson.build                | 63 ++++++++++++++++-----------------------
 libgda/sql-parser/meson.build     | 23 ++++----------
 libgda/sqlite/meson.build         | 14 ---------
 libgda/sqlite/virtual/meson.build | 16 ----------
 4 files changed, 30 insertions(+), 86 deletions(-)
---
diff --git a/libgda/meson.build b/libgda/meson.build
index e1fe4b83c..4a50d47e4 100644
--- a/libgda/meson.build
+++ b/libgda/meson.build
@@ -1,6 +1,11 @@
 inc_libgdah = include_directories ('.')
 inc_libgdah_dep = declare_dependency (include_directories : inc_libgdah)
 
+
+# Build auxiliary executables and libraries
+subdir('sqlite')
+subdir('sql-parser')
+
 conf = configuration_data()
 # FIXME: Set this variables
 # conf.set_quoted('LIBGDA_BDB_INC','')
@@ -167,8 +172,12 @@ libgda_source_all += [
        libgda_sources,
        libgda_headers,
        gda_enums,
-       gda_marshalls
+       gda_marshalls,
+       sqlitesources
        ]
+libgda_source_all += sqlitesources
+libgda_source_all += libgda_virtual_sources
+libgda_source_all += libgda_sql_parser_sources
 
 inc_sqliteh = include_directories ('sqlite')
 inc_sqliteh_dep = declare_dependency (include_directories : inc_sqliteh)
@@ -179,7 +188,17 @@ libgda_dep = [
        gio_dep,
        libxml_dep,
        inc_rooth_dep,
-       inc_libgdah_dep]
+       inc_libgdah_dep
+       ]
+
+libgda_cargs = [
+               '-include',
+               meson.build_root() + '/config.h',
+               '-DABI_VERSION='+project_abi_version,
+               '-DABI_NAME='+project_abi_name,
+       ]
+
+libgda_cargs += sqlite_cargs
 
 libgda = library(
        'gda-'+project_api_version,
@@ -188,40 +207,8 @@ libgda = library(
        version : gda_revision,
        dependencies : [libgda_dep,
                        gda_keywordshash_dep,
-                       inc_sqliteh_dep],
-       c_args : [
-               '-include',
-               meson.build_root() + '/config.h',
-               '-DABI_VERSION='+project_abi_version,
-               '-DABI_NAME='+project_abi_name,
-       ],
-       objects: [
-               libsqlite.extract_objects(),
-               libsqlite_virtual.extract_objects(),
-               ],
+                       inc_sqliteh_dep,
+                       inc_libsql_parserh_dep],
+       c_args : libgda_cargs,
        install : true
-       )
-
-
-# Build sql-parser library
-subdir('sql-parser')
-
-# Build auxiliary executables and libraries
-subdir('sqlite')
-
-# subdir('sql-parser')
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+       )
\ No newline at end of file
diff --git a/libgda/sql-parser/meson.build b/libgda/sql-parser/meson.build
index 26cd8f7e8..f7fa245bc 100644
--- a/libgda/sql-parser/meson.build
+++ b/libgda/sql-parser/meson.build
@@ -1,3 +1,6 @@
+inc_libsql_parserh = include_directories ('.')
+inc_libsql_parserh_dep = declare_dependency (include_directories : inc_libsql_parserh)
+
 lemonf = files([
        'lemon.c'
        ])
@@ -8,7 +11,7 @@ lemon_exe = executable('lemon',
        install: false
 )
 
-libgda_sql_parser_headers = [
+libgda_sql_parser_headers = files([
        'gda-statement-struct-decl.h',
        'gda-sql-statement.h',
        'gda-sql-parser.h',
@@ -22,7 +25,7 @@ libgda_sql_parser_headers = [
        'gda-statement-struct-select.h',
        'gda-statement-struct-trans.h',
        'gda-statement-struct-unknown.h',
-       'gda-statement-struct-util.h']
+       'gda-statement-struct-util.h'])
 
 gda_sql_parser_enums = gnome_module.mkenums_simple('gda-sql-parser-enum-types', sources: 
libgda_sql_parser_headers)
 
@@ -125,20 +128,4 @@ libgda_sql_parser_sources += [
                        lemon_delimiterh,
                        token_types
                        ]
-libgda_sql_parser = library(
-       'gda_sql_parser',
-       [libgda_sql_parser_sources],
-       dependencies: [
-               glib_dep,
-               libxml_dep,
-               inc_rooth_dep,
-               inc_sqliteh_dep,
-               inc_libgdah_dep],
-       c_args : [
-               '-include',
-               meson.build_root() + '/config.h',
-       ],
-       link_with: libgda,
-       install: false
-       )
 
diff --git a/libgda/sqlite/meson.build b/libgda/sqlite/meson.build
index 90e2c5eb3..5659206e4 100644
--- a/libgda/sqlite/meson.build
+++ b/libgda/sqlite/meson.build
@@ -39,17 +39,3 @@ if sqlite_dep.found ()
 endif
 
 sqlite_cargs += ['-DSEARCH_LIB_PATH="'+sqlite_path+'"']
-
-libsqlite = library(
-       'libgda_sqlite', sqlitesources,
-       dependencies: [
-               glib_dep,
-               gobject_dep,
-               sqlite_dep,
-               libxml_dep,
-               inc_rooth_dep,
-               inc_libgdah_dep ],
-       c_args : sqlite_cargs,
-       link_with: libgda,
-       install : false
-       )
\ No newline at end of file
diff --git a/libgda/sqlite/virtual/meson.build b/libgda/sqlite/virtual/meson.build
index 8b1d08815..4bb6d3bcf 100644
--- a/libgda/sqlite/virtual/meson.build
+++ b/libgda/sqlite/virtual/meson.build
@@ -25,19 +25,3 @@ libgda_virtual_sources = files(
        # 'gda-virtual-provider.c'
        )
 libgda_virtual_sources += virtual_headers
-
-libsqlite_virtual = library(
-       'gda_virtual', [libgda_virtual_sources],
-       dependencies : [
-               glib_dep,
-               sqlite_dep,
-               libxml_dep,
-               inc_rooth_dep,
-               inc_libgdah_dep,
-               inc_sqliteh_dep ],
-       c_args : [
-               '-include',
-               meson.build_root() + '/config.h',
-       ],
-       link_with: libgda,
-       install : false)
\ No newline at end of file