9 files changed, 45 insertions, 57 deletions
diff --git a/usr.bin/ssh/Makefile b/usr.bin/ssh/Makefile
index ad7d0b53e6c..668900c3bdd 100644
--- a/usr.bin/ssh/Makefile
+++ b/usr.bin/ssh/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.4 1999/09/27 23:47:43 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 1999/10/25 20:27:26 markus Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR=	ssh sshd ssh-add ssh-keygen ssh-agent scp
+SUBDIR=	lib ssh sshd ssh-add ssh-keygen ssh-agent scp
 
 distribution:
 	install -C -o root -g wheel -m 0644 ${.CURDIR}/ssh_config \
diff --git a/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc
index b6d0347f032..fddf3da2feb 100644
--- a/usr.bin/ssh/Makefile.inc
+++ b/usr.bin/ssh/Makefile.inc
@@ -1 +1,11 @@
 CFLAGS+=	-I${.CURDIR}/..
+
+.include <bsd.obj.mk>
+
+.if exists(${.CURDIR}/../lib/${__objdir})
+LDADD+=         -L${.CURDIR}/../lib/${__objdir} -lssh
+DPADD+=         ${.CURDIR}/../lib/${__objdir}/libssh.a
+.else
+LDADD+=         -L${.CURDIR}/../lib -lssh
+DPADD+=         ${.CURDIR}/../lib/libssh.a
+.endif
diff --git a/usr.bin/ssh/lib/Makefile b/usr.bin/ssh/lib/Makefile
new file mode 100644
index 00000000000..e9416e07b64
--- /dev/null
+++ b/usr.bin/ssh/lib/Makefile
@@ -0,0 +1,26 @@
+.PATH:		${.CURDIR}/..
+
+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 hostfile.c \
+	match.c mpaux.c nchan.c packet.c readpass.c rsa.c tildexpand.c \
+	ttymodes.c uidswap.c xmalloc.c
+
+CFLAGS+= ${DEBUG}
+NOPROFILE= yes
+NOPIC=	yes
+
+install:
+	@echo -n
+
+.include <bsd.own.mk>
+
+.if (${KERBEROS} == "yes")
+CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
+.if (${AFS} == "yes")
+CFLAGS+= -DAFS
+SRCS+=  radix.c
+.endif # AFS
+.endif # KERBEROS
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/ssh/scp/Makefile b/usr.bin/ssh/scp/Makefile
index c473b29ea5b..3f59a9fd153 100644
--- a/usr.bin/ssh/scp/Makefile
+++ b/usr.bin/ssh/scp/Makefile
@@ -13,6 +13,6 @@ BINMODE?=555
 BINDIR=	/usr/bin
 MAN=	scp.1
 
-SRCS=	scp.c xmalloc.c
+SRCS=	scp.c
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/ssh/ssh-add/Makefile b/usr.bin/ssh/ssh-add/Makefile
index acca86d3b93..5940cc6da2a 100644
--- a/usr.bin/ssh/ssh-add/Makefile
+++ b/usr.bin/ssh/ssh-add/Makefile
@@ -13,20 +13,9 @@ BINMODE?=555
 BINDIR=	/usr/bin
 LDADD=	-lcrypto -lutil -lz
 DPADD=	${LIBCRYPTO} ${LIBDES} ${LIBUTIL} ${LIBZ}
+#MARKUS_DPADD
 MAN=	ssh-add.1
 
-SRCS=	ssh-add.c log-client.c readpass.c rsa.c buffer.c xmalloc.c \
-	bufaux.c authfd.c authfile.c mpaux.c cipher.c
+SRCS=	ssh-add.c log-client.c
 
 .include <bsd.prog.mk>
-
-.if (${KERBEROS} == "yes")
-CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
-LDADD+=	 -lkrb
-DPADD+=	 ${LIBKRB}
-.if (${AFS} == "yes")
-CFLAGS+= -DAFS
-LDADD+=  -lkafs
-DPADD+=  ${LIBKRBAFS}
-.endif # AFS
-.endif # KERBEROS
diff --git a/usr.bin/ssh/ssh-agent/Makefile b/usr.bin/ssh/ssh-agent/Makefile
index 0c9f10b0170..6e23e17ad55 100644
--- a/usr.bin/ssh/ssh-agent/Makefile
+++ b/usr.bin/ssh/ssh-agent/Makefile
@@ -15,18 +15,6 @@ LDADD=	-lcrypto -lutil -lz
 DPADD=	${LIBCRYPTO} ${LIBDES} ${LIBUTIL} ${LIBZ}
 MAN=	ssh-agent.1
 
