diff options
| author | unknown <serg@sergbook.mysql.com> | 2006-04-30 15:52:30 -0400 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2006-04-30 15:52:30 -0400 |
| commit | 3d35b05a0cb35e873ca4ecf595e4524809281634 (patch) | |
| tree | 14e0a6e9a0872b3ed70305f630f07f19b7bc0609 /Makefile.am | |
| parent | 2eff96e63127e846d210ba94b8b3fcdfe9d6e5e6 (diff) | |
| download | mariadb-git-3d35b05a0cb35e873ca4ecf595e4524809281634.tar.gz | |
fixes
Makefile.am:
plugin/ must be built before sql/
config/ac-macros/plugins.m4:
simplifications, style fixes
BitKeeper/etc/ignore:
Added compile libmysqld/sql_builtin.cc sql/sql_builtin.cc to the ignore list
plugin/Makefile.am:
restore comment
plugin/fulltext/Makefile.am:
revert
sql/sql_show.cc:
revert
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index b9775577110..8709fca34c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,11 +24,11 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common \ @thread_dirs@ pstack \ - @sql_union_dirs@ storage \ + @sql_union_dirs@ storage plugin \ @sql_server@ scripts @man_dirs@ tests \ netware @libmysqld_dirs@ \ mysql-test support-files @tools_dirs@ \ - plugin unittest win + unittest win DIST_SUBDIRS = $(SUBDIRS) BUILD |