From ad914139c4c6dde31d8a17116e95f1de32d96386 Mon Sep 17 00:00:00 2001 From: kinichiro Date: Thu, 21 Apr 2016 14:49:39 +0900 Subject: fix ld warning "attempted multiple inclusion of file" on Solaris - To avoid ld warning on Solaris, use abs_top_builddir in Makefile.am --- apps/nc/Makefile.am | 6 +++--- apps/openssl/Makefile.am | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'apps') 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 EXTRA_DIST = nc.1 nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) -nc_LDADD += $(top_builddir)/crypto/libcrypto.la -nc_LDADD += $(top_builddir)/ssl/libssl.la -nc_LDADD += $(top_builddir)/tls/libtls.la +nc_LDADD += $(abs_top_builddir)/crypto/libcrypto.la +nc_LDADD += $(abs_top_builddir)/ssl/libssl.la +nc_LDADD += $(abs_top_builddir)/tls/libtls.la AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat 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 dist_man_MANS = openssl.1 openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) -openssl_LDADD += $(top_builddir)/ssl/libssl.la -openssl_LDADD += $(top_builddir)/crypto/libcrypto.la +openssl_LDADD += $(abs_top_builddir)/ssl/libssl.la +openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la openssl_SOURCES = apps.c openssl_SOURCES += asn1pars.c -- cgit v1.2.3-55-g6feb