summaryrefslogtreecommitdiff
path: root/extra/yassl
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-10-28 17:12:30 +0200
committerunknown <msvensson@neptunus.(none)>2005-10-28 17:12:30 +0200
commita62c4bdedf9f081b909601ec8232c8605cf5f68b (patch)
treef382cd8d5c00d7ceb47684dc615a4e70df7466dc /extra/yassl
parent0e8462315038a25d59bf3704ce3c5acf4256ec3d (diff)
downloadmariadb-git-a62c4bdedf9f081b909601ec8232c8605cf5f68b.tar.gz
Update after merge, include libtaoint-integer.o into libtaocrypt.a
extra/yassl/taocrypt/src/Makefile.am: Build libtaoint first and then link the .o file from that into libtaocrypt.a
Diffstat (limited to 'extra/yassl')
-rw-r--r--extra/yassl/taocrypt/src/Makefile.am11
1 files changed, 7 insertions, 4 deletions
diff --git a/extra/yassl/taocrypt/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am
index 354be165877..9ce083e9e56 100644
--- a/extra/yassl/taocrypt/src/Makefile.am
+++ b/extra/yassl/taocrypt/src/Makefile.am
@@ -1,12 +1,15 @@
INCLUDES = -I../include -I../../mySTL
-noinst_LIBRARIES = libtaocrypt.a libtaoint.a
+noinst_LIBRARIES = libtaoint.a libtaocrypt.a
+
+libtaoint_a_SOURCES = integer.cpp
+libtaoint_a_CXXFLAGS = @yassl_integer_extra_cxxflags@
+
libtaocrypt_a_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
-libtaocrypt_a_LIBADD = libtaoint.a
-libtaoint_a_SOURCES = integer.cpp
-libtaoint_a_CXXFLAGS = @yassl_integer_extra_cxxflags@
+libtaocrypt_a_LIBADD = libtaoint_a-integer.o
+
EXTRA_DIST = ../include/*.hpp
AM_CXXFLAGS = -DYASSL_PURE_C