diff options
| author | imp <imp@FreeBSD.org> | 2014-06-06 04:09:07 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-06-06 04:09:07 +0000 |
| commit | 0ed032933fe4bf3f047df5412d8df4df9da9c4d3 (patch) | |
| tree | 59c8f747159b3db5af5ad9aa0b3246c6c9382ff5 /libexec | |
| parent | 76945251893ff381099d670ad70698e1b0d67285 (diff) | |
| download | FreeBSD-src-0ed032933fe4bf3f047df5412d8df4df9da9c4d3.zip FreeBSD-src-0ed032933fe4bf3f047df5412d8df4df9da9c4d3.tar.gz | |
When building picobsd, define WITHOUT_OPENSSL and WITHOUT_KERBEROS and
remove the now-redundant checks for RELEASE_CRUNCH. This originally
was defined for building smaller sysinstall images, but was later also
used by picobsd builds for a similar purpose. Now that we've moved
away from sysinstall, picobsd is the only remaining consumer of this
interface. Adding these two options reduces the RELEASE_CRUNCH
special cases in the tree by half.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/telnetd/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 99f023f..4300d0d 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -31,8 +31,6 @@ LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap ${LIBTELNET} -# XXX for src/release/picobsd -.if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION @@ -45,6 +43,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> |
