Index: head/sys/modules/3dfx/Makefile
===================================================================
--- head/sys/modules/3dfx/Makefile	(revision 71984)
+++ head/sys/modules/3dfx/Makefile	(revision 71985)
@@ -1,26 +1,25 @@
 # $FreeBSD$
 
 MAINTAINER=	cokane@FreeBSD.org
 
 .PATH: $(.CURDIR)/../../dev/tdfx
 
 KMOD=	3dfx
 NOMAN=	YES
 SRCS=	opt_tdfx.h  bus_if.h pci_if.h device_if.h tdfx_pci.h tdfx_io.h\
 	tdfx_vars.h tdfx_pci.c
 INCSRC=	../../sys
 
 .if ${MACHINE_ARCH} == "i386"
 # This line enables linux ioctl handling by default
 # comment out if you don't want it
 TDFX_OPTS=	"\#define TDFX_LINUX"
 .endif
 
 # Uncomment this for debugging messages
 #CFLAGS+=	-DDEBUG
 
 opt_tdfx.h:
-	touch opt_tdfx.h
-	echo $(TDFX_OPTS) >> opt_tdfx.h
+	echo $(TDFX_OPTS) > opt_tdfx.h
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/acpi/Makefile
===================================================================
--- head/sys/modules/acpi/Makefile	(revision 71984)
+++ head/sys/modules/acpi/Makefile	(revision 71985)
@@ -1,51 +1,48 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Common \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Debugger \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Dispatcher \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Events \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Hardware \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Interpreter \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Namespace \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Parser \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Resources \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Tables \
        ${.CURDIR}/../../pci ${.CURDIR}/../../dev/acpica \
        ${.CURDIR}/../../dev/acpica/Osd
 
 KMOD=	acpica
 SRCS=	cmalloc.c cmclib.c cmcopy.c cmdebug.c cmdelete.c cmeval.c
 SRCS+=	cmglobal.c cminit.c cmobject.c cmutils.c cmxface.c dbcmds.c
 SRCS+=	dbdisasm.c dbdisply.c dbexec.c dbfileio.c dbhistry.c 
 SRCS+=	dbinput.c dbstats.c dbutils.c dbxface.c dsfield.c dsmethod.c
 SRCS+=	dsmthdat.c dsobject.c dsopcode.c dsutils.c dswexec.c
 SRCS+=	dswload.c dswscope.c dswstate.c evevent.c evmisc.c evregion.c
 SRCS+=	evrgnini.c evsci.c evxface.c evxfevnt.c evxfregn.c hwacpi.c
 SRCS+=	hwsleep.c hwtimer.c hwgpe.c hwregs.c amconfig.c amcreate.c amdump.c
 SRCS+=	amfield.c amfldio.c ammisc.c ammonad.c amnames.c amprep.c
 SRCS+=	amdyadic.c amregion.c amresnte.c amresolv.c amresop.c amstore.c 
 SRCS+=	amstoren.c amstorob.c amsystem.c amutils.c amxface.c amconvrt.c
 SRCS+=	nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c nsload.c
 SRCS+=	nsnames.c nsobject.c nssearch.c nsutils.c nswalk.c
 SRCS+=	nsxfobj.c nsxfname.c  psargs.c psfind.c psopcode.c psparse.c psscope.c
 SRCS+=	pstree.c psutils.c pswalk.c psxface.c rsaddr.c rscalc.c
 SRCS+=	rscreate.c rsdump.c rsio.c rsirq.c rslist.c rsmemory.c 
 SRCS+=	rsmisc.c rsutils.c rsxface.c tbconvrt.c tbget.c tbinstal.c tbutils.c 
 SRCS+=	tbxface.c tbxfroot.c acpi.c acpi_button.c
 SRCS+=	acpi_ec.c acpi_isa.c acpi_lid.c acpi_pcib.c
 SRCS+=	acpi_acad.c acpi_cmbat.c
 SRCS+=	acpi_resource.c acpi_thermal.c acpi_timer.c OsdDebug.c 
 SRCS+=	OsdHardware.c OsdInterrupt.c OsdMemory.c OsdSchedule.c
 SRCS+=	OsdStream.c OsdSynch.c OsdEnvironment.c 
 SRCS+=	opt_acpi.h opt_ddb.h
 SRCS+=	device_if.h bus_if.h pci_if.h pcib_if.h isa_if.h
 
 CFLAGS+=   -I${.CURDIR}/../../contrib/dev/acpica/Subsystem/Include
 
