Subject: kern/2142: vnode_if.[ch] build wastes time & space
To: None <gnats-bugs@NetBSD.ORG>
From: Chris G. Demetriou <cgd@sun-lamp.pc.cs.cmu.edu>
List: netbsd-bugs
Date: 02/27/1996 19:54:12
>Number:         2142
>Category:       kern
>Synopsis:       vnode_if.[ch] are built per-kernel.  this is a lose.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    kern-bug-people (Kernel Bug People)
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Feb 27 20:20:04 1996
>Last-Modified:
>Originator:     Chris G. Demetriou
>Organization:
Kernel Hackers 'r' Us
>Release:        NetBSD-current, Feb. 27, 1996
>Environment:
System: NetBSD sun-lamp.pc.cs.cmu.edu 1.1A NetBSD 1.1A (SUN_LAMP) #1: Tue Feb 27 18:00:52 EST 1996 cgd@sun-lamp.pc.cs.cmu.edu:/a/netbsd-src/working/src/sys/arch/i386/compile/SUN_LAMP i386


>Description:
	The vnode interface description files are built on a per-kernel basis.
	This has a few annoying problems:
		(1) it unnecessarily complicates ports' kernel Makefiles,
		(2) it wastes space and time,
		(3) it is inconsistent with the way that (some) other
		    machine-generated infrequently-changing files are
		    built.

	Clarification:

	(1) There are more rules, and more exceptions, than would otherwise
	    be necessary.

	(2) each kernel builds its own copy of vnode_if.[ch], even though
	    that's unnecessary.  This obviously wastes time (to build them)
	    and space (to store the private copies).

	(3) Contrast the vnode_if build process with the syscall table build
	    process.  Both sets of files are infrequently changing, etc.,
	    and have several other similar characteristics.  I believe that
	    if the machine-generated syscall files are going to be
	    pre-generated, the same should be done for the vnode_if files.

>How-To-Repeat:
	Build several kernels.  Note that each builds and stores its own
	vnode_if.[ch].

>Fix:
	A patch to make vnode_if.[ch] pre-generated is included below.
	vnode_if.c ends up in /sys/kern, and vnode_if.h ends up in /sys/sys.
	After having applied this patch, cd into /sys/kern, make vnode_if.c,
	then add and check in /sys/kern/vnode_if.c and /sys/sys/vnode_if.h
	into your revision control tree.

Index: arch/alpha/conf/Makefile.alpha
===================================================================
RCS file: /a/cvsroot/src/sys/arch/alpha/conf/Makefile.alpha,v
retrieving revision 1.13
diff -c -r1.13 Makefile.alpha
*** Makefile.alpha	1996/02/26 02:53:20	1.13
--- Makefile.alpha	1996/02/28 00:34:15
***************
*** 22,28 ****
  # PROF is set to -pg if profiling.
  
  AS?=	as
- AWK?=	awk
  CC?=	cc
  CPP?=	cpp
  LD?=	ld
--- 22,27 ----
***************
*** 81,87 ****
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o \
! 		vnode_if.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
--- 80,86 ----
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o \
! 		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
***************
*** 109,117 ****
  genassym.o: ${ALPHA}/alpha/genassym.c
  	${NORMAL_C_C}
  
- vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 
  param.c: $S/conf/param.c
  	rm -f param.c
  	cp $S/conf/param.c .
--- 108,113 ----
***************
*** 128,134 ****
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
--- 124,130 ----
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
***************
*** 149,159 ****
  	sh makelinks && rm -f dontlink
  
  SRCS=	${ALPHA}/alpha/locore.s \
! 	vnode_if.c param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h vnode_if.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${ALPHA}/alpha/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} vnode_if.c param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ALPHA}/alpha/genassym.c
  
--- 145,155 ----
  	sh makelinks && rm -f dontlink
  
  SRCS=	${ALPHA}/alpha/locore.s \
! 	param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${ALPHA}/alpha/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ALPHA}/alpha/genassym.c
  
