From 330698829eb4f39dca8c6cfb93d3029446188b30 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sun, 10 May 1998 16:01:36 +0000 Subject: [PATCH] Fixed missing dependencies on headers generated by rpcgen, as usual. Removed bogus dependencies of generated .c files on generated headers. Sorted sources lists. --- libexec/ypxfr/Makefile | 18 ++++++++++-------- usr.bin/passwd/Makefile | 20 +++++++++----------- usr.sbin/yppush/Makefile | 13 +++++++------ 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile index 61a59c7c96c4..b43aa87e073f 100644 --- a/libexec/ypxfr/Makefile +++ b/libexec/ypxfr/Makefile @@ -1,9 +1,11 @@ -# $Id$ +# $Id: Makefile,v 1.6 1997/02/22 14:22:46 peter Exp $ PROG= ypxfr -SRCS= ypxfr_clnt.c yp_clnt.c ypxfr_getmap.c yp_dblookup.c \ - yp_error.c ypxfr_misc.c ypxfr_main.c yp_dbwrite.c \ - ypxfrd_getmap.c +SRCS= yp_dblookup.c yp_dbwrite.c yp_error.c \ + ypxfr_getmap.c ypxfr_main.c ypxfr_misc.c \ + ypxfrd_getmap.c \ + ${GENSRCS} +GENSRCS=yp.h yp_clnt.c ypxfr_clnt.c .PATH: ${.CURDIR}/../../usr.sbin/ypserv @@ -13,16 +15,16 @@ CFLAGS+= -I. DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc -CLEANFILES= yp.h yp_clnt.c ypxfr_clnt.c +CLEANFILES= ${GENSRCS} RPCDIR= ${.CURDIR}/../../include/rpcsvc RPCGEN= rpcgen -I -C -ypxfr_clnt.c: ${RPCDIR}/yp.x yp.h +ypxfr_clnt.c: ${RPCDIR}/yp.x rm -f ${.TARGET} ${RPCGEN} -DYPPUSH_ONLY -l -o ${.TARGET} ${RPCDIR}/yp.x -yp_clnt.c: ${RPCDIR}/yp.x yp.h +yp_clnt.c: ${RPCDIR}/yp.x rm -f ${.TARGET} ${RPCGEN} -DYPSERV_ONLY -l -o ${.TARGET} ${RPCDIR}/yp.x @@ -30,7 +32,7 @@ yp.h: ${RPCDIR}/yp.x rm -f ${.TARGET} ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yp.x -# ypxfrd_xdr.c: ${RPCDIR}/ypxfrd.x ypxfrd.h +# ypxfrd_xdr.c: ${RPCDIR}/ypxfrd.x # rm -f ${.TARGET} # ${RPCGEN} -c -o ${.TARGET} ${RPCDIR}/ypxfrd.x diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index a4c4d27f848c..117be93f44fb 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,9 +1,11 @@ # From: @(#)Makefile 8.3 (Berkeley) 4/2/94 -# $Id: Makefile,v 1.26 1997/09/28 08:51:02 markm Exp $ +# $Id: Makefile,v 1.27 1998/03/06 14:02:04 bde Exp $ PROG= passwd -SRCS= local_passwd.c yppasswd_private_xdr.c yp_passwd.c \ - passwd.c pw_copy.c pw_util.c pw_yp.c +SRCS= local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \ + yp_passwd.c ypxfr_misc.c ${GENSRCS} +GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \ + yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c CFLAGS+=-Wall DPADD= ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL} @@ -19,11 +21,7 @@ CFLAGS+= -DLOGIN_CAP -DCRYPT -DYP -I. -I${.CURDIR} \ -I${.CURDIR}/../../usr.sbin/rpc.yppasswdd \ -Dyp_error=warnx -DLOGGING -SRCS+= ypxfr_misc.c yp_clnt.c yppasswd_clnt.c yppasswd_private_clnt.c \ - yppasswd_private.h - -CLEANFILES= yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \ - yppasswd_private.h yppasswd_private_xdr.c yppasswd_private_clnt.c +CLEANFILES= ${GENSRCS} RPCGEN= rpcgen -C RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x @@ -39,16 +37,16 @@ yp_clnt.c: ${RPCSRC} yp.h yppasswd.h: ${RPCSRC_PW} ${RPCGEN} -h -o ${.TARGET} ${RPCSRC_PW} -yppasswd_clnt.c: ${RPCSRC_PW} yppasswd.h +yppasswd_clnt.c: ${RPCSRC_PW} ${RPCGEN} -l -o ${.TARGET} ${RPCSRC_PW} yppasswd_private.h: ${RPCSRC_PRIV} ${RPCGEN} -h -o ${.TARGET} ${RPCSRC_PRIV} -yppasswd_private_xdr.c: ${RPCSRC_PRIV} yppasswd_private.h +yppasswd_private_xdr.c: ${RPCSRC_PRIV} ${RPCGEN} -c -o ${.TARGET} ${RPCSRC_PRIV} -yppasswd_private_clnt.c: ${RPCSRC_PRIV} yppasswd_private.h +yppasswd_private_clnt.c: ${RPCSRC_PRIV} ${RPCGEN} -l -o ${.TARGET} ${RPCSRC_PRIV} BINOWN= root diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile index fb58a1ad284a..68a33e0cbcda 100644 --- a/usr.sbin/yppush/Makefile +++ b/usr.sbin/yppush/Makefile @@ -1,8 +1,9 @@ -# $Id$ +# $Id: Makefile,v 1.4 1997/02/22 16:15:00 peter Exp $ PROG= yppush -SRCS= yp_clnt.c ypxfr_getmap.c yp_dblookup.c yppush_svc.c \ - yp_error.c ypxfr_misc.c yppush_main.c +SRCS= ypxfr_getmap.c yp_dblookup.c yp_error.c ypxfr_misc.c yppush_main.c \ + ${GENSRCS} +GENSRCS=yp.h yp_clnt.c yppush_svc.c MAN8= yppush.8 @@ -14,12 +15,12 @@ RPCGEN= rpcgen -C .PATH: ${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \ ${.CURDIR}/../../libexec/ypxfr -CLEANFILES= yp.h yp_clnt.c yppush_svc.c +CLEANFILES= ${GENSRCS} -yppush_svc.c: yp.x yp.h +yppush_svc.c: yp.x ${RPCGEN} -DYPPUSH_ONLY -m -o ${.TARGET} ${RPCDIR}/yp.x -yp_clnt.c: yp.x yp.h +yp_clnt.c: yp.x ${RPCGEN} -DYPSERV_ONLY -l -o ${.TARGET} ${RPCDIR}/yp.x yp.h: yp.x