summaryrefslogtreecommitdiffstats
path: root/secure/libexec
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2016-01-04 19:19:48 +0000
committergjb <gjb@FreeBSD.org>2016-01-04 19:19:48 +0000
commitccde53b74b7bd32198439bfa247743fbf4c91a76 (patch)
tree3882b41d5bbb0e4ad065fa3392bf2eab80a3d4e3 /secure/libexec
parent04942f20347330d49715904f537ca62d33372684 (diff)
parentc9ef17cbe9e3b753415472a271916c098cab7780 (diff)
downloadFreeBSD-src-ccde53b74b7bd32198439bfa247743fbf4c91a76.zip
FreeBSD-src-ccde53b74b7bd32198439bfa247743fbf4c91a76.tar.gz
MFH r289384-r293170
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'secure/libexec')
-rw-r--r--secure/libexec/Makefile2
-rw-r--r--secure/libexec/sftp-server/Makefile3
-rw-r--r--secure/libexec/ssh-keysign/Makefile3
-rw-r--r--secure/libexec/ssh-pkcs11-helper/Makefile3
4 files changed, 5 insertions, 6 deletions
diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile
index 07aa3dd..2e2eaf9 100644
--- a/secure/libexec/Makefile
+++ b/secure/libexec/Makefile
@@ -11,4 +11,6 @@ SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper
SUBDIR+=tests
.endif
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index 11839ff..f0bedff 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -6,6 +6,7 @@ PROG= sftp-server
SRCS= sftp-server.c sftp-common.c sftp-server-main.c
MAN= sftp-server.8
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
.if !defined(NO_SHARED)
# required when linking with a dynamic libssh
@@ -23,5 +24,3 @@ CFLAGS+= -DHAVE_LDNS=1
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index 9813e5d..c546e83 100644
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -6,6 +6,7 @@ PROG= ssh-keysign
SRCS= ssh-keysign.c roaming_dummy.c readconf.c
MAN= ssh-keysign.8
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
BINMODE=4555
LIBADD= ssh
@@ -21,5 +22,3 @@ LIBADD+= crypto
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile
index a8d681e..d8046d1 100644
--- a/secure/libexec/ssh-pkcs11-helper/Makefile
+++ b/secure/libexec/ssh-pkcs11-helper/Makefile
@@ -6,6 +6,7 @@ PROG= ssh-pkcs11-helper
SRCS= ssh-pkcs11.c ssh-pkcs11-helper.c
MAN= ssh-pkcs11-helper.8
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
.if !defined(NO_SHARED)
# required when linking with a dynamic libssh
@@ -25,5 +26,3 @@ LIBADD+= crypto
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
OpenPOWER on IntegriCloud