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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
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 | ||