diff options
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 3c781b7e45b..ca7f04c91f9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,6 +17,11 @@ ## Process this file with automake to create Makefile.in +if HAVE_YASSL + yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp +else + yassl_dummy_link_fix= +endif EXTRA_DIST = auto_increment.res auto_increment.tst \ function.res function.tst lock_test.pl lock_test.res \ export.pl big_record.pl \ @@ -35,9 +40,13 @@ noinst_PROGRAMS = insert_test select_test thread_test INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) LIBS = @CLIENT_LIBS@ -LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la -mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -mysql_client_test_SOURCES= mysql_client_test.c +LDADD = @CLIENT_EXTRA_LDFLAGS@ \ + $(top_builddir)/libmysql/libmysqlclient.la +mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) \ + $(top_builddir)/mysys/libmysys.a +mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) +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) select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) @@ -45,7 +54,7 @@ select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) DEFS = -DUNDEF_THREADS_HACK thread_test.o: thread_test.c - $(COMPILE) -c @MT_INCLUDES@ $(INCLUDES) $< + $(COMPILE) -c $(INCLUDES) $< # Don't update the files from bitkeeper %::SCCS/s.% |