diff options
Diffstat (limited to 'plugin')
-rw-r--r-- | plugin/Makefile.am | 28 | ||||
-rw-r--r-- | plugin/fulltext/Makefile.am | 47 | ||||
-rw-r--r-- | plugin/fulltext/plugin_example.c | 2 |
3 files changed, 69 insertions, 8 deletions
diff --git a/plugin/Makefile.am b/plugin/Makefile.am index da4ff0a8d5c..2e98d6a3328 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -1 +1,27 @@ -SUBDIRS= fulltext +# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# Process this file with automake to create Makefile.in + +AUTOMAKE_OPTIONS = foreign + +# These are built from source in the Docs directory +EXTRA_DIST = +SUBDIRS = +DIST_SUBDIRS = . fulltext + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/plugin/fulltext/Makefile.am b/plugin/fulltext/Makefile.am index 4df5a1dc78a..331db7c98f8 100644 --- a/plugin/fulltext/Makefile.am +++ b/plugin/fulltext/Makefile.am @@ -1,9 +1,44 @@ #Makefile.am example for a plugin -pkglibdir=$(libdir)/mysql -INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include -noinst_LTLIBRARIES= mypluglib.la -#pkglib_LTLIBRARIES= mypluglib.la -mypluglib_la_SOURCES= plugin_example.c -mypluglib_la_LDFLAGS= -module -rpath $(pkglibdir) +#MYSQL_MODULE(ftexample, [Simple Parser], +# [Simple full-text parser plugin]) +#MYSQL_MODULE_DIRECTORY(ftexample, [plugin/fulltext]) +#MYSQL_MODULE_STATIC(ftexample, [libftexample.a]) +#MYSQL_MODULE_DYNAMIC(ftexample, [ft_example.la]) + +#called from the top level Makefile + +MYSQLDATAdir = $(localstatedir) +MYSQLSHAREdir = $(pkgdatadir) +MYSQLBASEdir= $(prefix) +MYSQLLIBdir= $(pkglibdir) +INCLUDES = -I$(top_srcdir)/include \ + -I$(top_srcdir)/regex \ + -I$(top_srcdir)/sql \ + -I$(srcdir) +WRAPLIBS= + +LDADD = + +DEFS = @DEFS@ + +noinst_HEADERS = + +EXTRA_LTLIBRARIES = ft_example.la +pkglib_LTLIBRARIES = @plugin_ftexample_shared_target@ +ft_example_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) +ft_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN +ft_example_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN +ft_example_la_SOURCES = plugin_example.c + + +EXTRA_LIBRARIES = libftexample.a +noinst_LIBRARIES = @plugin_ftexample_static_target@ +libftexample_a_CXXFLAGS=$(AM_CFLAGS) +libftexample_a_CFLAGS = $(AM_CFLAGS) +libftexample_a_SOURCES= plugin_example.c + + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c index cdf1527b310..9b937453ce4 100644 --- a/plugin/fulltext/plugin_example.c +++ b/plugin/fulltext/plugin_example.c @@ -216,7 +216,7 @@ static struct st_mysql_show_var simple_status[]= Plugin library descriptor */ -mysql_declare_plugin +mysql_declare_plugin(ftexample) { MYSQL_FTPARSER_PLUGIN, /* type */ &simple_parser_descriptor, /* descriptor */ |