-SRCS=	ssh-agent.c log-client.c rsa.c buffer.c xmalloc.c bufaux.c \
-	authfd.c authfile.c mpaux.c cipher.c
+SRCS=	ssh-agent.c log-client.c
 
 .include <bsd.prog.mk>
-
-.if (${KERBEROS} == "yes")
-CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
-LDADD+=	 -lkrb
-DPADD+=	 ${LIBKRB}
-.if (${AFS} == "yes")
-CFLAGS+= -DAFS
-LDADD+=  -lkafs
-DPADD+=  ${LIBKRBAFS}
-.endif # AFS
-.endif # KERBEROS
diff --git a/usr.bin/ssh/ssh-keygen/Makefile b/usr.bin/ssh/ssh-keygen/Makefile
index 68b99d65dd9..bcebd0a848a 100644
--- a/usr.bin/ssh/ssh-keygen/Makefile
+++ b/usr.bin/ssh/ssh-keygen/Makefile
@@ -15,18 +15,6 @@ LDADD=	-lcrypto -lutil -lz
 DPADD=	${LIBCRYPTO} ${LIBDES} ${LIBUTIL} ${LIBZ}
 MAN=	ssh-keygen.1
 
-SRCS=	ssh-keygen.c log-client.c readpass.c rsa.c buffer.c \
-	xmalloc.c authfile.c mpaux.c bufaux.c cipher.c
+SRCS=	ssh-keygen.c log-client.c
 
 .include <bsd.prog.mk>
-
-.if (${KERBEROS} == "yes")
-CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
-LDADD+=	 -lkrb
-DPADD+=	 ${LIBKRB}
-.if (${AFS} == "yes")
-CFLAGS+= -DAFS
-LDADD+=  -lkafs
-DPADD+=  ${LIBKRBAFS}
-.endif # AFS
-.endif # KERBEROS
diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile
index 7e32758ed6f..61a38add711 100644
--- a/usr.bin/ssh/ssh/Makefile
+++ b/usr.bin/ssh/ssh/Makefile
@@ -15,18 +15,10 @@ MAN=	ssh.1
 LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
 MLINKS=	ssh.1 slogin.1
 
-SRCS=	ssh.c sshconnect.c log-client.c readconf.c hostfile.c readpass.c \
-	tildexpand.c uidswap.c clientloop.c canohost.c rsa.c buffer.c \
-	packet.c xmalloc.c ttymodes.c channels.c bufaux.c authfd.c \
-	authfile.c crc32.c match.c mpaux.c cipher.c compress.c deattack.c\
-	nchan.c compat.c
+SRCS=	ssh.c sshconnect.c log-client.c readconf.c clientloop.c
 
 .include <bsd.own.mk> # for AFS
 
-.if (${AFS} == "yes")
-SRCS+=	radix.c
-.endif
-
 .if (${KERBEROS} == "yes")
 CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
 LDADD+=	 -lkrb
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index d24bd810c8f..15d6eec2554 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -7,11 +7,7 @@ BINDIR=	/usr/sbin
 MAN=	sshd.8
 
 SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
-	pty.c log-server.c login.c hostfile.c canohost.c servconf.c \
-	tildexpand.c uidswap.c serverloop.c rsa.c buffer.c packet.c \
-	xmalloc.c ttymodes.c channels.c bufaux.c authfd.c authfile.c \
-	crc32.c match.c mpaux.c cipher.c compress.c deattack.c \
-	nchan.c compat.c
+	pty.c log-server.c login.c servconf.c serverloop.c
 
 .include <bsd.own.mk> # for KERBEROS and AFS
 
@@ -21,7 +17,6 @@ SRCS+=	auth-krb4.c
 LDADD+=	 -lkrb
 DPADD+=	 ${LIBKRB}
 .if (${AFS} == "yes")
-SRCS+=	radix.c
 CFLAGS+= -DAFS
 LDADD+=  -lkafs
 DPADD+=  ${LIBKRBAFS}