Index: arch/amiga/conf/Makefile.amiga
===================================================================
RCS file: /a/cvsroot/src/sys/arch/amiga/conf/Makefile.amiga,v
retrieving revision 1.38
diff -c -r1.38 Makefile.amiga
*** Makefile.amiga	1996/02/26 02:53:25	1.38
--- Makefile.amiga	1996/02/28 00:34:21
***************
*** 22,28 ****
  # PROF is set to -pg if profiling.
  
  AS?=	as
- AWK?=	awk
  CC?=	cc
  CPP?=	cpp
  LD?=	ld
--- 22,27 ----
***************
*** 90,96 ****
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o ${FPSP} \
! 		vnode_if.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
--- 89,95 ----
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o ${FPSP} \
! 		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
***************
*** 118,126 ****
  genassym.o: ${AMIGA}/amiga/genassym.c
  	${NORMAL_C_C}
  
- vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 
  param.c: $S/conf/param.c
  	rm -f param.c
  	cp $S/conf/param.c .
--- 117,122 ----
***************
*** 137,143 ****
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
--- 133,139 ----
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
***************
*** 158,168 ****
  	sh makelinks && rm -f dontlink
  
  SRCS=	${AMIGA}/amiga/locore.s \
! 	vnode_if.c param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h vnode_if.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${AMIGA}/amiga/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} vnode_if.c param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${AMIGA}/amiga/genassym.c
  
--- 154,164 ----
  	sh makelinks && rm -f dontlink
  
  SRCS=	${AMIGA}/amiga/locore.s \
! 	param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${AMIGA}/amiga/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${AMIGA}/amiga/genassym.c
  
Index: arch/arm32/conf/Makefile.arm32
===================================================================
RCS file: /a/cvsroot/src/sys/arch/arm32/conf/Makefile.arm32,v
retrieving revision 1.9
diff -c -r1.9 Makefile.arm32
*** Makefile.arm32	1996/02/26 02:53:27	1.9
--- Makefile.arm32	1996/02/28 00:34:31
***************
*** 22,28 ****
  # PROF is set to -pg if profiling.
  
  AS?=	as
- AWK?=	awk
  CC?=	cc
  CPP?=	cpp
  LD?=	ld
--- 22,27 ----
***************
*** 81,87 ****
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o modedefs.o \
! 		vnode_if.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
--- 80,86 ----
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o modedefs.o \
! 		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
***************
*** 109,117 ****
  genassym.o: ${ARM32}/arm32/genassym.c
  	${NORMAL_C_C}
  
- vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 
  param.c: $S/conf/param.c
  	rm -f param.c
  	cp $S/conf/param.c .
--- 108,113 ----
***************
*** 128,134 ****
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
--- 124,130 ----
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
***************
*** 149,160 ****
  	sh makelinks && rm -f dontlink
  
  SRCS=	${ARM32}/arm32/locore.S modedefs.c \
! 	vnode_if.c param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h vnode_if.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${ARM32}/arm32/locore.S
  	mkdep -a ${CFLAGS} ${CPPFLAGS} modedefs.c
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} vnode_if.c param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ARM32}/arm32/genassym.c
  
--- 145,156 ----
  	sh makelinks && rm -f dontlink
  
  SRCS=	${ARM32}/arm32/locore.S modedefs.c \
! 	param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${ARM32}/arm32/locore.S
  	mkdep -a ${CFLAGS} ${CPPFLAGS} modedefs.c
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ARM32}/arm32/genassym.c
  
Index: arch/atari/conf/Makefile.atari
===================================================================
RCS file: /a/cvsroot/src/sys/arch/atari/conf/Makefile.atari,v
retrieving revision 1.15
diff -c -r1.15 Makefile.atari
*** Makefile.atari	1996/02/26 02:53:30	1.15
--- Makefile.atari	1996/02/28 00:34:37
***************
*** 22,28 ****
  # PROF is set to -pg if profiling.
  
  AS?=	as
- AWK?=	awk
  CC?=	cc
  CPP?=	cpp
  LD?=	ld
