diff options
| author | unknown <guilhem@mysql.com> | 2004-11-16 00:04:12 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-11-16 00:04:12 +0100 |
| commit | 445c9103a345c560d15beec8c7ad4c944c3b1d2c (patch) | |
| tree | 4b3acfdee8480e9e03666d068ee6a08eed12672b /Makefile.am | |
| parent | 6763a1da76a07c3962492acae491c341714f8b82 (diff) | |
| parent | fa68d58087f0439fe9289ea3da830017a2ce5769 (diff) | |
| download | mariadb-git-445c9103a345c560d15beec8c7ad4c944c3b1d2c.tar.gz | |
Merge
Makefile.am:
Auto merged
client/Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_parse.cc:
SCCS merged
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index efd8914ba9c..8c643c8a484 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,15 +22,15 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests \ + @thread_dirs@ pstack \ + @sql_server_dirs@ @sql_client_dirs@ scripts man tests \ netware @libmysqld_dirs@ \ @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ @readline_topdir@ sql-common \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts @man_dirs@ tests SSL\ + @thread_dirs@ pstack \ + @sql_server_dirs@ @sql_client_dirs@ scripts @man_dirs@ tests SSL\ BUILD netware os2 @libmysqld_dirs@ \ @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ |