diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /secure/usr.bin/ssh-agent | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
Diffstat (limited to 'secure/usr.bin/ssh-agent')
| -rw-r--r-- | secure/usr.bin/ssh-agent/Makefile | 7 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-agent/Makefile.depend | 11 |
2 files changed, 3 insertions, 15 deletions
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index b5c98b7..e263dec 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -11,9 +11,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 @@ -22,8 +20,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/usr.bin/ssh-agent/Makefile.depend b/secure/usr.bin/ssh-agent/Makefile.depend index 6a5cf9c..3f50378 100644 --- a/secure/usr.bin/ssh-agent/Makefile.depend +++ b/secure/usr.bin/ssh-agent/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 \ |