--- 22,27 ----
***************
*** 84,90 ****
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o ${FPSP} \
! 		vnode_if.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
--- 83,89 ----
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o ${FPSP} \
! 		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
***************
*** 112,120 ****
  genassym.o: ${ATARI}/atari/genassym.c
  	${NORMAL_C_C}
  
- vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 
  param.c: $S/conf/param.c
  	rm -f param.c
  	cp $S/conf/param.c .
--- 111,116 ----
***************
*** 131,137 ****
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
--- 127,133 ----
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
***************
*** 152,162 ****
  	sh makelinks && rm -f dontlink
  
  SRCS=	${ATARI}/atari/locore.s \
! 	vnode_if.c param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h vnode_if.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${ATARI}/atari/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} vnode_if.c param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ATARI}/atari/genassym.c
  
--- 148,158 ----
  	sh makelinks && rm -f dontlink
  
  SRCS=	${ATARI}/atari/locore.s \
! 	param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${ATARI}/atari/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ATARI}/atari/genassym.c
  
Index: arch/hp300/conf/Makefile.hp300
===================================================================
RCS file: /a/cvsroot/src/sys/arch/hp300/conf/Makefile.hp300,v
retrieving revision 1.36
diff -c -r1.36 Makefile.hp300
*** Makefile.hp300	1996/02/26 02:53:33	1.36
--- Makefile.hp300	1996/02/28 00:34:44
***************
*** 22,28 ****
  # PROF is set to -pg if profiling.
  
  AS?=	as
- AWK?=	awk
  CC?=	cc
  CPP?=	cpp
  LD?=	ld
--- 22,27 ----
***************
*** 84,90 ****
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o ${FPSP} \
! 		vnode_if.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
--- 83,89 ----
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o ${FPSP} \
! 		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
***************
*** 112,120 ****
  genassym.o: ${HP300}/hp300/genassym.c
  	${NORMAL_C_C}
  
- vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 
  param.c: $S/conf/param.c
  	rm -f param.c
  	cp $S/conf/param.c .
--- 111,116 ----
***************
*** 131,137 ****
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
--- 127,133 ----
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
***************
*** 152,162 ****
  	sh makelinks && rm -f dontlink
  
  SRCS=	${HP300}/hp300/locore.s \
! 	vnode_if.c param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h vnode_if.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${HP300}/hp300/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} vnode_if.c param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${HP300}/hp300/genassym.c
  
--- 148,158 ----
  	sh makelinks && rm -f dontlink
  
  SRCS=	${HP300}/hp300/locore.s \
! 	param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${HP300}/hp300/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${HP300}/hp300/genassym.c
  
Index: arch/i386/conf/Makefile.i386
===================================================================
RCS file: /a/cvsroot/src/sys/arch/i386/conf/Makefile.i386,v
retrieving revision 1.65
diff -c -r1.65 Makefile.i386
*** Makefile.i386	1996/02/26 02:53:37	1.65
--- Makefile.i386	1996/02/28 00:34:49
***************
*** 22,28 ****
  # PROF is set to -pg if profiling.
  
  AS?=	as
- AWK?=	awk
  CC?=	cc
  CPP?=	cpp
  LD?=	ld
--- 22,27 ----
***************
*** 81,87 ****
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o \
! 		vnode_if.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
--- 80,86 ----
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o \
! 		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
***************
*** 109,117 ****
  genassym.o: ${I386}/i386/genassym.c
  	${NORMAL_C_C}
  
- vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 
  param.c: $S/conf/param.c
  	rm -f param.c
  	cp $S/conf/param.c .
--- 108,113 ----
***************
*** 128,134 ****
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
--- 124,130 ----
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
***************
*** 149,159 ****
  	sh makelinks && rm -f dontlink
  
  SRCS=	${I386}/i386/locore.s \
! 	vnode_if.c param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h vnode_if.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${I386}/i386/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} vnode_if.c param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${I386}/i386/genassym.c
  
--- 145,155 ----
  	sh makelinks && rm -f dontlink
  
  SRCS=	${I386}/i386/locore.s \
