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 /secure | |
| 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 'secure')
| -rw-r--r-- | secure/lib/libssh/Makefile | 3 | ||||
| -rw-r--r-- | secure/libexec/sftp-server/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/scp/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/sftp/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-add/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-agent/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-keygen/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-keyscan/Makefile | 4 |
8 files changed, 17 insertions, 14 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 61ae9d1..47c8417 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -24,6 +24,9 @@ CFLAGS+= -DKRB4 CFLAGS+= -DKRB5 .endif # MAKE_KERBEROS5 +DPADD= ${LIBCRYPTO} ${LIBZ} +LDADD= -lcrypto -lz + .include <bsd.lib.mk> .PATH: ${SSHDIR} ${SSHDIR}/lib diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index d2c6c85..c527ccf 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -5,8 +5,8 @@ PROG= sftp-server SRCS= sftp-server.c sftp-common.c MAN= sftp-server.8 -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index d26a2a2..56fcb91 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -4,8 +4,8 @@ PROG= scp SRCS= scp.c scp-common.c -LDADD+= -lssh -lcrypto -lutil -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} +DPADD= ${LIBSSH} +LDADD= -lssh .include <bsd.prog.mk> diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index f21e5a2..6430035 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -4,8 +4,8 @@ PROG= sftp SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c scp-common.c -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto +DPADD= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 16bb787..ad55bda 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -4,8 +4,8 @@ PROG= ssh-add SRCS= ssh-add.c -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 6187604..eb2ad98 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -4,8 +4,8 @@ PROG= ssh-agent SRCS= ssh-agent.c -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 3145c3f..722ccf9 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -4,8 +4,8 @@ PROG= ssh-keygen SRCS= ssh-keygen.c -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index ad9a276..994b569 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -4,8 +4,8 @@ PROG= ssh-keyscan SRCS= ssh-keyscan.c -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> |
