diff -p -up mysql-workbench-gpl-5.2.33-src/library/base/Makefile.am-linkage mysql-workbench-gpl-5.2.33-src/library/base/Makefile.am
--- mysql-workbench-gpl-5.2.33-src/library/base/Makefile.am-linkage 2011-05-02 15:29:16.234620616 -0300
+++ mysql-workbench-gpl-5.2.33-src/library/base/Makefile.am 2011-05-02 15:32:23.567618460 -0300
@@ -7,7 +7,7 @@ pkglib_LTLIBRARIES = libwbbase.la
INCLUDES= -Wall -Wsign-compare\
@MYSQL_INCLUDE@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@
-libwbbase_la_LIBADD=@GLIB_LIBS@\
+libwbbase_la_LIBADD=@GLIB_LIBS@ @SIGC_LIBS@\
@PCRE_LIBS@ @CAIRO_LIBS@
libwbbase_la_SOURCES=util_functions.cpp\
diff -p -up mysql-workbench-gpl-5.2.33-src/library/canvas/src/Makefile.am-linkage mysql-workbench-gpl-5.2.33-src/library/canvas/src/Makefile.am
--- mysql-workbench-gpl-5.2.33-src/library/canvas/src/Makefile.am-linkage 2011-05-02 15:43:47.224618058 -0300
+++ mysql-workbench-gpl-5.2.33-src/library/canvas/src/Makefile.am 2011-05-02 15:44:48.664618476 -0300
@@ -48,8 +48,8 @@ libmdcanvasgtk_la_SOURCES=\
gtk/mdc_gtk_canvas_view.cpp\
gtk/mdc_gtk_canvas_scroller.cpp
-libmdcanvas_la_LIBADD=@CAIRO_LIBS@
-libmdcanvasgtk_la_LIBADD=@CAIRO_LIBS@ @GNOME_LIBS@
+libmdcanvas_la_LIBADD=@CAIRO_LIBS@ @SIGC_LIBS@ @GLIB_LIBS@
+libmdcanvasgtk_la_LIBADD=@CAIRO_LIBS@ @GNOME_LIBS@
INCLUDES=@CAIRO_CFLAGS@ @GNOME_CFLAGS@ \
-I$(top_srcdir)/backend \
diff -p -up mysql-workbench-gpl-5.2.33-src/library/dbc/Makefile.am-linkage mysql-workbench-gpl-5.2.33-src/library/dbc/Makefile.am
--- mysql-workbench-gpl-5.2.33-src/library/dbc/Makefile.am-linkage 2011-05-02 16:17:18.249619448 -0300
+++ mysql-workbench-gpl-5.2.33-src/library/dbc/Makefile.am 2011-05-02 16:18:26.069618572 -0300
@@ -6,6 +6,7 @@ libcdbc_la_SOURCES=\
src/driver_manager.cpp\
src/sql_batch_exec.cpp
+libcdbc_la_LIBADD = $(SIGC_LIBS) $(GLIB_LIBS)
INCLUDES=@CAIRO_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ -I$(top_srcdir)/backend\
-I$(top_srcdir)/generated\
diff -p -up mysql-workbench-gpl-5.2.33-src/library/forms/Makefile.am-linkage mysql-workbench-gpl-5.2.33-src/library/forms/Makefile.am
--- mysql-workbench-gpl-5.2.33-src/library/forms/Makefile.am-linkage 2011-05-02 16:25:13.467617305 -0300
+++ mysql-workbench-gpl-5.2.33-src/library/forms/Makefile.am 2011-05-02 16:26:47.301618933 -0300
@@ -67,7 +67,7 @@ gtk/src/lf_button.cpp\
gtk/src/lf_menu.cpp\
gtk/src/lf_menubar.cpp
-libmforms_la_LIBADD=@GNOME_LIBS@ @GNOME_KEYRING_LIBS@
+libmforms_la_LIBADD=@GNOME_LIBS@ @GNOME_KEYRING_LIBS@
INCLUDES=@GNOME_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_KEYRING_CFLAGS@ \
-I$(top_srcdir)/library/forms\
<<<<<<< .mine
=======
diff -p -up mysql-workbench-gpl-5.2.33-src/library/Makefile.am-linkage mysql-workbench-gpl-5.2.33-src/library/Makefile.am
--- mysql-workbench-gpl-5.2.33-src/library/Makefile.am-linkage 2011-05-02 16:27:20.318859552 -0300
+++ mysql-workbench-gpl-5.2.33-src/library/Makefile.am 2011-05-02 16:28:08.001619400 -0300
@@ -1,2 +1,2 @@
-SUBDIRS= base canvas dbc sql-parser grt forms sshtunnel
+SUBDIRS= base canvas grt dbc sql-parser forms sshtunnel
>>>>>>> .r670736