! 	param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${I386}/i386/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${I386}/i386/genassym.c
  
Index: arch/mac68k/conf/Makefile.mac68k
===================================================================
RCS file: /a/cvsroot/src/sys/arch/mac68k/conf/Makefile.mac68k,v
retrieving revision 1.35
diff -c -r1.35 Makefile.mac68k
*** Makefile.mac68k	1996/02/26 02:53:40	1.35
--- Makefile.mac68k	1996/02/28 00:35:12
***************
*** 22,28 ****
  # PROF is set to -pg if profiling.
  
  AS?=	as
- AWK?=	awk
  CC?=	cc
  CPP?=	cpp
  LD?=	ld
--- 22,27 ----
***************
*** 84,90 ****
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o ${FPSP} \
! 		vnode_if.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
--- 83,89 ----
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o ${FPSP} \
! 		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
***************
*** 112,120 ****
  genassym.o: ${MAC68K}/mac68k/genassym.c
  	${NORMAL_C_C}
  
- vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 
  param.c: $S/conf/param.c
  	rm -f param.c
  	cp $S/conf/param.c .
--- 111,116 ----
***************
*** 131,137 ****
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
--- 127,133 ----
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
***************
*** 152,162 ****
  	sh makelinks && rm -f dontlink
  
  SRCS=	${MAC68K}/mac68k/locore.s \
! 	vnode_if.c param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h vnode_if.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${MAC68K}/mac68k/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} vnode_if.c param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${MAC68K}/mac68k/genassym.c
  
--- 148,158 ----
  	sh makelinks && rm -f dontlink
  
  SRCS=	${MAC68K}/mac68k/locore.s \
! 	param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${MAC68K}/mac68k/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${MAC68K}/mac68k/genassym.c
  
Index: arch/mvme68k/conf/Makefile.mvme68k
===================================================================
RCS file: /a/cvsroot/src/sys/arch/mvme68k/conf/Makefile.mvme68k,v
retrieving revision 1.9
diff -c -r1.9 Makefile.mvme68k
*** Makefile.mvme68k	1996/02/26 02:53:42	1.9
--- Makefile.mvme68k	1996/02/28 00:35:16
***************
*** 22,28 ****
  # PROF is set to -pg if profiling.
  
  AS?=	as
- AWK?=	awk
  CC?=	cc
  CPP?=	cpp
  LD?=	ld
--- 22,27 ----
***************
*** 84,90 ****
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o ${FPSP} \
! 		vnode_if.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
--- 83,89 ----
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o ${FPSP} \
! 		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
***************
*** 112,120 ****
  genassym.o: ${MVME68K}/mvme68k/genassym.c
  	${NORMAL_C_C}
  
- vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 
  param.c: $S/conf/param.c
  	rm -f param.c
  	cp $S/conf/param.c .
--- 111,116 ----
***************
*** 131,137 ****
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
--- 127,133 ----
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
***************
*** 152,162 ****
  	sh makelinks && rm -f dontlink
  
  SRCS=	${MVME68K}/mvme68k/locore.s \
! 	vnode_if.c param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h vnode_if.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${MVME68K}/mvme68k/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} vnode_if.c param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${MVME68K}/mvme68k/genassym.c
  
--- 148,158 ----
  	sh makelinks && rm -f dontlink
  
  SRCS=	${MVME68K}/mvme68k/locore.s \
! 	param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${MVME68K}/mvme68k/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${MVME68K}/mvme68k/genassym.c
  
Index: arch/pc532/conf/Makefile.pc532
===================================================================
RCS file: /a/cvsroot/src/sys/arch/pc532/conf/Makefile.pc532,v
retrieving revision 1.24
diff -c -r1.24 Makefile.pc532
*** Makefile.pc532	1996/02/26 02:53:44	1.24
--- Makefile.pc532	1996/02/28 00:35:20
***************
*** 22,28 ****
  # PROF is set to -pg if profiling.
  
  AS?=	as
- AWK?=	awk
  CC?=	cc
  CPP?=	cpp
  LD?=	ld
