diff options
| author | kinichiro <kinichiro.inoguchi@gmail.com> | 2020-09-20 13:37:52 +0900 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2020-10-04 03:50:18 -0500 |
| commit | 5a29b0472d5d0d1aa9936e430a87299fdb0f17ba (patch) | |
| tree | 288f41dc8dbe79fc1beba2352b992f5734f859eb /crypto | |
| parent | fe42a8011b25797afa48cf0359c7e2753b2ece5f (diff) | |
| download | portable-5a29b0472d5d0d1aa9936e430a87299fdb0f17ba.tar.gz portable-5a29b0472d5d0d1aa9936e430a87299fdb0f17ba.tar.bz2 portable-5a29b0472d5d0d1aa9936e430a87299fdb0f17ba.zip | |
Link crypto and ssl object files directly instead of static library
- Output object files list variable for libcrypto and libssl to .mk file.
- Include object files list variable .mk from tls/Makefile
- Link .lo files directly instead of static library for libtls.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Makefile.am | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 7fcfc02..97a84e1 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am | |||
| @@ -20,6 +20,7 @@ EXTRA_DIST += compat/strcasecmp.c | |||
| 20 | 20 | ||
| 21 | BUILT_SOURCES = crypto_portable.sym | 21 | BUILT_SOURCES = crypto_portable.sym |
| 22 | CLEANFILES = crypto_portable.sym | 22 | CLEANFILES = crypto_portable.sym |
| 23 | CLEANFILES += libcrypto_la_objects.mk | ||
| 23 | 24 | ||
| 24 | crypto_portable.sym: crypto.sym Makefile | 25 | crypto_portable.sym: crypto.sym Makefile |
| 25 | -echo "generating crypto_portable.sym ..." | 26 | -echo "generating crypto_portable.sym ..." |
| @@ -93,8 +94,20 @@ if HOST_WIN | |||
| 93 | -mv crypto_portable.sym.tmp crypto_portable.sym | 94 | -mv crypto_portable.sym.tmp crypto_portable.sym |
| 94 | endif | 95 | endif |
| 95 | 96 | ||
| 97 | libcrypto_la_objects.mk: Makefile | ||
| 98 | @echo "libcrypto_la_objects= $(libcrypto_la_OBJECTS)" \ | ||
| 99 | | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ | ||
| 100 | > libcrypto_la_objects.mk | ||
| 101 | @echo "libcompat_la_objects= $(libcompat_la_OBJECTS)" \ | ||
| 102 | | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ | ||
| 103 | >> libcrypto_la_objects.mk | ||
| 104 | @echo "libcompatnoopt_la_objects= $(libcompatnoopt_la_OBJECTS)" \ | ||
| 105 | | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ | ||
| 106 | >> libcrypto_la_objects.mk | ||
| 107 | |||
| 96 | libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym | 108 | libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym |
| 97 | EXTRA_libcrypto_la_DEPENDENCIES = crypto_portable.sym | 109 | EXTRA_libcrypto_la_DEPENDENCIES = crypto_portable.sym |
| 110 | EXTRA_libcrypto_la_DEPENDENCIES += libcrypto_la_objects.mk | ||
| 98 | libcrypto_la_LIBADD = libcompat.la | 111 | libcrypto_la_LIBADD = libcompat.la |
| 99 | if !HAVE_EXPLICIT_BZERO | 112 | if !HAVE_EXPLICIT_BZERO |
| 100 | libcrypto_la_LIBADD += libcompatnoopt.la | 113 | libcrypto_la_LIBADD += libcompatnoopt.la |