From c691459502efc76b7fa4478b461ba7ab6c0d48cb Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 9 Jan 2017 02:22:26 -0600 Subject: fix static mingw builds, platform LDADD needs to come at the end --- apps/nc/Makefile.am | 4 ++-- apps/openssl/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'apps') diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am index 2a24d87..791eade 100644 --- a/apps/nc/Makefile.am +++ b/apps/nc/Makefile.am @@ -11,10 +11,10 @@ endif EXTRA_DIST = nc.1 EXTRA_DIST += CMakeLists.txt -nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) -nc_LDADD += $(abs_top_builddir)/crypto/libcrypto.la +nc_LDADD = $(abs_top_builddir)/crypto/libcrypto.la nc_LDADD += $(abs_top_builddir)/ssl/libssl.la nc_LDADD += $(abs_top_builddir)/tls/libtls.la +nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am index 90881d0..9b9eb10 100644 --- a/apps/openssl/Makefile.am +++ b/apps/openssl/Makefile.am @@ -4,9 +4,9 @@ bin_PROGRAMS = openssl dist_man_MANS = openssl.1 -openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) -openssl_LDADD += $(abs_top_builddir)/ssl/libssl.la +openssl_LDADD = $(abs_top_builddir)/ssl/libssl.la openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la +openssl_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) openssl_SOURCES = apps.c openssl_SOURCES += asn1pars.c -- cgit v1.2.3-55-g6feb