diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-03-12 14:53:52 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-03-12 14:53:52 +0100 |
| commit | c0f1f2cbb39107dfac73b2e1b39f53d487ff23c1 (patch) | |
| tree | 39c4a6cb60f2c25b993f035ea7678e91428f5114 /mysys/Makefile.am | |
| parent | d438739d5684f00fb340d163760bd47a42fd6872 (diff) | |
| parent | 74536862f617ecadd71880dd51447593f6841dc3 (diff) | |
| download | mariadb-git-c0f1f2cbb39107dfac73b2e1b39f53d487ff23c1.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
BitKeeper/deleted/.del-CMakeLists.txt~14:
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 794b8b8369b..fca13ab52b8 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -56,7 +56,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ thr_mutex.c thr_rwlock.c \ CMakeLists.txt mf_soundex.c \ - my_conio.c my_wincond.c my_winsem.c my_winthread.c + my_conio.c my_wincond.c my_winthread.c libmysys_a_LIBADD = @THREAD_LOBJECTS@ # test_dir_DEPENDENCIES= $(LIBRARIES) # testhash_DEPENDENCIES= $(LIBRARIES) |