aboutsummaryrefslogtreecommitdiff
path: root/secure
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2002-06-24 12:32:30 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2002-06-24 12:32:30 +0000
commit360c9f6a02c9c547f1d2b62f44783823832aab9e (patch)
tree8602f078820c50bb3d13f90a2eaa48b82d484143 /secure
parent66ffb8a3710110244ecc099a83f14d44bdea5be4 (diff)
downloadsrc-360c9f6a02c9c547f1d2b62f44783823832aab9e.tar.gz
src-360c9f6a02c9c547f1d2b62f44783823832aab9e.zip
My previous style commits weren't entirely right. Fix some bugs I
introduced, and a few more I hadn't yet fixed. Submitted by: bde
Notes
Notes: svn path=/head/; revision=98749
Diffstat (limited to 'secure')
-rw-r--r--secure/usr.bin/scp/Makefile2
-rw-r--r--secure/usr.bin/sftp/Makefile3
-rw-r--r--secure/usr.bin/ssh-add/Makefile6
-rw-r--r--secure/usr.bin/ssh-agent/Makefile6
-rw-r--r--secure/usr.bin/ssh-keygen/Makefile6
-rw-r--r--secure/usr.bin/ssh-keyscan/Makefile6
-rw-r--r--secure/usr.bin/ssh-keysign/Makefile5
7 files changed, 11 insertions, 23 deletions
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index 0b92493866d3..2264e39795ec 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -1,8 +1,6 @@
# $FreeBSD$
-#
PROG= scp
-SRCS= scp.c
DPADD= ${LIBSSH}
LDADD= -lssh
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index 41d6224a3542..0f85afdccbc8 100644
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -1,11 +1,10 @@
# $FreeBSD$
-#
PROG= sftp
SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
-LDADD= -lssh -lcrypto
DPADD= ${LIBSSH} ${LIBCRYPTO}
+LDADD= -lssh -lcrypto
.include <bsd.prog.mk>
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
index dc39918c0c18..654057527804 100644
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -1,11 +1,9 @@
# $FreeBSD$
-#
PROG= ssh-add
-SRCS= ssh-add.c
-DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
-LDADD+= -lssh -lcrypto -lz
+DPADD= ${LIBSSH} ${LIBCRYPTO}
+LDADD= -lssh -lcrypto
.include <bsd.prog.mk>
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile
index 3925b99cc96a..c79fd24f805e 100644
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@@ -1,11 +1,9 @@
# $FreeBSD$
-#
PROG= ssh-agent
-SRCS= ssh-agent.c
-DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
-LDADD+= -lssh -lcrypto -lz
+DPADD= ${LIBSSH} ${LIBCRYPTO}
+LDADD= -lssh -lcrypto
.include <bsd.prog.mk>
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
index 0a5b86ac0f0d..99d1fb994106 100644
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -1,11 +1,9 @@
# $FreeBSD$
-#
PROG= ssh-keygen
-SRCS= ssh-keygen.c
-DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
-LDADD+= -lssh -lcrypto -lz
+DPADD= ${LIBSSH} ${LIBCRYPTO}
+LDADD= -lssh -lcrypto
.include <bsd.prog.mk>
diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile
index 7f65c74f0402..45e63d975f4a 100644
--- a/secure/usr.bin/ssh-keyscan/Makefile
+++ b/secure/usr.bin/ssh-keyscan/Makefile
@@ -1,11 +1,9 @@
# $FreeBSD$
-#
PROG= ssh-keyscan
-SRCS= ssh-keyscan.c
-DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
-LDADD+= -lssh -lcrypto -lz
+DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD= -lssh -lcrypto -lz
.include <bsd.prog.mk>
diff --git a/secure/usr.bin/ssh-keysign/Makefile b/secure/usr.bin/ssh-keysign/Makefile
index 9d9cf57b0861..0e1166b89861 100644
--- a/secure/usr.bin/ssh-keysign/Makefile
+++ b/secure/usr.bin/ssh-keysign/Makefile
@@ -1,11 +1,10 @@
# $FreeBSD$
-#
PROG= ssh-keysign
MAN= ssh-keysign.8
-DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
-LDADD+= -lssh -lcrypto -lz
+DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD= -lssh -lcrypto -lz
.include <bsd.prog.mk>