diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-11 20:43:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-11 20:43:48 +0200 |
| commit | a3d80d952d7b99680ca4a3a89e128ecc0d490c10 (patch) | |
| tree | 0d72ee69e037cdd09618ddb53652dd1b220890dc /storage/blackhole | |
| parent | ec06ba24553d2d83b3a6a6bc4d8150910b01ee7c (diff) | |
| parent | 966661c8cc75dd7d540a5fe40b4d893c40e91d26 (diff) | |
| download | mariadb-git-a3d80d952d7b99680ca4a3a89e128ecc0d490c10.tar.gz | |
merge with 5.1
Diffstat (limited to 'storage/blackhole')
| -rw-r--r-- | storage/blackhole/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/blackhole/Makefile.am b/storage/blackhole/Makefile.am index db4f67cf847..148746a9336 100644 --- a/storage/blackhole/Makefile.am +++ b/storage/blackhole/Makefile.am @@ -35,15 +35,13 @@ noinst_HEADERS = ha_blackhole.h EXTRA_LTLIBRARIES = ha_blackhole.la pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@ ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir) -ha_blackhole_la_CXXFLAGS=$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN +ha_blackhole_la_CXXFLAGS=-shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_blackhole_la_SOURCES=ha_blackhole.cc EXTRA_LIBRARIES = libblackhole.a noinst_LIBRARIES = @plugin_blackhole_static_target@ -libblackhole_a_CXXFLAGS=$(AM_CFLAGS) -libblackhole_a_CFLAGS = $(AM_CFLAGS) +libblackhole_a_CXXFLAGS=$(AM_CXXFLAGS) libblackhole_a_SOURCES= ha_blackhole.cc |