diff options
| author | Michael Widenius <monty@mysql.com> | 2010-11-30 23:11:03 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2010-11-30 23:11:03 +0200 |
| commit | 1e5061fe3be981d6f685a2865fd1e2bcd3fcc23a (patch) | |
| tree | a0c58838a4dd7bdf2ed4d739563da27727ada7b0 /plugin | |
| parent | b2e979d868d5d5964d58c97ed9580e07f6123217 (diff) | |
| parent | 6f279f40145624c1ffab06c63521f96ce4ac3a02 (diff) | |
| download | mariadb-git-1e5061fe3be981d6f685a2865fd1e2bcd3fcc23a.tar.gz | |
merge with 5.1
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/daemon_example/Makefile.am | 3 | ||||
| -rw-r--r-- | plugin/fulltext/Makefile.am | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/plugin/daemon_example/Makefile.am b/plugin/daemon_example/Makefile.am index 7bfaf5ac79f..5905e3ef075 100644 --- a/plugin/daemon_example/Makefile.am +++ b/plugin/daemon_example/Makefile.am @@ -34,6 +34,3 @@ EXTRA_LIBRARIES = libdaemon_example.a noinst_LIBRARIES = @plugin_daemon_example_static_target@ libdaemon_example_a_CXXFLAGS = $(AM_CXXFLAGS) libdaemon_example_a_SOURCES= daemon_example.cc - -# Don't update the files from bitkeeper -%::SCCS/s.% diff --git a/plugin/fulltext/Makefile.am b/plugin/fulltext/Makefile.am index 45565e9fdb2..8be2a97a34f 100644 --- a/plugin/fulltext/Makefile.am +++ b/plugin/fulltext/Makefile.am @@ -22,6 +22,3 @@ pkgplugin_LTLIBRARIES= mypluglib.la mypluglib_la_SOURCES= plugin_example.c mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir) mypluglib_la_CFLAGS= -shared -DMYSQL_DYNAMIC_PLUGIN - -# Don't update the files from bitkeeper -%::SCCS/s.% |