diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-06-07 09:31:28 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-06-07 09:31:28 +0000 |
| commit | 40e0db94af1a56731b01e22a2cbe66c321f7c6fc (patch) | |
| tree | a0d1ecfa2e0da5d8fc4aeeacef320972cb332bf5 /secure/usr.bin | |
| parent | f395d8386ab0c2aa9aa9577bba01bc36fc30f8bc (diff) | |
Notes
Diffstat (limited to 'secure/usr.bin')
| -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 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 8 |
7 files changed, 10 insertions, 22 deletions
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index f0512e9782a2..d6d5abafc383 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -1,12 +1,10 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= scp CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz +LDADD= -lssh -lcrypt -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 1af7d8264da8..08512e860457 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -1,13 +1,11 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= sftp SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz -ledit +LDADD= -lssh -lcrypt -lcrypto -lz -ledit .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 5d091c2abeb5..2716a62ed5b3 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -1,12 +1,10 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= ssh-add CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz +LDADD= -lssh -lcrypt -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 9aa20844d868..2f88a6d969c5 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -1,12 +1,10 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= ssh-agent CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz +LDADD= -lssh -lcrypt -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index b8a4cc170330..5dc86992ec96 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -1,12 +1,10 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= ssh-keygen CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz +LDADD= -lssh -lcrypt -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index f4f59ed80259..1c5ab3ed6b80 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -1,12 +1,10 @@ # $FreeBSD$ -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a - PROG= ssh-keyscan CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= ${LIBSSH} -lcrypt -lcrypto -lz +LDADD= -lssh -lcrypt -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 403ee767133a..274e481e23f7 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ - -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a +# PROG= ssh CFLAGS+=-I${SSHDIR} @@ -9,10 +8,11 @@ MAN= ssh.1 ssh_config.5 MLINKS= ssh.1 slogin.1 SRCS= ssh.c readconf.c clientloop.c sshtty.c \ - sshconnect.c sshconnect1.c sshconnect2.c + sshconnect.c sshconnect1.c sshconnect2.c \ + gss-genr.c DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} -LDADD= ${LIBSSH} -lutil -lz +LDADD= -lssh -lutil -lz .if !defined(NO_KERBEROS) CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL |