diff options
author | elliot@mysql.com <> | 2006-06-25 09:59:34 -0400 |
---|---|---|
committer | elliot@mysql.com <> | 2006-06-25 09:59:34 -0400 |
commit | bc2b96fee376a51e24ca9a9ee4ddda2f5515c417 (patch) | |
tree | 58d0df03a85c17a3a29ebd9cc7455d8cc34e2322 /include/Makefile.am | |
parent | b6e89c2b1e25a661445d165650d348b06db639ff (diff) | |
parent | fa98891ee74531b05d0e9f7c5e3a2cce9a751288 (diff) | |
download | mariadb-git-bc2b96fee376a51e24ca9a9ee4ddda2f5515c417.tar.gz |
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
Diffstat (limited to 'include/Makefile.am')
-rw-r--r-- | include/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 27b359bb6a3..26161b36ab8 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -32,7 +32,8 @@ noinst_HEADERS = config-win.h config-netware.h \ thr_lock.h t_ctype.h violite.h md5.h base64.h \ mysql_version.h.in my_handler.h my_time.h decimal.h \ my_vle.h my_user.h my_atomic.h atomic/nolock.h \ - atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h + atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \ + my_libwrap.h # mysql_version.h are generated CLEANFILES = mysql_version.h my_config.h readline openssl |