diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha
index 290b24ce4df5..de8d7a34ed74 100644
--- a/sys/alpha/conf/Makefile.alpha
+++ b/sys/alpha/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # 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
 #
@@ -62,8 +62,7 @@ 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
@@ -93,6 +92,8 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
 
 %SFILES
 
+%MFILES
+
 %LOAD
 
 %CLEAN
diff --git a/sys/alpha/conf/files.alpha b/sys/alpha/conf/files.alpha
index 541fcb4fb130..842428fcec6d 100644
--- a/sys/alpha/conf/files.alpha
+++ b/sys/alpha/conf/files.alpha
@@ -1,7 +1,7 @@
 # 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
@@ -58,13 +58,19 @@ 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
@@ -83,14 +89,20 @@ 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
@@ -100,23 +112,7 @@ 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
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 290b24ce4df5..de8d7a34ed74 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # 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
 #
@@ -62,8 +62,7 @@ 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
@@ -93,6 +92,8 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
 
 %SFILES
 
+%MFILES
+
 %LOAD
 
 %CLEAN
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 541fcb4fb130..842428fcec6d 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -1,7 +1,7 @@
 # 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
@@ -58,13 +58,19 @@ 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
@@ -83,14 +89,20 @@ 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
@@ -100,23 +112,7 @@ 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