scp should not link against kerberos stuff

6 files changed, 52 insertions, 16 deletions

diff --git a/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc
index 369896bf5bf..0be2a7ac5d7 100644
--- a/usr.bin/ssh/Makefile.inc
+++ b/usr.bin/ssh/Makefile.inc
@@ -1,14 +1 @@
 CFLAGS+=	-I${.OBJDIR} -I${.CURDIR}/..
-
-.include <bsd.own.mk> # for KERBEROS and AFS
-
-.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-add/Makefile b/usr.bin/ssh/ssh-add/Makefile
index 996d2075f73..0b974d4c9c8 100644
--- a/usr.bin/ssh/ssh-add/Makefile
+++ b/usr.bin/ssh/ssh-add/Makefile
@@ -12,3 +12,14 @@ 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
 
 .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 2dedb18cbcf..91f56f0a72e 100644
--- a/usr.bin/ssh/ssh-agent/Makefile
+++ b/usr.bin/ssh/ssh-agent/Makefile
@@ -12,3 +12,14 @@ SRCS=	ssh-agent.c log-client.c rsa.c buffer.c xmalloc.c bufaux.c \
 	authfd.c authfile.c mpaux.c cipher.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 5d07bf1edef..18a0e353c97 100644
--- a/usr.bin/ssh/ssh-keygen/Makefile
+++ b/usr.bin/ssh/ssh-keygen/Makefile
@@ -12,3 +12,14 @@ SRCS=	ssh-keygen.c log-client.c readpass.c rsa.c buffer.c \
 	xmalloc.c authfile.c mpaux.c bufaux.c cipher.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 c34bbe43fa2..aff0f091118 100644
--- a/usr.bin/ssh/ssh/Makefile
+++ b/usr.bin/ssh/ssh/Makefile
@@ -19,6 +19,17 @@ SRCS=	ssh.c sshconnect.c log-client.c readconf.c hostfile.c readpass.c \
 SRCS+=	radix.c
 .endif
 
+.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
+
 .include <bsd.prog.mk>
 
 LDADD+=	-lutil -lz -lcrypto
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index dc5c85b2cee..db22b53ed29 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -15,12 +15,17 @@ SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 .include <bsd.own.mk> # for KERBEROS and AFS
 
 .if (${KERBEROS} == "yes")
+CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
 SRCS+=	auth-krb4.c
-.endif
-
+LDADD+=	 -lkrb
+DPADD+=	 ${LIBKRB}
 .if (${AFS} == "yes")
 SRCS+=	radix.c
-.endif
+CFLAGS+= -DAFS
+LDADD+=  -lkafs
+DPADD+=  ${LIBKRBAFS}
+.endif # AFS
+.endif # KERBEROS
 
 .include <bsd.prog.mk>