diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-03-22 16:58:46 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-03-22 16:58:46 +0100 |
| commit | 0a656e0835fb9d6d5c926deea6cfaaf8d8ffd4de (patch) | |
| tree | 44f0a3fa08ec016c678508e9acd13a44735f8b61 /extra | |
| parent | 0897e29bf71d7e8ffec569e595da3454f416b9a2 (diff) | |
| parent | ff7b01d8d436f77325de5cbf2f0c520a6fa35164 (diff) | |
| download | mariadb-git-0a656e0835fb9d6d5c926deea6cfaaf8d8ffd4de.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
BUILD/check-cpu:
Auto merged
extra/yassl/taocrypt/benchmark/Makefile.am:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~14:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/benchmark/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/taocrypt/benchmark/Makefile.am b/extra/yassl/taocrypt/benchmark/Makefile.am index 891dd532b98..2fe1c90c90d 100644 --- a/extra/yassl/taocrypt/benchmark/Makefile.am +++ b/extra/yassl/taocrypt/benchmark/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../mySTL -bin_PROGRAMS = benchmark +noinst_PROGRAMS = benchmark benchmark_SOURCES = benchmark.cpp benchmark_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la benchmark_CXXFLAGS = -DYASSL_PURE_C |