[libgda] Corretions for bug #642170



commit 4123c7985d61521713c73920692f038806621164
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sat Feb 12 17:40:50 2011 +0100

    Corretions for bug #642170

 libgda-ui/Makefile.am           |    2 +-
 libgda/Makefile.am              |    2 +-
 providers/sqlcipher/Makefile.am |    4 +---
 tools/browser/Makefile.am       |    1 +
 4 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index b969663..8bdc52a 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -215,7 +215,7 @@ introspection_sources = \
 	$(ui_sources) \
 	$(ui_data_entries_sources)
 
-Gdaui-4_0.gir: $(lib_LTLIBRARIES)
+Gdaui-4.0.gir: $(lib_LTLIBRARIES)
 Gdaui_4_0_gir_INCLUDES = Gtk-2.0 Gda-4.0
 Gdaui_4_0_gir_CFLAGS = $(GLOBAL_CFLAGS)
 Gdaui_4_0_gir_LIBS = $(lib_LTLIBRARIES) ../libgda/libgda-4.0.la
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index d692a69..72c7157 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -353,7 +353,7 @@ introspection_sources = $(gda_sources) \
 	$(threadwrapper) \
 	$(sqlparser) \
 	$(handlers)
-Gda-4_0.gir: $(lib_LTLIBRARIES)
+Gda-4.0.gir: $(lib_LTLIBRARIES)
 Gda_4_0_gir_INCLUDES = GObject-2.0 libxml2-2.0
 Gda_4_0_gir_CFLAGS = $(GLOBAL_CFLAGS)
 
diff --git a/providers/sqlcipher/Makefile.am b/providers/sqlcipher/Makefile.am
index d45c0e2..6fb9a3d 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 15bd70c..d1d6d1e 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
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]