aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/nc/Makefile.am8
-rw-r--r--crypto/Makefile.am4
2 files changed, 8 insertions, 4 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
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 97a84e1..e32ca96 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -99,10 +99,10 @@ libcrypto_la_objects.mk: Makefile
99 | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ 99 | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \
100 > libcrypto_la_objects.mk 100 > libcrypto_la_objects.mk
101 @echo "libcompat_la_objects= $(libcompat_la_OBJECTS)" \ 101 @echo "libcompat_la_objects= $(libcompat_la_OBJECTS)" \
102 | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ 102 | sed 's/compat\// $$\(abs_top_builddir\)\/crypto\/&/g' \
103 >> libcrypto_la_objects.mk 103 >> libcrypto_la_objects.mk
104 @echo "libcompatnoopt_la_objects= $(libcompatnoopt_la_OBJECTS)" \ 104 @echo "libcompatnoopt_la_objects= $(libcompatnoopt_la_OBJECTS)" \
105 | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ 105 | sed 's/compat\// $$\(abs_top_builddir\)\/crypto\/&/g' \
106 >> libcrypto_la_objects.mk 106 >> libcrypto_la_objects.mk
107 107
108libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym 108libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym