Commit c0f1f2cb authored by unknown's avatar unknown
Browse files

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
parents d438739d 74536862

mysys/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -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)