build modules using kernel config

--nextPart1141864.Ax2tKPEt6p
Content-Type: multipart/mixed;
  boundary="Boundary-01=_TxACCa8EHrSoUjP"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--Boundary-01=_TxACCa8EHrSoUjP
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

a patch to build modules with kernel config, if modules are being built=20
together with kernel.

i'm running that since several months.

also available at:=20
<http://chlamydia.fs.ei.tum.de/~corecode/module_kernel_options.patch>

cheers
  simon

=2D-=20
/"\
\ /
 \     ASCII Ribbon Campaign
/ \  Against HTML Mail and News

--Boundary-01=_TxACCa8EHrSoUjP
Content-Type: text/plain;
  charset="us-ascii";
  name="module_kernel_options.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline;
	filename="module_kernel_options.patch"

=3D=3D=3D conf/kmod.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- conf/kmod.mk  (revision 6881)
+++ conf/kmod.mk  (revision 6882)
@@ -215,11 +215,16 @@
 	${KMODUNLOAD} -v ${KMOD}
 .endif
=20
=2D.for _src in ${SRCS:Mopt_*.h}
+.for _src in ${SRCS:Mopt_*.h} ${SRCS:Muse_*.h}
 CLEANFILES+=3D	${_src}
 .if !target(${_src})
+.if defined(BUILDING_WITH_KERNEL) && exists(${BUILDING_WITH_KERNEL}/${_src=
})
+${_src}: ${BUILDING_WITH_KERNEL}/${_src}
+	${INSTALL} ${BUILDING_WITH_KERNEL}/${_src} ${.TARGET}
+.else
 ${_src}:
 	touch ${.TARGET}
+.endif	# BUILDING_WITH_KERNEL
 .endif
 .endfor
=20
=3D=3D=3D conf/Makefile.i386
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- conf/Makefile.i386  (revision 6881)
+++ conf/Makefile.i386  (revision 6882)
@@ -257,7 +257,7 @@
 reinstall: modules-reinstall
 .endif
=20
=2DMKMODULESENV=3D	MAKEOBJDIRPREFIX=3D${.OBJDIR}
+MKMODULESENV=3D	MAKEOBJDIRPREFIX=3D${.OBJDIR} BUILDING_WITH_KERNEL=3D${.OB=
JDIR}
 .if defined(MODULES_OVERRIDE)
 MKMODULESENV+=3D	MODULES_OVERRIDE=3D"${MODULES_OVERRIDE}"
 .endif
=3D=3D=3D net/stf/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/stf/Makefile  (revision 6881)
+++ net/stf/Makefile  (revision 6882)
@@ -7,10 +7,12 @@
 SRCS=3D	if_stf.c opt_inet.h opt_inet6.h
 NOMAN=3D
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
=20
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D net/vlan/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/vlan/Makefile  (revision 6881)
+++ net/vlan/Makefile  (revision 6882)
@@ -8,7 +8,9 @@
 CFLAGS+=3D -DNVLAN=3D0
 NOMAN=3D
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D net/ip_mroute/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/ip_mroute/Makefile  (revision 6881)
+++ net/ip_mroute/Makefile  (revision 6882)
@@ -10,7 +10,4 @@
 opt_mrouting.h:
 	echo "#define MROUTING 1" > ${.TARGET}
=20
=2Dopt_random_ip_id.h:
=2D	echo > ${.TARGET}
=2D
 .include <bsd.kmod.mk>
