diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-09-26 16:04:16 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-09-26 16:04:16 +0200 |
| commit | f21ac7b6d1e58412fe229408cfb59c4117900449 (patch) | |
| tree | 45c06319ed6808cdfe54ddf9fa71bf91defe71f5 /extra/yassl/taocrypt/benchmark | |
| parent | 7bf40904e78b8feabcf3a978cb9981385d7130c4 (diff) | |
| parent | 62d2cadb629e6e50680ff1b7e8f7496d69b44490 (diff) | |
| download | mariadb-git-f21ac7b6d1e58412fe229408cfb59c4117900449.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
extra/yassl/src/Makefile.am:
Auto merged
extra/yassl/taocrypt/benchmark/Makefile.am:
Auto merged
extra/yassl/taocrypt/src/Makefile.am:
Auto merged
extra/yassl/taocrypt/test/Makefile.am:
Auto merged
extra/yassl/testsuite/Makefile.am:
Auto merged
Diffstat (limited to 'extra/yassl/taocrypt/benchmark')
| -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 cf64efc007f..a5b1713427c 100644 --- a/extra/yassl/taocrypt/benchmark/Makefile.am +++ b/extra/yassl/taocrypt/benchmark/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I../include -I../../mySTL +INCLUDES = -I../include -I../mySTL bin_PROGRAMS = benchmark benchmark_SOURCES = benchmark.cpp benchmark_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la |