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 /apps | |
| 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 'apps')
| -rw-r--r-- | apps/nc/Makefile.am | 6 | ||||
| -rw-r--r-- | apps/openssl/Makefile.am | 4 |
2 files changed, 5 insertions, 5 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 |