d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bye-bye /usr/lib/libtelnet.a. This should fix ``make release'' brokeness.

Browse Source 
Approved by:	markm
This commit is contained in:
ru 2001-03-28 12:08:22 +00:00
parent 79cf991a6b
commit 98c6ecb383
15 changed files with 49 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kerberos5/lib/libtelnet/Makefile
View File

@ -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

2
kerberos5/libexec/telnetd/Makefile
View File

@ -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>

2
kerberos5/usr.bin/telnet/Makefile
View File

@ -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>

4
kerberosIV/Makefile.inc
View File

@ -64,9 +64,9 @@ SLOBJDIR= ${.CURDIR}/../../lib/libsl
.endif
.if exists(${.OBJDIR}/../../lib/libtelnet)
TELNETOBJDIR= ${.OBJDIR}/../../lib/libtelnet
LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a
.else
TELNETOBJDIR= ${.CURDIR}/../../lib/libtelnet
LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a
.endif
CFLAGS+= -I${.CURDIR}/../../include -Wall -DHAVE_CONFIG_H \

9
kerberosIV/lib/libtelnet/Makefile
View File

@ -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

2
kerberosIV/libexec/telnetd/Makefile
View File

@ -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>

2
kerberosIV/usr.bin/telnet/Makefile
View File

@ -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>

6
lib/libtelnet/Makefile
View File

@ -2,9 +2,13 @@
# $FreeBSD$
LIB= telnet
INTERNALLIB=yes
INTERNALSTATICLIB=yes
NOPIC= yes
SRCS= genget.c getent.c misc.c
CFLAGS+= -DHAS_CGETENT
NOPIC= true
#
# Remove obsolete shared libraries, if any. We don't bother moving them

9
libexec/telnetd/Makefile
View File

@ -9,8 +9,15 @@ CFLAGS+=-I${.CURDIR}/../../lib
CFLAGS+=-DINET6
SRCS= global.c slc.c state.c sys_term.c telnetd.c \
termstat.c utility.c
.if exists(${.OBJDIR}/../../lib/libtelnet)
LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a
.else
LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a
.endif
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
LDADD= -lutil -ltermcap -ltelnet
LDADD= -lutil -ltermcap ${LIBTELNET}
MAN= telnetd.8
.include <bsd.prog.mk>

5
secure/Makefile.inc
View File

@ -3,6 +3,11 @@
DISTRIBUTION?=crypto
TELNETDIR= ${.CURDIR}/../../../crypto/telnet
.if exists(${.OBJDIR}/../../lib/libtelnet)
LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a
.else
LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a
.endif
.if exists(${.CURDIR}/../../lib/libcrypt/obj)
CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj

6
secure/lib/libtelnet/Makefile
View File

@ -2,14 +2,16 @@
LIB= telnet
INTERNALLIB= yes
INTERNALSTATICLIB=yes
NOPIC= yes
SRCS= genget.c getent.c misc.c encrypt.c auth.c \
enc_des.c pk.c
CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
-I${TELNETDIR}
NOPIC= yes
INCS= ${TELNETDIR}/arpa/telnet.h
INCDIR= /usr/include/arpa

2
secure/libexec/telnetd/Makefile
View File

@ -15,7 +15,7 @@ SRCS= global.c slc.c state.c sys_term.c telnetd.c \
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBMP} \
${LIBCRYPT}
LDADD= -lutil -ltermcap -ltelnet -lcrypto -lcrypt -lmp
LDADD= -lutil -ltermcap ${LIBTELNET} -lcrypto -lcrypt -lmp
.include <bsd.prog.mk>

2
secure/usr.bin/telnet/Makefile
View File

@ -11,7 +11,7 @@ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMP}
DPADD+= ${LIBIPSEC}
LDADD= -ltermcap -ltelnet -lcrypto -lcrypt -lmp
LDADD= -ltermcap ${LIBTELNET} -lcrypto -lcrypt -lmp
LDADD+= -lipsec
.include <bsd.prog.mk>

1
share/mk/bsd.libnames.mk
View File

@ -89,7 +89,6 @@ LIBSS?= ${DESTDIR}${LIBDIR}/libss.a
LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a # XXX in secure dist, not base
LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a
LIBTACPLUS?= ${DESTDIR}${LIBDIR}/libtacplus.a
LIBTELNET?= ${DESTDIR}${LIBDIR}/libtelnet.a
LIBTERMCAP?= ${DESTDIR}${LIBDIR}/libtermcap.a
LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP"
LIBUTIL?= ${DESTDIR}${LIBDIR}/libutil.a

8
usr.bin/telnet/Makefile
View File

@ -41,8 +41,14 @@ CFLAGS+=-DENV_HACK
CFLAGS+=-DSKEY
CFLAGS+=-I${.CURDIR}/../../lib
.if exists(${.OBJDIR}/../../lib/libtelnet)
LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a
.else
LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a
.endif
DPADD= ${LIBTERMCAP} ${LIBTELNET}
LDADD= -ltermcap -ltelnet
LDADD= -ltermcap ${LIBTELNET}
.if !defined(RELEASE_CRUNCH)
CFLAGS+=-DINET6