[libgda] Corrections to have "make distcheck" work

[Vivien Malerba <vivien src gnome org>]

commit 326da7d4c5a04df256c8367a84569dc3e09d591f
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sat May 5 15:00:50 2012 +0200

    Corrections to have "make distcheck" work

 doc/Makefile.am                    |    2 +-
 doc/mallard/gda-vala/C/Makefile.am |    9 +++++++--
 libgda/data/Makefile.am            |    2 +-
 tests/ui/Makefile.am               |    4 +++-
 tests/ui/common.c                  |    6 ++++--
 5 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2d3c84e..27949f4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,6 +2,6 @@ if ENABLE_VALA_DOC
 MALLARD_DOC_DIR=mallard
 endif
 
-SUBDIRS = C $(MALLARD_DOC_DIR)
+SUBDIRS = $(MALLARD_DOC_DIR) C
 
 DOC_LINGUAS = el es gl
diff --git a/doc/mallard/gda-vala/C/Makefile.am b/doc/mallard/gda-vala/C/Makefile.am
index 0eb5fbf..61eb05d 100644
--- a/doc/mallard/gda-vala/C/Makefile.am
+++ b/doc/mallard/gda-vala/C/Makefile.am
@@ -15,7 +15,7 @@ DOC_FIGURES = \
 	figures/table-class-uml.png
 
 htmldoc_SOURCES = \
-	gda.vala.stamp
+	gda.vala.stamp \
 	$(DOC_PAGES:.page=.html)
 
 gda.vala.stamp: $(DOC_PAGES)
@@ -40,5 +40,10 @@ figuresdir = \
 figures_DATA = \
 	$(DOC_FIGURES)
 
+EXTRA_DIST = \
+	$(DOC_FIGURES)
+
 CLEANFILES = \
-	(DOC_PAGES:.page=.html)
+	$(DOC_PAGES:.page=.html) \
+	$(JS_FILES) \
+	$(DOC_FIGURES)
diff --git a/libgda/data/Makefile.am b/libgda/data/Makefile.am
index 14eb3ac..8a1d4fc 100644
--- a/libgda/data/Makefile.am
+++ b/libgda/data/Makefile.am
@@ -137,7 +137,7 @@ CLEANFILES += \
 
 EXTRA_DIST = \
 	libgdadata-5.0.pc \
-	$(libgdadata_5_0_la_VALASOURCES:.vala=.c) \
+	$(libgdadata_5_0_la_VALASOURCES) \
 	$(vapi_DATA) \
 	$(INTROSPECTION_GIRS) \
 	$(typelibs_DATA) \
diff --git a/tests/ui/Makefile.am b/tests/ui/Makefile.am
index d5ce07a..a85ed58 100644
--- a/tests/ui/Makefile.am
+++ b/tests/ui/Makefile.am
@@ -5,8 +5,10 @@ AM_CPPFLAGS = \
 	$(COREDEPS_CFLAGS) \
 	$(COREDEPS_WFLAGS) \
 	$(GTK_CFLAGS) \
-	-DROOT_DIR=\""$(top_srcdir)"\"
+	-DROOT_DIR=\""$(top_srcdir)"\" \
+	-DTOP_BUILD_DIR=\""$(top_builddir)"\"
 
+TESTS_ENVIRONMENT = GDA_TOP_SRC_DIR="$(abs_top_srcdir)" GDA_TOP_BUILD_DIR="$(abs_top_builddir)"
 TESTS = check_sets check_raw_grid_model
 check_PROGRAMS = check_sets check_raw_grid_model
 
diff --git a/tests/ui/common.c b/tests/ui/common.c
index 3e09f72..bc18bd1 100644
--- a/tests/ui/common.c
+++ b/tests/ui/common.c
@@ -23,13 +23,15 @@ ui_tests_common_open_connection (void)
 {
 	GdaConnection *cnc;
 	gchar *cnc_string, *fname;
+	GError *error = NULL;
 	fname = g_build_filename (ROOT_DIR, "data", NULL);
 	cnc_string = g_strdup_printf ("DB_DIR=%s;DB_NAME=sales_test", fname);
 	g_free (fname);
 	cnc = gda_connection_open_from_string ("SQLite", cnc_string, NULL,
-					       GDA_CONNECTION_OPTIONS_READ_ONLY, NULL);
+					       GDA_CONNECTION_OPTIONS_READ_ONLY, &error);
 	if (!cnc) {
-		g_print ("Failed to open connection, cnc_string = %s\n", cnc_string);
+		g_print ("Failed to open connection, cnc_string = [%s]: %s\n", cnc_string,
+			 error && error->message ? error->message : "No detail");
 		exit (1);
 	}
 	g_free (cnc_string);