Clean up makefiles, and turn on WARNS=2. Take into account the telnet

#if cleanup.

secure/lib/libtelnet/Makefile

@@ -9,8 +9,10 @@ NOPIC=		yes
 SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
 		enc_des.c sra.c pk.c
 
-CFLAGS+=	-DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
-		-DSRA -I${TELNETDIR}
+CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA \
+		-I${TELNETDIR} -I${TELNETDIR}/libtelnet
+
+WARNS?=		2
 
 INCS=		${TELNETDIR}/arpa/telnet.h
 INCDIR=		/usr/include/arpa

secure/libexec/telnetd/Makefile

@@ -6,12 +6,14 @@
 PROG=		telnetd
 MAN=		telnetd.8
 
+SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
+		termstat.c utility.c authenc.c
+
 CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
 		-DENV_HACK -DAUTHENTICATION -DENCRYPTION \
 		-I${TELNETDIR} -DINET6
 
-SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
-		termstat.c utility.c authenc.c
+WARNS?=		2
 
 DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
 		${LIBCRYPT} ${LIBPAM}

secure/usr.bin/telnet/Makefile

@@ -2,17 +2,19 @@
 
 PROG=		telnet
 
+SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
+		telnet.c terminal.c utilities.c
+
 CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \
 		-DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
-		-I${TELNETDIR}
+		-I${TELNETDIR} -I${TELNETDIR}/libtelnet/
 
-SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
-		telnet.c terminal.c tn3270.c utilities.c
+WARNS?=		2
 
-DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} \
-		${LIBIPSEC} ${LIBPAM}
-LDADD=		-ltermcap ${LIBTELNET} -lmp -lcrypto -lcrypt \
-		-lipsec ${MINUSLPAM}
+DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
+		${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
+LDADD=		-ltermcap ${LIBTELNET} -lmp \
+		-lcrypto -lcrypt -lipsec ${MINUSLPAM}
 
 .include <bsd.prog.mk>