diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /usr.bin/telnet | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
Diffstat (limited to 'usr.bin/telnet')
| -rw-r--r-- | usr.bin/telnet/Makefile | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index b88f8e1..a24a966 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -19,15 +19,11 @@ CFLAGS+= -DINET6 WARNS?= 2 -LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a - -DPADD= ${LIBTERMCAPW} ${LIBTELNET} -LDADD= -ltermcapw ${LIBTELNET} +LIBADD= telnet ncursesw .if !defined(RELEASE_CRUNCH) CFLAGS+= -DIPSEC -DPADD+= ${LIBIPSEC} -LDADD+= -lipsec +LIBADD+= ipsec .else .PATH: ${TELNETDIR}/libtelnet SRCS+= genget.c getent.c misc.c @@ -35,16 +31,14 @@ CFLAGS+= -DHAS_CGETENT .endif .if ${MK_OPENSSL} != "no" -SRCS+= authenc.c +SRCS+= authenc.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC -DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM} -LDADD+= -lmp -lcrypto -lcrypt -lipsec ${MINUSLPAM} +LIBADD+= mp crypto ipsec pam .endif .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write -DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} -LDADD+= -lkrb5 -lhx509 -lasn1 -lcom_err -lroken +LIBADD+= krb5 roken .endif .include <bsd.prog.mk> |
