diff options
| author | Brent Cook <bcook@openbsd.org> | 2016-05-02 02:03:03 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2016-05-02 02:03:03 -0500 |
| commit | 552817b77f8dca7332d29af4b7a7bc0a08ec9a7a (patch) | |
| tree | b7ab0a81191a9387f0c0284fd18aac72394f0da0 /tls | |
| parent | 5582be55b4c8ee55243a13c4e46a1691ca919997 (diff) | |
| parent | 02e1cc4df185d34963b45b3e7c478f9c5a1818cc (diff) | |
| download | portable-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 'tls')
| -rw-r--r-- | tls/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tls/Makefile.am b/tls/Makefile.am index b19c881..b7dd4b0 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am | |||
| @@ -6,7 +6,9 @@ EXTRA_DIST = VERSION | |||
| 6 | EXTRA_DIST += CMakeLists.txt | 6 | EXTRA_DIST += CMakeLists.txt |
| 7 | 7 | ||
| 8 | libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined | 8 | libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined |
| 9 | libtls_la_LIBADD = ../crypto/libcrypto.la ../ssl/libssl.la $(PLATFORM_LDADD) | 9 | libtls_la_LIBADD = $(abs_top_builddir)/ssl/libssl.la |
| 10 | libtls_la_LIBADD += $(abs_top_builddir)/crypto/libcrypto.la | ||
| 11 | libtls_la_LIBADD += $(PLATFORM_LDADD) | ||
| 10 | 12 | ||
| 11 | libtls_la_CPPFLAGS = $(AM_CPPFLAGS) | 13 | libtls_la_CPPFLAGS = $(AM_CPPFLAGS) |
| 12 | if OPENSSLDIR_DEFINED | 14 | if OPENSSLDIR_DEFINED |