[libgda] Meson: adding dependencies for sqlite and postgres providers



commit d3f8372ec6128d7c33589ae3f617782d2b57e8a5
Author: Daniel Espinosa <esodan gmail com>
Date:   Mon Jun 18 18:34:57 2018 -0500

    Meson: adding dependencies for sqlite and postgres providers

 providers/reuseable/postgres/meson.build       | 8 +++++---
 providers/skel-implementation/capi/meson.build | 7 +++++--
 2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/providers/reuseable/postgres/meson.build b/providers/reuseable/postgres/meson.build
index fe21b0188..6afef29dd 100644
--- a/providers/reuseable/postgres/meson.build
+++ b/providers/reuseable/postgres/meson.build
@@ -54,11 +54,14 @@ pg_lemon_parserh = custom_target('pg_lemon-parser_h',
        install : false
        )
 
+pg_lemon_parserh_dep = declare_dependency(sources: pg_lemon_parserh)
+
 postgres_gendef = executable('gen_def', 'gen_def.c',
        c_args: [
                '-DIMPOSED_HEADER="'+join_paths (meson.build_root(), 'libgda', 
'sql-parser','token_types.h')+'"',
                '-DPARSER_HEADER_PATH="'+join_paths(meson.current_build_dir(),'parser.h')+'"'
                ],
+       dependencies: [pg_lemon_parserh_dep],
        install: false
        )
 
@@ -67,7 +70,7 @@ pg_token_types = custom_target('pg_token_types',
        capture: true,
        input: [pg_lemon_parserh],
        output: 'postgres_token_types.h',
-       install: false
+       install: false,
        )
 
 libgda_pg_sources = files([
@@ -79,10 +82,9 @@ libgda_pg_sources = files([
        'gda-postgres-meta.h',
        ])
 
-libgda_pg_sources += pg_token_types
-libgda_pg_sources += pg_token_types
 libgda_pg_sources += pg_lemon_parserc
 libgda_pg_sources += pg_lemon_parserh
+libgda_pg_sources += pg_token_types
 
 pg_reusable_dep = []
 pg_reusable_dep += pg_keywordshash_82_dep
diff --git a/providers/skel-implementation/capi/meson.build b/providers/skel-implementation/capi/meson.build
index eb80fae01..cdd52a0b6 100644
--- a/providers/skel-implementation/capi/meson.build
+++ b/providers/skel-implementation/capi/meson.build
@@ -107,19 +107,22 @@ capi_lemon_parserh = custom_target('capi_lemon-parser_h',
        install : false
        )
 
+capi_lemon_parserh_dep = declare_dependency(sources: capi_lemon_parserh)
+
 capi_gendef = executable('gen_def', 'gen_def.c',
        c_args: [
                '-DIMPOSED_HEADER="'+join_paths (meson.build_root(), 'libgda', 
'sql-parser','token_types.h')+'"',
                '-DPARSER_HEADER_PATH="'+join_paths(meson.current_build_dir(),'parser.h')+'"'
                ],
-       install: false
+       dependencies: [capi_lemon_parserh_dep],
+       install: false,
        )
 
 capi_token_types = custom_target('capi_token_types',
        command: [capi_gendef],
        capture: true,
+       input: [capi_lemon_parserh],
        output: 'capi_token_types.h',
-       depends: capi_lemon_parserh,
        install: false,
        )
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]