diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-03-14 18:54:29 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-03-14 18:54:29 +0000 |
| commit | 538354481ef7dbcd76ebc7334512a9d60994b84e (patch) | |
| tree | 7aa3dd8f24b6558f2ef57be4db6203ac91424ea3 /secure/usr.bin | |
| parent | 7d536dc855c85c15bf45f033d108a61b1f3cecc3 (diff) | |
| parent | 9580c0f7ce319d3e4e213faa40b59bd91c7b66ba (diff) | |
Notes
Diffstat (limited to 'secure/usr.bin')
| -rw-r--r-- | secure/usr.bin/scp/Makefile | 5 | ||||
| -rw-r--r-- | secure/usr.bin/sftp/Makefile | 5 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-add/Makefile | 5 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-agent/Makefile | 5 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-keygen/Makefile | 5 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-keyscan/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 3 |
7 files changed, 2 insertions, 28 deletions
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index ca00921f5e62f..34469a443287e 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -8,11 +8,6 @@ PACKAGE= ssh CFLAGS+=-I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h -.if !defined(NO_SHARED) -# required when linking with a dynamic libssh -SRCS+= roaming_dummy.c -.endif - LIBADD= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 4b1f24ebd9cad..249fef233d37c 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -8,11 +8,6 @@ PACKAGE= ssh CFLAGS+=-I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h -.if !defined(NO_SHARED) -# required when linking with a dynamic libssh -SRCS+= roaming_dummy.c -.endif - LIBADD= ssh edit .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 70feb8b00865d..acce73d3841da 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -8,11 +8,6 @@ PACKAGE= ssh CFLAGS+=-I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h -.if !defined(NO_SHARED) -# required when linking with a dynamic libssh -SRCS+= roaming_dummy.c -.endif - LIBADD= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 1e77d96ff0200..50eafa6ba6216 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -8,11 +8,6 @@ PACKAGE= ssh CFLAGS+=-I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h -.if !defined(NO_SHARED) -# required when linking with a dynamic libssh -SRCS+= roaming_dummy.c -.endif - LIBADD= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 5cd6e2f9cc90d..d6b5616dfc0ac 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -8,11 +8,6 @@ PACKAGE= ssh CFLAGS+=-I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h -.if !defined(NO_SHARED) -# required when linking with a dynamic libssh -SRCS+= roaming_dummy.c -.endif - LIBADD= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index 95b85e45b82ea..ade1e4237ff57 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -3,7 +3,7 @@ .include <src.opts.mk> PROG= ssh-keyscan -SRCS= ssh-keyscan.c roaming_dummy.c +SRCS= ssh-keyscan.c PACKAGE= ssh CFLAGS+=-I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 38eab11e3d6c2..8d82148ec2483 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -9,8 +9,7 @@ MLINKS= ssh.1 slogin.1 PACKAGE= ssh SRCS= ssh.c readconf.c clientloop.c sshtty.c \ - sshconnect.c sshconnect1.c sshconnect2.c mux.c \ - roaming_common.c roaming_client.c + sshconnect.c sshconnect1.c sshconnect2.c mux.c # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c |