From 6f940b38476a3dc6ecaca7ad305eddf1f9eab154 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sun, 28 Nov 1999 18:53:47 +0000 Subject: [PATCH] Removed special rules for building and cleaning device interface files and empty options files. The rules are now generated automatically in bsd.kmod.mk. Cleaned up related things ($S and ${CLEANFILES}). --- sys/modules/aha/Makefile | 17 ++--------------- sys/modules/al/Makefile | 20 +------------------- sys/modules/amr/Makefile | 14 ++------------ sys/modules/atapi/Makefile | 2 +- sys/modules/ax/Makefile | 16 +--------------- sys/modules/bktr/Makefile | 21 ++------------------- sys/modules/cardbus/Makefile | 8 -------- sys/modules/cbb/Makefile | 8 -------- sys/modules/ccd/Makefile | 2 +- sys/modules/coda/Makefile | 5 +---- sys/modules/coff/Makefile | 1 - sys/modules/dm/Makefile | 20 +------------------- sys/modules/fxp/Makefile | 16 +--------------- sys/modules/ibcs2/Makefile | 4 ---- sys/modules/if_disc/Makefile | 1 - sys/modules/if_ppp/Makefile | 3 +-- sys/modules/if_sl/Makefile | 2 +- sys/modules/if_tun/Makefile | 5 ----- sys/modules/joy/Makefile | 5 ----- sys/modules/linux/Makefile | 6 +----- sys/modules/md/Makefile | 9 --------- sys/modules/mfs/Makefile | 4 ---- sys/modules/mii/Makefile | 16 +--------------- sys/modules/mlx/Makefile | 14 ++------------ sys/modules/mx/Makefile | 19 +------------------ sys/modules/ncp/Makefile | 4 ---- sys/modules/netgraph/cisco/Makefile | 2 -- sys/modules/netgraph/iface/Makefile | 2 -- sys/modules/nfs/Makefile | 4 ---- sys/modules/nfsclient/Makefile | 4 ---- sys/modules/nfsserver/Makefile | 4 ---- sys/modules/ntfs/Makefile | 4 ---- sys/modules/nwfs/Makefile | 5 ----- sys/modules/pccard/Makefile | 11 ----------- sys/modules/pcic/Makefile | 11 ----------- sys/modules/pn/Makefile | 16 +--------------- sys/modules/procfs/Makefile | 4 ---- sys/modules/rl/Makefile | 20 +------------------- sys/modules/sf/Makefile | 20 +------------------- sys/modules/sis/Makefile | 20 +------------------- sys/modules/sk/Makefile | 16 +--------------- sys/modules/ste/Makefile | 20 +------------------- sys/modules/streams/Makefile | 11 +---------- sys/modules/svr4/Makefile | 6 +----- sys/modules/ti/Makefile | 17 ++--------------- sys/modules/tl/Makefile | 20 +------------------- sys/modules/ugen/Makefile | 13 +------------ sys/modules/uhid/Makefile | 13 +------------ sys/modules/ukbd/Makefile | 14 ++------------ sys/modules/ulpt/Makefile | 13 +------------ sys/modules/umass/Makefile | 14 +------------- sys/modules/umodem/Makefile | 13 +------------ sys/modules/ums/Makefile | 13 +------------ sys/modules/usb/Makefile | 18 ------------------ sys/modules/vesa/Makefile | 11 +---------- sys/modules/vinum/Makefile | 8 +------- sys/modules/vn/Makefile | 5 ----- sys/modules/vr/Makefile | 20 +------------------- sys/modules/wb/Makefile | 20 +------------------- sys/modules/wi/Makefile | 10 +--------- sys/modules/xl/Makefile | 20 +------------------- 61 files changed, 45 insertions(+), 619 deletions(-) diff --git a/sys/modules/aha/Makefile b/sys/modules/aha/Makefile index e0d4f3f6016c..295124f62504 100644 --- a/sys/modules/aha/Makefile +++ b/sys/modules/aha/Makefile @@ -1,29 +1,16 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/dev/aha +.PATH: ${.CURDIR}/../../dev/aha KMOD = aha SRCS = aha.c aha_isa.c ahareg.h opt_cam.h device_if.h bus_if.h aha.h \ opt_scsi.h isa_if.h -CLEANFILES += aha.h device_if.h bus_if.h opt_cam.h opt_scsi.h isa_if.h +CLEANFILES = aha.h CFLAGS += ${DEBUG_FLAGS} aha.h: echo "#define NAHA 1" > aha.h -opt_cam.h: - touch opt_cam.h - opt_scsi.h: echo "#define SCSI_DELAY 15000" > opt_scsi.h -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -isa_if.h: $S/kern/makedevops.pl $S/isa/isa_if.m - perl $S/kern/makedevops.pl -h $S/isa/isa_if.m - .include diff --git a/sys/modules/al/Makefile b/sys/modules/al/Makefile index db6554343075..58170cfe5357 100644 --- a/sys/modules/al/Makefile +++ b/sys/modules/al/Makefile @@ -1,28 +1,10 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = al SRCS = if_al.c opt_bdg.h device_if.h bus_if.h pci_if.h SRCS += miibus_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h -CLEANFILES += miibus_if.h CFLAGS += ${DEBUG_FLAGS} KMODDEPS = miibus -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - -miibus_if.h: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m - perl $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m - .include diff --git a/sys/modules/amr/Makefile b/sys/modules/amr/Makefile index f769bdcbc3b2..b83850ce094c 100644 --- a/sys/modules/amr/Makefile +++ b/sys/modules/amr/Makefile @@ -1,22 +1,12 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/dev/amr +.PATH: ${.CURDIR}/../../dev/amr KMOD = amr SRCS = amr.c amr_pci.c amr_disk.c device_if.h bus_if.h pci_if.h -CLEANFILES += amr.h device_if.h bus_if.h pci_if.h +CLEANFILES = amr.h CFLAGS += ${DEBUG_FLAGS} amr.h: echo "#define NAMR 1" > amr.h -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - .include diff --git a/sys/modules/atapi/Makefile b/sys/modules/atapi/Makefile index b01c43d0016e..5995e70caab9 100644 --- a/sys/modules/atapi/Makefile +++ b/sys/modules/atapi/Makefile @@ -5,7 +5,7 @@ KMOD = atapi SRCS = atapi.c wdc.h opt_atapi.h #wcd.h NOMAN = CFLAGS += -DATAPI_MODULE -CLEANFILES += wdc.h wcd.h opt_atapi.h +CLEANFILES = wcd.h wdc.h EXPORT_SYMS = _atapi_mod _atapi_debug_ptr _atapi_intr_ptr \ _atapi_request_callback_ptr _atapi_request_immediate_ptr \ _atapi_request_wait_ptr _atapi_start_ptr diff --git a/sys/modules/ax/Makefile b/sys/modules/ax/Makefile index 6f5eec332e08..3368a7fc57bf 100644 --- a/sys/modules/ax/Makefile +++ b/sys/modules/ax/Makefile @@ -1,22 +1,8 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_ax SRCS = if_ax.c opt_bdg.h device_if.h bus_if.h pci_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h CFLAGS += ${DEBUG_FLAGS} -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - .include diff --git a/sys/modules/bktr/Makefile b/sys/modules/bktr/Makefile index e884a35aa7a9..a341d6a6bf3d 100644 --- a/sys/modules/bktr/Makefile +++ b/sys/modules/bktr/Makefile @@ -11,14 +11,12 @@ # $FreeBSD$ -S= ${.CURDIR}/../.. -.PATH: $S/dev/bktr +.PATH: ${.CURDIR}/../../dev/bktr KMOD= bktr SRCS= bktr_core.c bktr_os.c bktr_audio.c bktr_tuner.c bktr_card.c \ bktr.h opt_devfs.h opt_bktr.h smbus.h bus_if.h device_if.h \ pci_if.h vnode_if.h -CLEANFILES += bktr.h opt_devfs.h opt_bktr.h smbus.h bus_if.h device_if.h \ - pci_if.h vnode_if.h vnode_if.c +CLEANFILES= bktr.h smbus.h bktr.h: echo "#define NBKTR 1" > bktr.h @@ -28,19 +26,4 @@ bktr.h: smbus.h: echo "#define NSMBUS 0" > smbus.h -opt_devfs.h: - touch opt_devfs.h - -opt_bktr.h: - touch opt_bktr.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - .include diff --git a/sys/modules/cardbus/Makefile b/sys/modules/cardbus/Makefile index 0f0bea8cced0..5ac7d33ea465 100644 --- a/sys/modules/cardbus/Makefile +++ b/sys/modules/cardbus/Makefile @@ -1,17 +1,9 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. .PATH: ${.CURDIR}/../../dev/cardbus KMOD= cardbus SRCS= cardbus.c \ device_if.h bus_if.h -CLEANFILES+= device_if.h bus_if.h NOMAN= -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - .include diff --git a/sys/modules/cbb/Makefile b/sys/modules/cbb/Makefile index 31096996b3cd..a48b00231a6d 100644 --- a/sys/modules/cbb/Makefile +++ b/sys/modules/cbb/Makefile @@ -1,17 +1,9 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. .PATH: ${.CURDIR}/../../pci KMOD= cbb SRCS= pccbb.c \ device_if.h bus_if.h -CLEANFILES+= device_if.h bus_if.h NOMAN= -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - .include diff --git a/sys/modules/ccd/Makefile b/sys/modules/ccd/Makefile index 223ad52b8ef5..3235eae6e474 100644 --- a/sys/modules/ccd/Makefile +++ b/sys/modules/ccd/Makefile @@ -6,7 +6,7 @@ SRCS= ccd.c ccd.h vnode_if.h NOMAN= NCCD?= 4 -CLEANFILES+= ccd.h vnode_if.h vnode_if.c +CLEANFILES= ccd.h ccd.h: echo "#define NCCD ${NCCD}" > ccd.h diff --git a/sys/modules/coda/Makefile b/sys/modules/coda/Makefile index d3ce37ebd1f0..dde14c105db4 100644 --- a/sys/modules/coda/Makefile +++ b/sys/modules/coda/Makefile @@ -7,10 +7,7 @@ SRCS= coda_fbsd.c coda_namecache.c coda_psdev.c coda_subr.c \ NOMAN= VFS_KLD= -CLEANFILES+= vcoda.h opt_devfs.h - -opt_devfs.h: - touch opt_devfs.h +CLEANFILES= vcoda.h vcoda.h: echo "#define NVCODA 4" > vcoda.h diff --git a/sys/modules/coff/Makefile b/sys/modules/coff/Makefile index ab7ecd123ad2..2fa1f5429bc4 100644 --- a/sys/modules/coff/Makefile +++ b/sys/modules/coff/Makefile @@ -4,7 +4,6 @@ KMOD= ibcs2_coff SRCS= imgact_coff.c vnode_if.h NOMAN= -CLEANFILES+= vnode_if.h vnode_if.c CFLAGS+= -DCOMPAT_IBCS2 KMODDEPS= ibcs2 diff --git a/sys/modules/dm/Makefile b/sys/modules/dm/Makefile index 6885c2d963b3..e0e19baad12a 100644 --- a/sys/modules/dm/Makefile +++ b/sys/modules/dm/Makefile @@ -1,28 +1,10 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_dm SRCS = if_dm.c opt_bdg.h device_if.h bus_if.h pci_if.h SRCS += miibus_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h -CLEANFILES += miibus_if.h CFLAGS += ${DEBUG_FLAGS} KMODDEPS = miibus -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - -miibus_if.h: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m - perl $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m - .include diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile index 42d41e7f1e47..9285bb2d4131 100644 --- a/sys/modules/fxp/Makefile +++ b/sys/modules/fxp/Makefile @@ -1,22 +1,8 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_fxp SRCS = if_fxp.c opt_bdg.h device_if.h bus_if.h pci_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h CFLAGS += ${DEBUG_FLAGS} -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - .include diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile index 579eed50de85..29f88a968d4c 100644 --- a/sys/modules/ibcs2/Makefile +++ b/sys/modules/ibcs2/Makefile @@ -11,12 +11,8 @@ SRCS= ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \ MAN8= ibcs2.8 CFLAGS+= -DCOMPAT_IBCS2 -CLEANFILES+= vnode_if.h vnode_if.c opt_spx_hack.h EXPORT_SYMS= _ibcs2_mod _ibcs2_emul_path _ibcs2_svr3_sysvec -opt_spx_hack.h: - touch opt_spx_hack.h - afterinstall: ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/ibcs2.sh ${DESTDIR}/usr/sbin/ibcs2 diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile index 71d9e7db53af..63b859263dff 100644 --- a/sys/modules/if_disc/Makefile +++ b/sys/modules/if_disc/Makefile @@ -8,7 +8,6 @@ NOMAN= NBPF?= 1 CFLAGS+= ${PROTOS} -CLEANFILES+= opt_inet.h opt_inet.h: echo "#define INET 1" > opt_inet.h diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile index 42d98a8b4b82..3e6c9a54e5da 100644 --- a/sys/modules/if_ppp/Makefile +++ b/sys/modules/if_ppp/Makefile @@ -5,7 +5,6 @@ KMOD= if_ppp SRCS= if_ppp.c ppp_tty.c slcompress.c \ ppp.h opt_inet.h opt_ipx.h opt_ppp.h vnode_if.h NOMAN= -CLEANFILES+= vnode_if.c vnode_if.h NPPP?= 2 PPP_BSDCOMP?= 1 # 0/1 @@ -23,7 +22,7 @@ SRCS+= bsd_comp.c SRCS+= ppp_deflate.c zlib.c .endif -CLEANFILES+= opt_inet.h opt_ipx.h opt_ppp.h ppp.h +CLEANFILES= ppp.h ppp.h: echo "#define NPPP ${NPPP}" > ppp.h diff --git a/sys/modules/if_sl/Makefile b/sys/modules/if_sl/Makefile index 95a5778a7d29..c188d19b0835 100644 --- a/sys/modules/if_sl/Makefile +++ b/sys/modules/if_sl/Makefile @@ -9,7 +9,7 @@ NSL?= 2 PROTOS?= -DINET CFLAGS+= ${PROTOS} -CLEANFILES+= opt_inet.h sl.h +CLEANFILES= sl.h opt_inet.h: echo "#define INET 1" > opt_inet.h diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile index d1d9c8ef886a..019bc910ed7d 100644 --- a/sys/modules/if_tun/Makefile +++ b/sys/modules/if_tun/Makefile @@ -4,16 +4,11 @@ KMOD= if_tun SRCS= if_tun.c opt_devfs.h opt_inet.h vnode_if.h NOMAN= -CLEANFILES+= vnode_if.h vnode_if.c NBPF?= 1 NTUN?= 2 CFLAGS+= ${PROTOS} -CLEANFILES+= opt_devfs.h opt_inet.h - -opt_devfs.h: - touch opt_devfs.h opt_inet.h: echo "#define INET 1" > opt_inet.h diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile index eefed22b4d26..3051bd7913d8 100644 --- a/sys/modules/joy/Makefile +++ b/sys/modules/joy/Makefile @@ -6,11 +6,6 @@ SRCS = joy.c opt_devfs.h MAN8 = joy.8 CFLAGS += -DJOY_MODULE -CLEANFILES += opt_devfs.h - -opt_devfs.h: - touch opt_devfs.h - afterinstall: ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 2c186f6dd9de..7c5a53e3e43f 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -14,8 +14,7 @@ MAN8= linux.8 # CFLAGS+= -DDEBUG EXPORT_SYMS=_linux_mod -CLEANFILES+= vnode_if.h vnode_if.c linux_genassym.o linux_genassym \ - linux_assym.h opt_compat.h opt_linux.h opt_vmpage.h +CLEANFILES= linux_assym.h linux_genassym linux_genassym.o build-tools: linux_genassym @@ -35,9 +34,6 @@ linux_genassym: linux_genassym.o opt_compat.h: echo "#define COMPAT_43 1" > opt_compat.h -opt_linux.h opt_vmpage.h: - touch ${.TARGET} - afterinstall: ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/linux.sh ${DESTDIR}/usr/sbin/linux diff --git a/sys/modules/md/Makefile b/sys/modules/md/Makefile index 0c1cbe5177d4..bbbec998b357 100644 --- a/sys/modules/md/Makefile +++ b/sys/modules/md/Makefile @@ -4,14 +4,5 @@ KMOD= md SRCS= md.c opt_mfs.h opt_md.h NOMAN= -CLEANFILES += opt_mfs.h opt_md.h - -opt_md.h: - touch opt_md.h - -opt_mfs.h: - touch opt_mfs.h .include - - diff --git a/sys/modules/mfs/Makefile b/sys/modules/mfs/Makefile index a5cbc9e4ba73..ab66b8ba2348 100644 --- a/sys/modules/mfs/Makefile +++ b/sys/modules/mfs/Makefile @@ -5,9 +5,5 @@ KMOD= mfs SRCS= mfs_vfsops.c mfs_vnops.c opt_mfs.h NOMAN= VFS_KLD= -CLEANFILES+= opt_mfs.h - -opt_mfs.h: - touch ${.TARGET} .include diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile index 9c36977a0935..72eb7187fd32 100644 --- a/sys/modules/mii/Makefile +++ b/sys/modules/mii/Makefile @@ -1,24 +1,10 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/dev/mii +.PATH: ${.CURDIR}/../../dev/mii KMOD = miibus SRCS = mii.c mii_physubr.c ukphy.c ukphy_subr.c bus_if.h SRCS += miibus_if.h device_if.h miibus_if.c exphy.c nsphy.c SRCS += mlphy.c tlphy.c rlphy.c amphy.c mxphy.c -CLEANFILES += device_if.h bus_if.h miibus_if.h miibus_if.c CFLAGS += ${DEBUG_FLAGS} -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -miibus_if.h: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m - perl $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m - -miibus_if.c: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m - perl $S/kern/makedevops.pl -c $S/dev/mii/miibus_if.m - .include diff --git a/sys/modules/mlx/Makefile b/sys/modules/mlx/Makefile index d804e85cb047..ab142b1e0788 100644 --- a/sys/modules/mlx/Makefile +++ b/sys/modules/mlx/Makefile @@ -1,22 +1,12 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/dev/mlx +.PATH: ${.CURDIR}/../../dev/mlx KMOD = mlx SRCS = mlx.c mlx_pci.c mlx_disk.c device_if.h bus_if.h pci_if.h -CLEANFILES += mlx.h device_if.h bus_if.h pci_if.h +CLEANFILES = mlx.h CFLAGS += ${DEBUG_FLAGS} mlx.h: echo "#define NMLX 1" > mlx.h -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - .include diff --git a/sys/modules/mx/Makefile b/sys/modules/mx/Makefile index 0ffb2f6416cd..bbb49c0c34b1 100644 --- a/sys/modules/mx/Makefile +++ b/sys/modules/mx/Makefile @@ -1,25 +1,8 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_mx SRCS = if_mx.c opt_bdg.h device_if.h bus_if.h pci_if.h miibus_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h miibus_if.h CFLAGS += ${DEBUG_FLAGS} -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - -miibus_if.h: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m - perl $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m - .include diff --git a/sys/modules/ncp/Makefile b/sys/modules/ncp/Makefile index 332be1019acd..4b63ca8c7306 100644 --- a/sys/modules/ncp/Makefile +++ b/sys/modules/ncp/Makefile @@ -19,12 +19,8 @@ CFLAGS+= -DNCPBURST .endif NOMAN= -CLEANFILES= opt_ncp.h opt_inet.h opt_ipx.h CFLAGS+= -DNCP -opt_ncp.h: - touch ${.TARGET} - opt_inet.h: touch ${.TARGET} .if ${NCP_INET} > 0 diff --git a/sys/modules/netgraph/cisco/Makefile b/sys/modules/netgraph/cisco/Makefile index 2a8d5be1a2c1..ba91dabeb3ff 100644 --- a/sys/modules/netgraph/cisco/Makefile +++ b/sys/modules/netgraph/cisco/Makefile @@ -12,8 +12,6 @@ IFACE_IPX?= 0 # 0/1 - requires IPX configured in kernel CFLAGS+= ${PROTOS} -CLEANFILES+= opt_inet.h opt_atalk.h opt_ipx.h - opt_inet.h: touch opt_inet.h .if ${IFACE_INET} > 0 diff --git a/sys/modules/netgraph/iface/Makefile b/sys/modules/netgraph/iface/Makefile index ccd6fe85e1f0..cc5cc1ec310f 100644 --- a/sys/modules/netgraph/iface/Makefile +++ b/sys/modules/netgraph/iface/Makefile @@ -12,8 +12,6 @@ IFACE_IPX?= 0 # 0/1 - requires IPX configured in kernel CFLAGS+= ${PROTOS} -CLEANFILES+= opt_inet.h opt_atalk.h opt_ipx.h - opt_inet.h: touch opt_inet.h .if ${IFACE_INET} > 0 diff --git a/sys/modules/nfs/Makefile b/sys/modules/nfs/Makefile index 9aa10ae87f80..7880e2efcb27 100644 --- a/sys/modules/nfs/Makefile +++ b/sys/modules/nfs/Makefile @@ -9,7 +9,6 @@ NFS_INET?= 1 # 0/1 - requires INET to be configured in kernel NOMAN= VFS_KLD= CFLAGS+= -DNFS -CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h opt_posix.h opt_bootp.h opt_inet.h: touch ${.TARGET} @@ -17,7 +16,4 @@ opt_inet.h: echo "#define INET 1" > ${.TARGET} .endif -opt_nfs.h opt_vmpage.h opt_posix.h opt_bootp.h: - touch ${.TARGET} - .include diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile index 9aa10ae87f80..7880e2efcb27 100644 --- a/sys/modules/nfsclient/Makefile +++ b/sys/modules/nfsclient/Makefile @@ -9,7 +9,6 @@ NFS_INET?= 1 # 0/1 - requires INET to be configured in kernel NOMAN= VFS_KLD= CFLAGS+= -DNFS -CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h opt_posix.h opt_bootp.h opt_inet.h: touch ${.TARGET} @@ -17,7 +16,4 @@ opt_inet.h: echo "#define INET 1" > ${.TARGET} .endif -opt_nfs.h opt_vmpage.h opt_posix.h opt_bootp.h: - touch ${.TARGET} - .include diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile index 9aa10ae87f80..7880e2efcb27 100644 --- a/sys/modules/nfsserver/Makefile +++ b/sys/modules/nfsserver/Makefile @@ -9,7 +9,6 @@ NFS_INET?= 1 # 0/1 - requires INET to be configured in kernel NOMAN= VFS_KLD= CFLAGS+= -DNFS -CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h opt_posix.h opt_bootp.h opt_inet.h: touch ${.TARGET} @@ -17,7 +16,4 @@ opt_inet.h: echo "#define INET 1" > ${.TARGET} .endif -opt_nfs.h opt_vmpage.h opt_posix.h opt_bootp.h: - touch ${.TARGET} - .include diff --git a/sys/modules/ntfs/Makefile b/sys/modules/ntfs/Makefile index 0aea8277177b..a86621197edc 100644 --- a/sys/modules/ntfs/Makefile +++ b/sys/modules/ntfs/Makefile @@ -7,9 +7,5 @@ SRCS= ntfs_vfsops.c ntfs_vnops.c ntfs_subr.c ntfs_ihash.c \ NOMAN= VFS_KLD= CFLAGS+= -DNTFS -CLEANFILES= opt_vmpage.h - -opt_vmpage.h: - touch ${.TARGET} .include diff --git a/sys/modules/nwfs/Makefile b/sys/modules/nwfs/Makefile index 381c318350bf..925fb0567119 100644 --- a/sys/modules/nwfs/Makefile +++ b/sys/modules/nwfs/Makefile @@ -10,8 +10,6 @@ SRCS= nwfs_node.c nwfs_ioctl.c nwfs_io.c nwfs_vfsops.c nwfs_vnops.c \ VFS_KLD=true -CLEANFILES= opt_ncp.h opt_nwfs.h opt_vmpage.h - NOMAN=true CFLAGS+= -DNWFS @@ -23,9 +21,6 @@ CFLAGS+= -DVNPRINT opt_ncp.h: echo "#define NCP 1" > ${.TARGET} -opt_nwfs.h opt_vmpage.h: - touch ${.TARGET} - load: nwfs.ko kldload ./nwfs.ko diff --git a/sys/modules/pccard/Makefile b/sys/modules/pccard/Makefile index 4ccb6d9b0156..a55651991ca7 100644 --- a/sys/modules/pccard/Makefile +++ b/sys/modules/pccard/Makefile @@ -1,20 +1,9 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. .PATH: ${.CURDIR}/../../dev/pccard KMOD= pccard SRCS= pccard.c pccard_cis.c pccard_cis_quirks.c \ device_if.h bus_if.h isa_if.h -CLEANFILES+= device_if.h bus_if.h isa_if.h NOMAN= -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -isa_if.h: $S/kern/makedevops.pl $S/isa/isa_if.m - perl $S/kern/makedevops.pl -h $S/isa/isa_if.m - .include diff --git a/sys/modules/pcic/Makefile b/sys/modules/pcic/Makefile index 88e313fc61d8..e4d22ef1e580 100644 --- a/sys/modules/pcic/Makefile +++ b/sys/modules/pcic/Makefile @@ -1,20 +1,9 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. .PATH: ${.CURDIR}/../../dev/pcic KMOD= pcic SRCS= i82365.c i82365_isa.c i82365_isasubr.c \ device_if.h bus_if.h isa_if.h -CLEANFILES+= device_if.h bus_if.h isa_if.h NOMAN= -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -isa_if.h: $S/kern/makedevops.pl $S/isa/isa_if.m - perl $S/kern/makedevops.pl -h $S/isa/isa_if.m - .include diff --git a/sys/modules/pn/Makefile b/sys/modules/pn/Makefile index 31da119375dc..51909c010030 100644 --- a/sys/modules/pn/Makefile +++ b/sys/modules/pn/Makefile @@ -1,22 +1,8 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_pn SRCS = if_pn.c opt_bdg.h device_if.h bus_if.h pci_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h CFLAGS += ${DEBUG_FLAGS} -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - .include diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile index 068c51299563..0f3c81fa01af 100644 --- a/sys/modules/procfs/Makefile +++ b/sys/modules/procfs/Makefile @@ -8,9 +8,5 @@ SRCS= opt_vmpage.h procfs_ctl.c procfs_map.c procfs_note.c procfs_rlimit.c \ NOMAN= VFS_KLD= CFLAGS+= -DPROCFS -CLEANFILES+= opt_vmpage.h - -opt_vmpage.h: - touch ${.TARGET} .include diff --git a/sys/modules/rl/Makefile b/sys/modules/rl/Makefile index ef27144a3608..03bd3950e250 100644 --- a/sys/modules/rl/Makefile +++ b/sys/modules/rl/Makefile @@ -1,29 +1,11 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_rl SRCS = if_rl.c opt_bdg.h device_if.h bus_if.h pci_if.h SRCS += miibus_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h -CLEANFILES += miibus_if.h KMODDEPS = miibus CFLAGS += ${DEBUG_FLAGS} -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - -miibus_if.h: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m - perl $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m - .include diff --git a/sys/modules/sf/Makefile b/sys/modules/sf/Makefile index 40c8234fb4d2..1601e1676c9d 100644 --- a/sys/modules/sf/Makefile +++ b/sys/modules/sf/Makefile @@ -1,29 +1,11 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_sf SRCS = if_sf.c opt_bdg.h device_if.h bus_if.h pci_if.h SRCS += miibus_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h -CLEANFILES += miibus_if.h KMODDEPS = miibus CFLAGS += ${DEBUG_FLAGS} -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - -miibus_if.h: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m - perl $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m - .include diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile index e4c868c06332..a0e29ada58de 100644 --- a/sys/modules/sis/Makefile +++ b/sys/modules/sis/Makefile @@ -1,28 +1,10 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_sis SRCS = if_sis.c opt_bdg.h device_if.h bus_if.h pci_if.h SRCS += miibus_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h -CLEANFILES += miibus_if.h CFLAGS += ${DEBUG_FLAGS} KMODDEPS = miibus -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - -miibus_if.h: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m - perl $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m - .include diff --git a/sys/modules/sk/Makefile b/sys/modules/sk/Makefile index 5614a10bd34e..3111b3424037 100644 --- a/sys/modules/sk/Makefile +++ b/sys/modules/sk/Makefile @@ -1,22 +1,8 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_sk SRCS = if_sk.c opt_bdg.h device_if.h bus_if.h pci_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h CFLAGS += ${DEBUG_FLAGS} -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - .include diff --git a/sys/modules/ste/Makefile b/sys/modules/ste/Makefile index 4dd2d1acd107..44d5b94fe25e 100644 --- a/sys/modules/ste/Makefile +++ b/sys/modules/ste/Makefile @@ -1,28 +1,10 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_ste SRCS = if_ste.c opt_bdg.h device_if.h bus_if.h pci_if.h SRCS += miibus_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h -CLEANFILES += miibus_if.h CFLAGS += ${DEBUG_FLAGS} KMODDEPS = miibus -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - -miibus_if.h: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m - perl $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m - .include diff --git a/sys/modules/streams/Makefile b/sys/modules/streams/Makefile index 6248101335e0..beda73574d65 100644 --- a/sys/modules/streams/Makefile +++ b/sys/modules/streams/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ MAINTAINER = newton@atdot.dotat.org -SOURCE= ${.CURDIR}/../../dev/streams .if defined(DEBUG) CFLAGS+= -DDEBUG_SVR4 .endif -.PATH: ${SOURCE} +.PATH: ${.CURDIR}/../../dev/streams KMOD= streams SRCS= streams.c opt_streams.h opt_devfs.h @@ -14,12 +13,4 @@ NOMAN= CFLAGS+= -O -CLEANFILES+= vnode_if.h vnode_if.c opt_streams.h opt_devfs.h - -opt_streams.h: - @touch opt_streams.h - -opt_devfs.h: - @touch opt_devfs.h - .include diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile index da429c1c1a69..1132ab23efb7 100644 --- a/sys/modules/svr4/Makefile +++ b/sys/modules/svr4/Makefile @@ -19,8 +19,7 @@ CFLAGS+= -DDEBUG_SVR4 .endif EXPORT_SYMS=_svr4_mod -CLEANFILES+= vnode_if.h vnode_if.c svr4_genassym.o svr4_genassym \ - svr4_assym.h opt_compat.h opt_vmpage.h +CLEANFILES= svr4_assym.h svr4_genassym svr4_genassym.o build-tools: svr4_genassym @@ -40,9 +39,6 @@ svr4_genassym: svr4_genassym.o opt_compat.h: echo "#define COMPAT_43 1" > opt_compat.h -opt_vmpage.h: - touch opt_vmpage.h - afterinstall: ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/svr4.sh ${DESTDIR}/usr/sbin/svr4 diff --git a/sys/modules/ti/Makefile b/sys/modules/ti/Makefile index 945bf4091e22..b91ae2ad00fd 100644 --- a/sys/modules/ti/Makefile +++ b/sys/modules/ti/Makefile @@ -1,25 +1,12 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_ti SRCS = if_ti.c opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h -CLEANFILES += opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h +CLEANFILES = vlan.h CFLAGS += ${DEBUG_FLAGS} -opt_bdg.h: - touch opt_bdg.h - vlan.h: touch vlan.h -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - .include diff --git a/sys/modules/tl/Makefile b/sys/modules/tl/Makefile index 5c7644a8ce18..810ed6f00338 100644 --- a/sys/modules/tl/Makefile +++ b/sys/modules/tl/Makefile @@ -1,28 +1,10 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_tl SRCS = if_tl.c opt_bdg.h device_if.h bus_if.h pci_if.h SRCS += miibus_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h -CLEANFILES += miibus_if.h CFLAGS += ${DEBUG_FLAGS} KMODDEPS = miibus -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - -miibus_if.h: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m - perl $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m - .include diff --git a/sys/modules/ugen/Makefile b/sys/modules/ugen/Makefile index 0d203880a060..180f6c7fef60 100644 --- a/sys/modules/ugen/Makefile +++ b/sys/modules/ugen/Makefile @@ -1,21 +1,10 @@ # $FreeBSD$ MAINTAINER = n_hibma@freebsd.org -S = ${.CURDIR}/../.. -.PATH: $S/dev/usb +.PATH: ${.CURDIR}/../../dev/usb KMOD = ugen SRCS = bus_if.h device_if.h vnode_if.h opt_usb.h ugen.c NOMAN = -CLEANFILES += bus_if.h device_if.h vnode_if.h opt_usb.h \ - vnode_if.c - -opt_usb.h: - echo > opt_usb.h - -bus_if.h: - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m -device_if.h: - perl $S/kern/makedevops.pl -h $S/kern/device_if.m .include diff --git a/sys/modules/uhid/Makefile b/sys/modules/uhid/Makefile index 572d93d55879..4f8af0b49f7a 100644 --- a/sys/modules/uhid/Makefile +++ b/sys/modules/uhid/Makefile @@ -1,21 +1,10 @@ # $FreeBSD$ MAINTAINER = n_hibma@freebsd.org -S = ${.CURDIR}/../.. -.PATH: $S/dev/usb +.PATH: ${.CURDIR}/../../dev/usb KMOD = uhid SRCS = bus_if.h device_if.h vnode_if.h opt_usb.h uhid.c NOMAN = -CLEANFILES += bus_if.h device_if.h vnode_if.h opt_usb.h \ - vnode_if.c - -opt_usb.h: - echo > opt_usb.h - -bus_if.h: - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m -device_if.h: - perl $S/kern/makedevops.pl -h $S/kern/device_if.m .include diff --git a/sys/modules/ukbd/Makefile b/sys/modules/ukbd/Makefile index fb07ab5e09d6..f9ccbe18a937 100644 --- a/sys/modules/ukbd/Makefile +++ b/sys/modules/ukbd/Makefile @@ -1,29 +1,19 @@ # $FreeBSD$ MAINTAINER = n_hibma@freebsd.org -S = ${.CURDIR}/../.. -.PATH: $S/dev/usb +.PATH: ${.CURDIR}/../../dev/usb KMOD = ukbd SRCS = bus_if.h device_if.h vnode_if.h \ opt_usb.h ukbd.h opt_kbd.h \ ukbd.c NOMAN = -CLEANFILES += bus_if.h device_if.h vnode_if.h \ - opt_usb.h ukbd.h opt_kbd.h \ - vnode_if.c - -opt_usb.h: - echo > opt_usb.h +CLEANFILES = ukbd.h opt_kbd.h ukbd.h: echo > ukbd.h opt_kbd.h: echo '#define KBD_INSTALL_CDEV 1' > opt_kbd.h -bus_if.h: - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m -device_if.h: - perl $S/kern/makedevops.pl -h $S/kern/device_if.m .include diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile index 5f2a88fed606..873005a211ff 100644 --- a/sys/modules/ulpt/Makefile +++ b/sys/modules/ulpt/Makefile @@ -1,21 +1,10 @@ # $FreeBSD$ MAINTAINER = n_hibma@freebsd.org -S = ${.CURDIR}/../.. -.PATH: $S/dev/usb +.PATH: ${.CURDIR}/../../dev/usb KMOD = ulpt SRCS = bus_if.h device_if.h vnode_if.h opt_usb.h ulpt.c NOMAN = -CLEANFILES += bus_if.h device_if.h vnode_if.h opt_usb.h \ - vnode_if.c - -opt_usb.h: - echo >opt_usb.h - -bus_if.h: - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m -device_if.h: - perl $S/kern/makedevops.pl -h $S/kern/device_if.m .include diff --git a/sys/modules/umass/Makefile b/sys/modules/umass/Makefile index 5679cddbe334..ad9af0638ed8 100644 --- a/sys/modules/umass/Makefile +++ b/sys/modules/umass/Makefile @@ -1,27 +1,15 @@ # $FreeBSD$ MAINTAINER = n_hibma@freebsd.org -S = ${.CURDIR}/../.. -.PATH: $S/dev/usb +.PATH: ${.CURDIR}/../../dev/usb KMOD = umass SRCS = bus_if.h device_if.h \ opt_usb.h opt_cam.h opt_scsi.h \ umass.c NOMAN = -CLEANFILES += bus_if.h device_if.h \ - opt_usb.h opt_cam.h opt_scsi.h -opt_usb.h: - echo > opt_usb.h opt_scsi.h: echo '#define SCSI_DELAY 15000' > opt_scsi.h -opt_cam.h: - echo > opt_cam.h - -bus_if.h: - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m -device_if.h: - perl $S/kern/makedevops.pl -h $S/kern/device_if.m .include diff --git a/sys/modules/umodem/Makefile b/sys/modules/umodem/Makefile index 073072b781a2..9b210c16c984 100644 --- a/sys/modules/umodem/Makefile +++ b/sys/modules/umodem/Makefile @@ -1,21 +1,10 @@ # $FreeBSD$ MAINTAINER = n_hibma@freebsd.org -S = ${.CURDIR}/../.. -.PATH: $S/dev/usb +.PATH: ${.CURDIR}/../../dev/usb KMOD = umodem SRCS = bus_if.h device_if.h vnode_if.h opt_usb.h umodem.c NOMAN = -CLEANFILES += bus_if.h device_if.h vnode_if.h opt_usb.h \ - vnode_if.c - -opt_usb.h: - echo > opt_usb.h - -bus_if.h: - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m -device_if.h: - perl $S/kern/makedevops.pl -h $S/kern/device_if.m .include diff --git a/sys/modules/ums/Makefile b/sys/modules/ums/Makefile index b153f5bf86c3..a18061e51637 100644 --- a/sys/modules/ums/Makefile +++ b/sys/modules/ums/Makefile @@ -1,21 +1,10 @@ # $FreeBSD$ MAINTAINER = n_hibma@freebsd.org -S = ${.CURDIR}/../.. -.PATH: $S/dev/usb +.PATH: ${.CURDIR}/../../dev/usb KMOD = ums SRCS = bus_if.h device_if.h vnode_if.h opt_usb.h ums.c NOMAN = -CLEANFILES += bus_if.h device_if.h vnode_if.h opt_usb.h \ - vnode_if.c - -opt_usb.h: - echo > opt_usb.h - -bus_if.h: - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m -device_if.h: - perl $S/kern/makedevops.pl -h $S/kern/device_if.m .include diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile index b83d88f73c68..edd1cba6b500 100644 --- a/sys/modules/usb/Makefile +++ b/sys/modules/usb/Makefile @@ -25,30 +25,12 @@ SRCS += opt_bus.h pci_if.h NOMAN = CFLAGS += -g -CLEANFILES += bus_if.h device_if.h pci_if.h usb_if.h usb_if.c \ - vnode_if.c vnode_if.h \ - uhci_pci.o uhci.o \ - ohci_pci.o ohci.o \ - opt_usb.h opt_bus.h opt_usb.h: echo > opt_usb.h # echo "#define USB_DEBUG 1" >> opt_usb.h # echo "#define UHCI_DEBUG 1" >> opt_usb.h # echo "#define OHCI_DEBUG 1" >> opt_usb.h -opt_bus.h: - echo > opt_bus.h - -bus_if.h: - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m -device_if.h: - perl $S/kern/makedevops.pl -h $S/kern/device_if.m -usb_if.h: - perl $S/kern/makedevops.pl -h $S/dev/usb/usb_if.m -usb_if.c: - perl $S/kern/makedevops.pl -c $S/dev/usb/usb_if.m -pci_if.h: - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m usb_devs.h: perl $S/kern/makedevlist.pl -h $S/dev/usb/usb.devs diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile index f38483fb54c7..16aa8d0354ba 100644 --- a/sys/modules/vesa/Makefile +++ b/sys/modules/vesa/Makefile @@ -5,7 +5,7 @@ KMOD = vesa SRCS = vesa.c scvesactl.c sc.h vga.h opt_syscons.h opt_vga.h \ opt_vesa.h opt_fb.h NOMAN = -CLEANFILES += sc.h vga.h opt_syscons.h opt_vga.h opt_vesa.h opt_fb.h +CLEANFILES = sc.h vga.h sc.h: echo "#define NSC 1" > sc.h @@ -13,16 +13,7 @@ sc.h: vga.h: echo "#define NVGA 1" > vga.h -opt_syscons.h: - touch opt_syscons.h - -opt_vga.h: - touch opt_vga.h - opt_vesa.h: echo "#define VESA 1" > opt_vesa.h -opt_fb.h: - touch opt_fb.h - .include diff --git a/sys/modules/vinum/Makefile b/sys/modules/vinum/Makefile index b717bbc2b7f1..88c118925287 100644 --- a/sys/modules/vinum/Makefile +++ b/sys/modules/vinum/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ MAINTAINER = grog@FreeBSD.org -SOURCE= ${.CURDIR}/../../dev/vinum -.PATH: ${SOURCE} +.PATH: ${.CURDIR}/../../dev/vinum KMOD= vinum SRCS= vnode_if.h opt_vinum.h vinumstate.h vinumvar.h \ vinumhdr.h request.h vinumext.h vinumio.h vinumkw.h \ @@ -17,13 +16,8 @@ NOMAN= # Otherwise a number of ioctls will fail. CFLAGS+= -DVINUMDEBUG -g -O -CLEANFILES+= vnode_if.h vnode_if.c opt_vinum.h - all: -opt_vinum.h: - @touch opt_vinum.h - state.h: maketabs vinumstate.h ./maketabs >state.h diff --git a/sys/modules/vn/Makefile b/sys/modules/vn/Makefile index 36da9450873c..3a342f0d48f4 100644 --- a/sys/modules/vn/Makefile +++ b/sys/modules/vn/Makefile @@ -5,9 +5,4 @@ KMOD= vn SRCS= vn.c vnode_if.h opt_devfs.h NOMAN= -CLEANFILES+= vnode_if.h vnode_if.c opt_devfs.h - -opt_devfs.h: - touch opt_devfs.h - .include diff --git a/sys/modules/vr/Makefile b/sys/modules/vr/Makefile index 6fc98ee57a8c..4f8fc51713c6 100644 --- a/sys/modules/vr/Makefile +++ b/sys/modules/vr/Makefile @@ -1,29 +1,11 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_vr SRCS = if_vr.c opt_bdg.h device_if.h bus_if.h pci_if.h SRCS += miibus_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h -CLEANFILES += miibus_if.h KMODDEPS = miibus CFLAGS += ${DEBUG_FLAGS} -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - -miibus_if.h: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m - perl $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m - .include diff --git a/sys/modules/wb/Makefile b/sys/modules/wb/Makefile index f45d1b0e6ddc..5428835719c5 100644 --- a/sys/modules/wb/Makefile +++ b/sys/modules/wb/Makefile @@ -1,28 +1,10 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_wb SRCS = if_wb.c opt_bdg.h device_if.h SRCS += bus_if.h miibus_if.h pci_if.h -CLEANFILES += opt_bdg.h device_if.h -CLEANFILES += bus_if.h miibus_if.h pci_if.h CFLAGS += ${DEBUG_FLAGS} KMODDEPS = miibus -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - -miibus_if.h: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m - perl $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m - .include diff --git a/sys/modules/wi/Makefile b/sys/modules/wi/Makefile index dc7b3cbf94c0..adfd2f47dd56 100644 --- a/sys/modules/wi/Makefile +++ b/sys/modules/wi/Makefile @@ -1,16 +1,8 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/i386/isa +.PATH: ${.CURDIR}/../../i386/isa KMOD = if_wi SRCS = if_wi.c device_if.h bus_if.h -CLEANFILES += device_if.h bus_if.h CFLAGS += ${DEBUG_FLAGS} -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - .include diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile index 797b807eb4a8..4b7141cee37f 100644 --- a/sys/modules/xl/Makefile +++ b/sys/modules/xl/Makefile @@ -1,28 +1,10 @@ # $FreeBSD$ -S = ${.CURDIR}/../.. -.PATH: $S/pci +.PATH: ${.CURDIR}/../../pci KMOD = if_xl SRCS = if_xl.c opt_bdg.h device_if.h bus_if.h pci_if.h SRCS += miibus_if.h -CLEANFILES += opt_bdg.h device_if.h bus_if.h pci_if.h -CLEANFILES += miibus_if.h CFLAGS += ${DEBUG_FLAGS} KMODDEPS = miibus -opt_bdg.h: - touch opt_bdg.h - -device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m - perl $S/kern/makedevops.pl -h $S/kern/device_if.m - -bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m - perl $S/kern/makedevops.pl -h $S/kern/bus_if.m - -pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m - perl $S/kern/makedevops.pl -h $S/pci/pci_if.m - -miibus_if.h: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m - perl $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m - .include