aboutsummaryrefslogtreecommitdiff
path: root/apps/openssl
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2016-05-02 02:03:03 -0500
committerBrent Cook <bcook@openbsd.org>2016-05-02 02:03:03 -0500
commit552817b77f8dca7332d29af4b7a7bc0a08ec9a7a (patch)
treeb7ab0a81191a9387f0c0284fd18aac72394f0da0 /apps/openssl
parent5582be55b4c8ee55243a13c4e46a1691ca919997 (diff)
parent02e1cc4df185d34963b45b3e7c478f9c5a1818cc (diff)
downloadportable-552817b77f8dca7332d29af4b7a7bc0a08ec9a7a.tar.gz
portable-552817b77f8dca7332d29af4b7a7bc0a08ec9a7a.tar.bz2
portable-552817b77f8dca7332d29af4b7a7bc0a08ec9a7a.zip
Land #192, fix fix ld warning "attempted multiple inclusion of file" on Solaris
Diffstat (limited to 'apps/openssl')
-rw-r--r--apps/openssl/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am
index 7345479..60a3f09 100644
--- a/apps/openssl/Makefile.am
+++ b/apps/openssl/Makefile.am
@@ -5,8 +5,8 @@ bin_PROGRAMS = openssl
5dist_man_MANS = openssl.1 5dist_man_MANS = openssl.1
6 6
7openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) 7openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD)
8openssl_LDADD += $(top_builddir)/ssl/libssl.la 8openssl_LDADD += $(abs_top_builddir)/ssl/libssl.la
9openssl_LDADD += $(top_builddir)/crypto/libcrypto.la 9openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la
10 10
11openssl_SOURCES = apps.c 11openssl_SOURCES = apps.c
12openssl_SOURCES += asn1pars.c 12openssl_SOURCES += asn1pars.c