-opt_acpi.h: Makefile
-	touch opt_acpi.h
-
 opt_ddb.h: Makefile
 	echo '#define DDB 1'  >opt_ddb.h
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/acpica/Makefile
===================================================================
--- head/sys/modules/acpica/Makefile	(revision 71984)
+++ head/sys/modules/acpica/Makefile	(revision 71985)
@@ -1,51 +1,48 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Common \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Debugger \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Dispatcher \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Events \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Hardware \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Interpreter \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Namespace \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Parser \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Resources \
        ${.CURDIR}/../../contrib/dev/acpica/Subsystem/Tables \
        ${.CURDIR}/../../pci ${.CURDIR}/../../dev/acpica \
        ${.CURDIR}/../../dev/acpica/Osd
 
 KMOD=	acpica
 SRCS=	cmalloc.c cmclib.c cmcopy.c cmdebug.c cmdelete.c cmeval.c
 SRCS+=	cmglobal.c cminit.c cmobject.c cmutils.c cmxface.c dbcmds.c
 SRCS+=	dbdisasm.c dbdisply.c dbexec.c dbfileio.c dbhistry.c 
 SRCS+=	dbinput.c dbstats.c dbutils.c dbxface.c dsfield.c dsmethod.c
 SRCS+=	dsmthdat.c dsobject.c dsopcode.c dsutils.c dswexec.c
 SRCS+=	dswload.c dswscope.c dswstate.c evevent.c evmisc.c evregion.c
 SRCS+=	evrgnini.c evsci.c evxface.c evxfevnt.c evxfregn.c hwacpi.c
 SRCS+=	hwsleep.c hwtimer.c hwgpe.c hwregs.c amconfig.c amcreate.c amdump.c
 SRCS+=	amfield.c amfldio.c ammisc.c ammonad.c amnames.c amprep.c
 SRCS+=	amdyadic.c amregion.c amresnte.c amresolv.c amresop.c amstore.c 
 SRCS+=	amstoren.c amstorob.c amsystem.c amutils.c amxface.c amconvrt.c
 SRCS+=	nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c nsload.c
 SRCS+=	nsnames.c nsobject.c nssearch.c nsutils.c nswalk.c
 SRCS+=	nsxfobj.c nsxfname.c  psargs.c psfind.c psopcode.c psparse.c psscope.c
 SRCS+=	pstree.c psutils.c pswalk.c psxface.c rsaddr.c rscalc.c
 SRCS+=	rscreate.c rsdump.c rsio.c rsirq.c rslist.c rsmemory.c 
 SRCS+=	rsmisc.c rsutils.c rsxface.c tbconvrt.c tbget.c tbinstal.c tbutils.c 
 SRCS+=	tbxface.c tbxfroot.c acpi.c acpi_button.c
 SRCS+=	acpi_ec.c acpi_isa.c acpi_lid.c acpi_pcib.c
 SRCS+=	acpi_acad.c acpi_cmbat.c
 SRCS+=	acpi_resource.c acpi_thermal.c acpi_timer.c OsdDebug.c 
 SRCS+=	OsdHardware.c OsdInterrupt.c OsdMemory.c OsdSchedule.c
 SRCS+=	OsdStream.c OsdSynch.c OsdEnvironment.c 
 SRCS+=	opt_acpi.h opt_ddb.h
 SRCS+=	device_if.h bus_if.h pci_if.h pcib_if.h isa_if.h
 
 CFLAGS+=   -I${.CURDIR}/../../contrib/dev/acpica/Subsystem/Include
 