=3D=3D=3D net/gif/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/gif/Makefile  (revision 6881)
+++ net/gif/Makefile  (revision 6882)
@@ -7,6 +7,7 @@
 SRCS=3D	if_gif.c in_gif.c in6_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
 NOMAN=3D
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
=20
@@ -15,5 +16,6 @@
=20
 opt_mrouting.h:
 	echo "#define MROUTING 1" > ${.TARGET}
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D net/faith/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/faith/Makefile  (revision 6881)
+++ net/faith/Makefile  (revision 6882)
@@ -8,10 +8,12 @@
 CFLAGS+=3D -DNFAITH=3D0
 NOMAN=3D
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
=20
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D net/gre/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/gre/Makefile  (revision 6881)
+++ net/gre/Makefile  (revision 6882)
@@ -5,6 +5,7 @@
 KMOD=3D	if_gre
 SRCS=3D	if_gre.c ip_gre.c opt_inet.h opt_ns.h opt_atalk.h
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
=20
@@ -13,5 +14,6 @@
=20
 opt_atalk.h:
 	echo "#define NETATALK 1" > ${.TARGET}
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D net/sl/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/sl/Makefile  (revision 6881)
+++ net/sl/Makefile  (revision 6882)
@@ -12,8 +12,10 @@
 CFLAGS+=3D ${PROTOS}
 CLEANFILES=3D	use_sl.h
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
+.endif
=20
 use_sl.h:
 	echo "#define NSL ${NSL}" > use_sl.h
=3D=3D=3D net/disc/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/disc/Makefile  (revision 6881)
+++ net/disc/Makefile  (revision 6882)
@@ -10,10 +10,12 @@
=20
 CFLAGS+=3D ${PROTOS}
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
=20
 #opt_inet6.h:
 #	echo "#define INET6 1" > opt_inet6.h
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D net/pf/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/pf/Makefile  (revision 6881)
+++ net/pf/Makefile  (revision 6882)
@@ -12,19 +12,15 @@
 use_pflog.h:
 	echo "#define NPFLOG 1" > ${.TARGET}
=20
+.if !defined(BUILDING_WITH_KERNEL)
 use_pfsync.h:
=2D# .PATH searches only work for targes without source
=2D.if !exists(use_pfsync.h)
 	echo "#define NPFSYNC 0" > ${.TARGET}
=2D.endif
=20
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
=20
 opt_inet6.h:
=2D# .PATH searches only work for targes without source
=2D.if !exists(opt_inet6.h)
 	echo "#define INET6 1" > ${.TARGET}
=2D.endif
+.endif	# !BUILDING_WITH_KERNEL
=20
 .include <bsd.kmod.mk>
=3D=3D=3D net/sppp/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/sppp/Makefile  (revision 6881)
+++ net/sppp/Makefile  (revision 6882)
@@ -16,6 +16,7 @@
 		sppp_isempty	\
 		sppp_flush
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
=20
@@ -24,5 +25,6 @@
=20
 opt_ipx.h:
 	echo "#define IPX 1" > opt_ipx.h
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D net/tap/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/tap/Makefile  (revision 6881)
+++ net/tap/Makefile  (revision 6882)
@@ -12,7 +12,9 @@
=20
 CLEANFILES+=3D	opt_inet.h
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D net/ef/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/ef/Makefile  (revision 6881)
+++ net/ef/Makefile  (revision 6882)
@@ -20,11 +20,13 @@
 CFLAGS+=3D -DEF_DEBUG
 .endif
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
=20
 opt_ipx.h:
 	echo "#define IPX 1" > opt_ipx.h
+.endif
=20
 opt_ef.h:
 .for frame in ETHER_II ETHER_8023 ETHER_8022 ETHER_SNAP
@@ -34,9 +36,9 @@
 .endfor
=20
 load: all
=2D	/sbin/kldload ./${PROG}
+	/sbin/kldload ${.OBJDIR}/${KMOD}
=20
 unload:
=2D	/sbin/kldunload ${PROG}
+	-/sbin/kldunload ${KMOD}
=20
 .include <bsd.kmod.mk>
=3D=3D=3D net/tun/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/tun/Makefile  (revision 6881)
+++ net/tun/Makefile  (revision 6882)
@@ -11,6 +11,7 @@
=20
 CFLAGS+=3D ${PROTOS}
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
=20
@@ -22,5 +23,6 @@
=20
 opt_ipx.h:
 	echo "#define IPX 1" > opt_ipx.h
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D vfs/smbfs/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- vfs/smbfs/Makefile  (revision 6881)
+++ vfs/smbfs/Makefile  (revision 6882)
@@ -65,6 +65,6 @@
 .endif
=20
 unload:
=2D	@(if kldunload ${KMOD}; then true; else true; fi)
+	@-kldunload ${KMOD}
=20
 .include <bsd.kmod.mk>
