summaryrefslogtreecommitdiff
path: root/storage/csv
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-09 09:28:51 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-09 09:28:51 -0300
commite1f748c0bd7e347dbefb831d64755d834845d15b (patch)
tree8edee282fc8a225a291cd9be2e44e38709e31b1a /storage/csv
parent80935b8659411177bc3fca4e0eb9f7747577eb1d (diff)
parented9ffc6b09a13197f3aadaf89c1dd3accee2dfd1 (diff)
downloadmariadb-git-e1f748c0bd7e347dbefb831d64755d834845d15b.tar.gz
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'storage/csv')
-rw-r--r--storage/csv/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/csv/Makefile.am b/storage/csv/Makefile.am
index 36d6b464fcc..5e3587c893f 100644
--- a/storage/csv/Makefile.am
+++ b/storage/csv/Makefile.am
@@ -32,12 +32,12 @@ noinst_HEADERS = ha_tina.h transparent_file.h
EXTRA_LTLIBRARIES = ha_csv.la
pkglib_LTLIBRARIES = @plugin_csv_shared_target@
ha_csv_la_LDFLAGS = -module -rpath $(MYSQLLIBdir)
-ha_csv_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_PLUGIN
+ha_csv_la_CXXFLAGS = $(AM_CXXFLAGS) -DMYSQL_PLUGIN
ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc
EXTRA_LIBRARIES = libcsv.a
noinst_LIBRARIES = @plugin_csv_static_target@
-libcsv_a_CXXFLAGS = $(AM_CFLAGS)
+libcsv_a_CXXFLAGS = $(AM_CXXFLAGS)
libcsv_a_SOURCES = transparent_file.cc ha_tina.cc
EXTRA_DIST = CMakeLists.txt plug.in