--- 22,27 ----
***************
*** 83,89 ****
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o \
! 		vnode_if.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
--- 82,88 ----
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o \
! 		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
***************
*** 111,119 ****
  genassym.o: ${PC532}/pc532/genassym.c
  	${NORMAL_C_C}
  
- vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 
  param.c: $S/conf/param.c
  	rm -f param.c
  	cp $S/conf/param.c .
--- 110,115 ----
***************
*** 130,136 ****
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
--- 126,132 ----
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
***************
*** 151,161 ****
  	sh makelinks && rm -f dontlink
  
  SRCS=	${PC532}/pc532/locore.s \
! 	vnode_if.c param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h vnode_if.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${PC532}/pc532/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} vnode_if.c param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${PC532}/pc532/genassym.c
  
--- 147,157 ----
  	sh makelinks && rm -f dontlink
  
  SRCS=	${PC532}/pc532/locore.s \
! 	param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${PC532}/pc532/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${PC532}/pc532/genassym.c
  
Index: arch/pmax/conf/Makefile.pmax
===================================================================
RCS file: /a/cvsroot/src/sys/arch/pmax/conf/Makefile.pmax,v
retrieving revision 1.25
diff -c -r1.25 Makefile.pmax
*** Makefile.pmax	1996/02/26 02:53:46	1.25
--- Makefile.pmax	1996/02/28 00:35:24
***************
*** 22,28 ****
  # PROF is set to -pg if profiling.
  
  AS?=	as
- AWK?=	awk
  CC?=	cc
  CPP?=	cpp
  LD?=	ld
--- 22,27 ----
***************
*** 81,87 ****
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o fp.o \
! 		vnode_if.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o ; \
--- 80,86 ----
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o fp.o \
! 		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o ; \
***************
*** 114,122 ****
  genassym.o: ${PMAX}/pmax/genassym.c
  	${NORMAL_C_C}
  
- vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 
  param.c: $S/conf/param.c
  	rm -f param.c
  	cp $S/conf/param.c .
--- 113,118 ----
***************
*** 133,139 ****
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
--- 129,135 ----
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
***************
*** 154,164 ****
  	sh makelinks && rm -f dontlink
  
  SRCS=	${PMAX}/pmax/locore.S ${PMAX}/pmax/fp.S \
! 	vnode_if.c param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h vnode_if.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${PMAX}/pmax/locore.S ${PMAX}/pmax/fp.S
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} vnode_if.c param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${PMAX}/pmax/genassym.c
  
--- 150,160 ----
  	sh makelinks && rm -f dontlink
  
  SRCS=	${PMAX}/pmax/locore.S ${PMAX}/pmax/fp.S \
! 	param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${PMAX}/pmax/locore.S ${PMAX}/pmax/fp.S
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${PMAX}/pmax/genassym.c
  
Index: arch/sparc/conf/Makefile.sparc
===================================================================
RCS file: /a/cvsroot/src/sys/arch/sparc/conf/Makefile.sparc,v
retrieving revision 1.28
diff -c -r1.28 Makefile.sparc
*** Makefile.sparc	1996/02/26 02:53:49	1.28
--- Makefile.sparc	1996/02/28 00:35:33
***************
*** 22,28 ****
  # PROF is set to -pg if profiling.
  
  AS?=	as
- AWK?=	awk
  CC?=	cc
  CPP?=	cpp
  LD?=	ld
--- 22,27 ----
***************
*** 81,87 ****
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o \
! 		vnode_if.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
--- 80,86 ----
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o \
! 		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
***************
*** 109,117 ****
  genassym.o: ${SPARC}/sparc/genassym.c
  	${NORMAL_C_C}
  
- vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 
  param.c: $S/conf/param.c
  	rm -f param.c
  	cp $S/conf/param.c .
--- 108,113 ----
***************
*** 128,134 ****
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
--- 124,130 ----
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
***************
*** 149,159 ****
  	sh makelinks && rm -f dontlink
  
  SRCS=	${SPARC}/sparc/locore.s \
