diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | ee7b0571c2c18bdec848ed2044223cc88db29bd8 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /libexec/telnetd | |
| parent | ffda191e301f128a62c152fde92b692548367fca (diff) | |
| parent | 15fc2873832ea5b9b639e701bbbf2e73af8b6a88 (diff) | |
Notes
Diffstat (limited to 'libexec/telnetd')
| -rw-r--r-- | libexec/telnetd/Makefile | 9 | ||||
| -rw-r--r-- | libexec/telnetd/Makefile.depend | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 99f023f263f2..f80bf5c92dc1 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -20,6 +20,8 @@ WFORMAT?= 0 CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ -DENV_HACK -DSTREAMSPTY +NO_PIE= yes + .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif @@ -28,11 +30,9 @@ CFLAGS+= -I${TELNETDIR} LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} -LDADD= -lutil -ltermcap ${LIBTELNET} +DPADD= ${LIBUTIL} ${LIBTERMCAPW} ${LIBTELNET} +LDADD= -lutil -ltermcapw ${LIBTELNET} -# XXX for src/release/picobsd -.if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION @@ -45,6 +45,5 @@ CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} LDADD+= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err .endif -.endif .include <bsd.prog.mk> diff --git a/libexec/telnetd/Makefile.depend b/libexec/telnetd/Makefile.depend index e2ee38e3ec48..ccb80ea92119 100644 --- a/libexec/telnetd/Makefile.depend +++ b/libexec/telnetd/Makefile.depend @@ -25,7 +25,6 @@ DIRDEPS = \ lib/libtelnet \ lib/libthr \ lib/libutil \ - lib/ncurses/ncurses \ lib/ncurses/ncursesw \ secure/lib/libcrypto \ |