diff -Naur mysql-workbench-oss-5.1.16/Makefile.am mysql-workbench-oss-5.1.16.oden/Makefile.am --- mysql-workbench-oss-5.1.16/Makefile.am 2009-06-29 23:51:21.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/Makefile.am 2010-02-18 19:05:30.260095557 +0100 @@ -1,4 +1,4 @@ -SUBDIRS=ext library tools/genobj generated backend modules frontend plugins res images +SUBDIRS=library tools/genobj generated backend modules frontend plugins res images tests: DEST_DIR=$(prefix) TEST_MODULES_DIR=$(prefix)/lib/mysql-workbench/modules make -C testing/tut test diff -Naur mysql-workbench-oss-5.1.16/backend/wbprivate/Makefile.am mysql-workbench-oss-5.1.16.oden/backend/wbprivate/Makefile.am --- mysql-workbench-oss-5.1.16/backend/wbprivate/Makefile.am 2009-06-29 23:51:21.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/backend/wbprivate/Makefile.am 2010-02-18 19:05:30.263027458 +0100 @@ -6,7 +6,7 @@ -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src -I$(top_srcdir)/library/forms\ -I$(top_srcdir)/modules -I$(top_srcdir)/frontend/common\ -I$(top_srcdir)/backend/wbpublic -I$(top_srcdir)/generated -I$(top_srcdir)/library/canvas/src\ - -I$(top_srcdir)/ext/cppconn/ -I$(top_srcdir)/library/dbc/src + -I$(top_srcdir)/library/dbc/src libwbprivate_a_SOURCES=\ workbench/metaclasses.cpp\ diff -Naur mysql-workbench-oss-5.1.16/backend/wbpublic/Makefile.am mysql-workbench-oss-5.1.16.oden/backend/wbpublic/Makefile.am --- mysql-workbench-oss-5.1.16/backend/wbpublic/Makefile.am 2009-06-29 23:51:21.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/backend/wbpublic/Makefile.am 2010-02-18 19:05:30.263027458 +0100 @@ -9,11 +9,9 @@ -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src \ -I$(top_srcdir)/library/forms\ -I$(top_srcdir)/library/canvas/src\ - -I$(top_srcdir)/ext/cppconn\ -I$(top_srcdir)/library/dbc/src\ -I$(top_srcdir)/backend/wbpublic -I$(top_srcdir)/generated\ - -I$(top_srcdir)/modules\ - -I$(top_srcdir)/ext + -I$(top_srcdir)/modules libwbpublic_la_SOURCES=\ grt/refresh_ui.cpp\ diff -Naur mysql-workbench-oss-5.1.16/configure.in mysql-workbench-oss-5.1.16.oden/configure.in --- mysql-workbench-oss-5.1.16/configure.in 2009-06-29 23:51:22.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/configure.in 2010-02-18 19:05:30.260095557 +0100 @@ -53,11 +53,10 @@ AC_CHECK_HEADERS([tr1/unordered_set tr1/unordered_map]) -## apparently fedora has hacked the default install dir of ctemplate headers......... -#AC_CHECK_HEADERS([ctemplate/template.h], AC_DEFINE(CTEMPLATE_NOT_IN_GOOGLE, [], [ctemplate headers not in standard location]) , -# [ AC_CHECK_HEADERS([google/template.h], [],AC_MSG_ERROR(["ctemplate not found"])) ] ) -#AC_ARG_WITH(ctemplate-libs, [ --with-ctemplates-libs=<libdir> ], [], [ac_LIBS=-lctemplate]) -#CTEMPLATE_LIBS=$ac_LIBS +AC_CHECK_HEADERS([ctemplate/template.h], AC_DEFINE(CTEMPLATE_NOT_IN_GOOGLE, [], [ctemplate headers not in standard location]) , + [ AC_CHECK_HEADERS([google/template.h], [],AC_MSG_ERROR(["ctemplate not found"])) ] ) +AC_ARG_WITH(ctemplate-libs, [ --with-ctemplates-libs=<libdir> ], [], [ac_LIBS=-lctemplate]) +CTEMPLATE_LIBS=$ac_LIBS @@ -119,6 +118,8 @@ # # mysql headers # +AC_CHECK_HEADERS([mysql-connector/cppconn/exception.h],[],AC_MSG_ERROR(["MySQL Connector/C++ not found"])) + AC_ARG_WITH(mysql-config, [ --with-mysql-config=<path> specifies how to run the mysql_config script [default=mysql_config]], ac_mysql_config_path="$withval", ac_mysql_config_path="mysql_config") @@ -362,10 +363,6 @@ res/grt/Makefile res/grtdata/Makefile res/wbdata/Makefile -ext/Makefile -ext/scintilla/gtk/Makefile -ext/cppconn/Makefile -ext/cppconn/driver/Makefile backend/Makefile backend/wbpublic/Makefile backend/wbprivate/Makefile @@ -416,13 +413,5 @@ generated/Makefile ]) -#AC_CONFIG_SUBDIRS(ext/ctemplate/ctemplate-src) - AC_OUTPUT() -( - cd ./ext/ctemplate/ctemplate-src && - autoreconf -i -s; - ./configure --prefix=$prefix --libdir=$libdir/mysql-workbench --disable-dependency-tracking -) - diff -Naur mysql-workbench-oss-5.1.16/ext/Makefile.am mysql-workbench-oss-5.1.16.oden/ext/Makefile.am --- mysql-workbench-oss-5.1.16/ext/Makefile.am 2009-06-29 23:51:22.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/ext/Makefile.am 2010-02-18 19:05:08.151969974 +0100 @@ -1 +1 @@ -SUBDIRS=ctemplate scintilla/gtk cppconn \ No newline at end of file +SUBDIRS=scintilla/gtk cppconn diff -Naur mysql-workbench-oss-5.1.16/ext/Makefile.in mysql-workbench-oss-5.1.16.oden/ext/Makefile.in --- mysql-workbench-oss-5.1.16/ext/Makefile.in 2009-06-29 23:51:31.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/ext/Makefile.in 2010-02-18 19:05:08.151969974 +0100 @@ -205,7 +205,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = ctemplate scintilla/gtk cppconn +SUBDIRS = scintilla/gtk cppconn all: all-recursive .SUFFIXES: diff -Naur mysql-workbench-oss-5.1.16/frontend/linux/linux_utilities/Makefile.am mysql-workbench-oss-5.1.16.oden/frontend/linux/linux_utilities/Makefile.am --- mysql-workbench-oss-5.1.16/frontend/linux/linux_utilities/Makefile.am 2009-06-29 23:51:24.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/frontend/linux/linux_utilities/Makefile.am 2010-02-18 19:05:30.261094959 +0100 @@ -4,14 +4,13 @@ pkglib_LTLIBRARIES=liblinux_utilities.la liblinux_utilities_la_LIBADD=$(top_srcdir)/frontend/linux/sqlide/libsqlide.la\ - $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la + -lscintilla INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@\ -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src \ -I$(top_srcdir)/backend/wbpublic -I$(top_srcdir)/generated -I$(top_srcdir)/library/canvas/src\ -I$(top_srcdir)/frontend/linux/workbench\ -I$(top_srcdir)/frontend/linux/sqlide\ - -I$(top_srcdir)/ext/scintilla/include\ -I$(top_srcdir)/library/forms\ -I$(top_srcdir)/library/forms/gtk\ -I$(top_srcdir)/generated/grti\ diff -Naur mysql-workbench-oss-5.1.16/frontend/linux/sqlide/Makefile.am mysql-workbench-oss-5.1.16.oden/frontend/linux/sqlide/Makefile.am --- mysql-workbench-oss-5.1.16/frontend/linux/sqlide/Makefile.am 2009-06-29 23:51:24.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/frontend/linux/sqlide/Makefile.am 2010-02-18 19:05:30.261094959 +0100 @@ -3,7 +3,7 @@ pkglib_LTLIBRARIES=libsqlide.la -libsqlide_la_LIBADD=$(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la +libsqlide_la_LIBADD=-lscintilla INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@\ -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src \ @@ -12,8 +12,7 @@ -I$(top_srcdir)/library/forms\ -I$(top_srcdir)/library/forms/gtk\ -I$(top_srcdir)/generated/grti\ - -I$(top_srcdir)/library/forms/mforms\ - -I$(top_srcdir)/ext/scintilla/include + -I$(top_srcdir)/library/forms/mforms libsqlide_la_SOURCES=\ sql_editor_fe.cpp\ diff -Naur mysql-workbench-oss-5.1.16/frontend/linux/workbench/Makefile.am mysql-workbench-oss-5.1.16.oden/frontend/linux/workbench/Makefile.am --- mysql-workbench-oss-5.1.16/frontend/linux/workbench/Makefile.am 2009-06-29 23:51:24.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/frontend/linux/workbench/Makefile.am 2010-02-18 19:05:30.261094959 +0100 @@ -41,7 +41,7 @@ $(top_srcdir)/library/utilities/src/libguiutil.la\ $(top_srcdir)/library/canvas/src/libmdcanvas.la\ $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\ - $(top_srcdir)/ext/ctemplate/ctemplate-src/.libs/libctemplate_wb.la\ + -lctemplate\ @GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ #precompiled.h.gch: precompiled.h diff -Naur mysql-workbench-oss-5.1.16/frontend/linux/workbench/Makefile.in mysql-workbench-oss-5.1.16.oden/frontend/linux/workbench/Makefile.in --- mysql-workbench-oss-5.1.16/frontend/linux/workbench/Makefile.in 2009-06-29 23:51:32.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/frontend/linux/workbench/Makefile.in 2010-02-18 19:05:08.150969517 +0100 @@ -69,8 +69,7 @@ $(top_srcdir)/library/dbc/libcdbc.la \ $(top_srcdir)/library/utilities/src/libguiutil.la \ $(top_srcdir)/library/canvas/src/libmdcanvas.la \ - $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la \ - $(top_srcdir)/ext/ctemplate/ctemplate-src/.libs/libctemplate_wb.la + $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -285,7 +284,7 @@ $(top_srcdir)/library/utilities/src/libguiutil.la\ $(top_srcdir)/library/canvas/src/libmdcanvas.la\ $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\ - $(top_srcdir)/ext/ctemplate/ctemplate-src/.libs/libctemplate_wb.la\ + -lctemplate\ @GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ mysql_workbench_bin_SOURCES = \ diff -Naur mysql-workbench-oss-5.1.16/library/dbc/Makefile.am mysql-workbench-oss-5.1.16.oden/library/dbc/Makefile.am --- mysql-workbench-oss-5.1.16/library/dbc/Makefile.am 2009-06-29 23:51:25.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/library/dbc/Makefile.am 2010-02-18 19:05:30.263027458 +0100 @@ -11,8 +11,7 @@ INCLUDES=@CAIRO_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ -I$(top_srcdir)/backend\ -I$(top_srcdir)/generated\ -I$(top_srcdir)/library/grt/src\ --I$(top_srcdir)/library/utilities/src\ --I$(top_srcdir)/ext/cppconn +-I$(top_srcdir)/library/utilities/src diff -Naur mysql-workbench-oss-5.1.16/library/dbc/src/cppdbc.h mysql-workbench-oss-5.1.16.oden/library/dbc/src/cppdbc.h --- mysql-workbench-oss-5.1.16/library/dbc/src/cppdbc.h 2009-06-29 23:51:25.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/library/dbc/src/cppdbc.h 2010-02-18 19:05:30.261094959 +0100 @@ -5,15 +5,15 @@ #include "driver_manager.h" #include "sql_batch_exec.h" -#include <cppconn/connection.h> -#include <cppconn/driver.h> -#include <cppconn/exception.h> -#include <cppconn/metadata.h> -#include <cppconn/parameter_metadata.h> -#include <cppconn/prepared_statement.h> -#include <cppconn/resultset.h> -#include <cppconn/resultset_metadata.h> -#include <cppconn/statement.h> +#include <mysql-connector/cppconn/connection.h> +#include <mysql-connector/cppconn/driver.h> +#include <mysql-connector/cppconn/exception.h> +#include <mysql-connector/cppconn/metadata.h> +#include <mysql-connector/cppconn/parameter_metadata.h> +#include <mysql-connector/cppconn/prepared_statement.h> +#include <mysql-connector/cppconn/resultset.h> +#include <mysql-connector/cppconn/resultset_metadata.h> +#include <mysql-connector/cppconn/statement.h> #endif // _CPPDBC_H_ diff -Naur mysql-workbench-oss-5.1.16/library/dbc/src/driver_manager.cpp mysql-workbench-oss-5.1.16.oden/library/dbc/src/driver_manager.cpp --- mysql-workbench-oss-5.1.16/library/dbc/src/driver_manager.cpp 2009-06-29 23:51:25.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/library/dbc/src/driver_manager.cpp 2010-02-18 19:05:30.262095326 +0100 @@ -7,9 +7,9 @@ #include "driver_manager.h" #include <gmodule.h> -#include <cppconn/connection.h> -#include <cppconn/statement.h> -#include <cppconn/exception.h> +#include <mysql-connector/cppconn/connection.h> +#include <mysql-connector/cppconn/statement.h> +#include <mysql-connector/cppconn/exception.h> namespace sql { diff -Naur mysql-workbench-oss-5.1.16/library/dbc/src/driver_manager.h mysql-workbench-oss-5.1.16.oden/library/dbc/src/driver_manager.h --- mysql-workbench-oss-5.1.16/library/dbc/src/driver_manager.h 2009-06-29 23:51:25.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/library/dbc/src/driver_manager.h 2010-02-18 19:05:30.262095326 +0100 @@ -4,7 +4,7 @@ #include "cppdbc_public_interface.h" #include "grts/structs.db.mgmt.h" -#include <cppconn/driver.h> +#include <mysql-connector/cppconn/driver.h> #include <memory> diff -Naur mysql-workbench-oss-5.1.16/library/dbc/src/sql_batch_exec.cpp mysql-workbench-oss-5.1.16.oden/library/dbc/src/sql_batch_exec.cpp --- mysql-workbench-oss-5.1.16/library/dbc/src/sql_batch_exec.cpp 2009-06-29 23:51:25.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/library/dbc/src/sql_batch_exec.cpp 2010-02-18 19:05:30.262095326 +0100 @@ -1,8 +1,8 @@ #include "stdafx.h" #include "sql_batch_exec.h" -#include <cppconn/exception.h> -#include <cppconn/resultset.h> +#include <mysql-connector/cppconn/exception.h> +#include <mysql-connector/cppconn/resultset.h> #include <memory> namespace sql diff -Naur mysql-workbench-oss-5.1.16/library/dbc/src/sql_batch_exec.h mysql-workbench-oss-5.1.16.oden/library/dbc/src/sql_batch_exec.h --- mysql-workbench-oss-5.1.16/library/dbc/src/sql_batch_exec.h 2009-06-29 23:51:25.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/library/dbc/src/sql_batch_exec.h 2010-02-18 19:05:30.262095326 +0100 @@ -3,8 +3,8 @@ #include "cppdbc_public_interface.h" -#include <cppconn/statement.h> -#include <cppconn/connection.h> +#include <mysql-connector/cppconn/statement.h> +#include <mysql-connector/cppconn/connection.h> #include <sigc++/sigc++.h> #include <list> #include <string> diff -Naur mysql-workbench-oss-5.1.16/modules/db.mysql/Makefile.am mysql-workbench-oss-5.1.16.oden/modules/db.mysql/Makefile.am --- mysql-workbench-oss-5.1.16/modules/db.mysql/Makefile.am 2009-06-29 23:51:26.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/modules/db.mysql/Makefile.am 2010-02-18 19:05:30.262095326 +0100 @@ -21,7 +21,6 @@ -I$(top_srcdir)/library/grt/src/diff\ -I$(top_srcdir)/library/sql-parser/include\ -I$(top_srcdir)/library/sql-parser/source\ - -I$(top_srcdir)/ext/ctemplate/ctemplate-src/src\ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @@ -32,7 +31,7 @@ # db_mysql_grt_la_LDFLAGS=-module -db_mysql_grt_la_LIBADD=$(top_srcdir)/ext/ctemplate/ctemplate-src/.libs/libctemplate_wb.la +db_mysql_grt_la_LIBADD=-lctemplate db_mysql_grt_la_SOURCES=src/db_mysql_catalog_report.cpp\ diff -Naur mysql-workbench-oss-5.1.16/modules/db.mysql/Makefile.in mysql-workbench-oss-5.1.16.oden/modules/db.mysql/Makefile.in --- mysql-workbench-oss-5.1.16/modules/db.mysql/Makefile.in 2009-06-29 23:51:33.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/modules/db.mysql/Makefile.in 2010-02-18 19:05:08.150969517 +0100 @@ -50,7 +50,6 @@ "$(DESTDIR)$(pkgdatadir)" pkglibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(pkglib_LTLIBRARIES) -db_mysql_grt_la_DEPENDENCIES = $(top_srcdir)/ext/ctemplate/ctemplate-src/.libs/libctemplate_wb.la am_db_mysql_grt_la_OBJECTS = db_mysql_catalog_report.lo \ db_mysql_diffsqlgen.lo db_mysql_params.lo module_db_mysql.lo db_mysql_grt_la_OBJECTS = $(am_db_mysql_grt_la_OBJECTS) @@ -255,7 +254,7 @@ # db_mysql_statement_parser_fe.cpp # db_mysql_grt_la_LDFLAGS = -module -db_mysql_grt_la_LIBADD = $(top_srcdir)/ext/ctemplate/ctemplate-src/.libs/libctemplate_wb.la +db_mysql_grt_la_LIBADD = -lctemplate db_mysql_grt_la_SOURCES = src/db_mysql_catalog_report.cpp\ src/db_mysql_diffsqlgen.cpp\ src/db_mysql_params.cpp\ diff -Naur mysql-workbench-oss-5.1.16/modules/db.mysql.sqlparser/Makefile.am mysql-workbench-oss-5.1.16.oden/modules/db.mysql.sqlparser/Makefile.am --- mysql-workbench-oss-5.1.16/modules/db.mysql.sqlparser/Makefile.am 2009-06-29 23:51:26.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/modules/db.mysql.sqlparser/Makefile.am 2010-02-18 19:05:30.264158000 +0100 @@ -13,7 +13,6 @@ -I$(top_srcdir)/library/sql-parser/include\ -I$(top_srcdir)/library/sql-parser/source\ -I$(top_srcdir)/library/sql-parser/source/linux\ - -I$(top_srcdir)/ext\ -I$(top_srcdir)/library/tinyxml\ -I$(top_srcdir)/library/utilities/src\ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ @SIGC_CFLAGS@ diff -Naur mysql-workbench-oss-5.1.16/modules/wb.model/Makefile.am mysql-workbench-oss-5.1.16.oden/modules/wb.model/Makefile.am --- mysql-workbench-oss-5.1.16/modules/wb.model/Makefile.am 2009-06-29 23:51:26.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/modules/wb.model/Makefile.am 2010-02-18 19:05:30.263027458 +0100 @@ -61,12 +61,10 @@ -I$(top_srcdir)/library/sql-parser/source\ -I$(top_srcdir)/library/sql-parser/source/linux\ -I$(top_srcdir)/library/tinyxml\ - -I$(top_srcdir)/ext/ctemplate/ctemplate-src/src\ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ wb_model_grt_la_LDFLAGS=-module -#wb_model_grt_la_LIBADD=$(top_srcdir)/ext/ctemplate wb_model_grt_la_SOURCES=src/graph_renderer.cpp \ src/reporting.cpp \ diff -Naur mysql-workbench-oss-5.1.16/modules/wb.mysql.validation/Makefile.am mysql-workbench-oss-5.1.16.oden/modules/wb.mysql.validation/Makefile.am --- mysql-workbench-oss-5.1.16/modules/wb.mysql.validation/Makefile.am 2009-06-29 23:51:26.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/modules/wb.mysql.validation/Makefile.am 2010-02-18 19:05:30.263027458 +0100 @@ -7,7 +7,6 @@ -I$(top_srcdir)/backend/wbpublic\ -I$(top_srcdir)/library/grt/src \ -I$(top_srcdir)/library \ - -I$(top_srcdir)/ext \ -I$(top_srcdir)/library/utilities/src\ -I$(top_srcdir)/modules\ -I$(top_srcdir)/modules/wb.validation/src\ @@ -20,7 +19,6 @@ wb_mysql_validation_grt_la_LDFLAGS=-module -#wb_mysql_import_grt_la_LIBADD=$(top_srcdir) wb_mysql_validation_grt_la_SOURCES=src/register_plugin.cpp\ src/wb_module_validation_mysql.cpp\ diff -Naur mysql-workbench-oss-5.1.16/modules/wb.validation/Makefile.am mysql-workbench-oss-5.1.16.oden/modules/wb.validation/Makefile.am --- mysql-workbench-oss-5.1.16/modules/wb.validation/Makefile.am 2009-06-29 23:51:26.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/modules/wb.validation/Makefile.am 2010-02-18 19:05:30.264158000 +0100 @@ -8,7 +8,6 @@ -I$(top_srcdir)/library/grt/src \ -I$(top_srcdir)/library \ -I$(top_srcdir)/library/utilities/src\ - -I$(top_srcdir)/ext\ -I$(top_srcdir)/modules\ -I$(top_srcdir)/library/grt/src/diff\ -I$(top_srcdir)/library/sql-parser/include\ diff -Naur mysql-workbench-oss-5.1.16/plugins/db.mysql/frontend/Makefile.am mysql-workbench-oss-5.1.16.oden/plugins/db.mysql/frontend/Makefile.am --- mysql-workbench-oss-5.1.16/plugins/db.mysql/frontend/Makefile.am 2009-06-29 23:51:26.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/plugins/db.mysql/frontend/Makefile.am 2010-02-18 19:05:30.264158000 +0100 @@ -9,8 +9,6 @@ -I$(top_srcdir)/backend\ -I$(top_srcdir)/modules/db.mysql/src\ -I$(top_srcdir)/library/dbc/src\ - -I$(top_srcdir)/ext/cppconn\ - -I$(top_srcdir)/ext/\ -I$(top_srcdir)/modules/interfaces\ -I$(top_srcdir)/modules/\ -I$(top_srcdir)/library/grt/src/diff\ diff -Naur mysql-workbench-oss-5.1.16/plugins/db.mysql.diff.reporting/frontend/Makefile.am mysql-workbench-oss-5.1.16.oden/plugins/db.mysql.diff.reporting/frontend/Makefile.am --- mysql-workbench-oss-5.1.16/plugins/db.mysql.diff.reporting/frontend/Makefile.am 2009-06-29 23:51:26.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/plugins/db.mysql.diff.reporting/frontend/Makefile.am 2010-02-18 19:05:30.263027458 +0100 @@ -9,7 +9,6 @@ -I$(top_srcdir)/backend\ -I$(top_srcdir)/modules/db.mysql/src\ -I$(top_srcdir)/library/dbc/src\ - -I$(top_srcdir)/ext/cppconn\ -I$(top_srcdir)/modules/interfaces\ -I$(top_srcdir)/modules/\ -I$(top_srcdir)/library/grt/src/diff\ diff -Naur mysql-workbench-oss-5.1.16/plugins/db.mysql.editors/linux/Makefile.am mysql-workbench-oss-5.1.16.oden/plugins/db.mysql.editors/linux/Makefile.am --- mysql-workbench-oss-5.1.16/plugins/db.mysql.editors/linux/Makefile.am 2009-06-29 23:51:26.000000000 +0200 +++ mysql-workbench-oss-5.1.16.oden/plugins/db.mysql.editors/linux/Makefile.am 2010-02-18 19:05:30.263027458 +0100 @@ -27,13 +27,12 @@ -I$(top_srcdir)/frontend/linux/workbench\ -I$(top_srcdir)/frontend/linux/linux_utilities\ -I$(top_srcdir)/frontend/linux/sqlide\ - -I$(top_srcdir)/ext/scintilla/include\ @GRT_CFLAGS@ @GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ db_mysql_editors_wbp_la_LDFLAGS=-module db_mysql_editors_wbp_la_LIBADD=$(top_srcdir)/frontend/linux/linux_utilities/liblinux_utilities.la\ - $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la + -lscintilla db_mysql_editors_wbp_la_SOURCES=\ ../backend/mysql_relationship_editor.cpp\