diff options
| author | kinichiro <kinichiro.inoguchi@gmail.com> | 2016-04-21 14:49:39 +0900 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2016-05-02 22:12:53 -0500 |
| commit | ad914139c4c6dde31d8a17116e95f1de32d96386 (patch) | |
| tree | 0d14475464dbb6e69aeeb54ec0f46fc32ef89ac2 /tls | |
| parent | 6a136f72ffd4f972790961e3ed36f551479e44fb (diff) | |
| download | portable-ad914139c4c6dde31d8a17116e95f1de32d96386.tar.gz portable-ad914139c4c6dde31d8a17116e95f1de32d96386.tar.bz2 portable-ad914139c4c6dde31d8a17116e95f1de32d96386.zip | |
fix ld warning "attempted multiple inclusion of file" on Solaris
- To avoid ld warning on Solaris, use abs_top_builddir in Makefile.am
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 |