diff options
author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-03-12 13:15:11 +0100 |
---|---|---|
committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-03-12 13:15:11 +0100 |
commit | d4d8d132ebdd7d171e15f6dd8a224270748b11be (patch) | |
tree | 5068c9a5d62bf06ae4ade775f50ab6e149951768 /mysys/Makefile.am | |
parent | 0fcd9c2bfb68e8c2078e975d69cb25992324fe13 (diff) | |
parent | 32b370bb7f561a6623c1d0e028331250d6936b0a (diff) | |
download | mariadb-git-d4d8d132ebdd7d171e15f6dd8a224270748b11be.tar.gz |
Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
include/Makefile.am:
Auto merged
Diffstat (limited to 'mysys/Makefile.am')
-rw-r--r-- | mysys/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am index a80df810c1c..90a28a9ce4b 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -51,7 +51,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c \ my_quick.c my_lockmem.c my_static.c \ my_sync.c my_getopt.c my_mkdir.c \ default.c my_compress.c checksum.c raid.cc \ - my_net.c my_semaphore.c my_port.c my_sleep.c \ + my_net.c my_port.c my_sleep.c \ charset.c charset-def.c my_bitmap.c my_bit.c md5.c \ my_gethostbyname.c rijndael.c my_aes.c sha1.c \ my_handler.c my_netware.c my_windac.c my_access.c |