diff options
| author | Brent Cook <busterb@gmail.com> | 2020-10-18 22:14:03 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2020-10-20 08:46:20 -0500 |
| commit | 1c023edb2a3488906d0b8435fcc4dc7f925bda3a (patch) | |
| tree | 4b8a7a9f38be7d3f82f11a007576166d0b600af5 /apps | |
| parent | 4722dcf746a81d2e648aa8fe31799867776dfb79 (diff) | |
| download | portable-1c023edb2a3488906d0b8435fcc4dc7f925bda3a.tar.gz portable-1c023edb2a3488906d0b8435fcc4dc7f925bda3a.tar.bz2 portable-1c023edb2a3488906d0b8435fcc4dc7f925bda3a.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.am | 8 |
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 @@ | |||
| 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 | |||
| 3 | if BUILD_NC | 5 | if BUILD_NC |
| 4 | 6 | ||
| 5 | if ENABLE_NC | 7 | if ENABLE_NC |
| @@ -12,11 +14,13 @@ endif | |||
| 12 | EXTRA_DIST = nc.1 | 14 | EXTRA_DIST = nc.1 |
| 13 | EXTRA_DIST += CMakeLists.txt | 15 | EXTRA_DIST += CMakeLists.txt |
| 14 | 16 | ||
| 15 | nc_LDFLAGS = $(abs_top_builddir)/crypto/.libs/libcrypto.a | ||
| 16 | |||
| 17 | nc_LDADD = $(abs_top_builddir)/tls/libtls.la | 17 | nc_LDADD = $(abs_top_builddir)/tls/libtls.la |
| 18 | nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) | 18 | nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) |
| 19 | 19 | ||
| 20 | nc_LDADD += $(libcrypto_la_objects) | ||
| 21 | nc_LDADD += $(libcompat_la_objects) | ||
| 22 | nc_LDADD += $(libcompatnoopt_la_objects) | ||
| 23 | |||
| 20 | AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat | 24 | AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat |
| 21 | 25 | ||
| 22 | nc_SOURCES = atomicio.c | 26 | nc_SOURCES = atomicio.c |