diff options
| author | unknown <mats@mysql.com> | 2006-04-13 13:25:58 +0200 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2006-04-13 13:25:58 +0200 |
| commit | 24caba3aefc37bec6a7d2bc63e46c98a6ba6b0c1 (patch) | |
| tree | adc28a1a37ac8a129730e0eecf1675e1ca04b790 /Makefile.am | |
| parent | dfaea5c81f1fc4c426d2219ed447c76072b00be5 (diff) | |
| parent | 24f672c003082386c87b8f69d54f9f97e760aa52 (diff) | |
| download | mariadb-git-24caba3aefc37bec6a7d2bc63e46c98a6ba6b0c1.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.1-new
into mysql.com:/home/bk/merge-mysql-5.1-wl3206
Makefile.am:
Merge with mysql-5.1-new
configure.in:
Merge with mysql-5.1-new
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 cc6cd7da8ce..26bcfb70cbc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ @mysql_se_plugins@ \ netware @libmysqld_dirs@ \ @bench_dirs@ support-files @tools_dirs@ \ - plugin win + plugin unittest win DIST_SUBDIRS = . include @docs_dirs@ zlib \ @readline_topdir@ sql-common \ @@ -39,7 +39,7 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ @man_dirs@ tests \ BUILD netware @libmysqld_dirs@\ @bench_dirs@ support-files server-tools \ - plugin win + plugin unittest win # Run these targets before any others, also make part of clean target, # to make sure we create new links after a clean. |