summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2005-01-03 06:04:08 +0000
committerlukem <lukem@NetBSD.org>2005-01-03 06:04:08 +0000
commitecfeee924bb3c5cbb60a82bce6dddf6954eb3012 (patch)
treee1af7d31fa9f11141150cb8710a4ae0c3c2d9508 /usr.bin/ssh
parent98a04f539096732bf5d7236f5857125200e20df4 (diff)
Use the public libssh that's now available.
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/Makefile4
-rw-r--r--usr.bin/ssh/Makefile.inc9
-rw-r--r--usr.bin/ssh/libssh/Makefile29
3 files changed, 5 insertions, 37 deletions
diff --git a/usr.bin/ssh/Makefile b/usr.bin/ssh/Makefile
index 508c5ae149f..40244d4d468 100644
--- a/usr.bin/ssh/Makefile
+++ b/usr.bin/ssh/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2004/05/16 09:53:10 lukem Exp $
+# $NetBSD: Makefile,v 1.20 2005/01/03 06:04:08 lukem Exp $
.include <bsd.own.mk>
SSHDIST?= ${NETBSDSRCDIR}/crypto/dist/ssh
-SUBDIR= libssh .WAIT ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
+SUBDIR= ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
ssh-keysign ssh-keyscan sftp
#SUBDIR+=scard
diff --git a/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc
index 04686ff748b..d47f79a5b20 100644
--- a/usr.bin/ssh/Makefile.inc
+++ b/usr.bin/ssh/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2002/09/18 14:00:41 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.7 2005/01/03 06:04:08 lukem Exp $
.include <bsd.own.mk>
@@ -7,11 +7,8 @@ SSHDIST?= ${NETBSDSRCDIR}/crypto/dist/ssh
CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP
.PATH: ${SSHDIST}
-.if defined(PROG)
-LIBSSHOBJDIR != cd ${.CURDIR}/../libssh && ${PRINTOBJDIR}
-LDADD+= -L${LIBSSHOBJDIR} -lssh
-DPADD+= ${LIBSSHOBJDIR}/libssh.a
-.endif
+LDADD+= -lssh -lcrypto -lz
+DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
.if exists(${.CURDIR}/../../Makefile.inc)
.include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.bin/ssh/libssh/Makefile b/usr.bin/ssh/libssh/Makefile
deleted file mode 100644
index 9bc22b92297..00000000000
--- a/usr.bin/ssh/libssh/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2004/05/23 02:24:51 lukem Exp $
-
-MKPRIVATELIB= yes
-
-.include <bsd.own.mk>
-
-# Prevent recursion.
-LIBSSHOBJDIR=${.OBJDIR}
-
-LIB= ssh
-SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
- cipher.c compat.c compress.c crc32.c deattack.c fatal.c \
- hostfile.c log.c match.c mpaux.c nchan.c packet.c readpass.c \
- rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
- key.c dispatch.c kex.c mac.c uuencode.c misc.c \
- rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
- kexdhc.c kexgexc.c scard.c msg.c progressmeter.c
-SRCS+= random.c
-SRCS+= readpassphrase.c getpeereid.c
-
-.if (${USE_KERBEROS} != "no")
-CPPFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/krb5
-.if (${USE_KERBEROS4} != "no")
-SRCS+= radix.c
-CPPFLAGS+= -DKRB4 -DAFS -I${DESTDIR}/usr/include/kerberosIV
-.endif # ${USE_KERBEROS4} != "no"
-.endif # ${USE_KERBEROS} != "no"
-
-.include <bsd.lib.mk>