-opt_acpi.h: Makefile
-	touch opt_acpi.h
-
 opt_ddb.h: Makefile
 	echo '#define DDB 1'  >opt_ddb.h
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/ar/Makefile
===================================================================
--- head/sys/modules/ar/Makefile	(revision 71984)
+++ head/sys/modules/ar/Makefile	(revision 71985)
@@ -1,11 +1,8 @@
 # $FreeBSD$
  
 .PATH:  ${.CURDIR}/../../dev/ar
 KMOD    = if_ar
 SRCS    = if_ar.c if_ar_pci.c
 SRCS    += device_if.h bus_if.h pci_if.h isa_if.h opt_netgraph.h
   
-opt_netgraph.h:
-	touch opt_netgraph.h
-
 .include <bsd.kmod.mk>
Index: head/sys/modules/if_ppp/Makefile
===================================================================
--- head/sys/modules/if_ppp/Makefile	(revision 71984)
+++ head/sys/modules/if_ppp/Makefile	(revision 71985)
@@ -1,53 +1,51 @@
 # $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../net
 
 KMOD=	if_ppp
 SRCS=	if_ppp.c ppp_tty.c slcompress.c \
 	opt_inet.h opt_ipx.h opt_ppp.h ppp.h vnode_if.h
 NOMAN=
 
 NPPP?=		2
 PPP_BSDCOMP?=	1	# 0/1
 PPP_DEFLATE?=	1	# 0/1
 PPP_FILTER?=	1	# 0/1 - requires bpf to be configured in kernel
 PPP_INET?=	1	# 0/1 - requires INET to be configured in kernel
 PPP_IPX?=	0	# 0/1 - requires IPX to be configured in kernel
 
 .if ${PPP_BSDCOMP} > 0
 SRCS+=	bsd_comp.c
 .endif
 .if ${PPP_DEFLATE} > 0
 SRCS+=	ppp_deflate.c zlib.c
 .endif
 
 CLEANFILES=	ppp.h
 
-opt_inet.h:
-	touch ${.TARGET}
 .if ${PPP_INET} > 0
+opt_inet.h:
 	echo "#define INET 1" >> ${.TARGET}
 .endif
 
-opt_ipx.h:
-	touch ${.TARGET}
 .if ${PPP_IPX} > 0
+opt_ipx.h:
 	echo "#define IPX ${PPP_IPX}" >> ${.TARGET}
 .endif
 
 opt_ppp.h:
 	touch ${.TARGET}
 .if ${PPP_BSDCOMP} > 0
 	echo "#define PPP_BSDCOMP ${PPP_BSDCOMP}" >> ${.TARGET}
 .endif
 .if ${PPP_DEFLATE} > 0
 	echo "#define PPP_DEFLATE ${PPP_DEFLATE}" >> ${.TARGET}
 .endif
 .if ${PPP_FILTER} > 0
 	echo "#define PPP_FILTER ${PPP_FILTER}" >> ${.TARGET}
 .endif
 
 ppp.h:
 	echo "#define NPPP ${NPPP}" > ${.TARGET}
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/ncp/Makefile
===================================================================
--- head/sys/modules/ncp/Makefile	(revision 71984)
+++ head/sys/modules/ncp/Makefile	(revision 71985)
@@ -1,44 +1,42 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../netncp
 
 KMOD=	ncp
 
 # Build with IPX support (1|0)
 NCP_IPX?=	1
 
 # Build with INET support (1|0)
 NCP_INET?=	1
 
 SRCS=	ncp_conn.c ncp_sock.c ncp_ncp.c ncp_subr.c ncp_crypt.c ncp_mod.c \
 	ncp_rq.c ncp_login.c ncp_nls.c opt_inet.h opt_ipx.h opt_ncp.h
 
 .if defined(NCPBURST)
 SRCS+=	ncp_burst.c
 CFLAGS+= -DNCPBURST
 .endif
 
 NOMAN=
 
-opt_inet.h:
-	touch ${.TARGET}
 .if ${NCP_INET} > 0
+opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
 .endif
 
-opt_ipx.h:
-	touch ${.TARGET}
 .if ${NCP_IPX} > 0
