diff options
| author | Brent Cook <bcook@openbsd.org> | 2017-01-09 02:22:26 -0600 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2017-01-09 02:22:26 -0600 |
| commit | c691459502efc76b7fa4478b461ba7ab6c0d48cb (patch) | |
| tree | 4bb07be318fb5f0bbc9240557d59f968c9db3c0a | |
| parent | 45d35f0dfba2219539ab2b0e8f7c460bd79bfa29 (diff) | |
| download | portable-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.am | 4 | ||||
| -rw-r--r-- | apps/openssl/Makefile.am | 4 | ||||
| -rw-r--r-- | 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 | |||
| 11 | EXTRA_DIST = nc.1 | 11 | EXTRA_DIST = nc.1 |
| 12 | EXTRA_DIST += CMakeLists.txt | 12 | EXTRA_DIST += CMakeLists.txt |
| 13 | 13 | ||
| 14 | nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) | 14 | nc_LDADD = $(abs_top_builddir)/crypto/libcrypto.la |
| 15 | nc_LDADD += $(abs_top_builddir)/crypto/libcrypto.la | ||
| 16 | nc_LDADD += $(abs_top_builddir)/ssl/libssl.la | 15 | nc_LDADD += $(abs_top_builddir)/ssl/libssl.la |
| 17 | nc_LDADD += $(abs_top_builddir)/tls/libtls.la | 16 | nc_LDADD += $(abs_top_builddir)/tls/libtls.la |
| 17 | nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) | ||
| 18 | 18 | ||
| 19 | AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat | 19 | AM_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 | ||
| 5 | dist_man_MANS = openssl.1 | 5 | dist_man_MANS = openssl.1 |
| 6 | 6 | ||
| 7 | openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) | 7 | openssl_LDADD = $(abs_top_builddir)/ssl/libssl.la |
| 8 | openssl_LDADD += $(abs_top_builddir)/ssl/libssl.la | ||
| 9 | openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la | 8 | openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la |
| 9 | openssl_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) | ||
| 10 | 10 | ||
| 11 | openssl_SOURCES = apps.c | 11 | openssl_SOURCES = apps.c |
| 12 | openssl_SOURCES += asn1pars.c | 12 | 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 | |||
| 7 | AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat | 7 | AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat |
| 8 | AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/apps/openssl/cert.pem\" | 8 | AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/apps/openssl/cert.pem\" |
| 9 | 9 | ||
| 10 | LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) | 10 | LDADD = $(abs_top_builddir)/tls/.libs/libtls.a |
| 11 | LDADD += $(abs_top_builddir)/tls/.libs/libtls.a | ||
| 12 | LDADD += $(abs_top_builddir)/ssl/.libs/libssl.a | 11 | LDADD += $(abs_top_builddir)/ssl/.libs/libssl.a |
| 13 | LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto.a | 12 | LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto.a |
| 13 | LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) | ||
| 14 | if HOST_ASM_MACOSX_X86_64 | 14 | if HOST_ASM_MACOSX_X86_64 |
| 15 | LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto_la-cpuid-macosx-x86_64.o | 15 | LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto_la-cpuid-macosx-x86_64.o |
| 16 | endif | 16 | endif |
