diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-28 11:45:30 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-28 11:45:30 +0200 |
| commit | 92f698f9f0eeac0d95442248e1581370493201b5 (patch) | |
| tree | 1376a3d4a74cd08e15f83cede09c69c5ec9fec94 /extra/yassl/taocrypt | |
| parent | 268eb66421971a5eb4581abe3c51ca4b8f4fd385 (diff) | |
| parent | 2533dd084403235c5f36590a1b8106761ff989b7 (diff) | |
| download | mariadb-git-92f698f9f0eeac0d95442248e1581370493201b5.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
config/ac-macros/yassl.m4:
Auto merged
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
extra/yassl/taocrypt/src/Makefile.am:
Manual merge
Diffstat (limited to 'extra/yassl/taocrypt')
| -rw-r--r-- | extra/yassl/taocrypt/src/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extra/yassl/taocrypt/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am index c4fc4607622..354be165877 100644 --- a/extra/yassl/taocrypt/src/Makefile.am +++ b/extra/yassl/taocrypt/src/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = -I../include -I../../mySTL -noinst_LTLIBRARIES = libtaocrypt.la libtaoint.la -libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \ +noinst_LIBRARIES = libtaocrypt.a libtaoint.a +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_la_LIBADD = libtaoint.la -libtaoint_la_SOURCES = integer.cpp -libtaoint_la_CXXFLAGS = @yassl_integer_extra_cxxflags@ +libtaocrypt_a_LIBADD = libtaoint.a +libtaoint_a_SOURCES = integer.cpp +libtaoint_a_CXXFLAGS = @yassl_integer_extra_cxxflags@ EXTRA_DIST = ../include/*.hpp AM_CXXFLAGS = -DYASSL_PURE_C |