Date: Sun, 14 Dec 2008 19:33:27 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 154655 for review Message-ID: <200812141933.mBEJXROG097095@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=154655 Change 154655 by ed@ed_dull on 2008/12/14 19:32:29 Generate teken_state.h using /sys/conf/files instead of hacks added to kern.post.mk. I wasn't aware we had a `compile-with' command yet. Pointed out by: imp Affected files ... .. //depot/projects/mpsafetty/sys/conf/files#34 edit .. //depot/projects/mpsafetty/sys/conf/kern.post.mk#3 integrate Differences ... ==== //depot/projects/mpsafetty/sys/conf/files#34 (text+ko) ==== @@ -75,6 +75,11 @@ compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ no-obj no-implicit-rule before-depend \ clean "pccarddevs.h" +teken_state.h optional sc \ + dependency "$S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences" \ + compile-with "${AWK} -f $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences > teken_state.h" \ + no-obj no-implicit-rule before-depend \ + clean "teken_state.h" usbdevs.h optional usb \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \ ==== //depot/projects/mpsafetty/sys/conf/kern.post.mk#3 (text+ko) ==== @@ -98,8 +98,7 @@ .endif .if !exists(${.OBJDIR}/.depend) -${SYSTEM_OBJS}: assym.s vnode_if.h teken_state.h ${BEFORE_DEPEND:M*.h}\ - ${MFILES:T:S/.m$/.h/} +${SYSTEM_OBJS}: assym.s vnode_if.h ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/} .endif LNFILES= ${CFILES:T:S/.c$/.ln/} @@ -118,7 +117,7 @@ ${FULLKERNEL} ${KERNEL_KO} ${KERNEL_KO}.symbols \ linterrs makelinks tags vers.c \ vnode_if.c vnode_if.h vnode_if_newproto.h vnode_if_typedef.h \ - teken_state.h ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ + ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ ${CLEAN} lint: ${LNFILES} @@ -148,7 +147,7 @@ kernel-depend: .depend # The argument list can be very long, so use make -V and xargs to # pass it to mkdep. -SRCS= assym.s vnode_if.h teken_state.h ${BEFORE_DEPEND} ${CFILES} \ +SRCS= assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \ ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ ${MFILES:T:S/.m$/.h/} .depend: .PRECIOUS ${SRCS} @@ -259,10 +258,6 @@ vnode_if_typedef.h: ${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -q -teken_state.h: $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences - ${AWK} -f $S/dev/syscons/teken/gensequences \ - < $S/dev/syscons/teken/sequences > teken_state.h - # XXX strictly, everything depends on Makefile because changes to ${PROF} # only appear there, but we don't handle that.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812141933.mBEJXROG097095>