summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
Diffstat (limited to 'plugin')
-rw-r--r--plugin/Makefile.am3
-rw-r--r--plugin/fulltext/Makefile.am47
2 files changed, 9 insertions, 41 deletions
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index deb73c988b3..6dee710103e 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -18,7 +18,10 @@
AUTOMAKE_OPTIONS = foreign
+# extra plugin example files are listed here, to
+# keep its Makefile.am cleaner as a template
EXTRA_DIST = fulltext/configure.in
+
SUBDIRS = @mysql_pg_dirs@
# Don't update the files from bitkeeper
diff --git a/plugin/fulltext/Makefile.am b/plugin/fulltext/Makefile.am
index 331db7c98f8..4df5a1dc78a 100644
--- a/plugin/fulltext/Makefile.am
+++ b/plugin/fulltext/Makefile.am
@@ -1,44 +1,9 @@
#Makefile.am example for a plugin
-#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])
+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)
-
-#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.%