diff options
author | Ed Maste <emaste@FreeBSD.org> | 2021-11-02 18:48:33 +0000 |
---|---|---|
committer | Ed Maste <emaste@FreeBSD.org> | 2021-11-03 23:38:05 +0000 |
commit | 9d63429fa16352f58037ac2aa6ddc734b25e8331 (patch) | |
tree | 247b483b678ab3dbebf95341d19ed70e32da8222 /secure/usr.bin | |
parent | 80f21bb039cef279e50e1b791b2808b916009bf6 (diff) | |
download | src-9d63429fa16352f58037ac2aa6ddc734b25e8331.tar.gz src-9d63429fa16352f58037ac2aa6ddc734b25e8331.zip |
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
Diffstat (limited to 'secure/usr.bin')
-rw-r--r-- | secure/usr.bin/scp/Makefile | 3 | ||||
-rw-r--r-- | secure/usr.bin/sftp/Makefile | 3 | ||||
-rw-r--r-- | secure/usr.bin/ssh-add/Makefile | 3 | ||||
-rw-r--r-- | secure/usr.bin/ssh-agent/Makefile | 3 | ||||
-rw-r--r-- | secure/usr.bin/ssh-keygen/Makefile | 3 | ||||
-rw-r--r-- | secure/usr.bin/ssh-keyscan/Makefile | 3 | ||||
-rw-r--r-- | secure/usr.bin/ssh/Makefile | 4 |
7 files changed, 7 insertions, 15 deletions
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index a4e55c1bf86b..c071f5198902 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ .include <src.opts.mk> +.include "${SRCTOP}/secure/ssh.mk" PROG= scp SRCS= scp.c sftp-common.c sftp-client.c sftp-glob.c progressmeter.c PACKAGE= ssh -CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -SRCS+= ssh_namespace.h LIBADD= ssh diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 249fef233d37..868f7a23bfde 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ .include <src.opts.mk> +.include "${SRCTOP}/secure/ssh.mk" PROG= sftp SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c PACKAGE= ssh -CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -SRCS+= ssh_namespace.h LIBADD= ssh edit diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index c76e50a4a91a..162ea60a29d0 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ .include <src.opts.mk> +.include "${SRCTOP}/secure/ssh.mk" PROG= ssh-add SRCS+= ssh-add.c ssh-sk-client.c PACKAGE= ssh -CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -SRCS+= ssh_namespace.h LIBADD= ssh diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 95ccd05811fe..c8139ec376c3 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ .include <src.opts.mk> +.include "${SRCTOP}/secure/ssh.mk" PROG= ssh-agent SRCS= ssh-agent.c PACKAGE= ssh -CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -SRCS+= ssh_namespace.h LIBADD= ssh diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index eec0b23e1b3f..b53b645e8576 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -1,13 +1,12 @@ # $FreeBSD$ .include <src.opts.mk> +.include "${SRCTOP}/secure/ssh.mk" PROG= ssh-keygen # XXX ssh-sk-client.c in libssh maybe? SRCS= ssh-keygen.c sshsig.c ssh-sk-client.c PACKAGE= ssh -CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -SRCS+= ssh_namespace.h LIBADD= ssh diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index ade1e4237ff5..130e5f61ec64 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ .include <src.opts.mk> +.include "${SRCTOP}/secure/ssh.mk" PROG= ssh-keyscan SRCS= ssh-keyscan.c PACKAGE= ssh -CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -SRCS+= ssh_namespace.h LIBADD= ssh diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 614cc7627fc5..5528aceed5ee 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ .include <src.opts.mk> +.include "${SRCTOP}/secure/ssh.mk" CONFS= ssh_config 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 SRCS+= gss-genr.c -CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -SRCS+= ssh_namespace.h - LIBADD= ssh .if ${MK_LDNS} != "no" |