diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-15 16:41:50 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-15 16:41:50 +0200 |
| commit | 9ae1145d53dcb257a0053a64785404800522a9e9 (patch) | |
| tree | ece1a33579f39a13758ea8b0510a70ffd2d000c7 /tests/Makefile.am | |
| parent | c5adcd20f1afc2efc8f9b9ee3396a99fb9037ba8 (diff) | |
| parent | 80421c1b5fe88db57beaef1d3689ecb1386280bd (diff) | |
| download | mariadb-git-9ae1145d53dcb257a0053a64785404800522a9e9.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139
into shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139
tests/Makefile.am:
Auto merged
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index fd7bc5a532e..e9bcb4693fd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -50,14 +50,11 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ LIBS = @CLIENT_LIBS@ LDADD = @CLIENT_EXTRA_LDFLAGS@ \ $(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) |