ssh: move common Makefile boilerplate to a new ssh.mk
This moves SSHDIR and ssh_namespace.h handling to a common location, and will simplify future work such as adding U2F support (D32509). Reviewed by: kevans MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32808
This commit is contained in:
parent
80f21bb039
commit
9d63429fa1
@ -1,15 +1,9 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
|
||||||
|
|
||||||
.if exists(${.CURDIR:H:H}/lib/libcrypt/obj)
|
.if exists(${.CURDIR:H:H}/lib/libcrypt/obj)
|
||||||
CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt/obj
|
CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt/obj
|
||||||
.else
|
.else
|
||||||
CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt
|
CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_OPENSSH} != "no"
|
|
||||||
SSHDIR= ${SRCTOP}/crypto/openssh
|
|
||||||
.endif
|
|
||||||
|
|
||||||
WARNS?= 0
|
WARNS?= 0
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
.include "${SRCTOP}/secure/ssh.mk"
|
||||||
|
|
||||||
LIB= ssh
|
LIB= ssh
|
||||||
PRIVATELIB= true
|
PRIVATELIB= true
|
||||||
@ -50,9 +51,6 @@ SRCS+= getrrsetbyname-ldns.c
|
|||||||
LIBADD+= ldns
|
LIBADD+= ldns
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
|
|
||||||
SRCS+= ssh_namespace.h
|
|
||||||
|
|
||||||
.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
|
.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
|
||||||
CFLAGS+= -include krb5_config.h
|
CFLAGS+= -include krb5_config.h
|
||||||
SRCS+= krb5_config.h
|
SRCS+= krb5_config.h
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
.include "${SRCTOP}/secure/ssh.mk"
|
||||||
|
|
||||||
PROG= sftp-server
|
PROG= sftp-server
|
||||||
SRCS= sftp-server.c sftp-common.c sftp-server-main.c
|
SRCS= sftp-server.c sftp-common.c sftp-server-main.c
|
||||||
MAN= sftp-server.8
|
MAN= sftp-server.8
|
||||||
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
|
|
||||||
SRCS+= ssh_namespace.h
|
|
||||||
|
|
||||||
LIBADD= ssh
|
LIBADD= ssh
|
||||||
|
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
.include "${SRCTOP}/secure/ssh.mk"
|
||||||
|
|
||||||
PROG= ssh-keysign
|
PROG= ssh-keysign
|
||||||
SRCS= ssh-keysign.c readconf.c uidswap.c
|
SRCS= ssh-keysign.c readconf.c uidswap.c
|
||||||
MAN= ssh-keysign.8
|
MAN= ssh-keysign.8
|
||||||
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
|
|
||||||
SRCS+= ssh_namespace.h
|
|
||||||
BINMODE=4555
|
BINMODE=4555
|
||||||
|
|
||||||
LIBADD= ssh
|
LIBADD= ssh
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
.include "${SRCTOP}/secure/ssh.mk"
|
||||||
|
|
||||||
PROG= ssh-pkcs11-helper
|
PROG= ssh-pkcs11-helper
|
||||||
SRCS= ssh-pkcs11.c ssh-pkcs11-helper.c
|
SRCS= ssh-pkcs11.c ssh-pkcs11-helper.c
|
||||||
MAN= ssh-pkcs11-helper.8
|
MAN= ssh-pkcs11-helper.8
|
||||||
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
|
|
||||||
SRCS+= ssh_namespace.h
|
|
||||||
|
|
||||||
LIBADD= ssh
|
LIBADD= ssh
|
||||||
|
|
||||||
|
6
secure/ssh.mk
Normal file
6
secure/ssh.mk
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
# Common Make variables for OpenSSH
|
||||||
|
|
||||||
|
SSHDIR= ${SRCTOP}/crypto/openssh
|
||||||
|
|
||||||
|
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
|
||||||
|
SRCS+= ssh_namespace.h
|
@ -1,12 +1,11 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
.include "${SRCTOP}/secure/ssh.mk"
|
||||||
|
|
||||||
PROG= scp
|
PROG= scp
|
||||||
SRCS= scp.c sftp-common.c sftp-client.c sftp-glob.c progressmeter.c
|
SRCS= scp.c sftp-common.c sftp-client.c sftp-glob.c progressmeter.c
|
||||||
PACKAGE= ssh
|
PACKAGE= ssh
|
||||||
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
|
|
||||||
SRCS+= ssh_namespace.h
|
|
||||||
|
|
||||||
LIBADD= ssh
|
LIBADD= ssh
|
||||||
|
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
.include "${SRCTOP}/secure/ssh.mk"
|
||||||
|
|
||||||
PROG= sftp
|
PROG= sftp
|
||||||
SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
|
SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
|
||||||
PACKAGE= ssh
|
PACKAGE= ssh
|
||||||
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
|
|
||||||
SRCS+= ssh_namespace.h
|
|
||||||
|
|
||||||
LIBADD= ssh edit
|
LIBADD= ssh edit
|
||||||
|
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
.include "${SRCTOP}/secure/ssh.mk"
|
||||||
|
|
||||||
PROG= ssh-add
|
PROG= ssh-add
|
||||||
SRCS+= ssh-add.c ssh-sk-client.c
|
SRCS+= ssh-add.c ssh-sk-client.c
|
||||||
PACKAGE= ssh
|
PACKAGE= ssh
|
||||||
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
|
|
||||||
SRCS+= ssh_namespace.h
|
|
||||||
|
|
||||||
LIBADD= ssh
|
LIBADD= ssh
|
||||||
|
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
.include "${SRCTOP}/secure/ssh.mk"
|
||||||
|
|
||||||
PROG= ssh-agent
|
PROG= ssh-agent
|
||||||
SRCS= ssh-agent.c
|
SRCS= ssh-agent.c
|
||||||
PACKAGE= ssh
|
PACKAGE= ssh
|
||||||
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
|
|
||||||
SRCS+= ssh_namespace.h
|
|
||||||
|
|
||||||
LIBADD= ssh
|
LIBADD= ssh
|
||||||
|
|
||||||
|
@ -1,13 +1,12 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
.include "${SRCTOP}/secure/ssh.mk"
|
||||||
|
|
||||||
PROG= ssh-keygen
|
PROG= ssh-keygen
|
||||||
# XXX ssh-sk-client.c in libssh maybe?
|
# XXX ssh-sk-client.c in libssh maybe?
|
||||||
SRCS= ssh-keygen.c sshsig.c ssh-sk-client.c
|
SRCS= ssh-keygen.c sshsig.c ssh-sk-client.c
|
||||||
PACKAGE= ssh
|
PACKAGE= ssh
|
||||||
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
|
|
||||||
SRCS+= ssh_namespace.h
|
|
||||||
|
|
||||||
LIBADD= ssh
|
LIBADD= ssh
|
||||||
|
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
.include "${SRCTOP}/secure/ssh.mk"
|
||||||
|
|
||||||
PROG= ssh-keyscan
|
PROG= ssh-keyscan
|
||||||
SRCS= ssh-keyscan.c
|
SRCS= ssh-keyscan.c
|
||||||
PACKAGE= ssh
|
PACKAGE= ssh
|
||||||
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
|
|
||||||
SRCS+= ssh_namespace.h
|
|
||||||
|
|
||||||
LIBADD= ssh
|
LIBADD= ssh
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
.include "${SRCTOP}/secure/ssh.mk"
|
||||||
|
|
||||||
CONFS= ssh_config
|
CONFS= ssh_config
|
||||||
CONFSDIR= /etc/ssh
|
CONFSDIR= /etc/ssh
|
||||||
@ -16,9 +17,6 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \
|
|||||||
# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
|
# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
|
||||||
SRCS+= gss-genr.c
|
SRCS+= gss-genr.c
|
||||||
|
|
||||||
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
|
|
||||||
SRCS+= ssh_namespace.h
|
|
||||||
|
|
||||||
LIBADD= ssh
|
LIBADD= ssh
|
||||||
|
|
||||||
.if ${MK_LDNS} != "no"
|
.if ${MK_LDNS} != "no"
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
.include "${SRCTOP}/secure/ssh.mk"
|
||||||
|
|
||||||
CONFS= moduli sshd_config
|
CONFS= moduli sshd_config
|
||||||
CONFSDIR= /etc/ssh
|
CONFSDIR= /etc/ssh
|
||||||
@ -25,8 +26,6 @@ PACKAGE= ssh
|
|||||||
SRCS+= gss-genr.c
|
SRCS+= gss-genr.c
|
||||||
|
|
||||||
MAN= sshd.8 sshd_config.5
|
MAN= sshd.8 sshd_config.5
|
||||||
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
|
|
||||||
SRCS+= ssh_namespace.h
|
|
||||||
|
|
||||||
# Don't rebuild based on moduli.c
|
# Don't rebuild based on moduli.c
|
||||||
moduli: .MADE
|
moduli: .MADE
|
||||||
|
Loading…
Reference in New Issue
Block a user