diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2013-09-10 22:26:11 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2013-09-10 22:26:11 +0000 |
commit | 9cfa8b3fee2f79940b0b9e5a4ffbc5f095861529 (patch) | |
tree | ab68ba5a5b6f4e8ee717558d70c0221f0b1ef6dc /secure/usr.bin/ssh-keygen | |
parent | 27789e56b28fd6d95ebb2bc7d9436305b193fe40 (diff) | |
download | src-9cfa8b3fee2f79940b0b9e5a4ffbc5f095861529.tar.gz src-9cfa8b3fee2f79940b0b9e5a4ffbc5f095861529.zip |
Clean up the OpenSSH build. It is now possible to build most components
as static binaries, if desired. The one exception is sshd, which runs
into trouble due to libpam.a's includion of pam_ssh.
Make OpenSSH use LDNS if available. This allows it to verify signed
SSHFP records.
Approved by: re (blanket)
Notes
Notes:
svn path=/head/; revision=255460
Diffstat (limited to 'secure/usr.bin/ssh-keygen')
-rw-r--r-- | secure/usr.bin/ssh-keygen/Makefile | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 48e486e573e0..75934d9bff91 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -1,16 +1,30 @@ # $FreeBSD$ +.include <bsd.own.mk> + PROG= ssh-keygen SRCS= ssh-keygen.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -# required when linking with a dynamic libssh -SRCS+= roaming_dummy.c +.if !defined(NO_SHARED) +# required when linking with a dynamic libssh +SRCS+= roaming_dummy.c +.endif -DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +DPADD= ${LIBSSH} +LDADD= -lssh USEPRIVATELIB= ssh +.if ${MK_LDNS} != "no" +CFLAGS+= -DHAVE_LDNS=1 +DPADD+= ${LIBLDNS} +LDADD+= -lldns +USEPRIVATELIB+= ldns +.endif + +DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lcrypt -lcrypto -lz + .include <bsd.prog.mk> .PATH: ${SSHDIR} |