From a7aac2725fd0273f23418c569a59fb33dbb2d80a Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Tue, 4 Jul 1995 08:39:27 +0000
Subject: [PATCH] Add a dependency on the .x source file and avoid copying it.

bootparam_prot.x was changed for nfsv3 but bootparamd and callbootd
kept using the old version which fortunately failed at build time.
Copying hasn't been necessary since path handling was fixed in
rpcgen/rpc_main.c some time ago.
---
 gnu/usr.bin/yppush/Makefile             | 18 ++++++++----------
 usr.sbin/bootparamd/bootparamd/Makefile | 25 ++++++++++---------------
 usr.sbin/bootparamd/callbootd/Makefile  | 25 ++++++++++---------------
 3 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/gnu/usr.bin/yppush/Makefile b/gnu/usr.bin/yppush/Makefile
index 9d883b6bc448..374760aa302c 100644
--- a/gnu/usr.bin/yppush/Makefile
+++ b/gnu/usr.bin/yppush/Makefile
@@ -1,20 +1,18 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id: Makefile,v 1.6 1995/04/02 20:28:09 wpaul Exp $
+#	$Id: Makefile,v 1.7 1995/05/30 05:05:19 rgrimes Exp $
 
 PROG=	yppush
 SRCS=	yp_clnt.c yppush.c
 
 MAN8=	yppush.8
-CLEANFILES= yp_clnt.c yp.h yp.x
+CLEANFILES= yp_clnt.c yp.h
 
-yp_clnt.c: yp.h
-	rm -f yp.x
-	cp ${DESTDIR}/usr/include/rpcsvc/yp.x .
-	rpcgen  -l -o yp_clnt.c yp.x
+RPCSRC=	${DESTDIR}/usr/include/rpcsvc/yp.x
 
-yp.h:
-	rm -f yp.x
-	cp ${DESTDIR}/usr/include/rpcsvc/yp.x .
-	rpcgen  -h -o yp.h yp.x
+yp_clnt.c: ${RPCSRC} yp.h
+	rpcgen -l -o ${.TARGET} ${RPCSRC}
+
+yp.h: ${RPCSRC}
+	rpcgen -h -o ${.TARGET} ${RPCSRC}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile
index dd85c805c6f1..c4e19d692cda 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile
+++ b/usr.sbin/bootparamd/bootparamd/Makefile
@@ -1,26 +1,21 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id: Makefile,v 1.4 1995/03/02 21:59:51 wpaul Exp $
+#	$Id: Makefile,v 1.5 1995/05/30 03:46:26 rgrimes Exp $
 
 PROG=	bootparamd
 SRCS=	bootparam_prot_xdr.c bootparam_prot_svc.c bootparamd.c main.c
 MAN8=	bootparamd.8
 CFLAGS+= -DTFTP_DIR=\"/tftpboot\" -I.
-CLEANFILES= bootparam_prot_svc.c bootparam_prot_xdr.c  \
-	    bootparam_prot.h bootparam_prot.x
+CLEANFILES= bootparam_prot_svc.c bootparam_prot_xdr.c bootparam_prot.h
 
-bootparam_prot_svc.c: bootparam_prot.h
-	rm -f bootparam_prot.x
-	cp ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x .
-	rpcgen  -m -o bootparam_prot_svc.c bootparam_prot.x
+RPCSRC=	${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x
 
-bootparam_prot_xdr.c: bootparam_prot.h
-	rm -f bootparam_prot.x
-	cp ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x .
-	rpcgen  -c -o bootparam_prot_xdr.c bootparam_prot.x
+bootparam_prot_svc.c: ${RPCSRC} bootparam_prot.h
+	rpcgen -m -o ${.TARGET} ${RPCSRC}
 
-bootparam_prot.h:
-	rm -f bootparam_prot.x
-	cp ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x .
-	rpcgen  -h -o bootparam_prot.h bootparam_prot.x
+bootparam_prot_xdr.c: ${RPCSRC} bootparam_prot.h
+	rpcgen -c -o ${.TARGET} ${RPCSRC}
+
+bootparam_prot.h: ${RPCSRC}
+	rpcgen -h -o ${.TARGET} ${RPCSRC}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile
index bc447616d6e6..82d8f8889588 100644
--- a/usr.sbin/bootparamd/callbootd/Makefile
+++ b/usr.sbin/bootparamd/callbootd/Makefile
@@ -1,26 +1,21 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id: Makefile,v 1.4 1995/03/02 22:00:33 wpaul Exp $
+#	$Id: Makefile,v 1.5 1995/05/30 03:46:29 rgrimes Exp $
 
 PROG=	callbootd
 SRCS=	bootparam_prot_xdr.c bootparam_prot_clnt.c callbootd.c
 NOMAN=
 CFLAGS+= -I.
-CLEANFILES= bootparam_prot_clnt.c bootparam_prot_xdr.c  \
-	    bootparam_prot.h bootparam_prot.x
+CLEANFILES= bootparam_prot_clnt.c bootparam_prot_xdr.c bootparam_prot.h
 
-bootparam_prot_clnt.c: bootparam_prot.h
-	rm -f bootparam_prot.x
-	cp ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x .
-	rpcgen  -l -o bootparam_prot_clnt.c bootparam_prot.x
+RPCSRC=	${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x
 
-bootparam_prot_xdr.c: bootparam_prot.h
-	rm -f bootparam_prot.x
-	cp ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x .
-	rpcgen  -c -o bootparam_prot_xdr.c bootparam_prot.x
+bootparam_prot_clnt.c: ${RPCSRC} bootparam_prot.h
+	rpcgen -l -o ${.TARGET} ${RPCSRC}
 
-bootparam_prot.h:
-	rm -f bootparam_prot.x
-	cp ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x .
-	rpcgen  -h -o bootparam_prot.h bootparam_prot.x
+bootparam_prot_xdr.c: ${RPCSRC} bootparam_prot.h
+	rpcgen -c -o ${.TARGET} ${RPCSRC}
+
+bootparam_prot.h: ${RPCSRC}
+	rpcgen -h -o ${.TARGET} ${RPCSRC}
 
 .include <bsd.prog.mk>