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 /tls | |
| 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 'tls')
| -rw-r--r-- | tls/Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tls/Makefile.am b/tls/Makefile.am index c4790a4..4cea3a2 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | include $(top_srcdir)/Makefile.am.common | 1 | include $(top_srcdir)/Makefile.am.common |
| 2 | 2 | ||
| 3 | -include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk | ||
| 4 | -include $(abs_top_builddir)/ssl/libssl_la_objects.mk | ||
| 5 | |||
| 3 | lib_LTLIBRARIES = libtls.la | 6 | lib_LTLIBRARIES = libtls.la |
| 4 | 7 | ||
| 5 | EXTRA_DIST = VERSION | 8 | EXTRA_DIST = VERSION |
| @@ -7,9 +10,11 @@ EXTRA_DIST += CMakeLists.txt | |||
| 7 | EXTRA_DIST += tls.sym | 10 | EXTRA_DIST += tls.sym |
| 8 | 11 | ||
| 9 | libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym | 12 | libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym |
| 10 | libtls_la_LDFLAGS += $(abs_top_builddir)/ssl/.libs/libssl.a | 13 | libtls_la_LIBADD = $(libcrypto_la_objects) |
| 11 | libtls_la_LDFLAGS += $(abs_top_builddir)/crypto/.libs/libcrypto.a | 14 | libtls_la_LIBADD += $(libcompat_la_objects) |
| 12 | libtls_la_LIBADD = $(PLATFORM_LDADD) | 15 | libtls_la_LIBADD += $(libcompatnoopt_la_objects) |
| 16 | libtls_la_LIBADD += $(libssl_la_objects) | ||
| 17 | libtls_la_LIBADD += $(PLATFORM_LDADD) | ||
| 13 | 18 | ||
| 14 | libtls_la_CPPFLAGS = $(AM_CPPFLAGS) | 19 | libtls_la_CPPFLAGS = $(AM_CPPFLAGS) |
| 15 | if OPENSSLDIR_DEFINED | 20 | if OPENSSLDIR_DEFINED |