summaryrefslogtreecommitdiffstats
path: root/secure/libexec
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2005-06-07 09:31:28 +0000
committerdes <des@FreeBSD.org>2005-06-07 09:31:28 +0000
commitd78c11891694d603e264051b72f7bfd1374b67a1 (patch)
treea0d1ecfa2e0da5d8fc4aeeacef320972cb332bf5 /secure/libexec
parenta047b79479f72a4c7501f00e3938652abee4b7fd (diff)
downloadFreeBSD-src-d78c11891694d603e264051b72f7bfd1374b67a1.zip
FreeBSD-src-d78c11891694d603e264051b72f7bfd1374b67a1.tar.gz
Revert the commits that made libssh an INTERNALLIB; they caused too much
trouble, especially on amd64. Requested by: ru
Diffstat (limited to 'secure/libexec')
-rw-r--r--secure/libexec/sftp-server/Makefile4
-rw-r--r--secure/libexec/ssh-keysign/Makefile4
2 files changed, 2 insertions, 6 deletions
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index ff1d4b1..28cff68 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,14 +1,12 @@
# $FreeBSD$
-LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a
-
PROG= sftp-server
SRCS= sftp-server.c sftp-common.c
MAN= sftp-server.8
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/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index 24bf29e..3f2ed51 100644
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -1,7 +1,5 @@
# $FreeBSD$
-LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a
-
PROG= ssh-keysign
SRCS= ssh-keysign.c readconf.c
MAN= ssh-keysign.8
@@ -11,7 +9,7 @@ BINMODE=4511
.endif
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
-LDADD= ${LIBSSH} -lcrypt -lcrypto -lz
+LDADD= -lssh -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud