aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2020-10-18 22:14:03 -0500
committerBrent Cook <busterb@gmail.com>2020-10-20 03:50:23 -0500
commit9abd36e3af5876f67c633f27496ad5660ab7fe24 (patch)
treee49dc4e1c7338bf7abf29ac82f94c85ec1742195 /apps
parent6359d9404d9d844f20d4478befda258a7ba3cdde (diff)
downloadportable-9abd36e3af5876f67c633f27496ad5660ab7fe24.tar.gz
portable-9abd36e3af5876f67c633f27496ad5660ab7fe24.tar.bz2
portable-9abd36e3af5876f67c633f27496ad5660ab7fe24.zip
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.
Diffstat (limited to 'apps')
-rw-r--r--apps/nc/Makefile.am8
1 files changed, 6 insertions, 2 deletions
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 @@
1include $(top_srcdir)/Makefile.am.common 1include $(top_srcdir)/Makefile.am.common
2 2
3-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
4
3if BUILD_NC 5if BUILD_NC
4 6
5if ENABLE_NC 7if ENABLE_NC
@@ -12,11 +14,13 @@ endif
12EXTRA_DIST = nc.1 14EXTRA_DIST = nc.1
13EXTRA_DIST += CMakeLists.txt 15EXTRA_DIST += CMakeLists.txt
14 16
15nc_LDFLAGS = $(abs_top_builddir)/crypto/.libs/libcrypto.a
16
17nc_LDADD = $(abs_top_builddir)/tls/libtls.la 17nc_LDADD = $(abs_top_builddir)/tls/libtls.la
18nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) 18nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
19 19
20nc_LDADD += $(libcrypto_la_objects)
21nc_LDADD += $(libcompat_la_objects)
22nc_LDADD += $(libcompatnoopt_la_objects)
23
20AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat 24AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat
21 25
22nc_SOURCES = atomicio.c 26nc_SOURCES = atomicio.c