aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2017-01-09 02:22:26 -0600
committerBrent Cook <bcook@openbsd.org>2017-01-09 02:22:26 -0600
commitc691459502efc76b7fa4478b461ba7ab6c0d48cb (patch)
tree4bb07be318fb5f0bbc9240557d59f968c9db3c0a
parent45d35f0dfba2219539ab2b0e8f7c460bd79bfa29 (diff)
downloadportable-c691459502efc76b7fa4478b461ba7ab6c0d48cb.tar.gz
portable-c691459502efc76b7fa4478b461ba7ab6c0d48cb.tar.bz2
portable-c691459502efc76b7fa4478b461ba7ab6c0d48cb.zip
fix static mingw builds, platform LDADD needs to come at the end
-rw-r--r--apps/nc/Makefile.am4
-rw-r--r--apps/openssl/Makefile.am4
-rw-r--r--tests/Makefile.am4
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
11EXTRA_DIST = nc.1 11EXTRA_DIST = nc.1
12EXTRA_DIST += CMakeLists.txt 12EXTRA_DIST += CMakeLists.txt
13 13
14nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) 14nc_LDADD = $(abs_top_builddir)/crypto/libcrypto.la
15nc_LDADD += $(abs_top_builddir)/crypto/libcrypto.la
16nc_LDADD += $(abs_top_builddir)/ssl/libssl.la 15nc_LDADD += $(abs_top_builddir)/ssl/libssl.la
17nc_LDADD += $(abs_top_builddir)/tls/libtls.la 16nc_LDADD += $(abs_top_builddir)/tls/libtls.la
17nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
18 18
19AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat 19AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat
20 20
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
4 4
5dist_man_MANS = openssl.1 5dist_man_MANS = openssl.1
6 6
7openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) 7openssl_LDADD = $(abs_top_builddir)/ssl/libssl.la
8openssl_LDADD += $(abs_top_builddir)/ssl/libssl.la
9openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la 8openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la
9openssl_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
10 10
11openssl_SOURCES = apps.c 11openssl_SOURCES = apps.c
12openssl_SOURCES += asn1pars.c 12openssl_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
7AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat 7AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat
8AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/apps/openssl/cert.pem\" 8AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/apps/openssl/cert.pem\"
9 9
10LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) 10LDADD = $(abs_top_builddir)/tls/.libs/libtls.a
11LDADD += $(abs_top_builddir)/tls/.libs/libtls.a
12LDADD += $(abs_top_builddir)/ssl/.libs/libssl.a 11LDADD += $(abs_top_builddir)/ssl/.libs/libssl.a
13LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto.a 12LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto.a
13LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
14if HOST_ASM_MACOSX_X86_64 14if HOST_ASM_MACOSX_X86_64
15LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto_la-cpuid-macosx-x86_64.o 15LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto_la-cpuid-macosx-x86_64.o
16endif 16endif