Make it possible to include a device interface description by a single

line in files or files.${arch} instead of 13 lines of code.

This is a small chance that this will break the alpha kernel build - I'll
fix it this evening if it does.

1 files changed, 14 insertions, 3 deletions

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 3ecd831..c79a7b2 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -73,6 +73,9 @@ NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
 NORMAL_S= ${CC} -c ${ASM_CFLAGS} ${.IMPSRC}
 PROFILE_C= ${CC} -c ${CFLAGS} ${.IMPSRC}
 
+NORMAL_M= perl5 $S/kern/makedevops.pl -c $<; \
+	  ${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c
+
 GEN_CFILES= $S/$M/$M/genassym.c
 # setdef0.c and setdef1.c are intentionally
 # omitted from SYSTEM_CFILES.  They include setdefs.h, a header which
@@ -118,14 +121,21 @@ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
 	${SYSTEM_LD_TAIL}
 
 .if !exists(.depend)
-${SYSTEM_OBJS}: vnode_if.h ${BEFORE_DEPEND:M*.h}
+${SYSTEM_OBJS}: vnode_if.h ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/}
 .endif
 
+.for mfile in ${MFILES}
+${mfile:T:S/.m$/.h/}: ${mfile}
+	perl5 $S/kern/makedevops.pl -h ${mfile}
+.endfor
+
 clean:
 	rm -f *.o *.so *.So *.ko *.s eddep errs genassym \
 	      ${FULLKERNEL} ${KERNEL} linterrs makelinks param.c \
 	      setdef[01].c setdefs.h tags \
-	      vers.c vnode_if.c vnode_if.h ${CLEAN}
+	      vers.c vnode_if.c vnode_if.h \
+	      ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
+	      ${CLEAN}
 
 #lint: /tmp param.c
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \
@@ -167,7 +177,8 @@ genassym.o: $S/$M/$M/genassym.c
 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
-	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} ${SYSTEM_SFILES}
+	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
+	    ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/}
 	rm -f .newdep
 	mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES}
 	env MKDEP_CPP="${CC} -E" \