Don't use the FreeBSD misfeature DPSRCS or give explicit dependencies

on generated headers.  Just put generated headers in SRCS so that
bsd.*.mk can generate better dependencies.

4 files changed, 5 insertions, 14 deletions

diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index 85cb9fc..58050fe 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -8,7 +8,7 @@ SRCS=	afs_ops.c am_ops.c clock.c util.c xutil.c \
 	info_ndbm.c info_passwd.c info_nis.c \
 	info_union.c map.c srvr_afs.c srvr_nfs.c \
 	mntfs.c misc_rpc.c mount_fs.c mount_xdr.c \
-	mtab.c mtab_bsd.c nfs_ops.c nfs_prot_svc.c \
+	mtab.c mtab_bsd.c nfs_ops.c nfs_prot.h nfs_prot_svc.c \
 	nfs_start.c nfs_subr.c nfs_prot_xdr.c opts.c \
 	pfs_ops.c rpc_fwd.c sched.c sfs_ops.c amq_svc.c \
 	amq_subr.c umount_fs.c host_ops.c nfsx_ops.c \
@@ -27,7 +27,6 @@ CLEANFILES+=mount.h mount_xdr.c nfs_prot.h nfs_prot_xdr.c nfs_prot_svc.c
 RPCCOM = rpcgen
 MOUNT_X= ${DESTDIR}/usr/include/rpcsvc/mount.x
 NFS_PROT_X= ${DESTDIR}/usr/include/rpcsvc/nfs_prot.x
-DPSRCS= nfs_prot.h
 
 vers.${PROG}.c: ${SRCS:.c=.o}
 	@d=${.CURDIR}/ sh ${.CURDIR}/../config/newvers.sh ${PROG} ${MACHINE} ${OS}
@@ -40,8 +39,6 @@ mount.h: ${MOUNT_X}
 mount_xdr.c: mount.h ${MOUNT_X}
 	${RPCCOM} -c -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET}
 
-beforedepend: nfs_prot.h
-
 nfs_prot.h: ${NFS_PROT_X}
 	${RPCCOM} -h ${NFS_PROT_X} -o ${.TARGET}
 
diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
index 2cb8124..7c9a926 100644
--- a/usr.sbin/amd/amq/Makefile
+++ b/usr.sbin/amd/amq/Makefile
@@ -2,7 +2,7 @@
 
 PROG = amq
 MAN8 = amq.8
-SRCS = amq.c amq_clnt.c amq_xdr.c misc_rpc.c
+SRCS = amq.c amq_clnt.c amq_xdr.c misc_rpc.c nfs_prot.h
 CFLAGS+=-I${.OBJDIR}
 CFLAGS+=-I${.CURDIR}/../include
 CFLAGS+=-I${.CURDIR}/../rpcx
@@ -14,12 +14,9 @@ CFLAGS+=-DOS_HDR=\"os-bsd44.h\"
 CLEANFILES+=nfs_prot.h
 RPCCOM = rpcgen
 NFS_PROT_X= ${DESTDIR}/usr/include/rpcsvc/nfs_prot.x
-DPSRCS= nfs_prot.h
 
 nfs_prot.h: ${NFS_PROT_X}
 	${RPCCOM} -h ${NFS_PROT_X} -o ${.TARGET}
 
-${OBJS} beforedepend: nfs_prot.h
-
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile
index 3e79074..64e4fb5 100644
--- a/usr.sbin/amd/mk-amd-map/Makefile
+++ b/usr.sbin/amd/mk-amd-map/Makefile
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/28/93
 
 PROG=	mk-amd-map
+SRCS=	mk-amd-map.c nfs_prot.h
 CFLAGS+=-I${.OBJDIR}
 CFLAGS+=-I${.CURDIR}/../include
 CFLAGS+=-I${.CURDIR}/../rpcx
@@ -10,12 +11,9 @@ MAN8=	mk-amd-map.8
 CLEANFILES+=nfs_prot.h
 RPCCOM = rpcgen
 NFS_PROT_X= ${DESTDIR}/usr/include/rpcsvc/nfs_prot.x
-DPSRCS= nfs_prot.h
 
 nfs_prot.h: ${NFS_PROT_X}
 	${RPCCOM} -h ${NFS_PROT_X} -o ${.TARGET}
 
-${OBJS} beforedepend: nfs_prot.h
-
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile
index 72acc8a..3b92854 100644
--- a/usr.sbin/rpc.statd/Makefile
+++ b/usr.sbin/rpc.statd/Makefile
@@ -1,9 +1,8 @@
-#	$Id: Makefile,v 1.5 1997/02/22 16:12:51 peter Exp $
+#	$Id: Makefile,v 1.6 1997/05/23 08:43:27 asami Exp $
 
 PROG =	rpc.statd
-SRCS =	file.c sm_inter_svc.c statd.c procs.c
+SRCS =	file.c sm_inter_svc.c sm_inter.h statd.c procs.c
 MAN8 =	rpc.statd.8
-DPSRCS+= sm_inter.h
 
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc