diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-11-19 22:33:47 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-11-19 22:33:47 +0100 |
| commit | 95b37a254b0797499b4a940ca8eb8fa907a7664f (patch) | |
| tree | bcd57843b07d10746160f485e039446bf4bd616e /storage/csv | |
| parent | 01d41622ba4cdb99327f98d0d1c1772ad842c66a (diff) | |
| parent | a967802ae94e1b0ce75436648446621a381838e7 (diff) | |
| download | mariadb-git-95b37a254b0797499b4a940ca8eb8fa907a7664f.tar.gz | |
Merge MariaDB 5.1->5.2
Diffstat (limited to 'storage/csv')
| -rw-r--r-- | storage/csv/Makefile.am | 9 | ||||
| -rw-r--r-- | storage/csv/plug.in | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/storage/csv/Makefile.am b/storage/csv/Makefile.am index 75ad9062984..c711e4020fc 100644 --- a/storage/csv/Makefile.am +++ b/storage/csv/Makefile.am @@ -29,16 +29,15 @@ LDADD = DEFS = @DEFS@ noinst_HEADERS = ha_tina.h transparent_file.h -EXTRA_LTLIBRARIES = ha_csv.la +EXTRA_LTLIBRARIES = libcsv.la ha_csv.la pkglib_LTLIBRARIES = @plugin_csv_shared_target@ ha_csv_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) ha_csv_la_CXXFLAGS = -shared $(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_CXXFLAGS) -libcsv_a_SOURCES = transparent_file.cc ha_tina.cc +noinst_LTLIBRARIES = @plugin_csv_static_target@ +libcsv_la_CXXFLAGS = $(AM_CXXFLAGS) +libcsv_la_SOURCES = transparent_file.cc ha_tina.cc EXTRA_DIST = CMakeLists.txt plug.in # Don't update the files from bitkeeper diff --git a/storage/csv/plug.in b/storage/csv/plug.in index bbc69680fcd..4ff32959fa2 100644 --- a/storage/csv/plug.in +++ b/storage/csv/plug.in @@ -1,5 +1,5 @@ MYSQL_STORAGE_ENGINE(csv,, [CSV Storage Engine], [Stores tables in text CSV format]) MYSQL_PLUGIN_DIRECTORY(csv, [storage/csv]) -MYSQL_PLUGIN_STATIC(csv, [libcsv.a]) +MYSQL_PLUGIN_STATIC(csv, [libcsv.la]) MYSQL_PLUGIN_MANDATORY(csv) dnl Used for logging |