From 4e8be68394d0781d567c571a3bcf95ead02ac780 Mon Sep 17 00:00:00 2001 From: ru Date: Wed, 30 Apr 2003 07:51:51 +0000 Subject: Most things depend on !defined(NO_OPENSSL); make it look so. --- secure/lib/Makefile | 6 +++--- secure/libexec/Makefile | 11 +++++++---- secure/usr.bin/Makefile | 6 +++--- 3 files changed, 13 insertions(+), 10 deletions(-) (limited to 'secure') diff --git a/secure/lib/Makefile b/secure/lib/Makefile index 48121bd..9c8856d 100644 --- a/secure/lib/Makefile +++ b/secure/lib/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ SUBDIR= libcipher -.if !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5) -SUBDIR+=libtelnet -.endif .if !defined(NO_OPENSSL) SUBDIR+=libcrypto libssl .if !defined(NO_OPENSSH) SUBDIR+=libssh .endif +.if !defined(MAKE_KERBEROS5) +SUBDIR+=libtelnet +.endif .endif .include diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile index 16f8b89..5a3f79d 100644 --- a/secure/libexec/Makefile +++ b/secure/libexec/Makefile @@ -1,10 +1,13 @@ # $FreeBSD$ -.if !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5) -SUBDIR= telnetd -.endif -.if !defined(NO_OPENSSL) && !defined(NO_OPENSSH) +SUBDIR= +.if !defined(NO_OPENSSL) +.if !defined(NO_OPENSSH) SUBDIR+=sftp-server ssh-keysign .endif +.if !defined(MAKE_KERBEROS5) +SUBDIR+=telnetd +.endif +.endif .include diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile index 6be66f4..a6bf02b 100644 --- a/secure/usr.bin/Makefile +++ b/secure/usr.bin/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ SUBDIR= bdes -.if !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5) -SUBDIR+=telnet -.endif .if !defined(NO_OPENSSL) SUBDIR+=openssl .if !defined(NO_OPENSSH) SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan .endif +.if !defined(MAKE_KERBEROS5) +SUBDIR+=telnet +.endif .endif .include -- cgit v1.1