diff options
| author | unknown <joerg@trift2.> | 2007-03-23 10:57:17 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-03-23 10:57:17 +0100 |
| commit | 4f5a822947a4a9e5aa8c2a223f3aa8de81496e35 (patch) | |
| tree | 36b7180c86dfeccae6ebcb449634f7aa1885cd80 /extra | |
| parent | 6f17f42c59e78e2bc618c7d00c661dea1d1c8a57 (diff) | |
| parent | cea1cf3251d7e98105c4b03a0836dabeaab528f6 (diff) | |
| download | mariadb-git-4f5a822947a4a9e5aa8c2a223f3aa8de81496e35.tar.gz | |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
BUILD/check-cpu:
Auto merged
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
Auto merged
BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c:
Auto merged
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
Auto merged
mysql-test/mysql-test-run.pl:
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 |