[libgda/libgda-vala] More work to build correctly libgdadata as Vala Extension

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 19d34cf91fe46dbfa46e4b2f5abec33b4b1605be
Author: Daniel Espinosa <despinosa src gnome org>
Date:   Mon Nov 28 17:55:36 2011 -0600

    More work to build correctly libgdadata as Vala Extension

 libgda/Makefile.am               |    6 +++++-
 libgda/data/Makefile.am          |   17 +++++++----------
 libgda/data/libgdadata-1.0.pc.in |   13 +++++++++++++
 tests/Makefile.am                |    5 ++++-
 tests/vala/Makefile.am           |   12 +++++++++---
 5 files changed, 38 insertions(+), 15 deletions(-)
---
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index b7291be..54c94ce 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -2,7 +2,11 @@ QUIET_GEN = $(Q:@= echo ' GEN '$@;)
 
 lib_LTLIBRARIES = libgda-5.0.la
 
-SUBDIRS = sqlite handlers binreloc sql-parser providers-support thread-wrapper data
+if ENABLE_VALA_EXTENSIONS
+    VALA_EXTENSIONS= . data
+endif
+
+SUBDIRS = sqlite handlers binreloc sql-parser providers-support thread-wrapper $(VALA_EXTENSIONS)
 
 DEF_FLAGS=
 if BDB 
diff --git a/libgda/data/Makefile.am b/libgda/data/Makefile.am
index cb78280..0cd8a22 100644
--- a/libgda/data/Makefile.am
+++ b/libgda/data/Makefile.am
@@ -1,7 +1,5 @@
 NULL =
 
-if ENABLE_VALA_EXTENSIONS
-
 AM_CPPFLAGS = \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
@@ -25,7 +23,6 @@ AM_CFLAGS =\
 lib_LTLIBRARIES = libgdadata.la
 
 VALAFLAGS = \
-    $(top_srcdir)/libgda/data/config.vapi \
     --vapidir=$(top_srcdir)/libgda \
     --pkg libxml-2.0 \
     --pkg gee-1.0 \
@@ -37,7 +34,7 @@ libgdadata_la_VALASOURCES = \
 	SelectQuery.vala \
 	$(NULL)
 
-libgdavala_la_SOURCES = \
+libgdadata_la_SOURCES = \
 	gdadata.vala.stamp \
 	$(libgdadata_la_VALASOURCES:.vala=.c) \
 	$(NULL)	
@@ -48,9 +45,10 @@ gdadata-1.0.vapi gdadata.vala.stamp GdaData-1.0.gir: $(libgdadata_la_VALASOURCES
 
 CLEANFILES+= gdadata-1.0.vapi GdaData-1.0.gir
 
-libgdavala_la_LDFLAGS = 
+libgdadata_la_LDFLAGS = 
 
-libgdavala_la_LIBADD = \
+libgdadata_la_LIBADD = \
+    $(top_builddir)/libgda/libgda-5.0.la \
 	$(LIBGDA_LIBS) \
 	$(GEE_LIBS) \
 	$(VALA_LIBS) \
@@ -60,8 +58,8 @@ include_HEADERS = \
 	libgdadata.h \
 	$(NULL)
 
-gdavalaincludedir = $(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/data
-gdavalainclude_HEADERS = libgdadata.h
+gdadataincludedir = $(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/data
+gdadatainclude_HEADERS = libgdadata.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgdadata-1.0.pc
@@ -94,10 +92,9 @@ CLEANFILES += $(INTROSPECTION_GIRS) $(typelibs_DATA) gdadata-1.0.vapi
 
 EXTRA_DIST = \
 	libgdadata-1.0.pc.in \
-	$(libgdadata_la_VALASOURCES) \
+	$(libgdadata_la_VALASOURCES:.vala=.c) \
 	$(vapi_DATA) \
 	$(INTROSPECTION_GIRS) \
 	$(typelibs_DATA) \
 	gdadata.vala.stamp
 
-endif
diff --git a/libgda/data/libgdadata-1.0.pc.in b/libgda/data/libgdadata-1.0.pc.in
new file mode 100644
index 0000000..f6ca6a4
--- /dev/null
+++ b/libgda/data/libgdadata-1.0.pc.in
@@ -0,0 +1,13 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+datarootdir= datarootdir@
+datadir= datadir@
+includedir= includedir@/libgdavala-1.0
+
+Name: libgxml
+Description: Sample library created by Anjuta project wizard.
+Version: 1.0
+Requires: libgda
+Libs: -L${libdir} -lgdavala
+Cflags: -I${includedir}
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6e448d6..0a811fc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,8 +4,11 @@ TESTS_ENVIRONMENT = GDA_TOP_SRC_DIR="$(abs_top_srcdir)" GDA_TOP_BUILD_DIR="$(abs
 TESTS = test-ddl-creator test-bin-converter test-sql-identifier test-identifiers-quotes test-sql-builder test-connection-string-split test-input-parsers
 check_PROGRAMS = test-ddl-creator test-bin-converter test-sql-identifier test-identifiers-quotes test-sql-builder test-connection-string-split test-input-parsers
 
+if ENABLE_VALA_EXTENSIONS
+    VALA_EXTENSIONS= vala
+endif
 
-SUBDIRS = providers parser value-holders meta-store data-models multi-threading vala
+SUBDIRS = providers parser value-holders meta-store data-models multi-threading $(VALA_EXTENSIONS)
 
 AM_CPPFLAGS = \
         -I$(top_builddir) \
diff --git a/tests/vala/Makefile.am b/tests/vala/Makefile.am
index e99b493..189189e 100644
--- a/tests/vala/Makefile.am
+++ b/tests/vala/Makefile.am
@@ -1,5 +1,13 @@
 NULL = 
-if ENABLE_VALA_EXTENSIONS
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/libgda \
+	-I$(top_builddir) \
+	$(COREDEPS_CFLAGS) \
+	$(COREDEPS_WFLAGS) \
+	$(JSON_GLIB_CFLAGS) \
+	-DROOT_DIR=\""$(top_srcdir)"\"
 
 TESTS_ENVIRONMENT = 
 TESTS = check_dataobject
@@ -27,5 +35,3 @@ check_dataobject check_dataobject.vala.stamp: $(check_dataobject_VALASOURCES)
 	@touch $@
 
 EXTRA_DIST = 
-
-endif