diff options
author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-07 16:08:09 +0000 |
---|---|---|
committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-07 16:08:09 +0000 |
commit | e42070a701fc8453434cfe449439d252fc176542 (patch) | |
tree | 6a1e5e2830d44ffda1dbf04bd3d32d8dcfd44c21 /secure/usr.bin/ssh | |
parent | 98a998d5e71e49fb5b209ff1d629114cd0b3a9ad (diff) | |
download | src-e42070a701fc8453434cfe449439d252fc176542.tar.gz src-e42070a701fc8453434cfe449439d252fc176542.zip |
Replace unneeded manual dependency on header by adding it to SRCS.
bsd.lib.mk and bsd.prog.mk already depend all objs on headers in SRCS if
there is not yet a depend file. The headers in SRCS are never built or
installed. After 'make depend' the header was already added as a proper
dependency on the objects where needed.
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=291941
Diffstat (limited to 'secure/usr.bin/ssh')
-rw-r--r-- | secure/usr.bin/ssh/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index a16f254e60e8..cad6b30335b6 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -3,7 +3,6 @@ .include <src.opts.mk> PROG= ssh -CFLAGS+=-I${SSHDIR} -include ssh_namespace.h LINKS= ${BINDIR}/ssh ${BINDIR}/slogin MAN= ssh.1 ssh_config.5 MLINKS= ssh.1 slogin.1 @@ -15,6 +14,9 @@ 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" @@ -23,6 +25,7 @@ CFLAGS+= -DHAVE_LDNS=1 .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h +SRCS+= krb5_config.h LIBADD+= gssapi .endif @@ -35,8 +38,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 |