mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
Bye-bye /usr/lib/libtelnet.a. This should fix ``make release'' brokeness.
Approved by: markm
This commit is contained in:
parent
1005a129e5
commit
4ecbb30346
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=74928
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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,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>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue