diff options
| author | markm <markm@FreeBSD.org> | 2000-02-24 18:59:34 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2000-02-24 18:59:34 +0000 |
| commit | ef025b40abfbf8549aa93743f5197893d1fa8bb4 (patch) | |
| tree | 4948b3b7ba051123b6a4dc394e76281aa3cf7657 /secure/usr.bin | |
| parent | 1f38e33d22f859166f6995f4fa28d9574458e156 (diff) | |
| download | FreeBSD-src-ef025b40abfbf8549aa93743f5197893d1fa8bb4.zip FreeBSD-src-ef025b40abfbf8549aa93743f5197893d1fa8bb4.tar.gz | |
Build everything properly. This means:
o Don't b uild libdes.
o Crypto is now housed in libcrypto (with a compatability symlink to
libdes)
o RSA may depend on RSAREF at your locale.
o OpenSSH is now a part of the base system.
Diffstat (limited to 'secure/usr.bin')
| -rw-r--r-- | secure/usr.bin/Makefile | 5 | ||||
| -rw-r--r-- | secure/usr.bin/telnet/Makefile | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile index 5f431e1..3d284da 100644 --- a/secure/usr.bin/Makefile +++ b/secure/usr.bin/Makefile @@ -1,11 +1,14 @@ # $FreeBSD$ SUBDIR= bdes -.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) +.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5) SUBDIR+=telnet .endif .if !defined(NO_OPENSSL) SUBDIR+=openssl .endif +.if !defined(NO_OPENSSH) +SUBDIR+=scp ssh ssh-add ssh-agent ssh-keygen +.endif .include <bsd.subdir.mk> diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile index f0db4cb..b59da7a 100644 --- a/secure/usr.bin/telnet/Makefile +++ b/secure/usr.bin/telnet/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD$ PROG= telnet @@ -9,9 +9,9 @@ CFLAGS+= -DIPSEC -DINET6 SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ telnet.c terminal.c tn3270.c utilities.c -DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBCRYPT} ${LIBMP} +DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMP} DPADD+= ${LIBIPSEC} -LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes -lcrypt -lmp +LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto -lcrypt -lmp LDADD+= -lipsec .include <bsd.prog.mk> |
