diff options
author | ru <ru@FreeBSD.org> | 2002-02-08 13:42:58 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2002-02-08 13:42:58 +0000 |
commit | b2c3dc0715238f31354d912c83694da380a31203 (patch) | |
tree | 4229aedf5ee097d57159ca1b7a081818d45f1656 /Makefile.inc1 | |
parent | 7a2afc75f215681c8a4505f180094c95cf618771 (diff) | |
download | FreeBSD-src-b2c3dc0715238f31354d912c83694da380a31203.zip FreeBSD-src-b2c3dc0715238f31354d912c83694da380a31203.tar.gz |
Now that cross-tools ld(1) has been fixed to look for dynamic
dependencies in the correct place, record the fact that -lssh
depends on -lcrypto and -lz.
Removed false dependencies on -lz (except ssh(1) and sshd(8)).
Removed false dependencies on -lcrypto and -lutil for scp(1).
Reviewed by: markm
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 6c104d4..d263006 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -731,6 +731,7 @@ includes: # librpcsvc libtacplus libutil libz libssh # libradius: libmd # libreadline: libncurses +# libssh: libcrypto libz # libstc++: msun # libtacplus: libmd # @@ -740,7 +741,7 @@ includes: # kerberosIV/lib kerberos5/lib: lib/libcrypt # lib/libpam: secure/lib/libcrypto kerberosIV/lib/libkrb \ # secure/lib/libssh lib/libz -# secure/lib: lib/libmd +# secure/lib: secure/lib/libcrypto lib/libmd lib/libz # .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}.pcc) _csu= lib/csu/${MACHINE_ARCH}.pcc @@ -750,8 +751,11 @@ _csu= lib/csu/i386-elf _csu= lib/csu/${MACHINE_ARCH} .endif -.if !defined(NOSECURE) && !defined(NOCRYPT) +.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) _secure_lib= secure/lib +.if exists(${.CURDIR}/secure/lib/libcrypto) +_libcrypto= secure/lib/libcrypto +.endif .endif .if !defined(NOCRYPT) && defined(MAKE_KERBEROS4) @@ -772,10 +776,10 @@ _libperl= gnu/usr.bin/perl/libperl libraries: .for _lib in ${_csu} gnu/lib/csu gnu/lib/libgcc lib/libmd lib/libcrypt \ - ${_secure_lib} ${_kerberosIV_lib} \ + lib/libz ${_libcrypto} ${_secure_lib} ${_kerberosIV_lib} \ ${_kerberos5_lib} lib/libcom_err lib/libkvm lib/msun lib/libncurses \ lib/libopie lib/libradius lib/librpcsvc lib/libsbuf lib/libtacplus \ - lib/libutil lib/libz lib gnu/lib ${_libperl} usr.bin/lex/lib ${_libkeycap} + lib/libutil lib gnu/lib ${_libperl} usr.bin/lex/lib ${_libkeycap} .if exists(${.CURDIR}/${_lib}) cd ${.CURDIR}/${_lib}; \ ${MAKE} depend; \ |