summaryrefslogtreecommitdiffstats
path: root/secure/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'secure/usr.bin')
-rw-r--r--secure/usr.bin/scp/Makefile4
-rw-r--r--secure/usr.bin/sftp/Makefile4
-rw-r--r--secure/usr.bin/ssh-add/Makefile4
-rw-r--r--secure/usr.bin/ssh-agent/Makefile4
-rw-r--r--secure/usr.bin/ssh-keygen/Makefile4
-rw-r--r--secure/usr.bin/ssh-keyscan/Makefile4
-rw-r--r--secure/usr.bin/ssh/Makefile8
7 files changed, 10 insertions, 22 deletions
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index f0512e9..d6d5aba 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 1af7d82..08512e8 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 5d091c2..2716a62 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 9aa2084..2f88a6d 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 b8a4cc1..5dc8699 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 f4f59ed..1c5ab3e 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 403ee76..274e481 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
OpenPOWER on IntegriCloud