After-merge fix for MySQL 5.1.41 merge into MariaDB: Fix incorrect merge breaking the build.
This commit is contained in:
parent
f92723ebc2
commit
d44270afe7
@ -18,15 +18,13 @@ INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
|
|||||||
|
|
||||||
noinst_HEADERS = thr_template.c
|
noinst_HEADERS = thr_template.c
|
||||||
|
|
||||||
noinst_PROGRAMS = bitmap-t base64-t my_atomic-t lf-t waiting_threads-t
|
|
||||||
|
|
||||||
LDADD = $(top_builddir)/unittest/mytap/libmytap.a \
|
LDADD = $(top_builddir)/unittest/mytap/libmytap.a \
|
||||||
$(top_builddir)/mysys/libmysys.a \
|
$(top_builddir)/mysys/libmysys.a \
|
||||||
$(top_builddir)/dbug/libdbug.a \
|
$(top_builddir)/dbug/libdbug.a \
|
||||||
$(top_builddir)/strings/libmystrings.a
|
$(top_builddir)/strings/libmystrings.a
|
||||||
|
|
||||||
EXTRA_DIST = CMakeLists.txt
|
EXTRA_DIST = CMakeLists.txt
|
||||||
noinst_PROGRAMS = bitmap-t base64-t
|
noinst_PROGRAMS = bitmap-t base64-t lf-t waiting_threads-t
|
||||||
|
|
||||||
if NEED_THREAD
|
if NEED_THREAD
|
||||||
# my_atomic-t is used to check thread functions, so it is safe to
|
# my_atomic-t is used to check thread functions, so it is safe to
|
||||||
|
Loading…
x
Reference in New Issue
Block a user