bk commit into 5.0 tree (msvensson:1.2265)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-14 12:29:10+02:00, msvensson@neptunus.(none) +3 -0
  yaSSL tests - Use direct reference to the library to link with

  extra/yassl/taocrypt/benchmark/Makefile.am@stripped, 2006-09-14 12:29:08+02:00, msvensson@neptunus.(none) +1 -3
    Use direct reference to the library to link with

  extra/yassl/taocrypt/test/Makefile.am@stripped, 2006-09-14 12:29:08+02:00, msvensson@neptunus.(none) +1 -3
    Use direct reference to the library to link with

  extra/yassl/testsuite/Makefile.am@stripped, 2006-09-14 12:29:08+02:00, msvensson@neptunus.(none) +1 -3
    Use direct reference to the library to link with

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/netware/my50-netware

--- 1.1/extra/yassl/taocrypt/benchmark/Makefile.am	2006-09-14 12:29:14 +02:00
+++ 1.2/extra/yassl/taocrypt/benchmark/Makefile.am	2006-09-14 12:29:14 +02:00
@@ -1,8 +1,6 @@
 INCLUDES = -I../include -I../../mySTL
 bin_PROGRAMS       = benchmark
 benchmark_SOURCES  = benchmark.cpp
-benchmark_LDFLAGS  = -L../src
-benchmark_LDADD    = -ltaocrypt
+benchmark_LDADD    = ../src/libtaocrypt.la
 benchmark_CXXFLAGS = -DYASSL_PURE_C
-benchmark_DEPENDENCIES = ../src/libtaocrypt.la
 EXTRA_DIST = benchmark.dsp rsa1024.der dh1024.der dsa1024.der make.bat

--- 1.1/extra/yassl/taocrypt/test/Makefile.am	2006-09-14 12:29:14 +02:00
+++ 1.2/extra/yassl/taocrypt/test/Makefile.am	2006-09-14 12:29:14 +02:00
@@ -1,8 +1,6 @@
 INCLUDES = -I../include -I../../mySTL
 bin_PROGRAMS = test
 test_SOURCES = test.cpp
-test_LDFLAGS  = -L../src
-test_LDADD    = -ltaocrypt
-test_DEPENDENCIES = ../src/libtaocrypt.la
+test_LDADD    = ../src/libtaocrypt.la
 test_CXXFLAGS = -DYASSL_PURE_C
 EXTRA_DIST = make.bat

--- 1.3/extra/yassl/testsuite/Makefile.am	2006-09-14 12:29:14 +02:00
+++ 1.4/extra/yassl/testsuite/Makefile.am	2006-09-14 12:29:14 +02:00
@@ -4,8 +4,6 @@ testsuite_SOURCES  = testsuite.cpp ../ta
 	../examples/client/client.cpp ../examples/server/server.cpp \
 	../examples/echoclient/echoclient.cpp \
 	../examples/echoserver/echoserver.cpp
-testsuite_LDFLAGS  = -L../src/ -L../taocrypt/src
+testsuite_LDADD  = ../src/libyassl.la ../taocrypt/src/libtaocrypt.la
 testsuite_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX -DNO_MAIN_DRIVER
-testsuite_LDADD    = -lyassl -ltaocrypt
-testsuite_DEPENDENCIES = ../src/libyassl.la ../taocrypt/src/libtaocrypt.la
 EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat