[libgda/gtk3] Corretions for bug #642170

[Vivien Malerba <vivien src gnome org>]

commit b232939cba984fc86f830c46e5e3c1f4f90087a5
Author: Vivien Malerba <malerba gnome-db org>
Date:   Fri Feb 18 18:25:23 2011 +0100

    Corretions for bug #642170

 libgda-ui/Makefile.am           |    2 +-
 libgda/Makefile.am              |    1 +
 providers/sqlcipher/Makefile.am |    4 +---
 tools/browser/Makefile.am       |    1 +
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index 4b3b107..efcebd8 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -216,7 +216,7 @@ introspection_sources = \
 	$(ui_data_entries_sources)
 
 Gdaui-5.0.gir: $(lib_LTLIBRARIES)
-Gdaui_5_0_gir_INCLUDES = Gtk-3.0 Gda-5.0
+Gdaui_5_0_gir_INCLUDES = Gtk-2.0 Gda-5.0
 Gdaui_5_0_gir_CFLAGS = $(GLOBAL_CFLAGS)
 Gdaui_5_0_gir_LIBS = $(lib_LTLIBRARIES) ../libgda/libgda-5.0.la
 Gdaui_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 006cb2b..f0bd4df 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -354,6 +354,7 @@ introspection_sources = $(gda_sources) \
 Gda-5.0.gir: $(lib_LTLIBRARIES)
 Gda_5_0_gir_INCLUDES = GObject-2.0 libxml2-2.0
 Gda_5_0_gir_CFLAGS = $(GLOBAL_CFLAGS)
+
 Gda_5_0_gir_LIBS = $(lib_LTLIBRARIES)
 Gda_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
 INTROSPECTION_GIRS += Gda-5.0.gir
diff --git a/providers/sqlcipher/Makefile.am b/providers/sqlcipher/Makefile.am
index 96a209b..30e060d 100644
--- a/providers/sqlcipher/Makefile.am
+++ b/providers/sqlcipher/Makefile.am
@@ -14,9 +14,7 @@ AM_CPPFLAGS = \
 
 sqlite_sources = sqlite3.c sqlite3.h
 $(sqlite_sources): $(srcdir)/sqlcipher.patch $(top_srcdir)/libgda/sqlite/sqlite-src/sqlite3.c $(top_srcdir)/libgda/sqlite/sqlite-src/sqlite3.h
-	cp $(top_srcdir)/libgda/sqlite/sqlite-src/sqlite3.c sqlite3.c
-	cp $(top_srcdir)/libgda/sqlite/sqlite-src/sqlite3.h sqlite3.h
-	patch -p0 < $(srcdir)/sqlcipher.patch
+	(cp $(top_srcdir)/libgda/sqlite/sqlite-src/sqlite3.c sqlite3.c && cp $(top_srcdir)/libgda/sqlite/sqlite-src/sqlite3.h sqlite3.h && patch -p0 < $(srcdir)/sqlcipher.patch)
 
 libgda_sqlcipher_la_SOURCES = \
 	$(sqlite_sources) \
diff --git a/tools/browser/Makefile.am b/tools/browser/Makefile.am
index dd893f8..14e6b43 100644
--- a/tools/browser/Makefile.am
+++ b/tools/browser/Makefile.am
@@ -121,6 +121,7 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 # canvas example
 canvas_example_DEPENDENCIES = \
+	libbrowser.la \
 	canvas/libcanvas.la \
 	common/libcommon.la