! 	vnode_if.c param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h vnode_if.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${SPARC}/sparc/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} vnode_if.c param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${SPARC}/sparc/genassym.c
  
--- 145,155 ----
  	sh makelinks && rm -f dontlink
  
  SRCS=	${SPARC}/sparc/locore.s \
! 	param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${SPARC}/sparc/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${SPARC}/sparc/genassym.c
  
Index: arch/sun3/conf/Makefile.sun3
===================================================================
RCS file: /a/cvsroot/src/sys/arch/sun3/conf/Makefile.sun3,v
retrieving revision 1.42
diff -c -r1.42 Makefile.sun3
*** Makefile.sun3	1996/02/26 02:53:51	1.42
--- Makefile.sun3	1996/02/28 00:35:36
***************
*** 22,28 ****
  # PROF is set to -pg if profiling.
  
  AS?=	as
- AWK?=	awk
  CC?=	cc
  CPP?=	cpp
  LD?=	ld
--- 22,27 ----
***************
*** 81,87 ****
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o \
! 		vnode_if.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
--- 80,86 ----
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	locore.o \
! 		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
***************
*** 109,117 ****
  genassym.o: ${SUN3}/sun3/genassym.c
  	${NORMAL_C_C}
  
- vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 
  param.c: $S/conf/param.c
  	rm -f param.c
  	cp $S/conf/param.c .
--- 108,113 ----
***************
*** 128,134 ****
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
--- 124,130 ----
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
  
  lint:
***************
*** 149,159 ****
  	sh makelinks && rm -f dontlink
  
  SRCS=	${SUN3}/sun3/locore.s \
! 	vnode_if.c param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h vnode_if.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${SUN3}/sun3/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} vnode_if.c param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${SUN3}/sun3/genassym.c
  
--- 145,155 ----
  	sh makelinks && rm -f dontlink
  
  SRCS=	${SUN3}/sun3/locore.s \
! 	param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} assym.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${SUN3}/sun3/locore.s
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${SUN3}/sun3/genassym.c
  
Index: arch/vax/conf/Makefile.vax
===================================================================
RCS file: /a/cvsroot/src/sys/arch/vax/conf/Makefile.vax,v
retrieving revision 1.19
diff -c -r1.19 Makefile.vax
*** Makefile.vax	1996/02/26 02:53:53	1.19
--- Makefile.vax	1996/02/28 00:35:39
***************
*** 23,29 ****
  # PROF is set to -pg if profiling.
  
  AS?=	as
- AWK?=	awk
  CC?=	cc
  CPP?=	cpp
  LD?=	ld
--- 23,28 ----
***************
*** 82,88 ****
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	intvec.o subr.o lim.o \
! 		vnode_if.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
--- 81,87 ----
  #	${SYSTEM_LD} swapxxx.o
  #	${SYSTEM_LD_TAIL}
  SYSTEM_OBJ=	intvec.o subr.o lim.o \
! 		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
  SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
  SYSTEM_LD_HEAD=	@rm -f $@
  SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
***************
*** 101,109 ****
  
  %LOAD
  
- vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 	AWK="${AWK}" sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
- 
  param.c: $S/conf/param.c
  	rm -f param.c
  	cp $S/conf/param.c .
--- 100,105 ----
***************
*** 120,126 ****
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags vnode_if.[ch] *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks
  
  lint:
--- 116,122 ----
  
  
  clean::
! 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
  	    [Ee]rrs linterrs makelinks
  
  lint:
***************
*** 141,152 ****
  	sh makelinks && rm -f dontlink
  
  SRCS=	${VAX}/vax/intvec.s ${VAX}/vax/subr.s lim.c \
! 	vnode_if.c param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} vnode_if.h param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${VAX}/vax/intvec.s ${VAX}/vax/subr.s
  	mkdep -a ${CFLAGS} ${CPPFLAGS} lim.c
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} vnode_if.c param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  
  
--- 137,148 ----
  	sh makelinks && rm -f dontlink
  
  SRCS=	${VAX}/vax/intvec.s ${VAX}/vax/subr.s lim.c \