+opt_ipx.h:
 	echo "#define IPX 1" > ${.TARGET}
 .endif
 
 load: ${KMOD}.ko
 	kldload ./${KMOD}.ko
 
 unload:
 	@(if kldunload ${KMOD}; then true; else true; fi)
 
 deinstall:
 	rm -f /modules/ncp.ko
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/nfs/Makefile
===================================================================
--- head/sys/modules/nfs/Makefile	(revision 71984)
+++ head/sys/modules/nfs/Makefile	(revision 71985)
@@ -1,19 +1,18 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../nfs
 
 KMOD=	nfs
 SRCS=	vnode_if.h \
 	nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
 	nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \
 	nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h opt_bootp.h
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
 NOMAN=
 
-opt_inet.h:
-	touch ${.TARGET}
 .if ${NFS_INET} > 0
+opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
 .endif
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/nfsclient/Makefile
===================================================================
--- head/sys/modules/nfsclient/Makefile	(revision 71984)
+++ head/sys/modules/nfsclient/Makefile	(revision 71985)
@@ -1,19 +1,18 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../nfs
 
 KMOD=	nfs
 SRCS=	vnode_if.h \
 	nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
 	nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \
 	nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h opt_bootp.h
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
 NOMAN=
 
-opt_inet.h:
-	touch ${.TARGET}
 .if ${NFS_INET} > 0
+opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
 .endif
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/nfsserver/Makefile
===================================================================
--- head/sys/modules/nfsserver/Makefile	(revision 71984)
+++ head/sys/modules/nfsserver/Makefile	(revision 71985)
@@ -1,19 +1,18 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../nfs
 
 KMOD=	nfs
 SRCS=	vnode_if.h \
 	nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
 	nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \
 	nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h opt_bootp.h
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
 NOMAN=
 
-opt_inet.h:
-	touch ${.TARGET}
 .if ${NFS_INET} > 0
+opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
 .endif
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/oldcard/Makefile
===================================================================
--- head/sys/modules/oldcard/Makefile	(revision 71984)
+++ head/sys/modules/oldcard/Makefile	(revision 71985)
@@ -1,14 +1,11 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../pccard ${.CURDIR}/../../pci
 
 KMOD=	oldcard
 SRCS=	pccard.c pcic.c pccard_beep.c pccard_nbk.c pcic_p.c \
 	opt_pcic.h device_if.h bus_if.h isa_if.h pci_if.h \
 	power_if.h card_if.h power_if.c card_if.c
 NOMAN=
 
-opt_pcic.h:
-	touch $@
-
 .include <bsd.kmod.mk>
Index: head/sys/modules/osf1/Makefile
===================================================================
--- head/sys/modules/osf1/Makefile	(revision 71984)
+++ head/sys/modules/osf1/Makefile	(revision 71985)
@@ -1,21 +1,18 @@
 # $FreeBSD$
 
 MAINTAINER=	gallatin@FreeBSD.org
 
 .PATH: ${.CURDIR}/../../alpha/osf1
 
 KMOD=	osf1
 SRCS=	osf1_ioctl.c osf1_misc.c osf1_signal.c osf1_sysent.c \
 	osf1_mount.c imgact_osf1.c osf1_sysvec.c opt_compat.h \
 	opt_simos.h opt_nfs.h device_if.h bus_if.h vnode_if.h
 
 #CFLAGS+=  -g
 EXPORT_SYMS=	_osf1
 
 opt_compat.h:
 	echo "#define COMPAT_43 1" > ${.TARGET}
 
-opt_osf1.h opt_simos.h opt_nfs.h:
-	touch ${.TARGET}
-
 .include <bsd.kmod.mk>
Index: head/sys/modules/pecoff/Makefile
===================================================================
--- head/sys/modules/pecoff/Makefile	(revision 71984)
+++ head/sys/modules/pecoff/Makefile	(revision 71985)
@@ -1,16 +1,12 @@
 # $FreeBSD$
 
 MAINTAINER=	takawata@FreeBSD.org
 
 .PATH: ${.CURDIR}/../../compat/pecoff
 
 KMOD=	pecoff
 SRCS=	imgact_pecoff.c opt_pecoff.h vnode_if.h
 
 CFLAGS+= -g -DDEBUG
