diff options
| author | ru <ru@FreeBSD.org> | 2001-03-28 12:08:22 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2001-03-28 12:08:22 +0000 |
| commit | 98c6ecb383b916a560f33c7ea2a31eef6a9a408e (patch) | |
| tree | e2334cdc0acdb67f74fc23b4d48794daac1dfb9b /secure | |
| parent | 79cf991a6bd845fad54bd6a15892cb5aaf74b223 (diff) | |
| download | FreeBSD-src-98c6ecb383b916a560f33c7ea2a31eef6a9a408e.zip FreeBSD-src-98c6ecb383b916a560f33c7ea2a31eef6a9a408e.tar.gz | |
Bye-bye /usr/lib/libtelnet.a. This should fix ``make release'' brokeness.
Approved by: markm
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/Makefile.inc | 5 | ||||
| -rw-r--r-- | secure/lib/libtelnet/Makefile | 6 | ||||
| -rw-r--r-- | secure/libexec/telnetd/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/telnet/Makefile | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/secure/Makefile.inc b/secure/Makefile.inc index ca5d1f4..9770b35 100644 --- a/secure/Makefile.inc +++ b/secure/Makefile.inc @@ -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 diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile index 23a0d0e..10760d5 100644 --- a/secure/lib/libtelnet/Makefile +++ b/secure/lib/libtelnet/Makefile @@ -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 diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile index 20ec331..7dffb39 100644 --- a/secure/libexec/telnetd/Makefile +++ b/secure/libexec/telnetd/Makefile @@ -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> diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile index 0e9db53..3e6aae2 100644 --- a/secure/usr.bin/telnet/Makefile +++ b/secure/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} ${LIBCRYPT} ${LIBMP} DPADD+= ${LIBIPSEC} -LDADD= -ltermcap -ltelnet -lcrypto -lcrypt -lmp +LDADD= -ltermcap ${LIBTELNET} -lcrypto -lcrypt -lmp LDADD+= -lipsec .include <bsd.prog.mk> |
