diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2003-04-30 07:51:51 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2003-04-30 07:51:51 +0000 |
| commit | 6402d39a2b8ca834010410a4de65148adf1a93a6 (patch) | |
| tree | f10a04dba748614dae62d71bc6fe45838eb74f60 /secure | |
| parent | bce0c9275c90f81acd79138fe4df4b842f254080 (diff) | |
| download | src-6402d39a2b8ca834010410a4de65148adf1a93a6.tar.gz src-6402d39a2b8ca834010410a4de65148adf1a93a6.zip | |
Most things depend on !defined(NO_OPENSSL); make it look so.
Notes
Notes:
svn path=/head/; revision=114282
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/Makefile | 6 | ||||
| -rw-r--r-- | secure/libexec/Makefile | 11 | ||||
| -rw-r--r-- | secure/usr.bin/Makefile | 6 |
3 files changed, 13 insertions, 10 deletions
diff --git a/secure/lib/Makefile b/secure/lib/Makefile index 48121bdee4ae..9c8856dcaab5 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 <bsd.subdir.mk> diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile index 16f8b8956fec..5a3f79d1e69d 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 <bsd.subdir.mk> diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile index 6be66f42affe..a6bf02b79fcb 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 <bsd.subdir.mk> |