=3D=3D=3D vfs/nwfs/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- vfs/nwfs/Makefile  (revision 6881)
+++ vfs/nwfs/Makefile  (revision 6882)
@@ -17,12 +17,12 @@
 	echo "#define NCP	1"  > ${.TARGET}
=20
 load: nwfs.ko
=2D	kldload ./nwfs.ko
+	kldload ${.OBJDIR}/nwfs.ko
=20
 unload:
=2D	@(if kldunload nwfs; then true; else true; fi)
+	@-kldunload nwfs
=20
 deinstall:
=2D	rm -f /modules/nwfs.ko
+	rm -f ${DESTDIR}/modules/nwfs.ko
=20
 .include <bsd.kmod.mk>
=3D=3D=3D netgraph/iface/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- netgraph/iface/Makefile  (revision 6881)
+++ netgraph/iface/Makefile  (revision 6882)
@@ -6,6 +6,7 @@
 SRCS=3D 		ng_iface.c opt_atalk.h opt_inet.h opt_inet6.h opt_ipx.h
 KMODDEPS=3D	netgraph
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
=20
@@ -17,5 +18,6 @@
=20
 opt_ipx.h:
 	echo "#define IPX 1" > opt_ipx.h
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D netproto/ncp/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- netproto/ncp/Makefile  (revision 6881)
+++ netproto/ncp/Makefile  (revision 6882)
@@ -34,12 +34,12 @@
 .endif
=20
 load: ${KMOD}.ko
=2D	kldload ./${KMOD}.ko
+	kldload ${.OBJDIR}/${KMOD}.ko
=20
 unload:
=2D	@(if kldunload ${KMOD}; then true; else true; fi)
+	@-kldunload ${KMOD}
=20
 deinstall:
=2D	rm -f /modules/ncp.ko
+	rm -f ${DESTDIR}/modules/ncp.ko
=20
 .include <bsd.kmod.mk>
=3D=3D=3D netproto/802_11/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- netproto/802_11/Makefile  (revision 6881)
+++ netproto/802_11/Makefile  (revision 6882)
@@ -5,10 +5,12 @@
 SRCS	+=3D ieee80211_node.c ieee80211_output.c ieee80211_proto.c
 SRCS	+=3D bus_if.h device_if.h opt_inet.h opt_ipx.h
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET	1" > ${.TARGET}
=20
 opt_ipx.h:
 	echo "#define IPX	1" > ${.TARGET}
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D dev/crypto/ubsec/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- dev/crypto/ubsec/Makefile  (revision 6881)
+++ dev/crypto/ubsec/Makefile  (revision 6882)
@@ -7,7 +7,9 @@
 SRCS   +=3D device_if.h bus_if.h pci_if.h
 SRCS   +=3D opt_bdg.h opt_bus.h crypto_if.h
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_ubsec.h:
 	echo "#define UBSEC_DEBUG 1" > opt_ubsec.h
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D dev/crypto/hifn/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- dev/crypto/hifn/Makefile  (revision 6881)
+++ dev/crypto/hifn/Makefile  (revision 6882)
@@ -7,7 +7,9 @@
 SRCS   +=3D device_if.h bus_if.h pci_if.h
 SRCS   +=3D opt_bdg.h opt_bus.h crypto_if.h
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_hifn.h:
 	echo "#define HIFN_DEBUG 1" > opt_hifn.h
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D dev/disk/aic7xxx/ahc/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- dev/disk/aic7xxx/ahc/Makefile  (revision 6881)
+++ dev/disk/aic7xxx/ahc/Makefile  (revision 6882)
@@ -35,7 +35,9 @@
=20
 CLEANFILES=3D ${GENSRCS} aic7xxx_reg_print.c
