diff options
| -rw-r--r-- | crypto/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | crypto/Makefile.am | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 64bccd8..b898296 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
| @@ -570,17 +570,17 @@ set( | |||
| 570 | 570 | ||
| 571 | set(COMPAT_SRC empty.c) | 571 | set(COMPAT_SRC empty.c) |
| 572 | 572 | ||
| 573 | set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log) | ||
| 574 | |||
| 573 | if(UNIX) | 575 | if(UNIX) |
| 574 | set(CRYPTO_SRC ${CRYPTO_SRC} crypto_lock.c) | 576 | set(CRYPTO_SRC ${CRYPTO_SRC} crypto_lock.c) |
| 575 | set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_posix.c) | 577 | set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_posix.c) |
| 576 | set(CRYPTO_SRC ${CRYPTO_SRC} bio/bss_log.c) | ||
| 577 | set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl.c) | 578 | set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl.c) |
| 578 | endif() | 579 | endif() |
| 579 | 580 | ||
| 580 | if(WIN32) | 581 | if(WIN32) |
| 581 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/crypto_lock_win.c) | 582 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/crypto_lock_win.c) |
| 582 | set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c) | 583 | set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c) |
| 583 | set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log) | ||
| 584 | set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c) | 584 | set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c) |
| 585 | endif() | 585 | endif() |
| 586 | 586 | ||
diff --git a/crypto/Makefile.am b/crypto/Makefile.am index d1c5b76..b8628f0 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am | |||
| @@ -51,10 +51,8 @@ crypto_portable.sym: crypto.sym Makefile | |||
| 51 | -echo "generating crypto_portable.sym ..." | 51 | -echo "generating crypto_portable.sym ..." |
| 52 | -cp $(top_srcdir)/crypto/crypto.sym crypto_portable.sym | 52 | -cp $(top_srcdir)/crypto/crypto.sym crypto_portable.sym |
| 53 | -chmod u+w crypto_portable.sym | 53 | -chmod u+w crypto_portable.sym |
| 54 | if HOST_WIN | ||
| 55 | -grep -v BIO_s_log crypto_portable.sym > crypto_portable.sym.tmp | 54 | -grep -v BIO_s_log crypto_portable.sym > crypto_portable.sym.tmp |
| 56 | -mv crypto_portable.sym.tmp crypto_portable.sym | 55 | -mv crypto_portable.sym.tmp crypto_portable.sym |
| 57 | endif | ||
| 58 | 56 | ||
| 59 | libcrypto_la_objects.mk: Makefile | 57 | libcrypto_la_objects.mk: Makefile |
| 60 | @echo "libcrypto_la_objects= $(libcrypto_la_OBJECTS)" \ | 58 | @echo "libcrypto_la_objects= $(libcrypto_la_OBJECTS)" \ |
| @@ -334,9 +332,6 @@ libcrypto_la_SOURCES += bio/bss_conn.c | |||
| 334 | libcrypto_la_SOURCES += bio/bss_dgram.c | 332 | libcrypto_la_SOURCES += bio/bss_dgram.c |
| 335 | libcrypto_la_SOURCES += bio/bss_fd.c | 333 | libcrypto_la_SOURCES += bio/bss_fd.c |
| 336 | libcrypto_la_SOURCES += bio/bss_file.c | 334 | libcrypto_la_SOURCES += bio/bss_file.c |
| 337 | if !HOST_WIN | ||
| 338 | libcrypto_la_SOURCES += bio/bss_log.c | ||
| 339 | endif | ||
| 340 | libcrypto_la_SOURCES += bio/bss_mem.c | 335 | libcrypto_la_SOURCES += bio/bss_mem.c |
| 341 | libcrypto_la_SOURCES += bio/bss_null.c | 336 | libcrypto_la_SOURCES += bio/bss_null.c |
| 342 | libcrypto_la_SOURCES += bio/bss_sock.c | 337 | libcrypto_la_SOURCES += bio/bss_sock.c |
