Add a manual dependency on ssh_namespace.h.

Discussed with: ru
2006-05-13 21:38:16 +00:00 · 2006-05-13 21:38:16 +00:00 · 456f2593a5
commit 456f2593a5
parent 7fe5e2882f
12 changed files with 28 additions and 2 deletions
--- a/lib/libpam/modules/pam_ssh/Makefile
+++ b/lib/libpam/modules/pam_ssh/Makefile
@ -1,16 +1,20 @@
 # PAM module for SSH
 # $FreeBSD$

-SSHSRC=	${.CURDIR}/../../../../crypto/openssh
+SSHDIR=	${.CURDIR}/../../../../crypto/openssh

 LIB=	pam_ssh
 MAN=	pam_ssh.8
 SRCS=	pam_ssh.c

 WARNS?=	0
-CFLAGS+= -I${SSHSRC} -include ssh_namespace.h
+CFLAGS+= -I${SSHDIR} -include ssh_namespace.h

 DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
 LDADD=	-lssh -lcrypto -lcrypt

 .include <bsd.lib.mk>
+
+.PATH: ${SSHDIR}
+
+${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@ -46,3 +46,5 @@ LDADD+=	-lcrypto -lcrypt
 .include <bsd.lib.mk>

 .PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat
+
+${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@ -11,3 +11,5 @@ LDADD=	-lssh -lcrypt -lcrypto -lz
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
+
+${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@ -14,3 +14,5 @@ LDADD=	-lssh -lcrypt -lcrypto -lz
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
+
+${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@ -9,3 +9,5 @@ LDADD=	-lssh -lcrypt -lcrypto -lz
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
+
+${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@ -10,3 +10,5 @@ LDADD=	-lssh -lcrypt -lcrypto -lz -ledit
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
+
+${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@ -9,3 +9,5 @@ LDADD=	-lssh -lcrypt -lcrypto -lz
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
+
+${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@ -9,3 +9,5 @@ LDADD=	-lssh -lcrypt -lcrypto -lz
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
+
+${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@ -9,3 +9,5 @@ LDADD=	-lssh -lcrypt -lcrypto -lz
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
+
+${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
--- a/secure/usr.bin/ssh-keyscan/Makefile
+++ b/secure/usr.bin/ssh-keyscan/Makefile
@ -9,3 +9,5 @@ LDADD=	-lssh -lcrypt -lcrypto -lz
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
+
+${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@ -32,3 +32,5 @@ LDADD+=	-lcrypt -lcrypto
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
+
+${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@ -47,3 +47,5 @@ LDADD+=	-lcrypto -lcrypt
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
+
+${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h