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. --- crypto/Makefile.am | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'crypto') 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 BUILT_SOURCES = crypto_portable.sym CLEANFILES = crypto_portable.sym +CLEANFILES += libcrypto_la_objects.mk crypto_portable.sym: crypto.sym Makefile -echo "generating crypto_portable.sym ..." @@ -93,8 +94,20 @@ if HOST_WIN -mv crypto_portable.sym.tmp crypto_portable.sym endif +libcrypto_la_objects.mk: Makefile + @echo "libcrypto_la_objects= $(libcrypto_la_OBJECTS)" \ + | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ + > libcrypto_la_objects.mk + @echo "libcompat_la_objects= $(libcompat_la_OBJECTS)" \ + | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ + >> libcrypto_la_objects.mk + @echo "libcompatnoopt_la_objects= $(libcompatnoopt_la_OBJECTS)" \ + | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ + >> libcrypto_la_objects.mk + libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym EXTRA_libcrypto_la_DEPENDENCIES = crypto_portable.sym +EXTRA_libcrypto_la_DEPENDENCIES += libcrypto_la_objects.mk libcrypto_la_LIBADD = libcompat.la if !HAVE_EXPLICIT_BZERO libcrypto_la_LIBADD += libcompatnoopt.la -- cgit v1.2.3-55-g6feb