summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <acurtis@xiphis.org>2005-12-21 14:58:03 -0800
committerunknown <acurtis@xiphis.org>2005-12-21 14:58:03 -0800
commit65c560e9b836953bba66307268430f0faf50ca3c (patch)
tree5a91c064f0e7c9b4a28ccc82366626ad854a955d /storage
parent597dc9a8e19e61f072bdb78653113e3102898e69 (diff)
downloadmariadb-git-65c560e9b836953bba66307268430f0faf50ca3c.tar.gz
Change for plugin storage engine to be built after mysqld
Makefile.am: Change build order for plugins config/ac-macros/storage.m4: Change build order for plugins configure.in: Change build order for plugins storage/Makefile.am: add csv and example to dist storage/csv/Makefile.am: remove unneeded dep storage/example/Makefile.am: remove unneeded dep
Diffstat (limited to 'storage')
-rw-r--r--storage/Makefile.am2
-rw-r--r--storage/csv/Makefile.am3
-rw-r--r--storage/example/Makefile.am3
3 files changed, 1 insertions, 7 deletions
diff --git a/storage/Makefile.am b/storage/Makefile.am
index d3df68449ca..7b6f50b4f33 100644
--- a/storage/Makefile.am
+++ b/storage/Makefile.am
@@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = foreign
# These are built from source in the Docs directory
EXTRA_DIST =
SUBDIRS =
-DIST_SUBDIRS = . bdb heap innobase myisam myisammrg ndb
+DIST_SUBDIRS = . csv example bdb heap innobase myisam myisammrg ndb
# Don't update the files from bitkeeper
%::SCCS/s.%
diff --git a/storage/csv/Makefile.am b/storage/csv/Makefile.am
index df7749b599c..1d3c47bd650 100644
--- a/storage/csv/Makefile.am
+++ b/storage/csv/Makefile.am
@@ -26,9 +26,6 @@ INCLUDES = -I$(top_srcdir)/include \
-I$(srcdir)
WRAPLIBS=
-$(top_builddir)/sql/sql_yacc.h: $(top_builddir)/sql/sql_yacc.yy
- ( cd $(top_builddir)/sql && $(MAKE) sql_yacc.cc )
-
pkglib_LTLIBRARIES = ha_csv.la
ha_csv_la_LDFLAGS = -module
diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am
index ad97866d73a..d5896946c5b 100644
--- a/storage/example/Makefile.am
+++ b/storage/example/Makefile.am
@@ -26,9 +26,6 @@ INCLUDES = -I$(top_srcdir)/include \
-I$(srcdir)
WRAPLIBS=
-$(top_builddir)/sql/sql_yacc.h: $(top_builddir)/sql/sql_yacc.yy
- ( cd $(top_builddir)/sql && $(MAKE) sql_yacc.cc )
-
pkglib_LTLIBRARIES = ha_example.la
ha_example_la_LDFLAGS = -module