diff options
| author | msvensson@devsrv-b.mysql.com <> | 2005-11-25 17:01:59 +0100 |
|---|---|---|
| committer | msvensson@devsrv-b.mysql.com <> | 2005-11-25 17:01:59 +0100 |
| commit | 3879027ade07be8bc31b9728dbb880cdf380f763 (patch) | |
| tree | 9d59f3f3ab8b02c5d038b3f97e9c7dc7d20bcbd3 /extra | |
| parent | e6708aa0df27548b94d16b664bfa4294793eb192 (diff) | |
| parent | 8f457699a860f17641ba959ba8bda304d35705a5 (diff) | |
| download | mariadb-git-3879027ade07be8bc31b9728dbb880cdf380f763.tar.gz | |
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15168/my50-bug15168
into devsrv-b.mysql.com:/space/magnus/mysql-5.0
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/src/Makefile.am | 4 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/Makefile.am | 12 |
2 files changed, 6 insertions, 10 deletions
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 |