summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorunknown <msvensson@shellback.(none)>2006-04-11 23:51:14 +0200
committerunknown <msvensson@shellback.(none)>2006-04-11 23:51:14 +0200
commit066431faa5da523cc413cde118d14dd396baaad4 (patch)
tree104c454524a118364ed5b482aa73171ca953a272 /extra
parent4a2cd8701bf6c16f77c93e1795215f8021eb2552 (diff)
downloadmariadb-git-066431faa5da523cc413cde118d14dd396baaad4.tar.gz
Add new yaSSL files
Add benchmark, testsuite and taocrypt/test as places where to produce Makfiles and build - very useful for debugging config/ac-macros/yassl.m4: Add Makefiles for yassl testsuite and benchmark extra/yassl/Makefile.am: Add new subdir testsuite extra/yassl/taocrypt/Makefile.am: Add new subdir test for the taocrypt test extra/yassl/taocrypt/src/Makefile.am: Add all new files for yaSSL and organize them alphabetically extra/yassl/taocrypt/benchmark/Makefile.am: New BitKeeper file ``extra/yassl/taocrypt/benchmark/Makefile.am'' extra/yassl/taocrypt/test/Makefile.am: New BitKeeper file ``extra/yassl/taocrypt/test/Makefile.am'' extra/yassl/testsuite/Makefile.am: New BitKeeper file ``extra/yassl/testsuite/Makefile.am''
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/Makefile.am2
-rw-r--r--extra/yassl/taocrypt/Makefile.am2
-rw-r--r--extra/yassl/taocrypt/benchmark/Makefile.am8
-rw-r--r--extra/yassl/taocrypt/src/Makefile.am10
-rw-r--r--extra/yassl/taocrypt/test/Makefile.am8
-rw-r--r--extra/yassl/testsuite/Makefile.am11
6 files changed, 35 insertions, 6 deletions
diff --git a/extra/yassl/Makefile.am b/extra/yassl/Makefile.am
index 41c4d84f24f..d0415012767 100644
--- a/extra/yassl/Makefile.am
+++ b/extra/yassl/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = taocrypt src
+SUBDIRS = taocrypt src testsuite
EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp)
diff --git a/extra/yassl/taocrypt/Makefile.am b/extra/yassl/taocrypt/Makefile.am
index af3ded7abfd..2aa43a6c814 100644
--- a/extra/yassl/taocrypt/Makefile.am
+++ b/extra/yassl/taocrypt/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = src
+SUBDIRS = src test
EXTRA_DIST = taocrypt.dsw taocrypt.dsp
diff --git a/extra/yassl/taocrypt/benchmark/Makefile.am b/extra/yassl/taocrypt/benchmark/Makefile.am
new file mode 100644
index 00000000000..81200ff7e6a
--- /dev/null
+++ b/extra/yassl/taocrypt/benchmark/Makefile.am
@@ -0,0 +1,8 @@
+INCLUDES = -I../include -I../../mySTL
+bin_PROGRAMS = benchmark
+benchmark_SOURCES = benchmark.cpp
+benchmark_LDFLAGS = -L../src
+benchmark_LDADD = -ltaocrypt
+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/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am
index d89fa95a940..d3e72346110 100644
--- a/extra/yassl/taocrypt/src/Makefile.am
+++ b/extra/yassl/taocrypt/src/Makefile.am
@@ -2,10 +2,12 @@ INCLUDES = -I../include -I../../mySTL
noinst_LTLIBRARIES = libtaocrypt.la
-libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
- coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp \
- md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \
- template_instnt.cpp integer.cpp
+libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp \
+ asn.cpp bftables.cpp blowfish.cpp coding.cpp des.cpp dh.cpp \
+ dsa.cpp file.cpp hash.cpp integer.cpp md2.cpp md5.cpp misc.cpp \
+ random.cpp ripemd.cpp rsa.cpp sha.cpp template_instnt.cpp \
+ tftables.cpp twofish.cpp
+
libtaocrypt_la_CXXFLAGS = @yassl_taocrypt_extra_cxxflags@ -DYASSL_PURE_C
EXTRA_DIST = $(wildcard ../include/*.hpp)
diff --git a/extra/yassl/taocrypt/test/Makefile.am b/extra/yassl/taocrypt/test/Makefile.am
new file mode 100644
index 00000000000..0b238f1e057
--- /dev/null
+++ b/extra/yassl/taocrypt/test/Makefile.am
@@ -0,0 +1,8 @@
+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_CXXFLAGS = -DYASSL_PURE_C
+EXTRA_DIST = make.bat
diff --git a/extra/yassl/testsuite/Makefile.am b/extra/yassl/testsuite/Makefile.am
new file mode 100644
index 00000000000..3a07ac316e1
--- /dev/null
+++ b/extra/yassl/testsuite/Makefile.am
@@ -0,0 +1,11 @@
+INCLUDES = -I../include -I../taocrypt/include -I../mySTL
+bin_PROGRAMS = testsuite
+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 $(PTHREAD_LDFLAGS)
+testsuite_CXXFLAGS = -DYASSL_PURE_C -DNO_MAIN_DRIVER -Wall -Wno-unused $(PTHREAD_CFLAGS)
+testsuite_LDADD = -lyassl -ltaocrypt $(EXTRA_PTHREAD) $(EXTRA_SOCKET)
+testsuite_DEPENDENCIES = ../src/libyassl.la ../taocrypt/src/libtaocrypt.la
+EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat