summaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorunknown <msvensson@shellback.(none)>2006-09-12 11:34:46 +0200
committerunknown <msvensson@shellback.(none)>2006-09-12 11:34:46 +0200
commit80421c1b5fe88db57beaef1d3689ecb1386280bd (patch)
treeea7c6f9d20059dce9960672edcf721bd6a561ef7 /tests/Makefile.am
parentbd8309cce6793352cebcf54459fa301eaab0b3b8 (diff)
downloadmariadb-git-80421c1b5fe88db57beaef1d3689ecb1386280bd.tar.gz
Bug#22139 undefined reference to `my_memmem' when compiling tests/mysql_client_test
- Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c tests/Makefile.am: Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am9
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ab747d6e4ec..e1bc93f65b6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,14 +42,11 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
LIBS = @CLIENT_LIBS@
LDADD = @CLIENT_EXTRA_LDFLAGS@ \
$(top_builddir)/libmysql/libmysqlclient.la
-if HAVE_NETWARE
+
mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS)
mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) \
- ../mysys/my_memmem.c
-else
-mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys
-mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix)
-endif
+ $(top_srcdir)/mysys/my_memmem.c
+
insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix)
select_test_SOURCES= select_test.c $(yassl_dummy_link_fix)
insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)