From 1c023edb2a3488906d0b8435fcc4dc7f925bda3a Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 18 Oct 2020 22:14:03 -0500 Subject: modify nc build to link libcompat objects directly Rather than assuming the static version of libcrypto exists for pulling in the compatibility functions, link the compat objects directly. This modifies the object file generation script a bit to handle the empty-case properly as well. --- apps/nc/Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'apps') diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am index d678f1e..58b5c01 100644 --- a/apps/nc/Makefile.am +++ b/apps/nc/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/Makefile.am.common +-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk + if BUILD_NC if ENABLE_NC @@ -12,11 +14,13 @@ endif EXTRA_DIST = nc.1 EXTRA_DIST += CMakeLists.txt -nc_LDFLAGS = $(abs_top_builddir)/crypto/.libs/libcrypto.a - nc_LDADD = $(abs_top_builddir)/tls/libtls.la nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) +nc_LDADD += $(libcrypto_la_objects) +nc_LDADD += $(libcompat_la_objects) +nc_LDADD += $(libcompatnoopt_la_objects) + AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat nc_SOURCES = atomicio.c -- cgit v1.2.3-55-g6feb