[libgda] Have "make distcheck" work

[Vivien Malerba <vivien src gnome org>]

commit 442fbacb3f79f3d0524c07ef9bbff7c0925ec30b
Author: Vivien Malerba <malerba gnome-db org>
Date:   Tue Sep 17 22:31:55 2013 +0200

    Have "make distcheck" work

 doc/mallard/gda-vala/C/Makefile.am |   16 +++++++++-------
 doc/mallard/gda-vala/Makefile.am   |    2 --
 tests/providers/prov-test-common.c |    2 +-
 tools/browser/help/Makefile.am     |    2 --
 tools/help/Makefile.am             |    2 --
 5 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/doc/mallard/gda-vala/C/Makefile.am b/doc/mallard/gda-vala/C/Makefile.am
index cd51fbb..d4c5dcf 100644
--- a/doc/mallard/gda-vala/C/Makefile.am
+++ b/doc/mallard/gda-vala/C/Makefile.am
@@ -1,6 +1,6 @@
 BUILT_SOURCES = gda.vala.stamp
 
-DOC_PAGES = \
+HELP_FILES = \
        classes.page \
        enable-vala-extensions.page \
        index.page \
@@ -10,7 +10,7 @@ DOC_PAGES = \
        record-class.page \
        table-class.page
 
-DOC_FIGURES = \
+HELP_MEDIA = \
        figures/classes-uml.png \
        figures/record-class-uml.png \
        figures/interfaces-uml.png \
@@ -20,7 +20,7 @@ htmldoc_SOURCES = \
        gda.vala.stamp \
        $(DOC_PAGES:.page=.html)
 
-gda.vala.stamp: $(DOC_PAGES)
+gda.vala.stamp: $(HELP_FILES)
        $(YELP_BUILD) html $^
 
 JS_FILES = C.css jquery.js jquery.syntax.js jquery.syntax.brush.clang.js jquery.syntax.layout.yelp.js 
jquery.syntax.core.js yelp.js yelp-note-tip.png
@@ -31,7 +31,7 @@ htmldocdir = \
        $(HTML_DIR)/libgda-5.0/gda-vala
 
 htmldoc_DATA = \
-       $(DOC_PAGES:.page=.html) \
+       $(HELP_FILES:.page=.html) \
        $(JS_FILES)
 
 figures: htmldoc
@@ -40,13 +40,15 @@ figuresdir = \
        $(HTML_DIR)/libgda-5.0/gda-vala/figures
 
 figures_DATA = \
-       $(DOC_FIGURES)
+       $(HELP_MEDIA)
 
 EXTRA_DIST = \
-       $(DOC_FIGURES)
+       $(HELP_MEDIA) \
+       $(HELP_FILES) \
+       $(JS_FILES)
 
 CLEANFILES = \
-       $(DOC_PAGES:.page=.html) \
+       $(HELP_FILES:.page=.html) \
        $(JS_FILES)
 
 clean-local:
diff --git a/doc/mallard/gda-vala/Makefile.am b/doc/mallard/gda-vala/Makefile.am
index f0aa596..e9e2fe5 100644
--- a/doc/mallard/gda-vala/Makefile.am
+++ b/doc/mallard/gda-vala/Makefile.am
@@ -24,7 +24,5 @@ DOC_FIGURES = \
 
 DOC_LINGUAS = 
 
-dist-hook: doc-dist-hook
-
 PAGES_DIR = C
 
diff --git a/tests/providers/prov-test-common.c b/tests/providers/prov-test-common.c
index ce91185..e3e6f4e 100644
--- a/tests/providers/prov-test-common.c
+++ b/tests/providers/prov-test-common.c
@@ -729,6 +729,7 @@ prov_test_common_check_timestamp (void)
        GdaSet *params = NULL;
        GError *error = NULL;
        int number_failed = 0;
+       GdaDataModel *model = NULL;
 
 #ifdef CHECK_EXTRA_INFO
        g_print ("\n============= %s() =============\n", __FUNCTION__);
@@ -762,7 +763,6 @@ prov_test_common_check_timestamp (void)
                goto out;
        }
 
-       GdaDataModel *model;
        model = gda_connection_statement_execute_select (cnc, stmt, NULL, &error);
        if (!model) {
                number_failed ++;
diff --git a/tools/browser/help/Makefile.am b/tools/browser/help/Makefile.am
index a9fe63d..0d00aeb 100644
--- a/tools/browser/help/Makefile.am
+++ b/tools/browser/help/Makefile.am
@@ -54,5 +54,3 @@ HELP_FILES = \
        ldap-connections.page
 
 HELP_LINGUAS = cs de el es gl id pt_BR sl zh_CN
-
-dist-hook: doc-dist-hook
diff --git a/tools/help/Makefile.am b/tools/help/Makefile.am
index f93c8d4..2ace9d0 100644
--- a/tools/help/Makefile.am
+++ b/tools/help/Makefile.am
@@ -7,5 +7,3 @@ DOC_PAGES = \
        gda-sql-help.xml
 
 DOC_LINGUAS = 
-
-dist-hook: doc-dist-hook