summaryrefslogtreecommitdiffstats
path: root/secure/usr.bin
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2002-02-08 13:42:58 +0000
committerru <ru@FreeBSD.org>2002-02-08 13:42:58 +0000
commitb2c3dc0715238f31354d912c83694da380a31203 (patch)
tree4229aedf5ee097d57159ca1b7a081818d45f1656 /secure/usr.bin
parent7a2afc75f215681c8a4505f180094c95cf618771 (diff)
downloadFreeBSD-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/usr.bin')
-rw-r--r--secure/usr.bin/scp/Makefile4
-rw-r--r--secure/usr.bin/sftp/Makefile4
-rw-r--r--secure/usr.bin/ssh-add/Makefile4
-rw-r--r--secure/usr.bin/ssh-agent/Makefile4
-rw-r--r--secure/usr.bin/ssh-keygen/Makefile4
-rw-r--r--secure/usr.bin/ssh-keyscan/Makefile4
6 files changed, 12 insertions, 12 deletions
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>
OpenPOWER on IntegriCloud