diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2001-09-10 22:44:48 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2001-09-10 22:44:48 +0000 |
| commit | 4732b11b0b8b682862b6b0f26ae7137a44a4b22a (patch) | |
| tree | 0e20d61bf78d2648fdc102c08c2e0c717367cf02 /usr.bin/ssh | |
| parent | d79f512660f57dfb3e1ac866a1054aa2f453684a (diff) | |
link k5 before k4 (new binutils is more picky than old ld)
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/ssh/Makefile | 14 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd/Makefile | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile index ed21d26c8b9..c0011f98d94 100644 --- a/usr.bin/ssh/ssh/Makefile +++ b/usr.bin/ssh/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2001/06/28 02:32:32 hin Exp $ +# $OpenBSD: Makefile,v 1.36 2001/09/10 22:44:47 jason Exp $ .PATH: ${.CURDIR}/.. @@ -17,6 +17,12 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \ .include <bsd.own.mk> # for AFS +.if (${KERBEROS5:L} == "yes") +CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV +LDADD+= -lkrb5 -lasn1 -lcom_err +DPADD+= ${LIBKRB5} ${LIBASN1} +.endif # KERBEROS5 + .if (${KERBEROS:L} == "yes") CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV LDADD+= -lkrb @@ -28,12 +34,6 @@ DPADD+= ${LIBKRBAFS} .endif # AFS .endif # KERBEROS -.if (${KERBEROS5:L} == "yes") -CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV -LDADD+= -lkrb5 -lasn1 -lcom_err -DPADD+= ${LIBKRB5} ${LIBASN1} -.endif # KERBEROS5 - .include <bsd.prog.mk> LDADD+= -lcrypto -lz diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile index 3b2cc26b034..7085187a03f 100644 --- a/usr.bin/ssh/sshd/Makefile +++ b/usr.bin/ssh/sshd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.43 2001/06/28 02:33:43 hin Exp $ +# $OpenBSD: Makefile,v 1.44 2001/09/10 22:44:47 jason Exp $ .PATH: ${.CURDIR}/.. @@ -17,6 +17,13 @@ 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 (${KERBEROS5:L} == "yes") +CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV +SRCS+= auth-krb5.c +LDADD+= -lkrb5 -lkafs -lasn1 -lcom_err +DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} +.endif # KERBEROS5 + .if (${KERBEROS:L} == "yes") .if (${AFS:L} == "yes") CFLAGS+= -DAFS @@ -29,13 +36,6 @@ LDADD+= -lkrb DPADD+= ${LIBKRB} .endif # KERBEROS -.if (${KERBEROS5:L} == "yes") -CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV -SRCS+= auth-krb5.c -LDADD+= -lkrb5 -lkafs -lasn1 -lcom_err -DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} -.endif # KERBEROS5 - .include <bsd.prog.mk> LDADD+= -lcrypto -lutil -lz |