summaryrefslogtreecommitdiffstats
path: root/secure/lib/libssh
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2014-11-25 21:18:18 +0000
committerbapt <bapt@FreeBSD.org>2014-11-25 21:18:18 +0000
commit1f187793183f3d481e685f06b9d0776d38926bf7 (patch)
tree569e9832fa3d4775e3b8244ea1f09d4307418368 /secure/lib/libssh
parent84381fd9772c40ffd0f864ffb6db9a6f89e54fe0 (diff)
downloadFreeBSD-src-1f187793183f3d481e685f06b9d0776d38926bf7.zip
FreeBSD-src-1f187793183f3d481e685f06b9d0776d38926bf7.tar.gz
Convert to LIBADD
Reduce overlinking
Diffstat (limited to 'secure/lib/libssh')
-rw-r--r--secure/lib/libssh/Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 36b4d76..d23330d 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -34,17 +34,14 @@ SRCS+= getrrsetbyname.c
LDNSDIR= ${.CURDIR}/../../../contrib/ldns
CFLAGS+= -DHAVE_LDNS=1 -I${LDNSDIR}
SRCS+= getrrsetbyname-ldns.c
-DPADD+= ${LIBLDNS}
-LDADD+= ${LDLDNS}
-USEPRIVATELIB+= ldns
+LIBADD+= ldns
.endif
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -include krb5_config.h
-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
-LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken
+LIBADD+= gssapi krb5 hx509 asn1 com_err md roken
.endif
.if ${MK_OPENSSH_NONE_CIPHER} != "no"
@@ -53,8 +50,7 @@ CFLAGS+= -DNONE_CIPHER_ENABLED
NO_LINT=
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBZ}
-LDADD+= -lcrypto -lcrypt -lz
+LIBADD+= crypto crypt z
.include <bsd.lib.mk>
OpenPOWER on IntegriCloud