split client/server kex; only ssh-keygen needs uuencode.o;

only scp/sftp use progressmeter.o; ok djm@

diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index fedbe11..310666f 100644 (file)
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.93 2017/12/14 21:07:39 naddy Exp $
+#      $OpenBSD: Makefile,v 1.94 2018/01/08 15:15:36 markus Exp $
 
 .PATH:         ${.CURDIR}/..
 
@@ -12,14 +12,14 @@ SRCS+=      addrmatch.c atomicio.c authfd.c authfile.c bitmap.c bufaux.c \
        bufbn.c bufec.c buffer.c canohost.c chacha.c channels.c \
        cipher-chachapoly.c cipher.c compat.c crc32.c dh.c digest-openssl.c \
        dispatch.c dns.c ed25519.c fatal.c fe25519.c ge25519.c hash.c hmac.c \
-       hostfile.c kex.c kexc25519.c kexc25519c.c kexc25519s.c kexdh.c \
-       kexdhc.c kexdhs.c kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c \
+       hostfile.c kex.c kexc25519.c kexc25519s.c kexdh.c \
+       kexdhs.c kexecdh.c kexecdhs.c kexgex.c \
        kexgexs.c key.c krl.c log.c mac.c match.c misc.c monitor_fdpass.c \
-       msg.c nchan.c opacket.c packet.c poly1305.c progressmeter.c readpass.c \
+       msg.c nchan.c opacket.c packet.c poly1305.c readpass.c \
        sc25519.c smult_curve25519_ref.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c \
        ssh-pkcs11.c ssh-rsa.c sshbuf-getput-basic.c sshbuf-getput-crypto.c \
        sshbuf-misc.c sshbuf.c ssherr.c sshkey.c ttymodes.c uidswap.c umac.c \
-       umac128.c utf8.c uuencode.c verify.c xmalloc.c
+       umac128.c utf8.c verify.c xmalloc.c
 
 PROG=  sshd
 BINOWN=        root