[libgda/wip/meson] Meson: added providers/reuseable/postgres

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 998f2c17272994e7e699e07a9633c4febb7f8973
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Jun 15 11:15:04 2018 -0500

    Meson: added providers/reuseable/postgres

 libgda/meson.build                                 |  6 +-
 meson.build                                        |  1 +
 providers/meson.build                              |  2 +
 providers/reuseable/meson.build                    |  2 +
 providers/reuseable/mysql/meson.build              |  0
 providers/reuseable/postgres/Makefile.am           | 12 ++--
 .../reuseable/postgres/gda-postgres-reuseable.c    |  4 +-
 providers/reuseable/postgres/meson.build           | 72 ++++++++++++++++++++++
 providers/sqlite/meson.build                       |  0
 9 files changed, 91 insertions(+), 8 deletions(-)
---
diff --git a/libgda/meson.build b/libgda/meson.build
index bfbd7eead..35a7e0496 100644
--- a/libgda/meson.build
+++ b/libgda/meson.build
@@ -28,7 +28,11 @@ gda_enum_headers = files ('gda-connection.h', 'gda-enums.h')
 
 gda_enums = gnome_module.mkenums_simple('gda-enum-types', sources: gda_enum_headers)
 
-mkkeywordhash = executable ('mkkeywordhash', 'sqlite/mkkeywordhash.c')
+mkkeywordhashf = files([
+       'sqlite/mkkeywordhash.c'
+])
+
+mkkeywordhash = executable ('mkkeywordhash', mkkeywordhashf)
 
 gda_keywordshash = custom_target('keywords_hash',
                command: [
diff --git a/meson.build b/meson.build
index 5c9cbdfbc..fdab15535 100644
--- a/meson.build
+++ b/meson.build
@@ -171,6 +171,7 @@ inc_rooth_dep = declare_dependency (include_directories : inc_rooth)
 
 subdir('po')
 subdir('libgda')
+subdir('providers')
 #subdir('libgda-ui')
 
 
diff --git a/providers/meson.build b/providers/meson.build
new file mode 100644
index 000000000..e1bdda8af
--- /dev/null
+++ b/providers/meson.build
@@ -0,0 +1,2 @@
+subdir('reuseable')
+subdir('sqlite')
\ No newline at end of file
diff --git a/providers/reuseable/meson.build b/providers/reuseable/meson.build
new file mode 100644
index 000000000..94c45cddf
--- /dev/null
+++ b/providers/reuseable/meson.build
@@ -0,0 +1,2 @@
+subdir('postgres')
+subdir('mysql')
\ No newline at end of file
diff --git a/providers/reuseable/mysql/meson.build b/providers/reuseable/mysql/meson.build
new file mode 100644
index 000000000..e69de29bb
diff --git a/providers/reuseable/postgres/Makefile.am b/providers/reuseable/postgres/Makefile.am
index 7bb7148f5..3a0090658 100644
--- a/providers/reuseable/postgres/Makefile.am
+++ b/providers/reuseable/postgres/Makefile.am
@@ -12,10 +12,10 @@ pkeyword_files=$(addprefix $(top_srcdir)/providers/reuseable/postgres/,$(keyword
 mkkeywordhash$(EXEEXT_FOR_BUILD): $(top_srcdir)/libgda/sqlite/mkkeywordhash.c
        $(CC_FOR_BUILD) -g -o mkkeywordhash$(EXEEXT_FOR_BUILD) $(GDA_DEBUG_FLAGS) $<
 
-keywords_hash.c: mkkeywordhash$(EXEEXT_FOR_BUILD) $(pkeyword_files)
-       ./mkkeywordhash$(EXEEXT_FOR_BUILD) $(top_srcdir)/providers/reuseable/postgres/keywords_82.list V82 > 
keywords_hash.c
-       ./mkkeywordhash$(EXEEXT_FOR_BUILD) $(top_srcdir)/providers/reuseable/postgres/keywords_83.list V83 >> 
keywords_hash.c
-       ./mkkeywordhash$(EXEEXT_FOR_BUILD) $(top_srcdir)/providers/reuseable/postgres/keywords_84.list V84 >> 
keywords_hash.c
+keywords_hash-82.code keywords_hash-83.code keywords_hash-84.code: mkkeywordhash$(EXEEXT_FOR_BUILD) 
$(pkeyword_files)
+       ./mkkeywordhash$(EXEEXT_FOR_BUILD) $(top_srcdir)/providers/reuseable/postgres/keywords_82.list V82 > 
keywords_hash-82.code
+       ./mkkeywordhash$(EXEEXT_FOR_BUILD) $(top_srcdir)/providers/reuseable/postgres/keywords_83.list V83 > 
keywords_hash-83.code
+       ./mkkeywordhash$(EXEEXT_FOR_BUILD) $(top_srcdir)/providers/reuseable/postgres/keywords_84.list V84 > 
keywords_hash-84.code
 
 # parser generation
 parser.c parser.h: parser.y $(top_builddir)/libgda/sql-parser/lemon$(EXEEXT_FOR_BUILD)
@@ -27,7 +27,7 @@ gen_def$(EXEEXT_FOR_BUILD): gen_def.c
 postgres_token_types.h: gen_def$(EXEEXT_FOR_BUILD) parser.h
        ./gen_def$(EXEEXT_FOR_BUILD) > postgres_token_types.h
 
-$(OBJECTS) $(libgda_postgres_la_OBJECTS): postgres_token_types.h keywords_hash.c
+$(OBJECTS) $(libgda_postgres_la_OBJECTS): postgres_token_types.h keywords_hash-82.code keywords_hash-83.code 
keywords_hash-84.code
 
 libgda_postgres_la_SOURCES = \
        gda-postgres-reuseable.c \
@@ -46,4 +46,4 @@ libgda_postgres_la_LIBADD = \
 
 EXTRA_DIST = parser.y gen_def.c $(keyword_files)
 CLEANFILES = parser.h parser.c parser.out postgres_token_types.h gen_def$(EXEEXT_FOR_BUILD) \
-       mkkeywordhash$(EXEEXT_FOR_BUILD) keywords_hash.c
+       mkkeywordhash$(EXEEXT_FOR_BUILD) keywords_hash-82.code keywords_hash-83.code keywords_hash-84.code
diff --git a/providers/reuseable/postgres/gda-postgres-reuseable.c 
b/providers/reuseable/postgres/gda-postgres-reuseable.c
index efd688b00..487072d3f 100644
--- a/providers/reuseable/postgres/gda-postgres-reuseable.c
+++ b/providers/reuseable/postgres/gda-postgres-reuseable.c
@@ -25,7 +25,9 @@
 #include "gda-postgres-parser.h"
 
 #include <libgda/sqlite/keywords_hash.h>
-#include "keywords_hash.c" /* this one is dynamically generated */
+#include "keywords_hash-82.code" /* this one is dynamically generated */
+#include "keywords_hash-83.code" /* this one is dynamically generated */
+#include "keywords_hash-84.code" /* this one is dynamically generated */
 
 /*
  * Reuseable interface entry point
diff --git a/providers/reuseable/postgres/meson.build b/providers/reuseable/postgres/meson.build
new file mode 100644
index 000000000..9c7c730b6
--- /dev/null
+++ b/providers/reuseable/postgres/meson.build
@@ -0,0 +1,72 @@
+
+pg_keywordshash_82 = custom_target('keywords_hash_82',
+               command: [
+                       mkkeywordhash,
+                       '@INPUT@'
+                       ],
+               capture: true,
+               input: 'keywords_82.list',
+               output: 'keywords_hash-82.code')
+
+pg_keywordshash_82_dep = declare_dependency (sources: pg_keywordshash_82)
+
+pg_keywordshash_83 = custom_target('keywords_hash_83',
+               command: [
+                       mkkeywordhash,
+                       '@INPUT@'
+                       ],
+               capture: true,
+               input: 'keywords_83.list',
+               output: 'keywords_hash-83.code')
+
+pg_keywordshash_83_dep = declare_dependency (sources: pg_keywordshash_83)
+
+pg_keywordshash_84 = custom_target('keywords_hash_84',
+               command: [
+                       mkkeywordhash,
+                       '@INPUT@'
+                       ],
+               capture: true,
+               input: 'keywords_84.list',
+               output: 'keywords_hash-84.code')
+
+pg_keywordshash_84_dep = declare_dependency (sources: pg_keywordshash_84)
+
+pg_lemon_parserc = custom_target('pg_lemon-parser_c',
+       command : [lemon_exe, '-d', '-h',
+       '-o'+meson.current_build_dir(),
+       '-T'+'@INPUT0@', '@INPUT1@'],
+       input : ['lempar.c', 'parser.y'],
+       output : ['parser.c'],
+       install : false
+       )
+
+
+pg_lemon_parserh = custom_target('pg_lemon-parser_h',
+       command : [lemon_exe, '-d', '-z',
+       '-o'+meson.current_build_dir(),
+       '-T'+'@INPUT0@', '@INPUT1@'],
+       input : ['lempar.c', 'parser.y'],
+       output : ['parser.h'],
+       install : false
+       )
+
+pg_token_types = custom_target('pg_token_types',
+       command: [gendef_exe],
+       capture: true,
+       input: [pg_lemon_parserh],
+       output: 'postgres_token_types.h',
+       install: false
+       )
+
+libgda_postgres_sources = files([
+       'gda-postgres-reuseable.c',
+       'gda-postgres-reuseable.h',
+       'gda-postgres-parser.c',
+       'gda-postgres-parser.h',
+       'gda-postgres-meta.c',
+       'gda-postgres-meta.h',
+       'parser.h',
+       'parser.c',
+       'postgres_token_types.h'
+       ])
\ No newline at end of file
diff --git a/providers/sqlite/meson.build b/providers/sqlite/meson.build
new file mode 100644
index 000000000..e69de29bb