diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-06-06 16:13:07 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-06-06 16:13:07 +0000 |
| commit | 32f80c77d0ac829da7dc50356410c269596bc171 (patch) | |
| tree | fc0d891fb78693b9d28a32724c77136823e79d08 /secure/usr.bin | |
| parent | 463d4f50933728c5abbf54c62b42e4c859e91f42 (diff) | |
| download | src-32f80c77d0ac829da7dc50356410c269596bc171.tar.gz src-32f80c77d0ac829da7dc50356410c269596bc171.zip | |
Make libssh an INTERNALLIB like it is in {Net,Open}BSD.
Notes
Notes:
svn path=/head/; revision=147056
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, 22 insertions, 10 deletions
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index d6d5abafc383..f0512e9782a2 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a + PROG= scp CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +LDADD= ${LIBSSH} -lcrypt -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 08512e860457..1af7d8264da8 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -1,11 +1,13 @@ # $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= -lssh -lcrypt -lcrypto -lz -ledit +LDADD= ${LIBSSH} -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 2716a62ed5b3..5d091c2abeb5 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a + PROG= ssh-add CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +LDADD= ${LIBSSH} -lcrypt -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 2f88a6d969c5..9aa20844d868 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a + PROG= ssh-agent CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +LDADD= ${LIBSSH} -lcrypt -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 5dc86992ec96..b8a4cc170330 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a + PROG= ssh-keygen CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +LDADD= ${LIBSSH} -lcrypt -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index 1c5ab3ed6b80..f4f59ed80259 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a + PROG= ssh-keyscan CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +LDADD= ${LIBSSH} -lcrypt -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 274e481e23f7..403ee767133a 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ -# + +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a PROG= ssh CFLAGS+=-I${SSHDIR} @@ -8,11 +9,10 @@ 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 \ - gss-genr.c + sshconnect.c sshconnect1.c sshconnect2.c DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} -LDADD= -lssh -lutil -lz +LDADD= ${LIBSSH} -lutil -lz .if !defined(NO_KERBEROS) CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL |