From 5a29b0472d5d0d1aa9936e430a87299fdb0f17ba Mon Sep 17 00:00:00 2001 From: kinichiro Date: Sun, 20 Sep 2020 13:37:52 +0900 Subject: 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. --- tls/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'tls') 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 @@ include $(top_srcdir)/Makefile.am.common +-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk +-include $(abs_top_builddir)/ssl/libssl_la_objects.mk + lib_LTLIBRARIES = libtls.la EXTRA_DIST = VERSION @@ -7,9 +10,11 @@ EXTRA_DIST += CMakeLists.txt EXTRA_DIST += tls.sym libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym -libtls_la_LDFLAGS += $(abs_top_builddir)/ssl/.libs/libssl.a -libtls_la_LDFLAGS += $(abs_top_builddir)/crypto/.libs/libcrypto.a -libtls_la_LIBADD = $(PLATFORM_LDADD) +libtls_la_LIBADD = $(libcrypto_la_objects) +libtls_la_LIBADD += $(libcompat_la_objects) +libtls_la_LIBADD += $(libcompatnoopt_la_objects) +libtls_la_LIBADD += $(libssl_la_objects) +libtls_la_LIBADD += $(PLATFORM_LDADD) libtls_la_CPPFLAGS = $(AM_CPPFLAGS) if OPENSSLDIR_DEFINED -- cgit v1.2.3-55-g6feb