! 	param.c ioconf.c ${CFILES} ${SFILES}
  depend: .depend
! .depend: ${SRCS} param.c
  	mkdep ${AFLAGS} ${CPPFLAGS} ${VAX}/vax/intvec.s ${VAX}/vax/subr.s
  	mkdep -a ${CFLAGS} ${CPPFLAGS} lim.c
! 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
  	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
  
  
Index: conf/files
===================================================================
RCS file: /a/cvsroot/src/sys/conf/files,v
retrieving revision 1.77
diff -c -r1.77 files
*** files	1996/02/27 21:59:14	1.77
--- files	1996/02/28 00:35:42
***************
*** 150,155 ****
--- 150,156 ----
  file kern/vfs_subr.c
  file kern/vfs_syscalls.c
  file kern/vfs_vnops.c
+ file kern/vnode_if.c
  file miscfs/deadfs/dead_vnops.c
  file miscfs/fdesc/fdesc_vfsops.c	fdesc
  file miscfs/fdesc/fdesc_vnops.c		fdesc
Index: conf/files.oldconf
===================================================================
RCS file: /a/cvsroot/src/sys/conf/files.oldconf,v
retrieving revision 1.62
diff -c -r1.62 files.oldconf
*** files.oldconf	1996/02/03 00:23:51	1.62
--- files.oldconf	1996/02/28 00:35:42
***************
*** 91,96 ****
--- 91,97 ----
  kern/vfs_subr.c		standard
  kern/vfs_syscalls.c	standard
  kern/vfs_vnops.c	standard
+ kern/vnode_if.c		standard
  miscfs/deadfs/dead_vnops.c	standard
  miscfs/fdesc/fdesc_vfsops.c	optional fdesc
  miscfs/fdesc/fdesc_vnops.c	optional fdesc
Index: kern/Makefile
===================================================================
RCS file: /a/cvsroot/src/sys/kern/Makefile,v
retrieving revision 1.3
diff -c -r1.3 Makefile
*** Makefile	1995/11/22 23:11:32	1.3
--- Makefile	1996/02/28 00:35:51
***************
*** 5,11 ****
  ARCH=	hp300 i386 luna68k news3400 pmax sparc tahoe vax
  
  all:
! 	@echo "make tags, make links or init_sysent.c only"
  
  SYSCALLSRC = makesyscalls.sh syscalls.conf syscalls.master
  init_sysent.c syscalls.c ../sys/syscall.h: ${SYSCALLSRC}
--- 5,12 ----
  ARCH=	hp300 i386 luna68k news3400 pmax sparc tahoe vax
  
  all:
! 	@echo "make one of: tags links init_sysent.c vnode_if.c"
! 	@false
  
  SYSCALLSRC = makesyscalls.sh syscalls.conf syscalls.master
  init_sysent.c syscalls.c ../sys/syscall.h: ${SYSCALLSRC}
***************
*** 14,19 ****
--- 15,26 ----
  	-mv -f ../sys/syscall.h ../sys/syscall.h.bak
  	-mv -f ../sys/syscallargs.h ../sys/syscallargs.h.bak
  	sh makesyscalls.sh syscalls.conf syscalls.master
+ 
+ VNODEIFSRC = vnode_if.sh vnode_if.src
+ vnode_if.c ../sys/vnode_if.h: ${VNODEIFSRC}
+ 	-mv -f vnode_if.c vnode_if.c.bak
+ 	-mv -f ../sys/vnode_if.h ../sys/vnode_if.h.bak
+ 	sh vnode_if.sh vnode_if.src
  
  # Kernel tags:
  # Tags files are built in the top-level directory for each architecture,
Index: kern/vnode_if.sh
===================================================================
RCS file: /a/cvsroot/src/sys/kern/vnode_if.sh,v
retrieving revision 1.8
diff -c -r1.8 vnode_if.sh
*** vnode_if.sh	1995/03/10 04:13:52	1.8
--- vnode_if.sh	1996/02/28 00:35:51
***************
*** 1,5 ****
  #!/bin/sh -
