[libgda/LIBGDA_5.2] Improved vala extensions build

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 84ae670d3d8c02941994c57b97ef7358bdb367b1
Author: Daniel Espinosa <esodan gmail com>
Date:   Wed Oct 3 12:18:59 2018 -0500

    Improved vala extensions build

 Makefile.am             |  2 +-
 NEWS                    |  5 ++---
 libgda-ui/Makefile.am   |  4 ++--
 libgda/Makefile.am      |  8 ++++----
 libgda/data/Makefile.am | 28 +++++++++++++++++-----------
 5 files changed, 26 insertions(+), 21 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 63184e733..0c7841db2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-gda-gi=yes --enable-introspection=yes 
--enable-gdaui-gi=yes --enable-gi-system-install=no --enable-vala=yes --enable-vala-extensions=yes
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-vala --enable-gi-system-install=no
 
 if HAVE_LIBXSLT
 XSLT_DIR=libgda-xslt
diff --git a/NEWS b/NEWS
index 2aaab44d6..6cc373554 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,6 @@
 
-libgda-5.2.6
+libgda-5.2.6 2018-10-03
  - Fixed compilation on MacOS
- - Improvements to Continuous Integration
  - All Vala bindings and Vala extensions are built by default using --enable-vala,
    added --disable* switch to disable some or all of them
  - Fixes on outdated unit tests
@@ -1892,4 +1891,4 @@ libgda 0.8.100, 2002-01-06
  - extended test suite with new connection tests (Gonzalo)
  - fixed #67242 orbit-idl not generating files when IDL changes (Gonzalo)
  - fixed lost-counter in data retrieval (Gonzalo)
- 
+ 
\ No newline at end of file
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index bee990d16..85365b42d 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -256,8 +256,8 @@ if ENABLE_GDAUI_VALA
 
 vapi: libgdaui-5.0.vapi
 
-libgdaui-5.0.vapi: Gdaui-5.0.gir
-       $(VAPIGEN) --metadatadir=$(top_srcdir)/libgda-ui --vapidir=$(top_srcdir)/libgda 
--girdir=$(top_srcdir)/libgda --library=libgda-ui-5.0 --pkg=libxml-2.0 --pkg=libgda-5.0 --pkg=gio-2.0 
--pkg=atk --pkg=gtk+-3.0 Gdaui-5.0.gir
+libgda-ui-5.0.vapi: Gdaui-5.0.gir
+       $(VAPIGEN) --metadatadir=$(top_srcdir)/libgda-ui --vapidir=$(top_builddir)/libgda 
--girdir=$(top_builddir)/libgda --library=libgda-ui-5.0 --pkg=libxml-2.0 --pkg=libgda-5.0 --pkg=gio-2.0 
--pkg=atk --pkg=gtk+-3.0 Gdaui-5.0.gir
 
 vapidir = $(datadir)/vala/vapi
 vapi_DATA=libgda-ui-5.0.vapi
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 36a3b6fce..8cf03e2cd 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -4,6 +4,10 @@ lib_LTLIBRARIES = libgda-5.0.la
 
 SUBDIRS = sqlite handlers binreloc sql-parser providers-support thread-wrapper
 
+if ENABLE_VALA_EXTENSIONS
+SUBDIRS+= . data
+endif
+
 DEF_FLAGS=
 if BDB 
 GDA_BDB_H=gda-data-model-bdb.h
@@ -379,7 +383,3 @@ EXTRA_DIST += \
 CLEANFILES += $(vapi_DATA)
 
 endif
-
-if ENABLE_VALA_EXTENSIONS
-    SUBDIRS+= . data
-endif
diff --git a/libgda/data/Makefile.am b/libgda/data/Makefile.am
index 3e95dc357..493a1b14f 100644
--- a/libgda/data/Makefile.am
+++ b/libgda/data/Makefile.am
@@ -17,10 +17,11 @@ AM_CFLAGS =\
 
 lib_LTLIBRARIES = libgdadata-5.0.la
 
-VALAFLAGS = \
+AM_VALAFLAGS = \
     --vapidir=$(top_builddir)/libgda \
     --vapidir=$(datadir)/vala/vapi \
     --includedir=$(top_srcdir)/libgda \
+    --includedir=$(top_builddir)/libgda \
     --pkg libxml-2.0 \
     --pkg gee-0.8 \
     --pkg libgda-5.0 \
@@ -53,19 +54,25 @@ db_collection_sources = \
 
 include_headers = libgdadata.h
 
-libgdadata_5_0_la_SOURCES = \
-       NamespaceInfo.vala \
+namespace_sources = \
+       NamespaceInfo.vala
+
+vala_sources = \
+       $(namespace_sources) \
        $(object_persistance_sources) \
        $(db_collection_sources)
 
-$(include_headers): DataBase.c
+gdadata-5.0.vapi GdaData-5.0.gir $(vala_sources:.vala=.c): $(vala_sources)
+       $(VALAC) $(AM_VALAFLAGS) $^
+
+libgdadata_5_0_la_SOURCES = $(vala_sources:.vala=.c)
+
+$(include_headers): libgdadata-5.0.la
 vapi: gdadata-5.0.vapi
 
 vapidir = $(datadir)/vala/vapi
 vapi_DATA = gdadata-5.0.vapi
 
-gdadata-5.0.vapi GdaData-5.0.gir: libgdadata-5.0.la
-
 CLEANFILES= gdadata-5.0.vapi
 
 libgdadata_5_0_la_LDFLAGS = 
@@ -115,15 +122,14 @@ typelibs_DATA = GdaData-5.0.typelib
 
 CLEANFILES += \
         $(typelibs_DATA) \
+        $(INTROSPECTION_GIRS) \
         gdadata-5.0.vapi \
         libgdadata-5.0.pc \
         $(include_headers) \
-        $(libgdadata_5_0_la_VALASOURCES:.vala=.c) \
+        $(vala_sources:.vala=.c) \
         $(srcdir)/libgdadata_5_0_la_vala.stamp
 
 EXTRA_DIST = \
-       libgdadata-5.0.pc \
-       $(vapi_DATA) \
-       $(INTROSPECTION_GIRS) \
-       $(typelibs_DATA)
+       $(vala_sources) \
+       libgdadata-5.0.pc.in