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
This commit is contained in:
parent
597dc9a8e1
commit
65c560e9b8
@ -26,6 +26,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
|
||||
@thread_dirs@ pstack \
|
||||
@sql_union_dirs@ @mysql_se_dirs@ \
|
||||
@sql_server@ scripts @man_dirs@ tests \
|
||||
@mysql_se_plugins@ \
|
||||
netware @libmysqld_dirs@ \
|
||||
@bench_dirs@ support-files @tools_dirs@
|
||||
|
||||
|
@ -40,9 +40,11 @@ then
|
||||
mysql_se_decls="${mysql_se_decls},$6"
|
||||
mysql_se_htons="${mysql_se_htons},&$6"
|
||||
mysql_se_objs="$mysql_se_objs $8"
|
||||
mysql_se_dirs="$mysql_se_dirs $7"
|
||||
mysql_se_libs="$mysql_se_libs $9"
|
||||
else
|
||||
mysql_se_plugins="$mysql_se_plugins $7"
|
||||
fi
|
||||
mysql_se_dirs="$mysql_se_dirs $7"
|
||||
mysql_se_libs="$mysql_se_libs $9"
|
||||
$10
|
||||
fi
|
||||
])
|
||||
|
@ -2520,6 +2520,7 @@ AC_SUBST(mysql_se_libs)
|
||||
AC_SUBST(mysql_se_objs)
|
||||
AC_SUBST(mysql_se_htons)
|
||||
AC_SUBST(mysql_se_decls)
|
||||
AC_SUBST(mysql_se_plugins)
|
||||
|
||||
|
||||
# Now that sql_client_dirs and sql_server_dirs are stable, determine the union.
|
||||
|
@ -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.%
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user