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/lib/libssh | |
| parent | b17ff922d4072ae132ece458f5b5d74a236880ac (diff) | |
| parent | e81032ad243db32b8fd615b2d55ee94b9f6a5b6a (diff) | |
| download | src-98e0ffaefb0f241cda3a72395d3be04192ae0d47.tar.gz src-98e0ffaefb0f241cda3a72395d3be04192ae0d47.zip | |
Merge sync of head
Notes
Notes:
svn path=/projects/bmake/; revision=283595
Diffstat (limited to 'secure/lib/libssh')
| -rw-r--r-- | secure/lib/libssh/Makefile | 9 | ||||
| -rw-r--r-- | secure/lib/libssh/Makefile.depend | 7 |
2 files changed, 2 insertions, 14 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 36b4d7606de9..725ace8d47f7 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -34,17 +34,13 @@ 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 .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" @@ -53,8 +49,7 @@ CFLAGS+= -DNONE_CIPHER_ENABLED NO_LINT= -DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBZ} -LDADD+= -lcrypto -lcrypt -lz +LIBADD+= crypto crypt z .include <bsd.lib.mk> diff --git a/secure/lib/libssh/Makefile.depend b/secure/lib/libssh/Makefile.depend index 474e282fceaf..2103620c72cd 100644 --- a/secure/lib/libssh/Makefile.depend +++ b/secure/lib/libssh/Makefile.depend @@ -8,18 +8,11 @@ DIRDEPS = \ include \ include/arpa \ include/xlocale \ - kerberos5/lib/libasn1 \ - kerberos5/lib/libhx509 \ - kerberos5/lib/libkrb5 \ - kerberos5/lib/libroken \ lib/${CSU_DIR} \ lib/libc \ - lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ - lib/libgssapi \ lib/libldns \ - lib/libmd \ lib/libpam/libpam \ lib/libutil \ lib/libz \ |