summaryrefslogtreecommitdiff
path: root/plugin/semisync/Makefile.am
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@sun.com>2009-12-11 01:58:13 -0700
committerMarc Alff <marc.alff@sun.com>2009-12-11 01:58:13 -0700
commitedd5ff174c063376fe8771be9d3f51fc343d9613 (patch)
tree5d91d6cc01f82639588f2c17fbb5289637567684 /plugin/semisync/Makefile.am
parente33a8b2a1a254271d99b6c5f00097fd0d89adb90 (diff)
parentbd1f8f5bfaf9748ca445401687cca97a89e0dfee (diff)
downloadmariadb-git-edd5ff174c063376fe8771be9d3f51fc343d9613.tar.gz
Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc
Diffstat (limited to 'plugin/semisync/Makefile.am')
-rw-r--r--plugin/semisync/Makefile.am18
1 files changed, 9 insertions, 9 deletions
diff --git a/plugin/semisync/Makefile.am b/plugin/semisync/Makefile.am
index 25949485987..0022d600f57 100644
--- a/plugin/semisync/Makefile.am
+++ b/plugin/semisync/Makefile.am
@@ -23,16 +23,16 @@ INCLUDES = -I$(top_srcdir)/include \
noinst_HEADERS = semisync.h semisync_master.h semisync_slave.h
-pkgplugin_LTLIBRARIES = libsemisync_master.la libsemisync_slave.la
+pkgplugin_LTLIBRARIES = semisync_master.la semisync_slave.la
-libsemisync_master_la_LDFLAGS = -module
-libsemisync_master_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-libsemisync_master_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-libsemisync_master_la_SOURCES = semisync.cc semisync_master.cc semisync_master_plugin.cc
+semisync_master_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
+semisync_master_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+semisync_master_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+semisync_master_la_SOURCES = semisync.cc semisync_master.cc semisync_master_plugin.cc
-libsemisync_slave_la_LDFLAGS = -module
-libsemisync_slave_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-libsemisync_slave_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-libsemisync_slave_la_SOURCES = semisync.cc semisync_slave.cc semisync_slave_plugin.cc
+semisync_slave_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
+semisync_slave_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+semisync_slave_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+semisync_slave_la_SOURCES = semisync.cc semisync_slave.cc semisync_slave_plugin.cc
EXTRA_DIST= CMakeLists.txt plug.in