diff options
author | Glen Barber <gjb@FreeBSD.org> | 2016-01-04 19:19:48 +0000 |
---|---|---|
committer | Glen Barber <gjb@FreeBSD.org> | 2016-01-04 19:19:48 +0000 |
commit | b626f5a73a48f44a31a200291b141e1da408a2ff (patch) | |
tree | 3882b41d5bbb0e4ad065fa3392bf2eab80a3d4e3 /secure/usr.sbin | |
parent | 5b7774f3ea9332e266e0353f708a83cb5ae348f7 (diff) | |
parent | 2418fd040b8118067ee3c923b9ed604664c9c709 (diff) | |
download | src-b626f5a73a48f44a31a200291b141e1da408a2ff.tar.gz src-b626f5a73a48f44a31a200291b141e1da408a2ff.zip |
MFH r289384-r293170
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/projects/release-pkg/; revision=293172
Diffstat (limited to 'secure/usr.sbin')
-rw-r--r-- | secure/usr.sbin/Makefile | 2 | ||||
-rw-r--r-- | secure/usr.sbin/sshd/Makefile | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile index e42f456b12d0..9b2f910f9c49 100644 --- a/secure/usr.sbin/Makefile +++ b/secure/usr.sbin/Makefile @@ -11,4 +11,6 @@ SUBDIR+=sshd SUBDIR+=tests .endif +SUBDIR_PARALLEL= + .include <bsd.subdir.mk> diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index d6244d302af2..e647c1e8106d 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -25,6 +25,7 @@ SRCS+= gss-genr.c MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h # pam should always happen before ssh here for static linking LIBADD= pam ssh util wrap @@ -42,13 +43,10 @@ LIBADD+= bsm .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h +SRCS+= krb5_config.h LIBADD+= gssapi_krb5 gssapi krb5 .endif -.if ${MK_OPENSSH_NONE_CIPHER} != "no" -CFLAGS+= -DNONE_CIPHER_ENABLED -.endif - LIBADD+= crypto .if defined(LOCALBASE) @@ -58,8 +56,3 @@ CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" .include <bsd.prog.mk> .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h -.if ${MK_KERBEROS_SUPPORT} != "no" -${OBJS} ${POBJS} ${SOBJS}: krb5_config.h -.endif |