svn commit: r293396 - in stable/10: lib/libpam/modules/pam_ssh secure/lib/libssh secure/libexec/sftp-server secure/libexec/ssh-keysign secure/libexec/ssh-pkcs11-helper secure/usr.bin/scp secure/usr...
Bryan Drewery
bdrewery at FreeBSD.org
Thu Jan 7 23:26:19 UTC 2016
Author: bdrewery
Date: Thu Jan 7 23:26:16 2016
New Revision: 293396
URL: https://svnweb.freebsd.org/changeset/base/293396
Log:
MFC r291941:
Replace unneeded manual dependency on header by adding it to SRCS.
Modified:
stable/10/lib/libpam/modules/pam_ssh/Makefile
stable/10/secure/lib/libssh/Makefile
stable/10/secure/libexec/sftp-server/Makefile
stable/10/secure/libexec/ssh-keysign/Makefile
stable/10/secure/libexec/ssh-pkcs11-helper/Makefile
stable/10/secure/usr.bin/scp/Makefile
stable/10/secure/usr.bin/sftp/Makefile
stable/10/secure/usr.bin/ssh-add/Makefile
stable/10/secure/usr.bin/ssh-agent/Makefile
stable/10/secure/usr.bin/ssh-keygen/Makefile
stable/10/secure/usr.bin/ssh-keyscan/Makefile
stable/10/secure/usr.bin/ssh/Makefile
stable/10/secure/usr.sbin/sshd/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libpam/modules/pam_ssh/Makefile
==============================================================================
--- stable/10/lib/libpam/modules/pam_ssh/Makefile Thu Jan 7 23:23:51 2016 (r293395)
+++ stable/10/lib/libpam/modules/pam_ssh/Makefile Thu Jan 7 23:26:16 2016 (r293396)
@@ -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/10/secure/lib/libssh/Makefile
==============================================================================
--- stable/10/secure/lib/libssh/Makefile Thu Jan 7 23:23:51 2016 (r293395)
+++ stable/10/secure/lib/libssh/Makefile Thu Jan 7 23:26:16 2016 (r293396)
@@ -40,9 +40,11 @@ USEPRIVATELIB+= ldns
.endif
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
@@ -59,8 +61,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/10/secure/libexec/sftp-server/Makefile
==============================================================================
--- stable/10/secure/libexec/sftp-server/Makefile Thu Jan 7 23:23:51 2016 (r293395)
+++ stable/10/secure/libexec/sftp-server/Makefile Thu Jan 7 23:26:16 2016 (r293396)
@@ -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
@@ -29,5 +30,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/10/secure/libexec/ssh-keysign/Makefile
==============================================================================
--- stable/10/secure/libexec/ssh-keysign/Makefile Thu Jan 7 23:23:51 2016 (r293395)
+++ stable/10/secure/libexec/ssh-keysign/Makefile Thu Jan 7 23:26:16 2016 (r293396)
@@ -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}
@@ -25,5 +26,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/10/secure/libexec/ssh-pkcs11-helper/Makefile
==============================================================================
--- stable/10/secure/libexec/ssh-pkcs11-helper/Makefile Thu Jan 7 23:23:51 2016 (r293395)
+++ stable/10/secure/libexec/ssh-pkcs11-helper/Makefile Thu Jan 7 23:26:16 2016 (r293396)
@@ -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
@@ -29,5 +30,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/10/secure/usr.bin/scp/Makefile
==============================================================================
--- stable/10/secure/usr.bin/scp/Makefile Thu Jan 7 23:23:51 2016 (r293395)
+++ stable/10/secure/usr.bin/scp/Makefile Thu Jan 7 23:26:16 2016 (r293396)
@@ -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
@@ -28,5 +29,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/10/secure/usr.bin/sftp/Makefile
==============================================================================
--- stable/10/secure/usr.bin/sftp/Makefile Thu Jan 7 23:23:51 2016 (r293395)
+++ stable/10/secure/usr.bin/sftp/Makefile Thu Jan 7 23:26:16 2016 (r293396)
@@ -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
@@ -28,5 +29,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/10/secure/usr.bin/ssh-add/Makefile
==============================================================================
--- stable/10/secure/usr.bin/ssh-add/Makefile Thu Jan 7 23:23:51 2016 (r293395)
+++ stable/10/secure/usr.bin/ssh-add/Makefile Thu Jan 7 23:26:16 2016 (r293396)
@@ -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
@@ -28,5 +29,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/10/secure/usr.bin/ssh-agent/Makefile
==============================================================================
--- stable/10/secure/usr.bin/ssh-agent/Makefile Thu Jan 7 23:23:51 2016 (r293395)
+++ stable/10/secure/usr.bin/ssh-agent/Makefile Thu Jan 7 23:26:16 2016 (r293396)
@@ -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
@@ -28,5 +29,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/10/secure/usr.bin/ssh-keygen/Makefile
==============================================================================
--- stable/10/secure/usr.bin/ssh-keygen/Makefile Thu Jan 7 23:23:51 2016 (r293395)
+++ stable/10/secure/usr.bin/ssh-keygen/Makefile Thu Jan 7 23:26:16 2016 (r293396)
@@ -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
@@ -28,5 +29,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/10/secure/usr.bin/ssh-keyscan/Makefile
==============================================================================
--- stable/10/secure/usr.bin/ssh-keyscan/Makefile Thu Jan 7 23:23:51 2016 (r293395)
+++ stable/10/secure/usr.bin/ssh-keyscan/Makefile Thu Jan 7 23:26:16 2016 (r293396)
@@ -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
@@ -23,5 +24,3 @@ LDADD+= -lcrypt -lcrypto -lz
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: stable/10/secure/usr.bin/ssh/Makefile
==============================================================================
--- stable/10/secure/usr.bin/ssh/Makefile Thu Jan 7 23:23:51 2016 (r293395)
+++ stable/10/secure/usr.bin/ssh/Makefile Thu Jan 7 23:26:16 2016 (r293396)
@@ -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,6 +14,9 @@ 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
@@ -28,6 +30,7 @@ USEPRIVATELIB+= ldns
.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -include krb5_config.h
+SRCS+= krb5_config.h
DPADD+= ${LIBGSSAPI}
LDADD+= -lgssapi
.endif
@@ -46,8 +49,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/10/secure/usr.sbin/sshd/Makefile
==============================================================================
--- stable/10/secure/usr.sbin/sshd/Makefile Thu Jan 7 23:23:51 2016 (r293395)
+++ stable/10/secure/usr.sbin/sshd/Makefile Thu Jan 7 23:26:16 2016 (r293396)
@@ -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}
@@ -44,6 +45,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} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC}
LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \
@@ -74,8 +76,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
More information about the svn-src-all
mailing list