From 98c6ecb383b916a560f33c7ea2a31eef6a9a408e Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Wed, 28 Mar 2001 12:08:22 +0000
Subject: Bye-bye /usr/lib/libtelnet.a.  This should fix ``make release''
 brokeness.

Approved by:	markm
---
 kerberos5/lib/libtelnet/Makefile   | 9 ++++++---
 kerberos5/libexec/telnetd/Makefile | 2 +-
 kerberos5/usr.bin/telnet/Makefile  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'kerberos5')

diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile
index d6f4031..35e936e 100644
--- a/kerberos5/lib/libtelnet/Makefile
+++ b/kerberos5/lib/libtelnet/Makefile
@@ -2,6 +2,10 @@
 
 LIB=		telnet
 
+INTERNALLIB=	yes
+INTERNALSTATICLIB=yes
+NOPIC=		yes
+
 SRCS=		genget.c getent.c misc.c encrypt.c auth.c kerberos.c \
 		enc_des.c pk.c sra.c
 
@@ -9,9 +13,8 @@ CFLAGS+=	-DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
 		-DKRB4 -DSRA -I${TELNETDIR} \
 		-I${KRB4DIR}/lib/krb
 
-NOPIC=		yes
-
-INCLUDES=	${TELNETDIR}/arpa/telnet.h 
+INCS=		${TELNETDIR}/arpa/telnet.h 
+INCDIR=		/usr/include/arpa
 
 #
 # Remove obsolete shared libraries, if any.  We don't bother moving them
diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile
index 996add4..6b35fa4 100644
--- a/kerberos5/libexec/telnetd/Makefile
+++ b/kerberos5/libexec/telnetd/Makefile
@@ -15,7 +15,7 @@ SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
 
 DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} \
 		${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=		-lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto \
+LDADD=		-lutil -ltermcap ${LIBTELNET} -lcrypto \
 		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile
index e3c97f5..8189235 100644
--- a/kerberos5/usr.bin/telnet/Makefile
+++ b/kerberos5/usr.bin/telnet/Makefile
@@ -11,7 +11,7 @@ SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
 
 DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} ${LIBCRYPT} \
 		${LIBCOM_ERR} ${LIBIPSEC}
-LDADD=		-ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto \
+LDADD=		-ltermcap ${LIBTELNET} -lcrypto \
 		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lipsec
 
 .include <bsd.prog.mk>
-- 
cgit v1.1