Index: head/sys/alpha/conf/Makefile.alpha
===================================================================
--- head/sys/alpha/conf/Makefile.alpha	(revision 38903)
+++ head/sys/alpha/conf/Makefile.alpha	(revision 38904)
@@ -1,284 +1,285 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.6 1998/07/30 08:12:14 dfr Exp $
+#	$Id: Makefile.alpha,v 1.7 1998/08/10 07:53:58 dfr Exp $
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/alpha/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/alpha/conf/Makefile.alpha
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
 %VERSREQ=	300005
 
 BINFORMAT?=	elf
 
 STD8X16FONT?=	iso
 
 .if exists(./@/.)
 S=	./@
 .else
 S=	../..
 .endif
 ALPHA=	${S}/alpha
 
 HCC?=${CC}
 SIZE?=size
 
 COPTFLAGS?=-O
 INCLUDES= -nostdinc -I- -I. -I$S
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
 .else
 INCLUDES+= -I/usr/include
 .endif
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h -U__NetBSD__
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -mno-fp-regs -Wa,-mev56
 LOAD_ADDRESS?=	0xfffffc0000300000
 DEFINED_PROF=	${PROF}
 .if defined(PROF)
 CFLAGS+=	-malign-functions=4
 .if ${PROFLEVEL} >= 2
 IDENT+=	-DGPROF4 -DGUPROF
 PROF+=	-mprofiler-epilogue
 .endif
 .endif
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 NORMAL_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $<
 DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 DRIVER_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $<
 PROFILE_C= ${CC} -c ${CFLAGS} ${PARAM} $<
 