! copyright='
  /*
   * Copyright (c) 1992, 1993
   *	The Regents of the University of California.  All rights reserved.
--- 1,5 ----
  #!/bin/sh -
! copyright="\
  /*
   * Copyright (c) 1992, 1993
   *	The Regents of the University of California.  All rights reserved.
***************
*** 32,38 ****
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   */
! '
  SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.8 1995/03/10 04:13:52 chopps Exp $'
  
  # Script to produce VFS front-end sugar.
--- 32,38 ----
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   */
! "
  SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.8 1995/03/10 04:13:52 chopps Exp $'
  
  # Script to produce VFS front-end sugar.
***************
*** 46,57 ****
  	exit 1
  fi
  
! # Name of the source file.
  src=$1
  
  # Names of the created files.
  out_c=vnode_if.c
! out_h=vnode_if.h
  
  # Awk program (must support nawk extensions)
  # Use "awk" at Berkeley, "nawk" or "gawk" elsewhere.
--- 46,58 ----
  	exit 1
  fi
  
! # Name and revision of the source file.
  src=$1
+ SRC_ID=`head -1 $src | sed -e 's/.*\$\(.*\)\$.*/\1/'`
  
  # Names of the created files.
  out_c=vnode_if.c
! out_h=../sys/vnode_if.h
  
  # Awk program (must support nawk extensions)
  # Use "awk" at Berkeley, "nawk" or "gawk" elsewhere.
***************
*** 123,137 ****
  '
  
  # This is put after the copyright on each generated file.
! warning="
  /*
   * Warning: This file is generated automatically.
   * (Modifications made here may easily be lost!)
   *
!  * Created by the script:
   *	${SCRIPT_ID}
   */
! "
  
  # This is to satisfy McKusick (get rid of evil spaces 8^)
  anal_retentive='s:\([^/]\*\) :\1:g'
--- 124,140 ----
  '
  
  # This is put after the copyright on each generated file.
! warning="\
  /*
   * Warning: This file is generated automatically.
   * (Modifications made here may easily be lost!)
   *
!  * Created from the file:
!  *	${SRC_ID}
!  * by the script:
   *	${SCRIPT_ID}
   */
! " 
  
  # This is to satisfy McKusick (get rid of evil spaces 8^)
  anal_retentive='s:\([^/]\*\) :\1:g'
***************
*** 143,150 ****
  exec > $out_h
  
  # Begin stuff
! echo "$copyright"
! echo "$warning"
  echo '
  extern struct vnodeop_desc vop_default_desc;
  '
--- 146,154 ----
  exec > $out_h
  
  # Begin stuff
! echo -n "$warning" | sed -e 's/\$//g'
! echo ""
! echo -n "$copyright"
  echo '
  extern struct vnodeop_desc vop_default_desc;
  '
***************
*** 224,231 ****
  exec > $out_c
  
  # Begin stuff
! echo "$copyright"
! echo "$warning"
  echo '
  #include <sys/param.h>
  #include <sys/mount.h>
--- 228,236 ----
  exec > $out_c
  
  # Begin stuff
! echo -n "$warning" | sed -e 's/\$//g'
! echo ""
! echo -n "$copyright"
  echo '
  #include <sys/param.h>
  #include <sys/mount.h>
Index: sys/vnode.h
===================================================================
RCS file: /a/cvsroot/src/sys/sys/vnode.h,v
retrieving revision 1.37
diff -c -r1.37 vnode.h
*** vnode.h	1996/02/09 18:25:47	1.37
--- vnode.h	1996/02/28 00:36:02
***************
*** 343,349 ****
  /*
   * Finally, include the default set of vnode operations.
   */
! #include "vnode_if.h"
  
  /*
   * Public vnode manipulation functions.
--- 343,349 ----
  /*
   * Finally, include the default set of vnode operations.
   */
! #include <sys/vnode_if.h>
  
  /*
   * Public vnode manipulation functions.
>Audit-Trail:
>Unformatted: