aboutsummaryrefslogtreecommitdiff
path: root/secure/libexec
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-11-25 21:18:18 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-11-25 21:18:18 +0000
commitee5a34ecba51f02e3bf46b112e265abf976f39b6 (patch)
tree569e9832fa3d4775e3b8244ea1f09d4307418368 /secure/libexec
parent8794b8a783923e2335c30f700e3a9db146c64ee6 (diff)
Notes
Diffstat (limited to 'secure/libexec')
-rw-r--r--secure/libexec/sftp-server/Makefile7
-rw-r--r--secure/libexec/ssh-keysign/Makefile7
-rw-r--r--secure/libexec/ssh-pkcs11-helper/Makefile7
3 files changed, 6 insertions, 15 deletions
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index ebddba95f2fd..3e55cc9db7eb 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -12,9 +12,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
SRCS+= roaming_dummy.c
.endif
-DPADD= ${LIBSSH}
-LDADD= ${LDSSH}
-USEPRIVATELIB= ssh
+LIBADD= ssh
.if ${MK_LDNS} != "no"
CFLAGS+= -DHAVE_LDNS=1
@@ -23,8 +21,7 @@ CFLAGS+= -DHAVE_LDNS=1
#USEPRIVATELIB+= ldns
.endif
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
-LDADD+= -lcrypt -lcrypto -lz
+LIBADD+= crypto crypto z
.include <bsd.prog.mk>
diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index f248666baace..01e51ef70f15 100644
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -8,9 +8,7 @@ MAN= ssh-keysign.8
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
BINMODE=4555
-DPADD= ${LIBSSH}
-LDADD= ${LDSSH}
-USEPRIVATELIB= ssh
+LIBADD= ssh
.if ${MK_LDNS} != "no"
CFLAGS+= -DHAVE_LDNS=1
@@ -19,8 +17,7 @@ CFLAGS+= -DHAVE_LDNS=1
#USEPRIVATELIB+= ldns
.endif
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
-LDADD+= -lcrypt -lcrypto -lz
+LIBADD+= crypt crypto z
.include <bsd.prog.mk>
diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile
index b73416f25dd1..55f151a66638 100644
--- a/secure/libexec/ssh-pkcs11-helper/Makefile
+++ b/secure/libexec/ssh-pkcs11-helper/Makefile
@@ -12,9 +12,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
SRCS+= roaming_dummy.c
.endif
-DPADD= ${LIBSSH}
-LDADD= ${LDSSH}
-USEPRIVATELIB= ssh
+LIBADD= ssh
.if ${MK_LDNS} != "no"
CFLAGS+= -DHAVE_LDNS=1
@@ -23,8 +21,7 @@ CFLAGS+= -DHAVE_LDNS=1
#USEPRIVATELIB+= ldns
.endif
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
-LDADD+= -lcrypt -lcrypto -lz
+LIBADD+= crypt crypto z
.include <bsd.prog.mk>