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 | |
| 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
| -rw-r--r-- | apps/nc/Makefile.am | 6 | ||||
| -rw-r--r-- | apps/openssl/Makefile.am | 4 | ||||
| -rw-r--r-- | ssl/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 | ||||
| -rw-r--r-- | tls/Makefile.am | 4 |
5 files changed, 12 insertions, 10 deletions
diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am index ceb72b8..ed45c3f 100644 --- a/apps/nc/Makefile.am +++ b/apps/nc/Makefile.am | |||
| @@ -12,9 +12,9 @@ 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 = $(PLATFORM_LDADD) $(PROG_LDADD) |
| 15 | nc_LDADD += $(top_builddir)/crypto/libcrypto.la | 15 | nc_LDADD += $(abs_top_builddir)/crypto/libcrypto.la |
| 16 | nc_LDADD += $(top_builddir)/ssl/libssl.la | 16 | nc_LDADD += $(abs_top_builddir)/ssl/libssl.la |
| 17 | nc_LDADD += $(top_builddir)/tls/libtls.la | 17 | nc_LDADD += $(abs_top_builddir)/tls/libtls.la |
| 18 | 18 | ||
| 19 | AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat | 19 | AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat |
| 20 | if OPENSSLDIR_DEFINED | 20 | if OPENSSLDIR_DEFINED |
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 | |||
| 5 | dist_man_MANS = openssl.1 | 5 | dist_man_MANS = openssl.1 |
| 6 | 6 | ||
| 7 | openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) | 7 | openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) |
| 8 | openssl_LDADD += $(top_builddir)/ssl/libssl.la | 8 | openssl_LDADD += $(abs_top_builddir)/ssl/libssl.la |
| 9 | openssl_LDADD += $(top_builddir)/crypto/libcrypto.la | 9 | openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la |
| 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/ssl/Makefile.am b/ssl/Makefile.am index 5d038a8..247d5c1 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am | |||
| @@ -6,7 +6,7 @@ EXTRA_DIST = VERSION | |||
| 6 | EXTRA_DIST += CMakeLists.txt | 6 | EXTRA_DIST += CMakeLists.txt |
| 7 | 7 | ||
| 8 | libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined | 8 | libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined |
| 9 | libssl_la_LIBADD = ../crypto/libcrypto.la | 9 | libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la |
| 10 | 10 | ||
| 11 | libssl_la_SOURCES = bio_ssl.c | 11 | libssl_la_SOURCES = bio_ssl.c |
| 12 | libssl_la_SOURCES += bs_ber.c | 12 | libssl_la_SOURCES += bs_ber.c |
diff --git a/tests/Makefile.am b/tests/Makefile.am index 17293b9..3a6edfe 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am | |||
| @@ -7,9 +7,9 @@ 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 | 8 | ||
| 9 | LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) | 9 | LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) |
| 10 | LDADD += $(top_builddir)/ssl/libssl.la | 10 | LDADD += $(abs_top_builddir)/ssl/libssl.la |
| 11 | LDADD += $(top_builddir)/crypto/libcrypto.la | 11 | LDADD += $(abs_top_builddir)/crypto/libcrypto.la |
| 12 | LDADD += $(top_builddir)/tls/libtls.la | 12 | LDADD += $(abs_top_builddir)/tls/libtls.la |
| 13 | 13 | ||
| 14 | TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh | 14 | TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh |
| 15 | 15 | ||
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 |