-NORMAL_M= sh $S/kern/makedevops.sh -c $<;\
-	  ${CC} -c ${CFLAGS} ${PROF} `basename $< .m`.c
+NORMAL_M= ${NORMAL_C}
 
 # ${ALPHA}/alpha/setdef0.c and ${ALPHA}/alpha/setdef1.c are intentionally
 # omitted from SYSTEM_CFILES.  They depend on setdefs.h, a header which
 # is generated from all of ${OBJS}.  We don't want to have to compile
 # everything just to do a make depend.
 SYSTEM_CFILES= ioconf.c param.c vnode_if.c config.c
 SYSTEM_SFILES= ${ALPHA}/alpha/locore.s
 SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 .if ${CFLAGS:M-g} == ""
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
 .if ${BINFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o \
 	${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.so
 SYSTEM_LD= @${LD} --export-dynamic -T$S/alpha/conf/kernel.script -e locorestart \
 	-o $@ -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
 .endif
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %CFILES
 
 %SFILES
+
+%MFILES
 
 %LOAD
 
 %CLEAN
 
 clean:
 	rm -f *.o *.s eddep errs genassym gensetdefs kernel linterrs \
 	      makelinks param.c setdefs.h symbols.exclude symbols.sort tags \
 	      vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} \
 #	  ${ALPHA}/alpha/Locore.c ${CFILES} ioconf.c param.c | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
 symbols.exclude: Makefile
 	echo "gcc2_compiled." >symbols.exclude
 	echo "___gnu_compiled_c" >>symbols.exclude
 
 symbols.sort: ${ALPHA}/alpha/symbols.raw
 	grep -v '^#' ${ALPHA}/alpha/symbols.raw \
 	    | sed 's/^	//' | sort -u > symbols.sort
 
 locore.o: ${ALPHA}/alpha/locore.s assym.s
 	${NORMAL_S}
 
 hack.so: Makefile
 	echo "void __elf_kld_hack() {}" > hack.c
 	${CC} -shared -nostdlib hack.c -o hack.so
 	rm -f hack.c
 
 setdef0.o: ${ALPHA}/alpha/setdef0.c setdefs.h
 	${NORMAL_C}
 
 setdef1.o: ${ALPHA}/alpha/setdef1.c setdefs.h
 	${NORMAL_C}
 
 setdefs.h: gensetdefs ${OBJS}
 	@echo Generating kernel linker sets
 	@./gensetdefs ${OBJS} >setdefs.h
 
 gensetdefs: gensetdefs.o
 	${HCC} -static gensetdefs.o -o $@
 
 gensetdefs.o: ${ALPHA}/alpha/gensetdefs.c
 	${HCC} -c -I${INCLUDES} ${ALPHA}/alpha/gensetdefs.c
 
 # everything potentially depends on the Makefile since everything potentially
 # depends on the options.  Some things are more dependent on the Makefile for
 # historical reasons.
 machdep.o: Makefile
 
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile
 
 # XXX - may no longer be needed
 locore.o: Makefile
 
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 
 # this rule stops ./assym.s in .depend from causing problems
 ./assym.s: assym.s
 
 assym.s: genassym
 	./genassym >assym.s
 
 # Some of the defines that genassym outputs may well depend on the
 # value of kernel options.
 genassym.o: ${ALPHA}/alpha/genassym.c Makefile opt_global.h
 	${HCC} -c ${COPTS} ${PARAM} -UKERNEL ${ALPHA}/alpha/genassym.c
 
 genassym: genassym.o
 	${HCC} -static ${COPTS} ${PARAM} genassym.o -o $@
 
 SYSTEM_OBJS+=	__divqu.o __divq.o __divlu.o __divl.o
 SYSTEM_OBJS+=	__remqu.o __remq.o __remlu.o __reml.o
 CLEAN+=	__divqu.S __divq.S __divlu.S __divl.S
 CLEAN+=	__remqu.S __remq.S __remlu.S __reml.S
 
 __divqu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divqu')define(OP,\`div')define(S,\`false')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __divq.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divq')define(OP,\`div')define(S,\`true')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __divlu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divlu')define(OP,\`div')define(S,\`false')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __divl.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divl')define(OP,\`div')define(S,\`true')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __remqu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__remqu')define(OP,\`rem')define(S,\`false')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __remq.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__remq')define(OP,\`rem')define(S,\`true')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __remlu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__remlu')define(OP,\`rem')define(S,\`false')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __reml.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__reml')define(OP,\`rem')define(S,\`true')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 
 ${OBJS}: opt_global.h
 
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
 	mkdep -a -f .newdep ${COPTS} ${CFILES} ${SYSTEM_CFILES}
 	mkdep -a -f .newdep ${COPTS} ${PARAM} -UKERNEL ${ALPHA}/alpha/genassym.c
 	MKDEP_CPP="${CC} -E -x assembler-with-cpp" ; export MKDEP_CPP ; \
 	mkdep -a -f .newdep -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .depend
 	mv -f .newdep .depend
 
 cleandepend:
 	rm -f .depend
 
 links:
 	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES:Nswapkernel.c} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
 tags:
 	@echo "see $S/kern/Makefile for tags"
 
 install:
 	@if [ ! -f kernel ] ; then \
 		echo "You must first build your kernel before trying to install." ; \
 		exit 1 ; \
 	fi
 .if exists(${DESTDIR}/kernel)
 	chflags noschg ${DESTDIR}/kernel
 	mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old
 .endif
 	PATH=$${PATH}:/sbin:/usr/sbin; \
 	if [ `sysctl -n kern.bootfile` = ${DESTDIR}/kernel ] ; then \
 		sysctl -w kern.bootfile=${DESTDIR}/kernel.old ; \
 		if [ -f /var/db/kvm_kernel.db ] ; then \
 			mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \
 		fi \
 	fi
 	install -c -m 555 -o root -g wheel -fschg kernel ${DESTDIR}/
 
 ioconf.o: ioconf.c $S/sys/param.h $S/sys/buf.h
 	${CC} -c ${CFLAGS} ioconf.c
 
 param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
 vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 	${CC} ${CFLAGS} -c vers.c
 
 vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
 vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
 
 .include <bsd.kern.mk>
 
 %RULES
 
 # DO NOT DELETE THIS LINE -- make depend uses it
Index: head/sys/alpha/conf/files.alpha
===================================================================
--- head/sys/alpha/conf/files.alpha	(revision 38903)
+++ head/sys/alpha/conf/files.alpha	(revision 38904)
@@ -1,144 +1,140 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.6 1998/08/20 08:27:10 dfr Exp $
+#	$Id: files.alpha,v 1.7 1998/08/24 08:48:22 dfr Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
 #
 font8x16.o			optional	std8x16font		\
 	compile-with	"uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \
 	no-implicit-rule before-depend \
 	clean		"${STD8X16FONT}-8x16 font8x16.c" 
 
 #
 alpha/alpha/autoconf.c		standard	device-driver
 alpha/alpha/cpuconf.c		standard
 alpha/alpha/atomic.s		standard
 alpha/alpha/dec_kn8ae.c		optional	dec_kn8ae
 alpha/alpha/dec_eb164.c		optional	dec_eb164
 alpha/alpha/dec_kn20aa.c	optional	dec_kn20aa
 alpha/alpha/dec_2100_a50.c	optional	dec_2100_a50
 alpha/alpha/dec_st550.c		optional	dec_st550
 alpha/alpha/dec_axppci_33.c	optional	dec_axppci_33
 alpha/alpha/dec_3000_300.c	optional	dec_3000_300
 alpha/alpha/dec_3000_500.c	optional	dec_3000_500
 alpha/alpha/mountroot.c		optional	slice
 alpha/alpha/ipl_funcs.c		standard
 alpha/alpha/pal.s		standard
 alpha/alpha/cons.c		standard
 alpha/alpha/prom.c		standard
 alpha/alpha/promcons.c		standard
 alpha/alpha/prom_disp.s		standard
 alpha/alpha/alpha-gdbstub.c	optional	ddb
 alpha/alpha/db_disasm.c		optional	ddb
 alpha/alpha/db_interface.c	optional	ddb
 alpha/alpha/db_trace.c		optional	ddb
 alpha/alpha/exception.s		standard
 alpha/alpha/in_cksum.c		optional	inet
 # locore.s needs to be handled in Makefile to put it first.  Otherwise it's
 # now normal.
 # alpha/alpha/locore.s		standard
 alpha/alpha/machdep.c		standard
 alpha/alpha/math_emulate.c	optional	math_emulate
 alpha/alpha/mem.c		standard
 alpha/alpha/mp_machdep.c	optional	smp
 alpha/alpha/perfmon.c		optional	perfmon	profiling-routine
 alpha/alpha/perfmon.c		optional	perfmon
 alpha/alpha/pmap.c		standard
 alpha/alpha/procfs_machdep.c	standard
 alpha/alpha/simplelock.s	optional	smp
 alpha/alpha/support.s		standard
 alpha/alpha/swtch.s		standard
 alpha/alpha/sys_machdep.c	standard
 alpha/alpha/trap.c		standard
 alpha/alpha/interrupt.c		standard
 alpha/alpha/userconfig.c	optional	userconfig
 alpha/alpha/vm_machdep.c	standard
 alpha/alpha/clock.c		standard
-alpha/alpha/clock_if.m		standard					\
-	dependency	"$S/kern/makedevops.sh"					\
+clock_if.o			standard				\
+	dependency	"clock_if.c"					\
+	compile-with	"${NORMAL_C}"					\
+	no-implicit-rule local
+clock_if.c			standard				\
+	dependency	"$S/kern/makedevops.sh $S/alpha/alpha/clock_if.m"	\
+	compile-with	"sh $S/kern/makedevops.sh -c $S/alpha/alpha/clock_if.m" \
+	no-obj no-implicit-rule before-depend local			\
 	clean		"clock_if.c"
-clock_if.h			standard					\ 
+clock_if.h			standard				\
 	dependency	"$S/kern/makedevops.sh $S/alpha/alpha/clock_if.m"	\
 	compile-with	"sh $S/kern/makedevops.sh -h $S/alpha/alpha/clock_if.m" \
-	no-obj no-implicit-rule before-depend					\
+	no-obj no-implicit-rule before-depend				\
 	clean		"clock_if.h"
 alpha/alpha/diskslice_machdep.c	standard
 alpha/tlsb/tlsb.c		optional	tlsb
 alpha/tlsb/gbus.c		optional	gbus
 alpha/tlsb/kftxx.c		optional	kft
 alpha/tlsb/mcclock_tlsb.c	optional	gbus
 alpha/tlsb/zs_tlsb.c		optional	gbus
 alpha/tlsb/dwlpx.c		optional	dwlpx
 alpha/tc/tcasic.c		optional	tcasic
 alpha/tc/tc.c			optional	tc
 alpha/tc/ioasic.c		optional	tc
 alpha/tc/mcclock_ioasic.c	optional	tc
 alpha/tc/if_le_ioasic.c		optional	le device-driver
 alpha/tc/if_le_dec.c		optional	le device-driver
 alpha/tc/am7990.c		optional	le device-driver
 alpha/tc/tcds.c			optional	tcds device-driver
 alpha/tc/tcds_dma.c		optional	tcds device-driver
 alpha/tc/esp.c			optional	esp device-driver
-dev/dec/mcclock.c		standard
-dev/dec/mcclock_if.m		standard				\
-	dependency	"$S/kern/makedevops.sh"					\
+dev/dec/mcclock.c		standard	device-driver
+mcclock_if.o			standard				\
+	dependency	"mcclock_if.c"					\
+	compile-with	"${NORMAL_C}"					\
+	no-implicit-rule local
+mcclock_if.c			standard				\
+	dependency	"$S/kern/makedevops.sh $S/dev/dec/mcclock_if.m"	\
+	compile-with	"sh $S/kern/makedevops.sh -c $S/dev/dec/mcclock_if.m" \
+	no-obj no-implicit-rule before-depend local			\
 	clean		"mcclock_if.c"
-mcclock_if.h			standard					\ 
-	dependency	"$S/kern/makedevops.sh $S/dev/dec/mcclock_if.m"		\
-	compile-with	"sh $S/kern/makedevops.sh -h $S/dev/dec/mcclock_if.m"	\
-	no-obj no-implicit-rule before-depend					\
+mcclock_if.h			standard				\
+	dependency	"$S/kern/makedevops.sh $S/dev/dec/mcclock_if.m"	\
+	compile-with	"sh $S/kern/makedevops.sh -h $S/dev/dec/mcclock_if.m" \
+	no-obj no-implicit-rule before-depend				\
 	clean		"mcclock_if.h"
 alpha/pci/cia.c			optional	cia
 alpha/pci/pci_eb164_intr.s	optional	cia
 alpha/isa/mcclock_isa.c		optional	cia
 alpha/pci/apecs.c		optional	apecs
 alpha/pci/lca.c			optional	lca
 alpha/pci/pcibus.c		optional	pci
 alpha/isa/isa.c			optional	isa
 kern/link_elf.c			standard
-kern/subr_bus.c			standard
-kern/device_if.m		standard					\
-	dependency	"$S/kern/makedevops.sh"					\
-	clean		"device_if.c"
-device_if.h			standard					\ 
-	dependency	"$S/kern/makedevops.sh $S/kern/device_if.m"		\
-	compile-with	"sh $S/kern/makedevops.sh -h $S/kern/device_if.m"	\
-	no-obj no-implicit-rule before-depend					\
-	clean		"device_if.h"
-kern/bus_if.m			standard					\
-	dependency	"$S/kern/makedevops.sh"					\
-	clean		"bus_if.c"
-bus_if.h			standard					\ 
-	dependency	"$S/kern/makedevops.sh $S/kern/bus_if.m"		\
-	compile-with	"sh $S/kern/makedevops.sh -h $S/kern/bus_if.m"	\
-	no-obj no-implicit-rule before-depend					\
-	clean		"bus_if.h"
+alpha/alpha/elf_machdep.c	standard
 libkern/bcd.c			standard
 libkern/bcmp.c			standard
 libkern/ffs.c			standard
 libkern/inet_ntoa.c		standard
 libkern/index.c			standard
 libkern/mcount.c		optional	profiling-routine
 libkern/qsort.c			standard
 libkern/random.c		standard
 libkern/scanc.c			standard
 libkern/skpc.c			standard
 libkern/strcat.c		standard
 libkern/strcmp.c		standard
 libkern/strcpy.c		standard
 libkern/strlen.c		standard
 libkern/strncmp.c		standard
 libkern/strncpy.c		standard
 libkern/alpha/htonl.S		standard
 libkern/alpha/htons.S		standard
 libkern/alpha/ntohl.S		standard
 libkern/alpha/ntohs.S		standard
 isa/sio.c			optional	sio device-driver
 isa/kbdio.c			optional        psm     device-driver
 isa/psm.c			optional	psm	device-driver
 isa/kbdio.c			optional        sc      device-driver
 isa/syscons.c			optional	sc	device-driver
Index: head/sys/conf/Makefile.alpha
===================================================================
--- head/sys/conf/Makefile.alpha	(revision 38903)
+++ head/sys/conf/Makefile.alpha	(revision 38904)
@@ -1,284 +1,285 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.6 1998/07/30 08:12:14 dfr Exp $
+#	$Id: Makefile.alpha,v 1.7 1998/08/10 07:53:58 dfr Exp $
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/alpha/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/alpha/conf/Makefile.alpha
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
 %VERSREQ=	300005
 
 BINFORMAT?=	elf
 
 STD8X16FONT?=	iso
 
 .if exists(./@/.)
 S=	./@
 .else
 S=	../..
 .endif
 ALPHA=	${S}/alpha
 
 HCC?=${CC}
 SIZE?=size
 
 COPTFLAGS?=-O
 INCLUDES= -nostdinc -I- -I. -I$S
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
 .else
 INCLUDES+= -I/usr/include
 .endif
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h -U__NetBSD__
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -mno-fp-regs -Wa,-mev56
 LOAD_ADDRESS?=	0xfffffc0000300000
 DEFINED_PROF=	${PROF}
 .if defined(PROF)
 CFLAGS+=	-malign-functions=4
 .if ${PROFLEVEL} >= 2
 IDENT+=	-DGPROF4 -DGUPROF
 PROF+=	-mprofiler-epilogue
 .endif
 .endif
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 NORMAL_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $<
 DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 DRIVER_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $<
 PROFILE_C= ${CC} -c ${CFLAGS} ${PARAM} $<
 
-NORMAL_M= sh $S/kern/makedevops.sh -c $<;\
-	  ${CC} -c ${CFLAGS} ${PROF} `basename $< .m`.c
+NORMAL_M= ${NORMAL_C}
 
 # ${ALPHA}/alpha/setdef0.c and ${ALPHA}/alpha/setdef1.c are intentionally
 # omitted from SYSTEM_CFILES.  They depend on setdefs.h, a header which
 # is generated from all of ${OBJS}.  We don't want to have to compile
 # everything just to do a make depend.
 SYSTEM_CFILES= ioconf.c param.c vnode_if.c config.c
 SYSTEM_SFILES= ${ALPHA}/alpha/locore.s
 SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 .if ${CFLAGS:M-g} == ""
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
 .if ${BINFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o \
 	${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.so
 SYSTEM_LD= @${LD} --export-dynamic -T$S/alpha/conf/kernel.script -e locorestart \
 	-o $@ -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
 .endif
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %CFILES
 
 %SFILES
+
+%MFILES
 
 %LOAD
 
 %CLEAN
 
 clean:
 	rm -f *.o *.s eddep errs genassym gensetdefs kernel linterrs \
 	      makelinks param.c setdefs.h symbols.exclude symbols.sort tags \
 	      vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} \
 #	  ${ALPHA}/alpha/Locore.c ${CFILES} ioconf.c param.c | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
 symbols.exclude: Makefile
 	echo "gcc2_compiled." >symbols.exclude
 	echo "___gnu_compiled_c" >>symbols.exclude
 
 symbols.sort: ${ALPHA}/alpha/symbols.raw
 	grep -v '^#' ${ALPHA}/alpha/symbols.raw \
 	    | sed 's/^	//' | sort -u > symbols.sort
 
 locore.o: ${ALPHA}/alpha/locore.s assym.s
 	${NORMAL_S}
 
 hack.so: Makefile
 	echo "void __elf_kld_hack() {}" > hack.c
 	${CC} -shared -nostdlib hack.c -o hack.so
 	rm -f hack.c
 
 setdef0.o: ${ALPHA}/alpha/setdef0.c setdefs.h
 	${NORMAL_C}
 
 setdef1.o: ${ALPHA}/alpha/setdef1.c setdefs.h
 	${NORMAL_C}
 
 setdefs.h: gensetdefs ${OBJS}
 	@echo Generating kernel linker sets
 	@./gensetdefs ${OBJS} >setdefs.h
 
 gensetdefs: gensetdefs.o
 	${HCC} -static gensetdefs.o -o $@
 
 gensetdefs.o: ${ALPHA}/alpha/gensetdefs.c
 	${HCC} -c -I${INCLUDES} ${ALPHA}/alpha/gensetdefs.c
 
 # everything potentially depends on the Makefile since everything potentially
 # depends on the options.  Some things are more dependent on the Makefile for
 # historical reasons.
 machdep.o: Makefile
 
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile
 
 # XXX - may no longer be needed
 locore.o: Makefile
 
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 
 # this rule stops ./assym.s in .depend from causing problems
 ./assym.s: assym.s
 
 assym.s: genassym
 	./genassym >assym.s
 
 # Some of the defines that genassym outputs may well depend on the
 # value of kernel options.
 genassym.o: ${ALPHA}/alpha/genassym.c Makefile opt_global.h
 	${HCC} -c ${COPTS} ${PARAM} -UKERNEL ${ALPHA}/alpha/genassym.c
 
 genassym: genassym.o
 	${HCC} -static ${COPTS} ${PARAM} genassym.o -o $@
 
 SYSTEM_OBJS+=	__divqu.o __divq.o __divlu.o __divl.o
 SYSTEM_OBJS+=	__remqu.o __remq.o __remlu.o __reml.o
 CLEAN+=	__divqu.S __divq.S __divlu.S __divl.S
 CLEAN+=	__remqu.S __remq.S __remlu.S __reml.S
 
 __divqu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divqu')define(OP,\`div')define(S,\`false')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __divq.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divq')define(OP,\`div')define(S,\`true')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __divlu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divlu')define(OP,\`div')define(S,\`false')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __divl.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divl')define(OP,\`div')define(S,\`true')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __remqu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__remqu')define(OP,\`rem')define(S,\`false')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __remq.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__remq')define(OP,\`rem')define(S,\`true')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __remlu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__remlu')define(OP,\`rem')define(S,\`false')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __reml.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__reml')define(OP,\`rem')define(S,\`true')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 
 ${OBJS}: opt_global.h
 
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
 	mkdep -a -f .newdep ${COPTS} ${CFILES} ${SYSTEM_CFILES}
 	mkdep -a -f .newdep ${COPTS} ${PARAM} -UKERNEL ${ALPHA}/alpha/genassym.c
 	MKDEP_CPP="${CC} -E -x assembler-with-cpp" ; export MKDEP_CPP ; \
 	mkdep -a -f .newdep -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .depend
 	mv -f .newdep .depend
 
 cleandepend:
 	rm -f .depend
 
 links:
 	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES:Nswapkernel.c} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
 tags:
 	@echo "see $S/kern/Makefile for tags"
 
 install:
 	@if [ ! -f kernel ] ; then \
 		echo "You must first build your kernel before trying to install." ; \
 		exit 1 ; \
 	fi
 .if exists(${DESTDIR}/kernel)
 	chflags noschg ${DESTDIR}/kernel
 	mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old
 .endif
 	PATH=$${PATH}:/sbin:/usr/sbin; \
 	if [ `sysctl -n kern.bootfile` = ${DESTDIR}/kernel ] ; then \
 		sysctl -w kern.bootfile=${DESTDIR}/kernel.old ; \
 		if [ -f /var/db/kvm_kernel.db ] ; then \
 			mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \
 		fi \
 	fi
 	install -c -m 555 -o root -g wheel -fschg kernel ${DESTDIR}/
 
 ioconf.o: ioconf.c $S/sys/param.h $S/sys/buf.h
 	${CC} -c ${CFLAGS} ioconf.c
 
 param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
 vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 	${CC} ${CFLAGS} -c vers.c
 
 vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
 vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
 
 .include <bsd.kern.mk>
 
 %RULES
 
 # DO NOT DELETE THIS LINE -- make depend uses it
Index: head/sys/conf/files.alpha
===================================================================
--- head/sys/conf/files.alpha	(revision 38903)
+++ head/sys/conf/files.alpha	(revision 38904)
@@ -1,144 +1,140 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.6 1998/08/20 08:27:10 dfr Exp $
+#	$Id: files.alpha,v 1.7 1998/08/24 08:48:22 dfr Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
 #
 font8x16.o			optional	std8x16font		\
 	compile-with	"uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \
 	no-implicit-rule before-depend \
 	clean		"${STD8X16FONT}-8x16 font8x16.c" 
 
 #
 alpha/alpha/autoconf.c		standard	device-driver
 alpha/alpha/cpuconf.c		standard
 alpha/alpha/atomic.s		standard
 alpha/alpha/dec_kn8ae.c		optional	dec_kn8ae
 alpha/alpha/dec_eb164.c		optional	dec_eb164
 alpha/alpha/dec_kn20aa.c	optional	dec_kn20aa
 alpha/alpha/dec_2100_a50.c	optional	dec_2100_a50
 alpha/alpha/dec_st550.c		optional	dec_st550
 alpha/alpha/dec_axppci_33.c	optional	dec_axppci_33
 alpha/alpha/dec_3000_300.c	optional	dec_3000_300
 alpha/alpha/dec_3000_500.c	optional	dec_3000_500
 alpha/alpha/mountroot.c		optional	slice
 alpha/alpha/ipl_funcs.c		standard
 alpha/alpha/pal.s		standard
 alpha/alpha/cons.c		standard
 alpha/alpha/prom.c		standard
 alpha/alpha/promcons.c		standard
 alpha/alpha/prom_disp.s		standard
 alpha/alpha/alpha-gdbstub.c	optional	ddb
 alpha/alpha/db_disasm.c		optional	ddb
 alpha/alpha/db_interface.c	optional	ddb
 alpha/alpha/db_trace.c		optional	ddb
 alpha/alpha/exception.s		standard
 alpha/alpha/in_cksum.c		optional	inet
 # locore.s needs to be handled in Makefile to put it first.  Otherwise it's
 # now normal.
 # alpha/alpha/locore.s		standard
 alpha/alpha/machdep.c		standard
 alpha/alpha/math_emulate.c	optional	math_emulate
 alpha/alpha/mem.c		standard
 alpha/alpha/mp_machdep.c	optional	smp
 alpha/alpha/perfmon.c		optional	perfmon	profiling-routine
 alpha/alpha/perfmon.c		optional	perfmon
 alpha/alpha/pmap.c		standard
 alpha/alpha/procfs_machdep.c	standard
 alpha/alpha/simplelock.s	optional	smp
 alpha/alpha/support.s		standard
 alpha/alpha/swtch.s		standard
 alpha/alpha/sys_machdep.c	standard
 alpha/alpha/trap.c		standard
 alpha/alpha/interrupt.c		standard
 alpha/alpha/userconfig.c	optional	userconfig
 alpha/alpha/vm_machdep.c	standard
 alpha/alpha/clock.c		standard
-alpha/alpha/clock_if.m		standard					\
-	dependency	"$S/kern/makedevops.sh"					\
+clock_if.o			standard				\
+	dependency	"clock_if.c"					\
+	compile-with	"${NORMAL_C}"					\
+	no-implicit-rule local
+clock_if.c			standard				\
+	dependency	"$S/kern/makedevops.sh $S/alpha/alpha/clock_if.m"	\
+	compile-with	"sh $S/kern/makedevops.sh -c $S/alpha/alpha/clock_if.m" \
+	no-obj no-implicit-rule before-depend local			\
 	clean		"clock_if.c"
-clock_if.h			standard					\ 
+clock_if.h			standard				\
 	dependency	"$S/kern/makedevops.sh $S/alpha/alpha/clock_if.m"	\
 	compile-with	"sh $S/kern/makedevops.sh -h $S/alpha/alpha/clock_if.m" \
-	no-obj no-implicit-rule before-depend					\
+	no-obj no-implicit-rule before-depend				\
 	clean		"clock_if.h"
 alpha/alpha/diskslice_machdep.c	standard
 alpha/tlsb/tlsb.c		optional	tlsb
 alpha/tlsb/gbus.c		optional	gbus
 alpha/tlsb/kftxx.c		optional	kft
 alpha/tlsb/mcclock_tlsb.c	optional	gbus
 alpha/tlsb/zs_tlsb.c		optional	gbus
 alpha/tlsb/dwlpx.c		optional	dwlpx
 alpha/tc/tcasic.c		optional	tcasic
 alpha/tc/tc.c			optional	tc
 alpha/tc/ioasic.c		optional	tc
 alpha/tc/mcclock_ioasic.c	optional	tc
 alpha/tc/if_le_ioasic.c		optional	le device-driver
 alpha/tc/if_le_dec.c		optional	le device-driver
 alpha/tc/am7990.c		optional	le device-driver
 alpha/tc/tcds.c			optional	tcds device-driver
 alpha/tc/tcds_dma.c		optional	tcds device-driver
 alpha/tc/esp.c			optional	esp device-driver
-dev/dec/mcclock.c		standard
-dev/dec/mcclock_if.m		standard				\
-	dependency	"$S/kern/makedevops.sh"					\
+dev/dec/mcclock.c		standard	device-driver
+mcclock_if.o			standard				\
+	dependency	"mcclock_if.c"					\
+	compile-with	"${NORMAL_C}"					\
+	no-implicit-rule local
+mcclock_if.c			standard				\
+	dependency	"$S/kern/makedevops.sh $S/dev/dec/mcclock_if.m"	\
+	compile-with	"sh $S/kern/makedevops.sh -c $S/dev/dec/mcclock_if.m" \
+	no-obj no-implicit-rule before-depend local			\
 	clean		"mcclock_if.c"
-mcclock_if.h			standard					\ 
-	dependency	"$S/kern/makedevops.sh $S/dev/dec/mcclock_if.m"		\
-	compile-with	"sh $S/kern/makedevops.sh -h $S/dev/dec/mcclock_if.m"	\
-	no-obj no-implicit-rule before-depend					\
+mcclock_if.h			standard				\
+	dependency	"$S/kern/makedevops.sh $S/dev/dec/mcclock_if.m"	\
+	compile-with	"sh $S/kern/makedevops.sh -h $S/dev/dec/mcclock_if.m" \
+	no-obj no-implicit-rule before-depend				\
 	clean		"mcclock_if.h"
 alpha/pci/cia.c			optional	cia
 alpha/pci/pci_eb164_intr.s	optional	cia
 alpha/isa/mcclock_isa.c		optional	cia
 alpha/pci/apecs.c		optional	apecs
 alpha/pci/lca.c			optional	lca
 alpha/pci/pcibus.c		optional	pci
 alpha/isa/isa.c			optional	isa
 kern/link_elf.c			standard
-kern/subr_bus.c			standard
-kern/device_if.m		standard					\
-	dependency	"$S/kern/makedevops.sh"					\
-	clean		"device_if.c"
-device_if.h			standard					\ 
-	dependency	"$S/kern/makedevops.sh $S/kern/device_if.m"		\
-	compile-with	"sh $S/kern/makedevops.sh -h $S/kern/device_if.m"	\
-	no-obj no-implicit-rule before-depend					\
-	clean		"device_if.h"
-kern/bus_if.m			standard					\
-	dependency	"$S/kern/makedevops.sh"					\
-	clean		"bus_if.c"
-bus_if.h			standard					\ 
-	dependency	"$S/kern/makedevops.sh $S/kern/bus_if.m"		\
-	compile-with	"sh $S/kern/makedevops.sh -h $S/kern/bus_if.m"	\
-	no-obj no-implicit-rule before-depend					\
-	clean		"bus_if.h"
+alpha/alpha/elf_machdep.c	standard
 libkern/bcd.c			standard
 libkern/bcmp.c			standard
 libkern/ffs.c			standard
 libkern/inet_ntoa.c		standard
 libkern/index.c			standard
 libkern/mcount.c		optional	profiling-routine
 libkern/qsort.c			standard
 libkern/random.c		standard
 libkern/scanc.c			standard
 libkern/skpc.c			standard
 libkern/strcat.c		standard
 libkern/strcmp.c		standard
 libkern/strcpy.c		standard
 libkern/strlen.c		standard
 libkern/strncmp.c		standard
 libkern/strncpy.c		standard
 libkern/alpha/htonl.S		standard
 libkern/alpha/htons.S		standard
 libkern/alpha/ntohl.S		standard
 libkern/alpha/ntohs.S		standard
 isa/sio.c			optional	sio device-driver
 isa/kbdio.c			optional        psm     device-driver
 isa/psm.c			optional	psm	device-driver
 isa/kbdio.c			optional        sc      device-driver
 isa/syscons.c			optional	sc	device-driver