-#EXPORT_SYMS=_pecoff_mod
-
-opt_pecoff.h: Makefile
-	touch opt_pecoff.h
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/sr/Makefile
===================================================================
--- head/sys/modules/sr/Makefile	(revision 71984)
+++ head/sys/modules/sr/Makefile	(revision 71985)
@@ -1,11 +1,8 @@
 # $FreeBSD$
  
 .PATH:  ${.CURDIR}/../../dev/sr
 KMOD    = if_sr
 SRCS    = if_sr.c if_sr_isa.c if_sr_pci.c
 SRCS    += device_if.h bus_if.h pci_if.h isa_if.h opt_netgraph.h
   
-opt_netgraph.h:
-	touch opt_netgraph.h
-
 .include <bsd.kmod.mk>
Index: head/sys/modules/svr4/Makefile
===================================================================
--- head/sys/modules/svr4/Makefile	(revision 71984)
+++ head/sys/modules/svr4/Makefile	(revision 71985)
@@ -1,41 +1,40 @@
 # $FreeBSD$
 
 MAINTAINER=	newton@FreeBSD.org
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 
 .PATH:	${.CURDIR}/../../${TARGET_ARCH}/svr4 ${.CURDIR}/../../compat/svr4
 KMOD=	svr4
 SRCS=	svr4_sysent.c svr4_sysvec.c opt_compat.h opt_svr4.h opt_vmpage.h \
 	vnode_if.h imgact_svr4.c svr4_signal.c svr4_fcntl.c svr4_misc.c \
 	svr4_ioctl.c svr4_stat.c svr4_filio.c svr4_ttold.c svr4_termios.c \
 	svr4_stream.c svr4_socket.c svr4_sockio.c svr4_machdep.c \
 	svr4_resource.c svr4_ipc.c
 OBJS=	svr4_locore.o 
 
 EXPORT_SYMS=	_svr4_mod
 CLEANFILES=	svr4_assym.h svr4_genassym.o
 
 svr4_assym.h: svr4_genassym.o
 .if exists(@)
 svr4_assym.h: @/kern/genassym.sh
 .endif
 	sh @/kern/genassym.sh svr4_genassym.o > ${.TARGET}
 
 svr4_locore.o: svr4_locore.s svr4_assym.h
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 		${.IMPSRC} -o ${.TARGET}
 
 svr4_genassym.o: svr4_genassym.c svr4.h @ machine
 	${CC} -c ${CFLAGS} ${.IMPSRC}
 
 opt_compat.h:
 	echo "#define COMPAT_43 1" > opt_compat.h
 
-opt_svr4.h:
-	touch opt_svr4.h
 .if defined(DEBUG)
-	echo "#define DEBUG_SVR4 1" >> opt_svr4.h
+opt_svr4.h:
+	echo "#define DEBUG_SVR4 1" > opt_svr4.h
 .endif
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/sysvipc/sysvmsg/Makefile
===================================================================
--- head/sys/modules/sysvipc/sysvmsg/Makefile	(revision 71984)
+++ head/sys/modules/sysvipc/sysvmsg/Makefile	(revision 71985)
@@ -1,11 +1,8 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../kern
 
 KMOD=	sysvmsg
 SRCS=	sysv_msg.c opt_sysvipc.h
 
-opt_sysvipc.h:
-	touch $@
-
 .include <bsd.kmod.mk>
Index: head/sys/modules/sysvipc/sysvsem/Makefile
===================================================================
--- head/sys/modules/sysvipc/sysvsem/Makefile	(revision 71984)
+++ head/sys/modules/sysvipc/sysvsem/Makefile	(revision 71985)
@@ -1,11 +1,8 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../kern
 
 KMOD=	sysvsem
 SRCS=	sysv_sem.c opt_sysvipc.h
 
-opt_sysvipc.h:
-	touch $@
-
 .include <bsd.kmod.mk>
Index: head/sys/modules/sysvipc/sysvshm/Makefile
===================================================================
--- head/sys/modules/sysvipc/sysvshm/Makefile	(revision 71984)
+++ head/sys/modules/sysvipc/sysvshm/Makefile	(revision 71985)
@@ -1,12 +1,9 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../kern
 
 KMOD=	sysvshm
 OPTS=	opt_sysvipc.h opt_compat.h opt_rlimit.h
 SRCS=	sysv_shm.c $(OPTS)
 
-$(OPTS):
-	touch $@
-
 .include <bsd.kmod.mk>