From 8f457699a860f17641ba959ba8bda304d35705a5 Mon Sep 17 00:00:00 2001
From: "msvensson@devsrv-b.mysql.com" <>
Date: Thu, 24 Nov 2005 17:17:36 +0100
Subject: Bug #15168  	yassl failure on amd64  - Use libtool to build
 libraries

---
 extra/yassl/src/Makefile.am          |  4 ++--
 extra/yassl/taocrypt/src/Makefile.am | 12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'extra/yassl')

diff --git a/extra/yassl/src/Makefile.am b/extra/yassl/src/Makefile.am
index df96018e1cf..a852ca4019b 100644
--- a/extra/yassl/src/Makefile.am
+++ b/extra/yassl/src/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I../include -I../taocrypt/include -I../mySTL
 
-noinst_LIBRARIES = libyassl.a
-libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \
+noinst_LTLIBRARIES = libyassl.la
+libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \
 	handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \
 	template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp
 EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h)
diff --git a/extra/yassl/taocrypt/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am
index 0319fc6057b..d89fa95a940 100644
--- a/extra/yassl/taocrypt/src/Makefile.am
+++ b/extra/yassl/taocrypt/src/Makefile.am
@@ -1,15 +1,11 @@
 INCLUDES = -I../include -I../../mySTL
 
-noinst_LIBRARIES = libtaoint.a libtaocrypt.a
+noinst_LTLIBRARIES = libtaocrypt.la
 
-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 \
+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
-libtaocrypt_a_LIBADD = libtaoint_a-integer.o
+	template_instnt.cpp integer.cpp
+libtaocrypt_la_CXXFLAGS = @yassl_taocrypt_extra_cxxflags@ -DYASSL_PURE_C
 
 EXTRA_DIST = $(wildcard ../include/*.hpp)
-AM_CXXFLAGS = -DYASSL_PURE_C
-- 
cgit v1.2.1