From 9720b176d20fe95100c379a78e0563d88b67df2d Mon Sep 17 00:00:00 2001 From: des Date: Mon, 24 Jun 2002 12:32:30 +0000 Subject: 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 --- secure/usr.bin/scp/Makefile | 2 -- secure/usr.bin/sftp/Makefile | 3 +-- secure/usr.bin/ssh-add/Makefile | 6 ++---- secure/usr.bin/ssh-agent/Makefile | 6 ++---- secure/usr.bin/ssh-keygen/Makefile | 6 ++---- secure/usr.bin/ssh-keyscan/Makefile | 6 ++---- secure/usr.bin/ssh-keysign/Makefile | 5 ++--- 7 files changed, 11 insertions(+), 23 deletions(-) diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index 0b92493..2264e39 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 41d6224..0f85afd 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 diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index dc39918..6540575 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 diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 3925b99..c79fd24 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 diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 0a5b86a..99d1fb9 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 diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index 7f65c74..45e63d9 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 diff --git a/secure/usr.bin/ssh-keysign/Makefile b/secure/usr.bin/ssh-keysign/Makefile index 9d9cf57..0e1166b 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 -- cgit v1.1