summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2003-07-24 17:19:15 +0000
committermarkm <markm@FreeBSD.org>2003-07-24 17:19:15 +0000
commitc26205b55380c77b3e0a6f931ada7b68540fa6ae (patch)
tree4aede763ad1e0ecffe02367798b914ca9b6322ea
parente2309e4ab442a9dc22c48a838ceb818a964f1dbc (diff)
downloadFreeBSD-src-c26205b55380c77b3e0a6f931ada7b68540fa6ae.zip
FreeBSD-src-c26205b55380c77b3e0a6f931ada7b68540fa6ae.tar.gz
Make sure that a "make release" (more accurately the bit that makes
the crunched binary) get a non-cryptographic telnet. This is overkill in that it covers stuff that is not normally used in a crunched binary.
-rw-r--r--lib/libtelnet/Makefile2
-rw-r--r--libexec/telnetd/Makefile2
-rw-r--r--usr.bin/telnet/Makefile2
3 files changed, 6 insertions, 0 deletions
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 0339402..3d12f8a 100644
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@@ -13,6 +13,7 @@ CFLAGS+= -I${TELNETDIR}
WARNS?= 2
+.if !defined(RELEASE_CRUNCH)
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DISTRIBUTION= crypto
SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c
@@ -23,6 +24,7 @@ CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write
.endif
.endif
+.endif
INCS= ${TELNETDIR}/arpa/telnet.h
INCSDIR= ${INCLUDEDIR}/arpa
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 8a7e784..3390093 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -28,6 +28,7 @@ LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
LDADD= -lutil -ltermcap ${LIBTELNET}
+.if !defined(RELEASE_CRUNCH)
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DISTRIBUTION= crypto
SRCS+= authenc.c
@@ -40,5 +41,6 @@ DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR}
LDADD+= -lkrb5 -lasn1 -lroken -lcom_err
.endif
.endif
+.endif
.include <bsd.prog.mk>
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index cdb15a4..74ccd8a 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -30,6 +30,7 @@ SRCS+= genget.c getent.c misc.c
CFLAGS+= -DHAS_CGETENT
.endif
+.if !defined(RELEASE_CRUNCH)
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DISTRIBUTION= crypto
SRCS+= authenc.c
@@ -42,5 +43,6 @@ DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
LDADD+= -lkrb5 -lasn1 -lcom_err -lroken
.endif
.endif
+.endif
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud