From acf4d74a74aa0f1012db9e79ec1b76b61ebc0a79 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Fri, 30 Nov 2001 21:12:31 +0000
Subject: [PATCH] Style clean-up, and diff-reduce WRT
src/secure/*/telnet/Makefile
---
kerberosIV/lib/libtelnet/Makefile | 19 ++++++++++++-------
kerberosIV/libexec/telnetd/Makefile | 12 ++++++++----
kerberosIV/usr.bin/telnet/Makefile | 19 ++++++++++++-------
3 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/kerberosIV/lib/libtelnet/Makefile b/kerberosIV/lib/libtelnet/Makefile
index 289918776cc6..068622f7f276 100644
--- a/kerberosIV/lib/libtelnet/Makefile
+++ b/kerberosIV/lib/libtelnet/Makefile
@@ -10,21 +10,26 @@ SRCS= genget.c getent.c misc.c encrypt.c auth.c \
enc_des.c sra.c pk.c
SRCS+= kerberos.c
-CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
- -DSRA -I${TELNETDIR}
+CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA -I${TELNETDIR}
CFLAGS+= -DKRB4 -I${KRB4DIR}/lib/krb
+WARNS?= 2
+
INCS= ${TELNETDIR}/arpa/telnet.h
INCDIR= /usr/include/arpa
+.include <bsd.lib.mk>
+
+.PATH: ${TELNETDIR}/libtelnet
+
#
# Remove obsolete shared libraries, if any. We don't bother moving them
# to /usr/lib/compat, since they were only used by telnet, telnetd and
# tn3270.
#
-beforeinstall:
+beforeinstall: __remove-stale-libs
+__remove-stale-libs: .PHONY
+.if exists(${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0)
+ -chflags noschg ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
-
-.include <bsd.lib.mk>
-
-.PATH: ${TELNETDIR}/libtelnet
+.endif
diff --git a/kerberosIV/libexec/telnetd/Makefile b/kerberosIV/libexec/telnetd/Makefile
index df8cccaa280b..ea0a03cae950 100644
--- a/kerberosIV/libexec/telnetd/Makefile
+++ b/kerberosIV/libexec/telnetd/Makefile
@@ -6,18 +6,22 @@
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
CFLAGS+= -DKRB4
-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} \
- ${LIBKRB} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBPAM}
+ ${LIBKRB} ${LIBCOM_ERR} \
+ ${LIBCRYPT} ${LIBPAM}
LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
- -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err ${MINUSLPAM}
+ -L${KRBOBJDIR} -lkrb -lcom_err \
+ -lcrypt ${MINUSLPAM}
.include <bsd.prog.mk>
diff --git a/kerberosIV/usr.bin/telnet/Makefile b/kerberosIV/usr.bin/telnet/Makefile
index 69f0e4f961de..fa8fd9d98a4d 100644
--- a/kerberosIV/usr.bin/telnet/Makefile
+++ b/kerberosIV/usr.bin/telnet/Makefile
@@ -2,18 +2,23 @@
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/
+
CFLAGS+= -DKRB4
-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} ${LIBKRB} \
- ${LIBCRYPT} ${LIBCOM_ERR} ${LIBIPSEC} ${LIBPAM}
-LDADD= -ltermcap ${LIBTELNET} -lmp -lcrypto \
- -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lipsec ${MINUSLPAM}
+DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
+ ${LIBKRB} ${LIBCOM_ERR} \
+ ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
+LDADD= -ltermcap ${LIBTELNET} -lmp \
+ -lkrb -lcom_err \
+ -lcrypto -lcrypt -lipsec ${MINUSLPAM}
.include <bsd.prog.mk>