diff options
| -rw-r--r-- | bin/rcp/Makefile | 4 | ||||
| -rw-r--r-- | libexec/login_krb5-or-pwd/Makefile | 5 | ||||
| -rw-r--r-- | libexec/login_krb5/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd/Makefile | 10 | ||||
| -rw-r--r-- | usr.bin/telnet/Makefile | 4 |
6 files changed, 16 insertions, 17 deletions
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile index ac55a1d66e2..20f27d3e804 100644 --- a/bin/rcp/Makefile +++ b/bin/rcp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2003/05/14 08:01:02 mho Exp $ +# $OpenBSD: Makefile,v 1.10 2003/07/16 19:10:13 deraadt Exp $ PROG= rcp SRCS= rcp.c util.c @@ -12,8 +12,8 @@ BINMODE=555 #.PATH: ${.CURDIR}/../../usr.bin/rsh #SRCS+= krcmd.c kcmd.c #CFLAGS+=-DKERBEROS -#LDADD+= -lkrb -ldes #DPADD+= ${LIBKRB} ${LIBDES} +#LDADD+= -lkrb -ldes #.endif .include <bsd.prog.mk> diff --git a/libexec/login_krb5-or-pwd/Makefile b/libexec/login_krb5-or-pwd/Makefile index c3305d2272d..bb6e533679b 100644 --- a/libexec/login_krb5-or-pwd/Makefile +++ b/libexec/login_krb5-or-pwd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2003/07/15 19:02:19 deraadt Exp $ +# $OpenBSD: Makefile,v 1.11 2003/07/16 19:10:14 deraadt Exp $ .include <bsd.own.mk> @@ -9,8 +9,7 @@ CFLAGS+=-DPASSWD -Wall -Werror -I${.CURDIR}/../login_passwd .if (${KERBEROS5:L} == "yes") SRCS+= login_krb5.c -DPADD+= ${LIBKRB} ${LIBCRYPTO} ${LIBUTIL} ${LIBKRB5} ${LIBKASN1} \ - ${LIBKAFS} ${LIBDES} +DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBUTIL} ${LIBDES} LDADD+= -lkrb5 -lasn1 -lcrypto -lutil -ldes CFLAGS+=-DKRB5 .PATH: ${.CURDIR}/../login_passwd ${.CURDIR}/../login_krb5 diff --git a/libexec/login_krb5/Makefile b/libexec/login_krb5/Makefile index b57534881b9..35e680db9ce 100644 --- a/libexec/login_krb5/Makefile +++ b/libexec/login_krb5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2003/07/15 19:02:19 deraadt Exp $ +# $OpenBSD: Makefile,v 1.15 2003/07/16 19:10:14 deraadt Exp $ .include <bsd.own.mk> @@ -10,7 +10,7 @@ CFLAGS+=-Wall -Werror -I${.CURDIR}/../login_passwd .if (${KERBEROS5:L} == "yes") SRCS+= login_krb5.c -DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBKRB} ${LIBCRYPTO} ${LIBKAFS} ${LIBDES} +DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBDES} LDADD+= -lkrb5 -lasn1 -lcrypto -ldes CFLAGS+=-DKRB5 .endif diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile index 60199a6f35f..8e015ad12bd 100644 --- a/usr.bin/ssh/ssh/Makefile +++ b/usr.bin/ssh/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.46 2003/07/15 19:02:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.47 2003/07/16 19:10:13 deraadt Exp $ .PATH: ${.CURDIR}/.. @@ -19,11 +19,11 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \ .if (${KERBEROS5:L} == "yes") CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV -LDADD+= -lkrb5 -lasn1 DPADD+= ${LIBKRB5} ${LIBASN1} +LDADD+= -lkrb5 -lasn1 .endif # KERBEROS5 .include <bsd.prog.mk> -LDADD+= -lcrypto -lz -ldes DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBDES} +LDADD+= -lcrypto -lz -ldes diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile index 3aa87db2e7a..234f9c310a2 100644 --- a/usr.bin/ssh/sshd/Makefile +++ b/usr.bin/ssh/sshd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.57 2003/07/15 19:02:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.58 2003/07/16 19:10:13 deraadt Exp $ .PATH: ${.CURDIR}/.. @@ -23,23 +23,23 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ .if (${KERBEROS5:L} == "yes") CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV SRCS+= auth-krb5.c auth2-krb5.c +DPADD+= ${LIBKRB5} ${LIBASN1} LDADD+= -lkrb5 -lasn1 -DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} .endif # KERBEROS5 .include <bsd.prog.mk> -LDADD+= -lcrypto -lutil -lz -ldes DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBDES} +LDADD+= -lcrypto -lutil -lz -ldes .if (${TCP_WRAPPERS:L} == "yes") CFLAGS+= -DLIBWRAP -LDADD+= -lwrap DPADD+= ${LIBWRAP} +LDADD+= -lwrap .endif #.if (${SKEY:L} == "yes") #CFLAGS+= -DSKEY -#LDADD+= -lskey #DPADD+= ${SKEY} +#LDADD+= -lskey #.endif diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index d6001abb1a7..8a02f5e5fb1 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2003/07/15 19:02:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.22 2003/07/16 19:10:14 deraadt Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -48,8 +48,8 @@ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ .if (${KERBEROS5:L} == "yes") CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB5 -DDES_ENCRYPTION -LDADD+= -lkrb5 -lasn1 -lcrypto -ldes DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBDES} +LDADD+= -lkrb5 -lasn1 -lcrypto -ldes SRCS+= kerberos5.c enc_des.c .endif |