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 /apps | |
| 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 '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 34c5cd3..07e31de 100644 --- a/apps/nc/Makefile.am +++ b/apps/nc/Makefile.am | |||
| @@ -11,9 +11,9 @@ endif | |||
| 11 | EXTRA_DIST = nc.1 | 11 | EXTRA_DIST = nc.1 |
| 12 | 12 | ||
| 13 | nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) | 13 | nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) |
| 14 | nc_LDADD += $(top_builddir)/crypto/libcrypto.la | 14 | nc_LDADD += $(abs_top_builddir)/crypto/libcrypto.la |
| 15 | nc_LDADD += $(top_builddir)/ssl/libssl.la | 15 | nc_LDADD += $(abs_top_builddir)/ssl/libssl.la |
| 16 | nc_LDADD += $(top_builddir)/tls/libtls.la | 16 | nc_LDADD += $(abs_top_builddir)/tls/libtls.la |
| 17 | 17 | ||
| 18 | AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat | 18 | AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat |
| 19 | if OPENSSLDIR_DEFINED | 19 | if OPENSSLDIR_DEFINED |
diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am index 6ec3d62..a65f3bc 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 |