diff options
| author | unknown <kent@mysql.com> | 2005-11-19 11:20:52 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-11-19 11:20:52 +0100 |
| commit | 6e478b60ebe881c7a9ab660cb110e267d50f2910 (patch) | |
| tree | 72e512a15fa352244220469442c3b8e3c2b1b59f /extra/yassl | |
| parent | 6ba79a251681a765f491db1428a467a0a06a69bd (diff) | |
| parent | 0bf5fa03c77e1fca3fa97672b1c987a2771945ed (diff) | |
| download | mariadb-git-6e478b60ebe881c7a9ab660cb110e267d50f2910.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
configure.in:
Auto merged
Diffstat (limited to 'extra/yassl')
| -rw-r--r-- | extra/yassl/Makefile.am | 2 | ||||
| -rw-r--r-- | extra/yassl/src/Makefile.am | 2 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/extra/yassl/Makefile.am b/extra/yassl/Makefile.am index 7c1f2ea5acb..41c4d84f24f 100644 --- a/extra/yassl/Makefile.am +++ b/extra/yassl/Makefile.am @@ -1,2 +1,2 @@ SUBDIRS = taocrypt src -EXTRA_DIST = yassl.dsp yassl.dsw mySTL/*.hpp +EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp) diff --git a/extra/yassl/src/Makefile.am b/extra/yassl/src/Makefile.am index 4ebb9a2d862..df96018e1cf 100644 --- a/extra/yassl/src/Makefile.am +++ b/extra/yassl/src/Makefile.am @@ -4,5 +4,5 @@ noinst_LIBRARIES = libyassl.a libyassl_a_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 = ../include/*.hpp ../include/openssl/*.h +EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h) AM_CXXFLAGS = -DYASSL_PURE_C diff --git a/extra/yassl/taocrypt/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am index 9ce083e9e56..0319fc6057b 100644 --- a/extra/yassl/taocrypt/src/Makefile.am +++ b/extra/yassl/taocrypt/src/Makefile.am @@ -11,5 +11,5 @@ libtaocrypt_a_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \ template_instnt.cpp libtaocrypt_a_LIBADD = libtaoint_a-integer.o -EXTRA_DIST = ../include/*.hpp +EXTRA_DIST = $(wildcard ../include/*.hpp) AM_CXXFLAGS = -DYASSL_PURE_C |