summaryrefslogtreecommitdiffstats
path: root/secure/usr.bin/ssh
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/usr.bin/ssh
parent84381fd9772c40ffd0f864ffb6db9a6f89e54fe0 (diff)
downloadFreeBSD-src-1f187793183f3d481e685f06b9d0776d38926bf7.zip
FreeBSD-src-1f187793183f3d481e685f06b9d0776d38926bf7.tar.gz
Convert to LIBADD
Reduce overlinking
Diffstat (limited to 'secure/usr.bin/ssh')
-rw-r--r--secure/usr.bin/ssh/Makefile14
1 files changed, 4 insertions, 10 deletions
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 3c969cd..2f2f97b 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -15,29 +15,23 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \
# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
SRCS+= gss-genr.c
-DPADD= ${LIBSSH} ${LIBUTIL}
-LDADD= ${LDSSH} -lutil
-USEPRIVATELIB= ssh
+LIBADD= ssh util
.if ${MK_LDNS} != "no"
CFLAGS+= -DHAVE_LDNS=1
-DPADD+= ${LIBLDNS}
-LDADD+= ${LDLDNS}
-USEPRIVATELIB+= ldns
+LIBADD+= ldns
.endif
.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -include krb5_config.h
-DPADD+= ${LIBGSSAPI}
-LDADD+= -lgssapi
+LIBADD+= gssapi
.endif
.if ${MK_OPENSSH_NONE_CIPHER} != "no"
CFLAGS+= -DNONE_CIPHER_ENABLED
.endif
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
-LDADD+= -lcrypt -lcrypto -lz
+LIBADD+= crypt crypto z
.if defined(LOCALBASE)
CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
OpenPOWER on IntegriCloud