diff options
| author | msvensson@shellback.(none) <> | 2006-09-21 12:25:35 +0200 |
|---|---|---|
| committer | msvensson@shellback.(none) <> | 2006-09-21 12:25:35 +0200 |
| commit | 08cdf195ceeb78c95120d581fb3c50ac67e516d9 (patch) | |
| tree | 47f45d64c4a93647e02c0ae829f2907c7d0028d3 /extra | |
| parent | c74ebcc176989a2fef4e2651dc2acf4a9a349795 (diff) | |
| parent | 346730ee6b01c6ed7bf8a6d0ad0e7e5a9cb4f6a8 (diff) | |
| download | mariadb-git-08cdf195ceeb78c95120d581fb3c50ac67e516d9.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/benchmark/Makefile.am | 4 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/test/Makefile.am | 4 | ||||
| -rw-r--r-- | extra/yassl/testsuite/Makefile.am | 5 |
3 files changed, 4 insertions, 9 deletions
diff --git a/extra/yassl/taocrypt/benchmark/Makefile.am b/extra/yassl/taocrypt/benchmark/Makefile.am index 81200ff7e6a..cf64efc007f 100644 --- a/extra/yassl/taocrypt/benchmark/Makefile.am +++ b/extra/yassl/taocrypt/benchmark/Makefile.am @@ -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 = $(top_builddir)/extra/yassl/taocrypt/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 diff --git a/extra/yassl/taocrypt/test/Makefile.am b/extra/yassl/taocrypt/test/Makefile.am index 0b238f1e057..d59ada08745 100644 --- a/extra/yassl/taocrypt/test/Makefile.am +++ b/extra/yassl/taocrypt/test/Makefile.am @@ -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 = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la test_CXXFLAGS = -DYASSL_PURE_C EXTRA_DIST = make.bat diff --git a/extra/yassl/testsuite/Makefile.am b/extra/yassl/testsuite/Makefile.am index 5fccab7ee2b..c433b0081dc 100644 --- a/extra/yassl/testsuite/Makefile.am +++ b/extra/yassl/testsuite/Makefile.am @@ -4,10 +4,9 @@ testsuite_SOURCES = testsuite.cpp ../taocrypt/test/test.cpp \ ../examples/client/client.cpp ../examples/server/server.cpp \ ../examples/echoclient/echoclient.cpp \ ../examples/echoserver/echoserver.cpp -testsuite_LDFLAGS = -L../src/ -L../taocrypt/src testsuite_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX -DNO_MAIN_DRIVER -testsuite_LDADD = -lyassl -ltaocrypt -testsuite_DEPENDENCIES = ../src/libyassl.la ../taocrypt/src/libtaocrypt.la +testsuite_LDADD = $(top_builddir)/extra/yassl/src/libyassl.la \ + $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat # Don't update the files from bitkeeper |