3 files changed, 23 insertions, 9 deletions

diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am
index e9db6e5..aba306e 100644
--- a/apps/nc/Makefile.am
+++ b/apps/nc/Makefile.am
@@ -1,6 +1,8 @@
 include $(top_srcdir)/Makefile.am.common
 
 -include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
+-include $(abs_top_builddir)/ssl/libssl_la_objects.mk
+-include $(abs_top_builddir)/tls/libtls_la_objects.mk
 
 if BUILD_NC
 
@@ -14,12 +16,13 @@ endif
 EXTRA_DIST = nc.1
 EXTRA_DIST += CMakeLists.txt
 
-nc_LDADD = $(abs_top_builddir)/tls/libtls.la
-nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
-
-nc_LDADD += $(libcrypto_la_objects)
+nc_LDADD = $(libcrypto_la_objects)
 nc_LDADD += $(libcompat_la_objects)
 nc_LDADD += $(libcompatnoopt_la_objects)
+nc_LDADD += $(libssl_la_objects)
+nc_LDADD += $(libtls_la_objects)
+
+nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
 
 AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat
 
diff --git a/apps/ocspcheck/Makefile.am b/apps/ocspcheck/Makefile.am
index 7c7b454..e6f3c54 100644
--- a/apps/ocspcheck/Makefile.am
+++ b/apps/ocspcheck/Makefile.am
@@ -1,5 +1,9 @@
 include $(top_srcdir)/Makefile.am.common
 
+-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
+-include $(abs_top_builddir)/ssl/libssl_la_objects.mk
+-include $(abs_top_builddir)/tls/libtls_la_objects.mk
+
 if !ENABLE_LIBTLS_ONLY
 bin_PROGRAMS = ocspcheck
 dist_man_MANS = ocspcheck.8
@@ -10,9 +14,11 @@ endif
 EXTRA_DIST = ocspcheck.8
 EXTRA_DIST += CMakeLists.txt
 
-ocspcheck_LDADD = $(abs_top_builddir)/crypto/libcrypto.la
-ocspcheck_LDADD += $(abs_top_builddir)/ssl/libssl.la
-ocspcheck_LDADD += $(abs_top_builddir)/tls/libtls.la
+ocspcheck_LDADD = $(libcrypto_la_objects)
+ocspcheck_LDADD += $(libcompat_la_objects)
+ocspcheck_LDADD += $(libcompatnoopt_la_objects)
+ocspcheck_LDADD += $(libssl_la_objects)
+ocspcheck_LDADD += $(libtls_la_objects)
 ocspcheck_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
 
 ocspcheck_SOURCES = http.c
diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am
index 064975b..2567ef0 100644
--- a/apps/openssl/Makefile.am
+++ b/apps/openssl/Makefile.am
@@ -1,5 +1,8 @@
 include $(top_srcdir)/Makefile.am.common
 
+-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
+-include $(abs_top_builddir)/ssl/libssl_la_objects.mk
+
 if !ENABLE_LIBTLS_ONLY
 bin_PROGRAMS = openssl
 dist_man_MANS = openssl.1
@@ -7,8 +10,10 @@ else
 noinst_PROGRAMS = openssl
 endif
 
-openssl_LDADD = $(abs_top_builddir)/ssl/libssl.la
-openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la
+openssl_LDADD = $(libcrypto_la_objects)
+openssl_LDADD += $(libcompat_la_objects)
+openssl_LDADD += $(libcompatnoopt_la_objects)
+openssl_LDADD += $(libssl_la_objects)
 openssl_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
 
 openssl_SOURCES = apps.c