Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/librpcsvc No need to do the tricky XRPCGEN dance; simply...



details:   https://anonhg.NetBSD.org/src/rev/e4b7249dab0b
branches:  trunk
changeset: 516859:e4b7249dab0b
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Oct 31 20:56:09 2001 +0000

description:
No need to do the tricky XRPCGEN dance; simply add the rules after
.include <bsd.lib.mk>.  Defining the explicit compile rules later is fine.

diffstat:

 lib/librpcsvc/Makefile |  20 ++++----------------
 1 files changed, 4 insertions(+), 16 deletions(-)

diffs (40 lines):

diff -r c17032be4b8f -r e4b7249dab0b lib/librpcsvc/Makefile
--- a/lib/librpcsvc/Makefile    Wed Oct 31 20:41:17 2001 +0000
+++ b/lib/librpcsvc/Makefile    Wed Oct 31 20:56:09 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.31 2001/03/21 20:14:10 mycroft Exp $
+#      $NetBSD: Makefile,v 1.32 2001/10/31 20:56:09 tv Exp $
 
 RPCSRCS=       bootparam_prot.x klm_prot.x mount.x nfs_prot.x\
                nlm_prot.x rex.x rnusers.x rusers.x rquota.x rstat.x rwall.x\
@@ -14,27 +14,15 @@
 MKMAN=         no
 MKPIC=         no
 
-# This little dance is necessary because RPCGEN doesn't get set until
-# bsd.lib.mk is included at the end of the makefile.  Unfortunately
-# that's after make has figured out dependencies using the (lack of) values
-# of variables at the time it parses the dependency line.
-.ifnmake getrpcgen
-XRPCGEN != cd ${.CURDIR} && ${MAKE} -B ${MAKEFLAGS} getrpcgen
-.endif
-
-getrpcgen:
-       @set -- X `type ${RPCGEN}` && shift `expr $$# - 1` && echo "$$1"
+.include <bsd.lib.mk>
 
 # We don't use explicit suffix rules here to avoid dependencies in the
 # Installed files.
 
 .for I in ${RPCSRCS}
-
-${I:.x=.c}: $I ${XRPCGEN}
+${I:.x=.c}: $I ${RPCGEN}
        ${RPCGEN} -C -c ${.CURDIR}/$I -o ${.TARGET}
 
-${I:.x=.h}: $I ${XRPCGEN}
+${I:.x=.h}: $I ${RPCGEN}
        ${RPCGEN} -C -h ${.CURDIR}/$I -o ${.TARGET}
 .endfor
-
-.include <bsd.lib.mk>



Home | Main Index | Thread Index | Old Index