Author: bdrewery
Date: Fri Jan 8 00:07:37 2016
New Revision: 293400
URL: https://svnweb.freebsd.org/changeset/base/293400
Log:
MFC r291941:
Replace unneeded manual dependency on header by adding it to SRCS.
Modified:
stable/9/lib/libpam/modules/pam_ssh/Makefile
stable/9/secure/lib/libssh/Makefile
stable/9/secure/libexec/sftp-server/Makefile
stable/9/secure/libexec/ssh-keysign/Makefile
stable/9/secure/libexec/ssh-pkcs11-helper/Makefile
stable/9/secure/usr.bin/scp/Makefile
stable/9/secure/usr.bin/sftp/Makefile
stable/9/secure/usr.bin/ssh-add/Makefile
stable/9/secure/usr.bin/ssh-agent/Makefile
stable/9/secure/usr.bin/ssh-keygen/Makefile
stable/9/secure/usr.bin/ssh-keyscan/Makefile
stable/9/secure/usr.bin/ssh/Makefile
stable/9/secure/usr.sbin/sshd/Makefile
Directory Properties:
stable/9/lib/libpam/ (props changed)
stable/9/secure/lib/libssh/ (props changed)
stable/9/secure/libexec/sftp-server/ (props changed)
stable/9/secure/libexec/ssh-keysign/ (props changed)
stable/9/secure/libexec/ssh-pkcs11-helper/ (props changed)
stable/9/secure/usr.bin/scp/ (props changed)
stable/9/secure/usr.bin/sftp/ (props changed)
stable/9/secure/usr.bin/ssh/ (props changed)
stable/9/secure/usr.bin/ssh-add/ (props changed)
stable/9/secure/usr.bin/ssh-agent/ (props changed)
stable/9/secure/usr.bin/ssh-keygen/ (props changed)
stable/9/secure/usr.bin/ssh-keyscan/ (props changed)
stable/9/secure/usr.sbin/sshd/ (props changed)
Modified: stable/9/lib/libpam/modules/pam_ssh/Makefile
==============================================================================
--- stable/9/lib/libpam/modules/pam_ssh/Makefile Fri Jan 8 00:05:47
2016 (r293399)
+++ stable/9/lib/libpam/modules/pam_ssh/Makefile Fri Jan 8 00:07:37
2016 (r293400)
@@ -12,6 +12,7 @@ SRCS+= roaming_dummy.c
WARNS?= 3
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
LDADD= -lssh -lcrypto -lcrypt
@@ -20,5 +21,3 @@ USEPRIVATELIB= ssh
.include <bsd.lib.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/9/secure/lib/libssh/Makefile
==============================================================================
--- stable/9/secure/lib/libssh/Makefile Fri Jan 8 00:05:47 2016
(r293399)
+++ stable/9/secure/lib/libssh/Makefile Fri Jan 8 00:07:37 2016
(r293400)
@@ -31,9 +31,11 @@ SRCS+= bcrypt_pbkdf.c blowfish.c bsd-mis
SRCS+= getrrsetbyname.c
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -include krb5_config.h
+SRCS+= krb5_config.h
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR}
${LIBMD} ${LIBROKEN}
LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken
.endif
@@ -50,8 +52,3 @@ LDADD+= -lcrypto -lcrypt -lz
.include <bsd.lib.mk>
.PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
-.if ${MK_KERBEROS_SUPPORT} != "no"
-${OBJS} ${POBJS} ${SOBJS}: krb5_config.h
-.endif
Modified: stable/9/secure/libexec/sftp-server/Makefile
==============================================================================
--- stable/9/secure/libexec/sftp-server/Makefile Fri Jan 8 00:05:47
2016 (r293399)
+++ stable/9/secure/libexec/sftp-server/Makefile Fri Jan 8 00:07:37
2016 (r293400)
@@ -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
@@ -22,5 +23,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/9/secure/libexec/ssh-keysign/Makefile
==============================================================================
--- stable/9/secure/libexec/ssh-keysign/Makefile Fri Jan 8 00:05:47
2016 (r293399)
+++ stable/9/secure/libexec/ssh-keysign/Makefile Fri Jan 8 00:07:37
2016 (r293400)
@@ -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
DPADD= ${LIBSSH}
@@ -18,5 +19,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/9/secure/libexec/ssh-pkcs11-helper/Makefile
==============================================================================
--- stable/9/secure/libexec/ssh-pkcs11-helper/Makefile Fri Jan 8 00:05:47
2016 (r293399)
+++ stable/9/secure/libexec/ssh-pkcs11-helper/Makefile Fri Jan 8 00:07:37
2016 (r293400)
@@ -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
@@ -22,5 +23,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/9/secure/usr.bin/scp/Makefile
==============================================================================
--- stable/9/secure/usr.bin/scp/Makefile Fri Jan 8 00:05:47 2016
(r293399)
+++ stable/9/secure/usr.bin/scp/Makefile Fri Jan 8 00:07:37 2016
(r293400)
@@ -5,6 +5,7 @@
PROG= scp
SRCS= scp.c
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
.if !defined(NO_SHARED)
# required when linking with a dynamic libssh
@@ -21,5 +22,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/9/secure/usr.bin/sftp/Makefile
==============================================================================
--- stable/9/secure/usr.bin/sftp/Makefile Fri Jan 8 00:05:47 2016
(r293399)
+++ stable/9/secure/usr.bin/sftp/Makefile Fri Jan 8 00:07:37 2016
(r293400)
@@ -5,6 +5,7 @@
PROG= sftp
SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
.if !defined(NO_SHARED)
# required when linking with a dynamic libssh
@@ -21,5 +22,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/9/secure/usr.bin/ssh-add/Makefile
==============================================================================
--- stable/9/secure/usr.bin/ssh-add/Makefile Fri Jan 8 00:05:47 2016
(r293399)
+++ stable/9/secure/usr.bin/ssh-add/Makefile Fri Jan 8 00:07:37 2016
(r293400)
@@ -5,6 +5,7 @@
PROG= ssh-add
SRCS+= ssh-add.c
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
.if !defined(NO_SHARED)
# required when linking with a dynamic libssh
@@ -21,5 +22,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/9/secure/usr.bin/ssh-agent/Makefile
==============================================================================
--- stable/9/secure/usr.bin/ssh-agent/Makefile Fri Jan 8 00:05:47 2016
(r293399)
+++ stable/9/secure/usr.bin/ssh-agent/Makefile Fri Jan 8 00:07:37 2016
(r293400)
@@ -5,6 +5,7 @@
PROG= ssh-agent
SRCS= ssh-agent.c
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
.if !defined(NO_SHARED)
# required when linking with a dynamic libssh
@@ -21,5 +22,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/9/secure/usr.bin/ssh-keygen/Makefile
==============================================================================
--- stable/9/secure/usr.bin/ssh-keygen/Makefile Fri Jan 8 00:05:47 2016
(r293399)
+++ stable/9/secure/usr.bin/ssh-keygen/Makefile Fri Jan 8 00:07:37 2016
(r293400)
@@ -5,6 +5,7 @@
PROG= ssh-keygen
SRCS= ssh-keygen.c
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
.if !defined(NO_SHARED)
# required when linking with a dynamic libssh
@@ -21,5 +22,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/9/secure/usr.bin/ssh-keyscan/Makefile
==============================================================================
--- stable/9/secure/usr.bin/ssh-keyscan/Makefile Fri Jan 8 00:05:47
2016 (r293399)
+++ stable/9/secure/usr.bin/ssh-keyscan/Makefile Fri Jan 8 00:07:37
2016 (r293400)
@@ -5,6 +5,7 @@
PROG= ssh-keyscan
SRCS= ssh-keyscan.c roaming_dummy.c
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
DPADD= ${LIBSSH}
LDADD= -lssh
@@ -16,5 +17,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/9/secure/usr.bin/ssh/Makefile
==============================================================================
--- stable/9/secure/usr.bin/ssh/Makefile Fri Jan 8 00:05:47 2016
(r293399)
+++ stable/9/secure/usr.bin/ssh/Makefile Fri Jan 8 00:07:37 2016
(r293400)
@@ -3,7 +3,6 @@
.include <bsd.own.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,12 +14,16 @@ SRCS= ssh.c readconf.c clientloop.c ssht
# 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
+
DPADD= ${LIBSSH} ${LIBUTIL}
LDADD= -lssh -lutil
USEPRIVATELIB= ssh
.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -include krb5_config.h
+SRCS+= krb5_config.h
DPADD+= ${LIBGSSAPI}
LDADD+= -lgssapi
.endif
@@ -39,8 +42,3 @@ CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
-.if ${MK_KERBEROS_SUPPORT} != "no"
-${OBJS} ${POBJS} ${SOBJS}: krb5_config.h
-.endif
Modified: stable/9/secure/usr.sbin/sshd/Makefile
==============================================================================
--- stable/9/secure/usr.sbin/sshd/Makefile Fri Jan 8 00:05:47 2016
(r293399)
+++ stable/9/secure/usr.sbin/sshd/Makefile Fri Jan 8 00:07:37 2016
(r293400)
@@ -24,6 +24,7 @@ SRCS+= gss-genr.c
MAN= sshd.8 sshd_config.5
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
DPADD= ${LIBSSH} ${LIBUTIL} ${LIBWRAP} ${LIBPAM}
LDADD= -lssh -lutil -lwrap ${MINUSLPAM}
@@ -37,6 +38,7 @@ LDADD+= -lbsm
.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -include krb5_config.h
+SRCS+= krb5_config.h
DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509}
${LIBASN1} \
${LIBCOM_ERR} ${LIBROKEN}
LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \
@@ -67,8 +69,3 @@ CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
-.if ${MK_KERBEROS_SUPPORT} != "no"
-${OBJS} ${POBJS} ${SOBJS}: krb5_config.h
-.endif
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
