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 /kerberosIV | |
| 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 'kerberosIV')
| -rw-r--r-- | kerberosIV/Makefile.inc | 4 | ||||
| -rw-r--r-- | kerberosIV/lib/libtelnet/Makefile | 9 | ||||
| -rw-r--r-- | kerberosIV/libexec/telnetd/Makefile | 2 | ||||
| -rw-r--r-- | kerberosIV/usr.bin/telnet/Makefile | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc index 76e4198..e415792 100644 --- a/kerberosIV/Makefile.inc +++ b/kerberosIV/Makefile.inc @@ -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 \ diff --git a/kerberosIV/lib/libtelnet/Makefile b/kerberosIV/lib/libtelnet/Makefile index d6f4031..35e936e 100644 --- a/kerberosIV/lib/libtelnet/Makefile +++ b/kerberosIV/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/kerberosIV/libexec/telnetd/Makefile b/kerberosIV/libexec/telnetd/Makefile index 996add4..6b35fa4 100644 --- a/kerberosIV/libexec/telnetd/Makefile +++ b/kerberosIV/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/kerberosIV/usr.bin/telnet/Makefile b/kerberosIV/usr.bin/telnet/Makefile index e3c97f5..8189235 100644 --- a/kerberosIV/usr.bin/telnet/Makefile +++ b/kerberosIV/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> |
