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 ++-- tests/Makefile.am | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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 diff --git a/tests/Makefile.am b/tests/Makefile.am index e7a6e90..7725796 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,10 +7,10 @@ AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/apps/openssl/cert.pem\" -LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) -LDADD += $(abs_top_builddir)/tls/.libs/libtls.a +LDADD = $(abs_top_builddir)/tls/.libs/libtls.a LDADD += $(abs_top_builddir)/ssl/.libs/libssl.a LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto.a +LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) if HOST_ASM_MACOSX_X86_64 LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto_la-cpuid-macosx-x86_64.o endif -- cgit v1.2.3-55-g6feb