diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 98e0ffaefb0f241cda3a72395d3be04192ae0d47 (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /secure/libexec | |
| parent | b17ff922d4072ae132ece458f5b5d74a236880ac (diff) | |
| parent | e81032ad243db32b8fd615b2d55ee94b9f6a5b6a (diff) | |
Notes
Diffstat (limited to 'secure/libexec')
| -rw-r--r-- | secure/libexec/sftp-server/Makefile | 7 | ||||
| -rw-r--r-- | secure/libexec/sftp-server/Makefile.depend | 11 | ||||
| -rw-r--r-- | secure/libexec/ssh-keysign/Makefile | 7 | ||||
| -rw-r--r-- | secure/libexec/ssh-keysign/Makefile.depend | 11 | ||||
| -rw-r--r-- | secure/libexec/ssh-pkcs11-helper/Makefile | 7 | ||||
| -rw-r--r-- | secure/libexec/ssh-pkcs11-helper/Makefile.depend | 11 |
6 files changed, 8 insertions, 46 deletions
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index ebddba95f2fd..3ec21fdfbe50 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,9 +21,6 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz - .include <bsd.prog.mk> .PATH: ${SSHDIR} diff --git a/secure/libexec/sftp-server/Makefile.depend b/secure/libexec/sftp-server/Makefile.depend index 6a5cf9c35ef7..3f50378ffc9f 100644 --- a/secure/libexec/sftp-server/Makefile.depend +++ b/secure/libexec/sftp-server/Makefile.depend @@ -8,21 +8,12 @@ DIRDEPS = \ include \ include/arpa \ include/xlocale \ - kerberos5/lib/libasn1 \ - kerberos5/lib/libheimbase \ - kerberos5/lib/libhx509 \ - kerberos5/lib/libkrb5 \ - kerberos5/lib/libroken \ - kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ - lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ - lib/libgssapi \ - lib/libmd \ + lib/libldns \ lib/libpam/libpam \ - lib/libthr \ lib/libutil \ lib/libz \ secure/lib/libcrypto \ diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index f248666baace..9efad92e59ac 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+= crypto .include <bsd.prog.mk> diff --git a/secure/libexec/ssh-keysign/Makefile.depend b/secure/libexec/ssh-keysign/Makefile.depend index 6a5cf9c35ef7..3f50378ffc9f 100644 --- a/secure/libexec/ssh-keysign/Makefile.depend +++ b/secure/libexec/ssh-keysign/Makefile.depend @@ -8,21 +8,12 @@ DIRDEPS = \ include \ include/arpa \ include/xlocale \ - kerberos5/lib/libasn1 \ - kerberos5/lib/libheimbase \ - kerberos5/lib/libhx509 \ - kerberos5/lib/libkrb5 \ - kerberos5/lib/libroken \ - kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ - lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ - lib/libgssapi \ - lib/libmd \ + lib/libldns \ lib/libpam/libpam \ - lib/libthr \ lib/libutil \ lib/libz \ secure/lib/libcrypto \ diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile index b73416f25dd1..6733048c3b5c 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+= crypto .include <bsd.prog.mk> diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile.depend b/secure/libexec/ssh-pkcs11-helper/Makefile.depend index 6a5cf9c35ef7..3f50378ffc9f 100644 --- a/secure/libexec/ssh-pkcs11-helper/Makefile.depend +++ b/secure/libexec/ssh-pkcs11-helper/Makefile.depend @@ -8,21 +8,12 @@ DIRDEPS = \ include \ include/arpa \ include/xlocale \ - kerberos5/lib/libasn1 \ - kerberos5/lib/libheimbase \ - kerberos5/lib/libhx509 \ - kerberos5/lib/libkrb5 \ - kerberos5/lib/libroken \ - kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ - lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ - lib/libgssapi \ - lib/libmd \ + lib/libldns \ lib/libpam/libpam \ - lib/libthr \ lib/libutil \ lib/libz \ secure/lib/libcrypto \ |