diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-09 09:28:51 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-09 09:28:51 -0300 |
| commit | 1c924a165259dc8ffb9c1cdcdb1f0d43876bcb20 (patch) | |
| tree | 8edee282fc8a225a291cd9be2e44e38709e31b1a /storage/blackhole | |
| parent | 024dba64b64f395151f6b95650e8ee69a1591428 (diff) | |
| parent | 11fae04527098cb6c266eae41188504bd22a5b52 (diff) | |
| download | mariadb-git-1c924a165259dc8ffb9c1cdcdb1f0d43876bcb20.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'storage/blackhole')
| -rw-r--r-- | storage/blackhole/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/blackhole/Makefile.am b/storage/blackhole/Makefile.am index f3bdbdbd070..38c2f354844 100644 --- a/storage/blackhole/Makefile.am +++ b/storage/blackhole/Makefile.am @@ -35,14 +35,14 @@ 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_CXXFLAGS=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -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_CXXFLAGS=$(AM_CXXFLAGS) libblackhole_a_CFLAGS = $(AM_CFLAGS) libblackhole_a_SOURCES= ha_blackhole.cc |