diff options
author | msvensson@pilot.mysql.com <> | 2007-01-29 18:48:20 +0100 |
---|---|---|
committer | msvensson@pilot.mysql.com <> | 2007-01-29 18:48:20 +0100 |
commit | 544c19b3e6c615c7212466240947cdbacd97fbde (patch) | |
tree | a26b837612ed5ce18144cfcdae58716a3a86ac82 /extra/yassl | |
parent | a7659cf5c70575a3cd53a03e8dbd1874a5c0d4cc (diff) | |
parent | 26e4f2e5060c1ea1e12ac260a6240a362bcbc0be (diff) | |
download | mariadb-git-544c19b3e6c615c7212466240947cdbacd97fbde.tar.gz |
Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work
into pilot.mysql.com:/home/msvensson/mysql/work/my51-work
Diffstat (limited to 'extra/yassl')
-rw-r--r-- | extra/yassl/taocrypt/test/Makefile.am | 2 | ||||
-rw-r--r-- | extra/yassl/testsuite/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extra/yassl/taocrypt/test/Makefile.am b/extra/yassl/taocrypt/test/Makefile.am index 6344efa4fb7..73e7f729bdb 100644 --- a/extra/yassl/taocrypt/test/Makefile.am +++ b/extra/yassl/taocrypt/test/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../mySTL -bin_PROGRAMS = test +noinst_PROGRAMS = test test_SOURCES = test.cpp test_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la test_CXXFLAGS = -DYASSL_PURE_C diff --git a/extra/yassl/testsuite/Makefile.am b/extra/yassl/testsuite/Makefile.am index 138077300f9..cae34e7bbc0 100644 --- a/extra/yassl/testsuite/Makefile.am +++ b/extra/yassl/testsuite/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../taocrypt/include -I$(srcdir)/../taocrypt/mySTL -bin_PROGRAMS = testsuite +noinst_PROGRAMS = testsuite testsuite_SOURCES = testsuite.cpp ../taocrypt/test/test.cpp \ ../examples/client/client.cpp ../examples/server/server.cpp \ ../examples/echoclient/echoclient.cpp \ |