===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- src/usr.bin/telnet/Makefile	2002/05/11 00:20:20	1.17
+++ src/usr.bin/telnet/Makefile	2003/05/14 01:46:51	1.18
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2002/05/11 00:20:20 espie Exp $
+#	$OpenBSD: Makefile,v 1.18 2003/05/14 01:46:51 hin Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -37,25 +37,31 @@
 PROG=	telnet
 
 CFLAGS+=-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY -Dunix
-CFLAGS+=-I${.CURDIR}/../../lib
-LDADD+=	-lcurses -ltelnet
-DPADD=	${LIBCURSES} ${LIBTELNET}
+CFLAGS+=-I${.CURDIR}/../../libexec/telnetd
+CFLAGS+= -DHAS_CGETENT -Wall -Wno-unused
+LDADD+=	-lcurses
+DPADD=	${LIBCURSES}
 
 SRCS=	authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
-	terminal.c tn3270.c utilities.c
+	terminal.c tn3270.c utilities.c auth.c encrypt.c genget.c getent.c \
+	misc.c
 
+.PATH:	${.CURDIR}/../../libexec/telnetd
+
 .include <bsd.own.mk> # for KERBEROS
 
 .if (${KERBEROS5:L} == "yes")
-CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB5
+CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB5 -DDES_ENCRYPTION
 LDADD+= -lkrb5 -lasn1 -lcrypto -lcom_err -lkafs -ldes
 DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBDES}
+SRCS+= kerberos5.c enc_des.c
 .endif
 
 .if (${KERBEROS:L} == "yes")
-CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB4
+CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB4 -DDES_ENCRYPTION
 LDADD+= -lkrb -lcrypto -ldes
 DPADD+= ${LIBDES} ${LIBKRB} ${LIBDES}
+SRCS+= kerberos.c
 .endif
 
 .include <bsd.prog.mk>