=20
+.if !defined(BUILDING_WITH_KERNEL)
 use_pci.h:
 	echo "#define NPCI 1" > use_pci.h
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D dev/disk/trm/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- dev/disk/trm/Makefile  (revision 6881)
+++ dev/disk/trm/Makefile  (revision 6882)
@@ -7,7 +7,9 @@
 SRCS=3D	trm.c trm.h opt_cam.h device_if.h bus_if.h \
 	opt_scsi.h pci_if.h
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_scsi.h:
 	echo "#define SCSI_DELAY 15000" > opt_scsi.h
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D dev/disk/aha/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- dev/disk/aha/Makefile  (revision 6881)
+++ dev/disk/aha/Makefile  (revision 6882)
@@ -10,7 +10,9 @@
 use_aha.h:
 	echo "#define NAHA 1" > use_aha.h
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_scsi.h:
 	echo "#define SCSI_DELAY 15000" > opt_scsi.h
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D dev/misc/dcons/dcons/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- dev/misc/dcons/dcons/Makefile  (revision 6881)
+++ dev/misc/dcons/dcons/Makefile  (revision 6882)
@@ -8,10 +8,12 @@
 SRCS	=3D dcons.c dcons_os.c
 SRCS	+=3D dcons.h dcons_os.h opt_dcons.h opt_ddb.h opt_comconsole.h
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_ddb.h:
=2D	echo "#define DDB 1" > $@
+	echo "#define DDB 1" > ${.TARGET}
+.endif
=20
 opt_comconsole.h:
=2D	echo "#define ALT_BREAK_TO_DEBUGGER 1" > $@
+	echo "#define ALT_BREAK_TO_DEBUGGER 1" > ${.TARGET}
=20
 .include <bsd.kmod.mk>
=3D=3D=3D dev/usbmisc/ukbd/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- dev/usbmisc/ukbd/Makefile  (revision 6881)
+++ dev/usbmisc/ukbd/Makefile  (revision 6882)
@@ -8,7 +8,9 @@
 		   ukbd.c
 NOMAN		 =3D
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_kbd.h:
 	echo '#define KBD_INSTALL_CDEV 1' > opt_kbd.h
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D dev/netif/snc/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- dev/netif/snc/Makefile  (revision 6881)
+++ dev/netif/snc/Makefile  (revision 6882)
@@ -6,7 +6,9 @@
 SRCS	=3D if_snc.c if_snc_cbus.c if_snc_pccard.c dp83932.c dp83932subr.c
 SRCS	+=3D opt_inet.h opt_bdg.h device_if.h bus_if.h isa_if.h card_if.h
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D dev/netif/ie/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- dev/netif/ie/Makefile  (revision 6881)
+++ dev/netif/ie/Makefile  (revision 6882)
@@ -9,11 +9,13 @@
 use_ie.h:
 	echo "#define NIE 1" > ${.TARGET}
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
=20
 opt_ipx.h:
 	echo "" > ${.TARGET}
+.endif
=20
 .include <bsd.kmod.mk>
=20
=3D=3D=3D dev/netif/an/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- dev/netif/an/Makefile  (revision 6881)
+++ dev/netif/an/Makefile  (revision 6882)
@@ -6,7 +6,9 @@
 SRCS	=3D if_an.c if_an_pccard.c if_an_pci.c if_an_isa.c
 SRCS	+=3D opt_inet.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h
=20
+.if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
+.endif
=20
 .include <bsd.kmod.mk>
=3D=3D=3D dev/netif/em/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- dev/netif/em/Makefile  (revision 6881)
+++ dev/netif/em/Makefile  (revision 6882)
@@ -5,9 +5,4 @@
 SRCS    =3D device_if.h bus_if.h pci_if.h opt_bdg.h
 SRCS    +=3D if_em.c if_em_hw.c
=20
=2Dclean:
=2D	rm -f opt_bdg.h device_if.h bus_if.h pci_if.h setdef*
=2D	rm -f *.o *.kld *.ko
=2D	rm -f @ machine
=2D
 .include <bsd.kmod.mk>

--Boundary-01=_TxACCa8EHrSoUjP--

--nextPart1141864.Ax2tKPEt6p
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (FreeBSD)

iD8DBQBCCAxVr5S+dk6z85oRAoPnAJ42ml8sp7bd54Td9bcJb6+zIP43CACgxIjd
VHFHTxVFkKX2/VuvZKs75P8=
=RgPP
-----END PGP SIGNATURE-----

--nextPart1141864.Ax2tKPEt6p--