summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/modules/3dfx/Makefile21
-rw-r--r--sys/modules/aac/Makefile15
-rw-r--r--sys/modules/accf_data/Makefile7
-rw-r--r--sys/modules/accf_http/Makefile7
-rw-r--r--sys/modules/acpi/Makefile85
-rw-r--r--sys/modules/acpica/Makefile85
-rw-r--r--sys/modules/agp/Makefile15
-rw-r--r--sys/modules/aha/Makefile9
-rw-r--r--sys/modules/aic/Makefile17
-rw-r--r--sys/modules/amr/Makefile15
-rw-r--r--sys/modules/an/Makefile9
-rw-r--r--sys/modules/asr/Makefile11
-rw-r--r--sys/modules/aue/Makefile11
-rw-r--r--sys/modules/bktr/bktr/Makefile5
-rw-r--r--sys/modules/bktr/bktr_mem/Makefile5
-rw-r--r--sys/modules/cam/Makefile49
-rw-r--r--sys/modules/cardbus/Makefile3
-rw-r--r--sys/modules/cbb/Makefile7
-rw-r--r--sys/modules/ccd/Makefile9
-rw-r--r--sys/modules/cd9660/Makefile3
-rw-r--r--sys/modules/coda/Makefile3
-rw-r--r--sys/modules/coff/Makefile4
-rw-r--r--sys/modules/cue/Makefile11
-rw-r--r--sys/modules/dc/Makefile9
-rw-r--r--sys/modules/de/Makefile7
-rw-r--r--sys/modules/ed/Makefile15
-rw-r--r--sys/modules/el/Makefile9
-rw-r--r--sys/modules/ep/Makefile17
-rw-r--r--sys/modules/fdesc/Makefile3
-rw-r--r--sys/modules/fdescfs/Makefile3
-rw-r--r--sys/modules/fpu/Makefile7
-rw-r--r--sys/modules/fxp/Makefile7
-rw-r--r--sys/modules/gnufpu/Makefile7
-rw-r--r--sys/modules/hpfs/Makefile3
-rw-r--r--sys/modules/ibcs2/Makefile3
-rw-r--r--sys/modules/if_disc/Makefile3
-rw-r--r--sys/modules/if_ef/Makefile6
-rw-r--r--sys/modules/if_ppp/Makefile1
-rw-r--r--sys/modules/if_sl/Makefile3
-rw-r--r--sys/modules/if_tap/Makefile7
-rw-r--r--sys/modules/if_tun/Makefile3
-rw-r--r--sys/modules/ip6fw/Makefile7
-rw-r--r--sys/modules/ip_mroute_mod/Makefile4
-rw-r--r--sys/modules/ipfilter/Makefile4
-rw-r--r--sys/modules/ipfw/Makefile4
-rw-r--r--sys/modules/ispfw/Makefile7
-rw-r--r--sys/modules/joy/Makefile7
-rw-r--r--sys/modules/kue/Makefile11
-rw-r--r--sys/modules/linprocfs/Makefile6
-rw-r--r--sys/modules/linux/Makefile20
-rw-r--r--sys/modules/lnc/Makefile14
-rw-r--r--sys/modules/md/Makefile3
-rw-r--r--sys/modules/mfs/Makefile3
-rw-r--r--sys/modules/mii/Makefile13
-rw-r--r--sys/modules/mlx/Makefile7
-rw-r--r--sys/modules/mly/Makefile11
-rw-r--r--sys/modules/msdos/Makefile3
-rw-r--r--sys/modules/msdosfs/Makefile3
-rw-r--r--sys/modules/ncp/Makefile4
-rw-r--r--sys/modules/netgraph/UI/Makefile4
-rw-r--r--sys/modules/netgraph/async/Makefile4
-rw-r--r--sys/modules/netgraph/bpf/Makefile8
-rw-r--r--sys/modules/netgraph/bridge/Makefile4
-rw-r--r--sys/modules/netgraph/cisco/Makefile4
-rw-r--r--sys/modules/netgraph/echo/Makefile4
-rw-r--r--sys/modules/netgraph/ether/Makefile4
-rw-r--r--sys/modules/netgraph/frame_relay/Makefile4
-rw-r--r--sys/modules/netgraph/hole/Makefile4
-rw-r--r--sys/modules/netgraph/iface/Makefile4
-rw-r--r--sys/modules/netgraph/ksocket/Makefile4
-rw-r--r--sys/modules/netgraph/lmi/Makefile4
-rw-r--r--sys/modules/netgraph/mppc/Makefile14
-rw-r--r--sys/modules/netgraph/netgraph/Makefile4
-rw-r--r--sys/modules/netgraph/one2many/Makefile4
-rw-r--r--sys/modules/netgraph/ppp/Makefile4
-rw-r--r--sys/modules/netgraph/pppoe/Makefile4
-rw-r--r--sys/modules/netgraph/pptpgre/Makefile4
-rw-r--r--sys/modules/netgraph/rfc1490/Makefile4
-rw-r--r--sys/modules/netgraph/socket/Makefile4
-rw-r--r--sys/modules/netgraph/tee/Makefile4
-rw-r--r--sys/modules/netgraph/tty/Makefile6
-rw-r--r--sys/modules/netgraph/vjc/Makefile8
-rw-r--r--sys/modules/nfs/Makefile1
-rw-r--r--sys/modules/nfsclient/Makefile1
-rw-r--r--sys/modules/nfsserver/Makefile1
-rw-r--r--sys/modules/ntfs/Makefile3
-rw-r--r--sys/modules/nullfs/Makefile3
-rw-r--r--sys/modules/nwfs/Makefile6
-rw-r--r--sys/modules/oldcard/Makefile7
-rw-r--r--sys/modules/pccard/Makefile7
-rw-r--r--sys/modules/pccbb/Makefile3
-rw-r--r--sys/modules/pcfclock/Makefile1
-rw-r--r--sys/modules/pcic/Makefile7
-rw-r--r--sys/modules/pcn/Makefile9
-rw-r--r--sys/modules/pecoff/Makefile10
-rw-r--r--sys/modules/portal/Makefile3
-rw-r--r--sys/modules/portalfs/Makefile3
-rw-r--r--sys/modules/procfs/Makefile3
-rw-r--r--sys/modules/random/Makefile18
-rw-r--r--sys/modules/ray/Makefile11
-rw-r--r--sys/modules/rl/Makefile9
-rw-r--r--sys/modules/rp/Makefile7
-rw-r--r--sys/modules/s3/Makefile11
-rw-r--r--sys/modules/sf/Makefile9
-rw-r--r--sys/modules/sis/Makefile9
-rw-r--r--sys/modules/sk/Makefile9
-rw-r--r--sys/modules/sn/Makefile9
-rw-r--r--sys/modules/snc/Makefile9
-rw-r--r--sys/modules/sound/driver/ad1816/Makefile9
-rw-r--r--sys/modules/sound/driver/csa/Makefile9
-rw-r--r--sys/modules/sound/driver/csapcm/Makefile9
-rw-r--r--sys/modules/sound/driver/driver/Makefile9
-rw-r--r--sys/modules/sound/driver/ds1/Makefile9
-rw-r--r--sys/modules/sound/driver/emu10k1/Makefile9
-rw-r--r--sys/modules/sound/driver/es137x/Makefile9
-rw-r--r--sys/modules/sound/driver/es1888/Makefile9
-rw-r--r--sys/modules/sound/driver/ess/Makefile9
-rw-r--r--sys/modules/sound/driver/fm801/Makefile9
-rw-r--r--sys/modules/sound/driver/gusc/Makefile9
-rw-r--r--sys/modules/sound/driver/maestro/Makefile9
-rw-r--r--sys/modules/sound/driver/mss/Makefile9
-rw-r--r--sys/modules/sound/driver/neomagic/Makefile9
-rw-r--r--sys/modules/sound/driver/sb16/Makefile9
-rw-r--r--sys/modules/sound/driver/sb8/Makefile9
-rw-r--r--sys/modules/sound/driver/sbc/Makefile9
-rw-r--r--sys/modules/sound/driver/solo/Makefile9
-rw-r--r--sys/modules/sound/driver/t4dwave/Makefile9
-rw-r--r--sys/modules/sound/driver/via82c686/Makefile9
-rw-r--r--sys/modules/sound/pcm/Makefile17
-rw-r--r--sys/modules/sound/sound/Makefile17
-rw-r--r--sys/modules/splash/bmp/Makefile1
-rw-r--r--sys/modules/sppp/Makefile7
-rw-r--r--sys/modules/ste/Makefile9
-rw-r--r--sys/modules/streams/Makefile17
-rw-r--r--sys/modules/svr4/Makefile12
-rw-r--r--sys/modules/sym/Makefile9
-rw-r--r--sys/modules/syscons/apm/Makefile2
-rw-r--r--sys/modules/syscons/blank/Makefile4
-rw-r--r--sys/modules/syscons/daemon/Makefile4
-rw-r--r--sys/modules/syscons/fade/Makefile4
-rw-r--r--sys/modules/syscons/fire/Makefile4
-rw-r--r--sys/modules/syscons/green/Makefile4
-rw-r--r--sys/modules/syscons/logo/Makefile4
-rw-r--r--sys/modules/syscons/rain/Makefile4
-rw-r--r--sys/modules/syscons/snake/Makefile4
-rw-r--r--sys/modules/syscons/star/Makefile4
-rw-r--r--sys/modules/syscons/warp/Makefile4
-rw-r--r--sys/modules/sysvipc/sysvmsg/Makefile7
-rw-r--r--sys/modules/sysvipc/sysvsem/Makefile7
-rw-r--r--sys/modules/sysvipc/sysvshm/Makefile9
-rw-r--r--sys/modules/ti/Makefile9
-rw-r--r--sys/modules/tl/Makefile9
-rw-r--r--sys/modules/twe/Makefile3
-rw-r--r--sys/modules/tx/Makefile9
-rw-r--r--sys/modules/udbp/Makefile17
-rw-r--r--sys/modules/ugen/Makefile13
-rw-r--r--sys/modules/uhid/Makefile13
-rw-r--r--sys/modules/ukbd/Makefile16
-rw-r--r--sys/modules/ulpt/Makefile13
-rw-r--r--sys/modules/umapfs/Makefile3
-rw-r--r--sys/modules/umass/Makefile17
-rw-r--r--sys/modules/umodem/Makefile13
-rw-r--r--sys/modules/ums/Makefile13
-rw-r--r--sys/modules/union/Makefile3
-rw-r--r--sys/modules/unionfs/Makefile3
-rw-r--r--sys/modules/urio/Makefile13
-rw-r--r--sys/modules/usb/Makefile48
-rw-r--r--sys/modules/uscanner/Makefile15
-rw-r--r--sys/modules/vesa/Makefile9
-rw-r--r--sys/modules/vinum/Makefile5
-rw-r--r--sys/modules/vn/Makefile7
-rw-r--r--sys/modules/vpo/Makefile3
-rw-r--r--sys/modules/vr/Makefile9
-rw-r--r--sys/modules/vx/Makefile11
-rw-r--r--sys/modules/wb/Makefile9
-rw-r--r--sys/modules/wi/Makefile7
-rw-r--r--sys/modules/wx/Makefile7
-rw-r--r--sys/modules/xl/Makefile9
178 files changed, 853 insertions, 718 deletions
diff --git a/sys/modules/3dfx/Makefile b/sys/modules/3dfx/Makefile
index cdb773e..5c67621 100644
--- a/sys/modules/3dfx/Makefile
+++ b/sys/modules/3dfx/Makefile
@@ -1,22 +1,25 @@
# $FreeBSD$
+
+MAINTAINER= cokane@FreeBSD.org
+
.PATH: $(.CURDIR)/../../dev/tdfx
-MAINTAINER= cokane@FreeBSD.org
-KMOD= 3dfx
-NOMAN= YES
-SRCS= opt_tdfx.h pci.h bus_if.h pci_if.h device_if.h tdfx_pci.h tdfx_io.h\
- tdfx_vars.h tdfx_pci.c
-INCSRC= ../../sys
-CLEANFILES= pci.h
+KMOD= 3dfx
+NOMAN= YES
+SRCS= opt_tdfx.h pci.h bus_if.h pci_if.h device_if.h tdfx_pci.h tdfx_io.h\
+ tdfx_vars.h tdfx_pci.c
+INCSRC= ../../sys
+
+CLEANFILES= pci.h
.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"
+TDFX_OPTS= "\#define TDFX_LINUX"
.endif
# Uncomment this for debugging messages
-#CFLAGS+= -DDEBUG
+#CFLAGS+= -DDEBUG
pci.h:
echo "#define NPCI 1" > pci.h
diff --git a/sys/modules/aac/Makefile b/sys/modules/aac/Makefile
index 6a2baef..3759b50 100644
--- a/sys/modules/aac/Makefile
+++ b/sys/modules/aac/Makefile
@@ -1,13 +1,14 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/aac
-KMOD = aac
-SRCS = aac.c aac_pci.c aac_disk.c
-SRCS += device_if.h bus_if.h pci_if.h
+.PATH: ${.CURDIR}/../../dev/aac
-CFLAGS+= -DAAC_COMPAT_LINUX
+KMOD= aac
+SRCS= aac.c aac_pci.c aac_disk.c
+SRCS+= device_if.h bus_if.h pci_if.h
-#CFLAGS+= -DAAC_DEBUG=2
-#SRCS += aac_debug.c
+CFLAGS+= -DAAC_COMPAT_LINUX
+
+#CFLAGS+= -DAAC_DEBUG=2
+#SRCS+= aac_debug.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/accf_data/Makefile b/sys/modules/accf_data/Makefile
index 9f3a64e..6c5216c 100644
--- a/sys/modules/accf_data/Makefile
+++ b/sys/modules/accf_data/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../netinet
-KMOD = accf_data
-SRCS = accf_data.c
+.PATH: ${.CURDIR}/../../netinet
+
+KMOD= accf_data
+SRCS= accf_data.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/accf_http/Makefile b/sys/modules/accf_http/Makefile
index 2b76ac6..b942d3e 100644
--- a/sys/modules/accf_http/Makefile
+++ b/sys/modules/accf_http/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../netinet
-KMOD = accf_http
-SRCS = accf_http.c
+.PATH: ${.CURDIR}/../../netinet
+
+KMOD= accf_http
+SRCS= accf_http.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile
index 41b8b58..50a3322 100644
--- a/sys/modules/acpi/Makefile
+++ b/sys/modules/acpi/Makefile
@@ -1,52 +1,51 @@
# $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
+.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 += hwcpu32.c hwgpe.c hwxface.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
-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_apic.c acpi_button.c
-SRCS += acpi_ec.c acpi_isa.c acpi_lid.c acpi_pcib.c acpi_processor.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
+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+= hwcpu32.c hwgpe.c hwxface.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
+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_apic.c acpi_button.c
+SRCS+= acpi_ec.c acpi_isa.c acpi_lid.c acpi_pcib.c acpi_processor.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
+CFLAGS+= -I${.CURDIR}/../../contrib/dev/acpica/Subsystem/Include
-#CFLAGS+=
-opt_acpi.h:Makefile
+opt_acpi.h: Makefile
touch opt_acpi.h
-opt_ddb.h:Makefile
+
+opt_ddb.h: Makefile
echo '#define DDB 1' >opt_ddb.h
.include <bsd.kmod.mk>
-
diff --git a/sys/modules/acpica/Makefile b/sys/modules/acpica/Makefile
index 41b8b58..50a3322 100644
--- a/sys/modules/acpica/Makefile
+++ b/sys/modules/acpica/Makefile
@@ -1,52 +1,51 @@
# $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
+.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 += hwcpu32.c hwgpe.c hwxface.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
-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_apic.c acpi_button.c
-SRCS += acpi_ec.c acpi_isa.c acpi_lid.c acpi_pcib.c acpi_processor.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
+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+= hwcpu32.c hwgpe.c hwxface.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
+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_apic.c acpi_button.c
+SRCS+= acpi_ec.c acpi_isa.c acpi_lid.c acpi_pcib.c acpi_processor.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
+CFLAGS+= -I${.CURDIR}/../../contrib/dev/acpica/Subsystem/Include
-#CFLAGS+=
-opt_acpi.h:Makefile
+opt_acpi.h: Makefile
touch opt_acpi.h
-opt_ddb.h:Makefile
+
+opt_ddb.h: Makefile
echo '#define DDB 1' >opt_ddb.h
.include <bsd.kmod.mk>
-
diff --git a/sys/modules/agp/Makefile b/sys/modules/agp/Makefile
index dcb415d..625d4d9 100644
--- a/sys/modules/agp/Makefile
+++ b/sys/modules/agp/Makefile
@@ -1,11 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../pci
-KMOD = agp
-SRCS = agp.c agp_intel.c agp_via.c agp_sis.c agp_ali.c agp_amd.c
-SRCS += agp_i810.c agp_if.c
-SRCS += device_if.h bus_if.h agp_if.h pci_if.h
-SRCS += opt_bdg.h opt_bus.h opt_pci.h
-MFILES = kern/device_if.m kern/bus_if.m pci/agp_if.m dev/pci/pci_if.m
+.PATH: ${.CURDIR}/../../pci
+
+KMOD= agp
+SRCS= agp.c agp_intel.c agp_via.c agp_sis.c agp_ali.c agp_amd.c
+SRCS+= agp_i810.c agp_if.c
+SRCS+= device_if.h bus_if.h agp_if.h pci_if.h
+SRCS+= opt_bdg.h opt_bus.h opt_pci.h
+MFILES= kern/device_if.m kern/bus_if.m pci/agp_if.m dev/pci/pci_if.m
.include <bsd.kmod.mk>
diff --git a/sys/modules/aha/Makefile b/sys/modules/aha/Makefile
index a133522..48b6b2c 100644
--- a/sys/modules/aha/Makefile
+++ b/sys/modules/aha/Makefile
@@ -1,10 +1,11 @@
# $FreeBSD$
-.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 \
+.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
+CLEANFILES= aha.h
aha.h:
echo "#define NAHA 1" > aha.h
diff --git a/sys/modules/aic/Makefile b/sys/modules/aic/Makefile
index 56cfbb5..e0fb1ad 100644
--- a/sys/modules/aic/Makefile
+++ b/sys/modules/aic/Makefile
@@ -1,16 +1,17 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/aic
-KMOD = aic
-SRCS = aic.c aic_pccard.c
-SRCS += opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h
-SRCS += opt_cam.h opt_scsi.h
+.PATH: ${.CURDIR}/../../dev/aic
+
+KMOD= aic
+SRCS= aic.c aic_pccard.c
+SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h
+SRCS+= opt_cam.h opt_scsi.h
.if ${MACHINE} == "pc98"
-SRCS += aic_cbus.c
-CFLAGS += -DPC98
+SRCS+= aic_cbus.c
+CFLAGS+= -DPC98
.else
-SRCS += aic_isa.c
+SRCS+= aic_isa.c
.endif
.include <bsd.kmod.mk>
diff --git a/sys/modules/amr/Makefile b/sys/modules/amr/Makefile
index d2fd388..b014d27 100644
--- a/sys/modules/amr/Makefile
+++ b/sys/modules/amr/Makefile
@@ -1,17 +1,18 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/amr
-KMOD = amr
-SRCS = amr.c amr_pci.c amr_disk.c device_if.h bus_if.h pci_if.h
+.PATH: ${.CURDIR}/../../dev/amr
+
+KMOD= amr
+SRCS= amr.c amr_pci.c amr_disk.c device_if.h bus_if.h pci_if.h
# SCSI passthrough support for non-disk devices
-#CFLAGS += -DAMR_SCSI_PASSTHROUGH
-#SRCS += amr_cam.c opt_cam.h opt_scsi.h
+#CFLAGS+= -DAMR_SCSI_PASSTHROUGH
+#SRCS+= amr_cam.c opt_cam.h opt_scsi.h
# Enable a questionable optimisation for newer adapters
-#CFLAGS += -DAMR_QUARTZ_GOFASTER
+#CFLAGS+= -DAMR_QUARTZ_GOFASTER
# Debugging
-#CFLAGS += -DAMR_DEBUG=3
+#CFLAGS+= -DAMR_DEBUG=3
.include <bsd.kmod.mk>
diff --git a/sys/modules/an/Makefile b/sys/modules/an/Makefile
index 7c18f5d..4c3f752 100644
--- a/sys/modules/an/Makefile
+++ b/sys/modules/an/Makefile
@@ -1,9 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/an
-KMOD = if_an
-SRCS = if_an.c if_an_pccard.c if_an_pci.c if_an_isa.c
-SRCS += opt_inet.h device_if.h bus_if.h pci_if.h isa_if.h
+.PATH: ${.CURDIR}/../../dev/an
+
+KMOD= if_an
+SRCS= if_an.c if_an_pccard.c if_an_pci.c if_an_isa.c
+SRCS+= opt_inet.h device_if.h bus_if.h pci_if.h isa_if.h
opt_inet.h:
echo "#define INET 1" > opt_inet.h
diff --git a/sys/modules/asr/Makefile b/sys/modules/asr/Makefile
index ee0cd1c..ca2b098 100644
--- a/sys/modules/asr/Makefile
+++ b/sys/modules/asr/Makefile
@@ -1,9 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/asr
-KMOD = asr
-SRCS = asr.c
-SRCS += opt_scsi.h opt_cam.h opt_asr.h
-SRCS += device_if.h bus_if.h pci_if.h
+.PATH: ${.CURDIR}/../../dev/asr
+
+KMOD= asr
+SRCS= asr.c
+SRCS+= opt_scsi.h opt_cam.h opt_asr.h
+SRCS+= device_if.h bus_if.h pci_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/aue/Makefile b/sys/modules/aue/Makefile
index 8eac7a8..85ff78f 100644
--- a/sys/modules/aue/Makefile
+++ b/sys/modules/aue/Makefile
@@ -1,9 +1,10 @@
# $FreeBSD$
-S = ${.CURDIR}/../..
-.PATH: $S/dev/usb
-KMOD = if_aue
-SRCS = if_aue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
-SRCS += miibus_if.h
+S= ${.CURDIR}/../..
+.PATH: $S/dev/usb
+
+KMOD= if_aue
+SRCS= if_aue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
+SRCS+= miibus_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/bktr/bktr/Makefile b/sys/modules/bktr/bktr/Makefile
index 253e479..8076f5a 100644
--- a/sys/modules/bktr/bktr/Makefile
+++ b/sys/modules/bktr/bktr/Makefile
@@ -1,8 +1,9 @@
+# $FreeBSD$
+
# Makefile for the bktr Brooktree Bt848/Bt878 PCI video capture device
-# $FreeBSD$
+.PATH: ${.CURDIR}/../../../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 \
diff --git a/sys/modules/bktr/bktr_mem/Makefile b/sys/modules/bktr/bktr_mem/Makefile
index 4d2bba3..f62d945 100644
--- a/sys/modules/bktr/bktr_mem/Makefile
+++ b/sys/modules/bktr/bktr_mem/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-MAINTAINER = roger@freebsd.org
+MAINTAINER= roger@freebsd.org
+
+.PATH: ${.CURDIR}/../../../dev/bktr
-.PATH: ${.CURDIR}/../../../dev/bktr
KMOD= bktr_mem
SRCS= bktr_mem.c
diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile
index 2075d39..ff90f81 100644
--- a/sys/modules/cam/Makefile
+++ b/sys/modules/cam/Makefile
@@ -1,33 +1,34 @@
-# $FreeBSD$
+# $FreeBSD$
-MAINTAINER = n_hibma@freebsd.org
-S = ${.CURDIR}/../..
+MAINTAINER= n_hibma@freebsd.org
+S= ${.CURDIR}/../..
-.PATH: $S/cam $S/cam/scsi
-KMOD = cam
+.PATH: $S/cam $S/cam/scsi
+
+KMOD= cam
# See sys/conf/options for the flags that go into the different opt_*.h files.
-SRCS = opt_cam.h
-SRCS += opt_scsi.h
-SRCS += opt_cd.h
-SRCS += opt_hw_wdog.h
-SRCS += opt_pt.h
-SRCS += opt_sa.h
-SRCS += opt_ses.h
-SRCS += device_if.h bus_if.h
-SRCS += cam.c cam_extend.c cam_periph.c cam_queue.c
-SRCS += cam_sim.c cam_xpt.c
-SRCS += scsi_all.c scsi_cd.c scsi_ch.c
-SRCS += scsi_da.c
-SRCS += scsi_pass.c
-SRCS += scsi_pt.c
-SRCS += scsi_sa.c
-SRCS += scsi_ses.c
-SRCS += scsi_targ_bh.c scsi_target.c
+SRCS= opt_cam.h
+SRCS+= opt_scsi.h
+SRCS+= opt_cd.h
+SRCS+= opt_hw_wdog.h
+SRCS+= opt_pt.h
+SRCS+= opt_sa.h
+SRCS+= opt_ses.h
+SRCS+= device_if.h bus_if.h
+SRCS+= cam.c cam_extend.c cam_periph.c cam_queue.c
+SRCS+= cam_sim.c cam_xpt.c
+SRCS+= scsi_all.c scsi_cd.c scsi_ch.c
+SRCS+= scsi_da.c
+SRCS+= scsi_pass.c
+SRCS+= scsi_pt.c
+SRCS+= scsi_sa.c
+SRCS+= scsi_ses.c
+SRCS+= scsi_targ_bh.c scsi_target.c
-NOMAN =
+NOMAN=
opt_scsi.h:
- echo '#define SCSI_DELAY 15000' > opt_scsi.h
+ echo '#define SCSI_DELAY 15000' > opt_scsi.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/cardbus/Makefile b/sys/modules/cardbus/Makefile
index 3491ad4..394367d 100644
--- a/sys/modules/cardbus/Makefile
+++ b/sys/modules/cardbus/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/cardbus
+.PATH: ${.CURDIR}/../../dev/cardbus
+
KMOD= cardbus
SRCS= cardbus.c cardbus_cis.c \
device_if.h bus_if.h card_if.h power_if.h pci_if.h pcib_if.h
diff --git a/sys/modules/cbb/Makefile b/sys/modules/cbb/Makefile
index a48b002..9530058 100644
--- a/sys/modules/cbb/Makefile
+++ b/sys/modules/cbb/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../pci
-KMOD= cbb
-SRCS= pccbb.c \
+.PATH: ${.CURDIR}/../../pci
+
+KMOD= cbb
+SRCS= pccbb.c \
device_if.h bus_if.h
NOMAN=
diff --git a/sys/modules/ccd/Makefile b/sys/modules/ccd/Makefile
index 3235eae..a4135a3 100644
--- a/sys/modules/ccd/Makefile
+++ b/sys/modules/ccd/Makefile
@@ -1,11 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/ccd
-KMOD= ccd
-SRCS= ccd.c ccd.h vnode_if.h
+.PATH: ${.CURDIR}/../../dev/ccd
+
+KMOD= ccd
+SRCS= ccd.c ccd.h vnode_if.h
NOMAN=
-NCCD?= 4
+NCCD?= 4
CLEANFILES= ccd.h
ccd.h:
diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile
index 8443e31..091ef78 100644
--- a/sys/modules/cd9660/Makefile
+++ b/sys/modules/cd9660/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../isofs/cd9660
+.PATH: ${.CURDIR}/../../isofs/cd9660
+
KMOD= cd9660
SRCS= vnode_if.h \
cd9660_bmap.c cd9660_lookup.c cd9660_node.c cd9660_rrip.c \
diff --git a/sys/modules/coda/Makefile b/sys/modules/coda/Makefile
index 2c0e138..d46dba2 100644
--- a/sys/modules/coda/Makefile
+++ b/sys/modules/coda/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../coda
+.PATH: ${.CURDIR}/../../coda
+
KMOD= coda
SRCS= vnode_if.h \
coda_fbsd.c coda_namecache.c coda_psdev.c coda_subr.c \
diff --git a/sys/modules/coff/Makefile b/sys/modules/coff/Makefile
index 6eabe78..a1e9a81 100644
--- a/sys/modules/coff/Makefile
+++ b/sys/modules/coff/Makefile
@@ -1,9 +1,11 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../i386/ibcs2
+.PATH: ${.CURDIR}/../../i386/ibcs2
+
KMOD= ibcs2_coff
SRCS= imgact_coff.c vnode_if.h
NOMAN=
+
CFLAGS+= -DCOMPAT_IBCS2
.include <bsd.kmod.mk>
diff --git a/sys/modules/cue/Makefile b/sys/modules/cue/Makefile
index 449cce2..78dbd5e 100644
--- a/sys/modules/cue/Makefile
+++ b/sys/modules/cue/Makefile
@@ -1,9 +1,10 @@
# $FreeBSD$
-S = ${.CURDIR}/../..
-.PATH: $S/dev/usb
-KMOD = if_cue
-SRCS = if_cue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
-SRCS += miibus_if.h
+S= ${.CURDIR}/../..
+.PATH: $S/dev/usb
+
+KMOD= if_cue
+SRCS= if_cue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
+SRCS+= miibus_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/dc/Makefile b/sys/modules/dc/Makefile
index dfa84d2..ac56533 100644
--- a/sys/modules/dc/Makefile
+++ b/sys/modules/dc/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../pci
-KMOD = if_dc
-SRCS = if_dc.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS += miibus_if.h
+.PATH: ${.CURDIR}/../../pci
+
+KMOD= if_dc
+SRCS= if_dc.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS+= miibus_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/de/Makefile b/sys/modules/de/Makefile
index 5e83ec9..e8424b1 100644
--- a/sys/modules/de/Makefile
+++ b/sys/modules/de/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../pci
-KMOD = if_de
-SRCS = if_de.c opt_bdg.h device_if.h bus_if.h pci_if.h
+.PATH: ${.CURDIR}/../../pci
+
+KMOD= if_de
+SRCS= if_de.c opt_bdg.h device_if.h bus_if.h pci_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/ed/Makefile b/sys/modules/ed/Makefile
index b87438e..23dda90b 100644
--- a/sys/modules/ed/Makefile
+++ b/sys/modules/ed/Makefile
@@ -1,16 +1,17 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/ed
-KMOD = if_ed
-SRCS = if_ed.c if_ed_pccard.c if_ed_pci.c
+.PATH: ${.CURDIR}/../../dev/ed
+
+KMOD= if_ed
+SRCS= if_ed.c if_ed_pccard.c if_ed_pci.c
.if ${MACHINE} == "pc98"
-SRCS += if_ed_cbus.c
-CFLAGS += -DPC98
+SRCS+= if_ed_cbus.c
+CFLAGS+= -DPC98
.else
-SRCS += if_ed_isa.c
+SRCS+= if_ed_isa.c
.endif
-SRCS += opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h
+SRCS+= opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/el/Makefile b/sys/modules/el/Makefile
index 17c4a42..7839405 100644
--- a/sys/modules/el/Makefile
+++ b/sys/modules/el/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../i386/isa
-KMOD = if_el
-SRCS = if_el.c
-SRCS += opt_bdg.h opt_inet.h opt_ipx.h device_if.h bus_if.h isa_if.h
+.PATH: ${.CURDIR}/../../i386/isa
+
+KMOD= if_el
+SRCS= if_el.c
+SRCS+= opt_bdg.h opt_inet.h opt_ipx.h device_if.h bus_if.h isa_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/ep/Makefile b/sys/modules/ep/Makefile
index 94eb1a1..23edb12 100644
--- a/sys/modules/ep/Makefile
+++ b/sys/modules/ep/Makefile
@@ -1,15 +1,14 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/ep
-.PATH: ${.CURDIR}/../../i386/isa
+.PATH: ${.CURDIR}/../../dev/ep
+.PATH: ${.CURDIR}/../../i386/isa
-KMOD = if_ep
-SRCS = if_ep.c if_ep_pccard.c elink.c
-SRCS += if_ep_isa.c
-#SRCS += if_ep_eisa.c
-#SRCS += if_ep_mca.c
-
-SRCS += opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h
+KMOD= if_ep
+SRCS= if_ep.c if_ep_pccard.c elink.c
+SRCS+= if_ep_isa.c
+#SRCS+= if_ep_eisa.c
+#SRCS+= if_ep_mca.c
+SRCS+= opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
diff --git a/sys/modules/fdesc/Makefile b/sys/modules/fdesc/Makefile
index f728bf3..4344517 100644
--- a/sys/modules/fdesc/Makefile
+++ b/sys/modules/fdesc/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/fdesc
+.PATH: ${.CURDIR}/../../miscfs/fdesc
+
KMOD= fdesc
SRCS= vnode_if.h \
fdesc_vfsops.c fdesc_vnops.c
diff --git a/sys/modules/fdescfs/Makefile b/sys/modules/fdescfs/Makefile
index f728bf3..4344517 100644
--- a/sys/modules/fdescfs/Makefile
+++ b/sys/modules/fdescfs/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/fdesc
+.PATH: ${.CURDIR}/../../miscfs/fdesc
+
KMOD= fdesc
SRCS= vnode_if.h \
fdesc_vfsops.c fdesc_vnops.c
diff --git a/sys/modules/fpu/Makefile b/sys/modules/fpu/Makefile
index 66c2ad1..33b12cf 100644
--- a/sys/modules/fpu/Makefile
+++ b/sys/modules/fpu/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../i386/i386
-KMOD= fpu
-SRCS= math_emulate.c
+.PATH: ${.CURDIR}/../../i386/i386
+
+KMOD= fpu
+SRCS= math_emulate.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile
index e59179d..cb2b467 100644
--- a/sys/modules/fxp/Makefile
+++ b/sys/modules/fxp/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../pci
-KMOD = if_fxp
-SRCS = if_fxp.c opt_bdg.h device_if.h bus_if.h pci_if.h
+.PATH: ${.CURDIR}/../../pci
+
+KMOD= if_fxp
+SRCS= if_fxp.c opt_bdg.h device_if.h bus_if.h pci_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/gnufpu/Makefile b/sys/modules/gnufpu/Makefile
index d7bfb67..84a801d 100644
--- a/sys/modules/gnufpu/Makefile
+++ b/sys/modules/gnufpu/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../gnu/i386/fpemul
-KMOD= gnufpu
-SRCS= div_small.s errors.c fpu_arith.c fpu_aux.c fpu_entry.c fpu_etc.c \
+.PATH: ${.CURDIR}/../../gnu/i386/fpemul
+
+KMOD= gnufpu
+SRCS= div_small.s errors.c fpu_arith.c fpu_aux.c fpu_entry.c fpu_etc.c \
fpu_trig.c get_address.c load_store.c poly_2xm1.c poly_atan.c \
poly_div.s poly_l2.c poly_mul64.s poly_sin.c poly_tan.c \
polynomial.s reg_add_sub.c reg_compare.c reg_constant.c reg_div.s \
diff --git a/sys/modules/hpfs/Makefile b/sys/modules/hpfs/Makefile
index 9e10cd2..41f9f2b 100644
--- a/sys/modules/hpfs/Makefile
+++ b/sys/modules/hpfs/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../fs/hpfs
+.PATH: ${.CURDIR}/../../fs/hpfs
+
KMOD= hpfs
SRCS= vnode_if.h \
hpfs_vfsops.c hpfs_vnops.c hpfs_hash.c hpfs_subr.c hpfs_lookup.c \
diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile
index f433a38..e7ad32b 100644
--- a/sys/modules/ibcs2/Makefile
+++ b/sys/modules/ibcs2/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../i386/ibcs2
+.PATH: ${.CURDIR}/../../i386/ibcs2
+
KMOD= ibcs2
SRCS= ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \
ibcs2_fcntl.c ibcs2_signal.c ibcs2_sysent.c ibcs2_ioctl.c \
diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile
index cbb04d8..a284e7f 100644
--- a/sys/modules/if_disc/Makefile
+++ b/sys/modules/if_disc/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../net
+.PATH: ${.CURDIR}/../../net
+
KMOD= if_disc
SRCS= if_disc.c opt_inet.h opt_inet6.h
NOMAN=
diff --git a/sys/modules/if_ef/Makefile b/sys/modules/if_ef/Makefile
index f3996ed..7ea9351 100644
--- a/sys/modules/if_ef/Makefile
+++ b/sys/modules/if_ef/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../net
+.PATH: ${.CURDIR}/../../net
-KMOD= if_ef
-SRCS= if_ef.c opt_ipx.h opt_inet.h opt_ef.h
+KMOD= if_ef
+SRCS= if_ef.c opt_ipx.h opt_inet.h opt_ef.h
NOMAN=
# If you need only limited number of frames comment out unneeded ones
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index 3884226..2becf7e 100644
--- a/sys/modules/if_ppp/Makefile
+++ b/sys/modules/if_ppp/Makefile
@@ -1,6 +1,7 @@
# $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
diff --git a/sys/modules/if_sl/Makefile b/sys/modules/if_sl/Makefile
index ddd71dd..4bf7520 100644
--- a/sys/modules/if_sl/Makefile
+++ b/sys/modules/if_sl/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../net
+.PATH: ${.CURDIR}/../../net
+
KMOD= if_sl
SRCS= if_sl.c slcompress.c opt_inet.h opt_slip.h
NOMAN=
diff --git a/sys/modules/if_tap/Makefile b/sys/modules/if_tap/Makefile
index 8bc3758..29e0a90 100644
--- a/sys/modules/if_tap/Makefile
+++ b/sys/modules/if_tap/Makefile
@@ -2,9 +2,10 @@
#
# $FreeBSD$
-.PATH: ${.CURDIR}/../../net
-KMOD= if_tap
-SRCS= if_tap.c opt_inet.h vnode_if.h
+.PATH: ${.CURDIR}/../../net
+
+KMOD= if_tap
+SRCS= if_tap.c opt_inet.h vnode_if.h
CLEANFILES+= opt_devfs.h opt_inet.h vnode_if.h
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index baa4420..1b6e3b3 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../net
+.PATH: ${.CURDIR}/../../net
+
KMOD= if_tun
SRCS= if_tun.c opt_inet.h vnode_if.h
NOMAN=
diff --git a/sys/modules/ip6fw/Makefile b/sys/modules/ip6fw/Makefile
index 64fa17e..ca39dc9 100644
--- a/sys/modules/ip6fw/Makefile
+++ b/sys/modules/ip6fw/Makefile
@@ -1,17 +1,18 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../netinet6
+.PATH: ${.CURDIR}/../../netinet6
+
KMOD= ip6fw
SRCS= ip6_fw.c
NOMAN=
+
CFLAGS+= -DIPV6FIREWALL
-#
+
#If you want it verbose
#CFLAGS+= -DIPV6FIREWALL_VERBOSE
#CFLAGS+= -DIPV6FIREWALL_VERBOSE_LIMIT=100
#
#If you want it to pass all packets by default
#CFLAGS+= -DIPV6FIREWALL_DEFAULT_TO_ACCEPT
-#
.include <bsd.kmod.mk>
diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile
index 39412bc..cbe04ab 100644
--- a/sys/modules/ip_mroute_mod/Makefile
+++ b/sys/modules/ip_mroute_mod/Makefile
@@ -1,9 +1,11 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../netinet
+.PATH: ${.CURDIR}/../../netinet
+
KMOD= ip_mroute
SRCS= ip_mroute.c
NOMAN=
+
CFLAGS+= -DMROUTE_LKM -DMROUTING
.include <bsd.kmod.mk>
diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile
index e2c038d..fd6d8b4 100644
--- a/sys/modules/ipfilter/Makefile
+++ b/sys/modules/ipfilter/Makefile
@@ -1,10 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../netinet
+.PATH: ${.CURDIR}/../../netinet
+
KMOD= ipl
SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \
ip_log.c ip_fil.c fil.c
NOMAN=
+
CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG
#
# If you don't want log functionality remove -DIPFILTER_LOG
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index 963349f..6ac704d 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -1,9 +1,11 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../netinet
+.PATH: ${.CURDIR}/../../netinet
+
KMOD= ipfw
SRCS= ip_fw.c
NOMAN=
+
CFLAGS+= -DIPFIREWALL
#
#If you want it verbose
diff --git a/sys/modules/ispfw/Makefile b/sys/modules/ispfw/Makefile
index a6a4e88..07b9f8b 100644
--- a/sys/modules/ispfw/Makefile
+++ b/sys/modules/ispfw/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/ispfw
-KMOD = ispfw
-SRCS = ispfw.c
+.PATH: ${.CURDIR}/../../dev/ispfw
+
+KMOD= ispfw
+SRCS= ispfw.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile
index 7c7eefb..ff81783 100644
--- a/sys/modules/joy/Makefile
+++ b/sys/modules/joy/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../isa
-KMOD = joy
-SRCS = bus_if.h device_if.h isa_if.h joy.c
+.PATH: ${.CURDIR}/../../isa
+
+KMOD= joy
+SRCS= bus_if.h device_if.h isa_if.h joy.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/kue/Makefile b/sys/modules/kue/Makefile
index 573a431..42c8910 100644
--- a/sys/modules/kue/Makefile
+++ b/sys/modules/kue/Makefile
@@ -1,9 +1,10 @@
# $FreeBSD$
-S = ${.CURDIR}/../..
-.PATH: $S/dev/usb
-KMOD = if_kue
-SRCS = if_kue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
-SRCS += miibus_if.h
+S= ${.CURDIR}/../..
+.PATH: $S/dev/usb
+
+KMOD= if_kue
+SRCS= if_kue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
+SRCS+= miibus_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/linprocfs/Makefile b/sys/modules/linprocfs/Makefile
index e69f3ce..c114953 100644
--- a/sys/modules/linprocfs/Makefile
+++ b/sys/modules/linprocfs/Makefile
@@ -1,11 +1,13 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../compat/linprocfs
+.PATH: ${.CURDIR}/../../compat/linprocfs
+
KMOD= linprocfs
SRCS= vnode_if.h linprocfs_misc.c linprocfs_subr.c \
- linprocfs_vfsops.c linprocfs_vnops.c
+ linprocfs_vfsops.c linprocfs_vnops.c
NOMAN=
VFS_KLD=
+
CFLAGS+= -DLINPROCFS
test: unload install load
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index ff58b39..8ba2ffa 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux
-
MAINTAINER= marcel@FreeBSD.org
+.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux
+
KMOD= linux
SRCS= linux_file.c linux_ioctl.c linux_ipc.c linux_machdep.c linux_misc.c \
linux_signal.c linux_socket.c linux_stats.c linux_mib.c \
@@ -12,23 +12,23 @@ SRCS= linux_file.c linux_ioctl.c linux_ipc.c linux_machdep.c linux_misc.c \
OBJS= linux_locore.o
.if ${MACHINE_ARCH} != "alpha"
-SRCS+= imgact_linux.c
+SRCS+= imgact_linux.c
.endif
-EXPORT_SYMS=_linux_mod
-CLEANFILES= linux_assym.h linux_genassym.o
+EXPORT_SYMS= _linux_mod
+CLEANFILES= linux_assym.h linux_genassym.o
-linux_assym.h: linux_genassym.o
+linux_assym.h: linux_genassym.o
.if exists(@)
-linux_assym.h: @/kern/genassym.sh
+linux_assym.h: @/kern/genassym.sh
.endif
sh @/kern/genassym.sh linux_genassym.o > ${.TARGET}
-linux_locore.o: linux_locore.s linux_assym.h
+linux_locore.o: linux_locore.s linux_assym.h
${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
- ${.IMPSRC} -o ${.TARGET}
+ ${.IMPSRC} -o ${.TARGET}
-linux_genassym.o: linux_genassym.c linux.h @ machine
+linux_genassym.o: linux_genassym.c linux.h @ machine
${CC} -c ${CFLAGS} ${.IMPSRC}
opt_compat.h:
diff --git a/sys/modules/lnc/Makefile b/sys/modules/lnc/Makefile
index 44d80c1..fa2fece 100644
--- a/sys/modules/lnc/Makefile
+++ b/sys/modules/lnc/Makefile
@@ -1,11 +1,13 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/lnc
-KMOD = if_lnc
-SRCS = if_lnc.c if_lnc_pci.c if_lnc_isa.c if_lnc_pc98.c
-SRCS += opt_inet.h device_if.h bus_if.h isa_if.h pci_if.h
-#SRCS += miibus_if.h
+.PATH: ${.CURDIR}/../../dev/lnc
+
+KMOD= if_lnc
+SRCS= if_lnc.c if_lnc_pci.c if_lnc_isa.c if_lnc_pc98.c
+SRCS+= opt_inet.h device_if.h bus_if.h isa_if.h pci_if.h
+#SRCS+= miibus_if.h
#KMODDEPS = miibus
-CFLAGS += -g -I${.CURDIR}/../../dev/lnc
+
+CFLAGS+= -g -I${.CURDIR}/../../dev/lnc
.include <bsd.kmod.mk>
diff --git a/sys/modules/md/Makefile b/sys/modules/md/Makefile
index bb793c5..3f2130f 100644
--- a/sys/modules/md/Makefile
+++ b/sys/modules/md/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/md
+.PATH: ${.CURDIR}/../../dev/md
+
KMOD= md
SRCS= md.c opt_mfs.h opt_md.h vnode_if.h
NOMAN=
diff --git a/sys/modules/mfs/Makefile b/sys/modules/mfs/Makefile
index 7f2a0d4..94148d0 100644
--- a/sys/modules/mfs/Makefile
+++ b/sys/modules/mfs/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../ufs/mfs
+.PATH: ${.CURDIR}/../../ufs/mfs
+
KMOD= mfs
SRCS= vnode_if.h \
mfs_vfsops.c mfs_vnops.c opt_mfs.h
diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile
index 82a3225..f4dfc79 100644
--- a/sys/modules/mii/Makefile
+++ b/sys/modules/mii/Makefile
@@ -1,10 +1,11 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/mii
-KMOD = miibus
-SRCS = mii.c mii_physubr.c ukphy.c ukphy_subr.c bus_if.h pci_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 dcphy.c pnphy.c
-SRCS += brgphy.c xmphy.c pnaphy.c
+.PATH: ${.CURDIR}/../../dev/mii
+
+KMOD= miibus
+SRCS= mii.c mii_physubr.c ukphy.c ukphy_subr.c bus_if.h pci_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 dcphy.c pnphy.c
+SRCS+= brgphy.c xmphy.c pnaphy.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/mlx/Makefile b/sys/modules/mlx/Makefile
index aaae0f6..ba0951a 100644
--- a/sys/modules/mlx/Makefile
+++ b/sys/modules/mlx/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/mlx
-KMOD = mlx
-SRCS = mlx.c mlx_pci.c mlx_disk.c device_if.h bus_if.h pci_if.h
+.PATH: ${.CURDIR}/../../dev/mlx
+
+KMOD= mlx
+SRCS= mlx.c mlx_pci.c mlx_disk.c device_if.h bus_if.h pci_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/mly/Makefile b/sys/modules/mly/Makefile
index 1f8abe8..6bb1f4f 100644
--- a/sys/modules/mly/Makefile
+++ b/sys/modules/mly/Makefile
@@ -1,10 +1,11 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/mly
-KMOD = mly
-SRCS = mly.c mly_pci.c mly_cam.c
-SRCS += opt_scsi.h opt_cam.h
-SRCS += device_if.h bus_if.h pci_if.h
+.PATH: ${.CURDIR}/../../dev/mly
+
+KMOD= mly
+SRCS= mly.c mly_pci.c mly_cam.c
+SRCS+= opt_scsi.h opt_cam.h
+SRCS+= device_if.h bus_if.h pci_if.h
#CFLAGS+= -DMLY_DEBUG=1
diff --git a/sys/modules/msdos/Makefile b/sys/modules/msdos/Makefile
index aac0da5..fb3b2f8 100644
--- a/sys/modules/msdos/Makefile
+++ b/sys/modules/msdos/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../msdosfs
+.PATH: ${.CURDIR}/../../msdosfs
+
KMOD= msdos
SRCS= vnode_if.h \
msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile
index aac0da5..fb3b2f8 100644
--- a/sys/modules/msdosfs/Makefile
+++ b/sys/modules/msdosfs/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../msdosfs
+.PATH: ${.CURDIR}/../../msdosfs
+
KMOD= msdos
SRCS= vnode_if.h \
msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
diff --git a/sys/modules/ncp/Makefile b/sys/modules/ncp/Makefile
index f68602f..7c84e7f 100644
--- a/sys/modules/ncp/Makefile
+++ b/sys/modules/ncp/Makefile
@@ -1,6 +1,6 @@
-# $FreeBSD$
+# $FreeBSD$
-.PATH: ${.CURDIR}/../../netncp
+.PATH: ${.CURDIR}/../../netncp
KMOD= ncp
diff --git a/sys/modules/netgraph/UI/Makefile b/sys/modules/netgraph/UI/Makefile
index ed7e0c8..49eb908 100644
--- a/sys/modules/netgraph/UI/Makefile
+++ b/sys/modules/netgraph/UI/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
-KMOD= ng_UI
-SRCS= ng_UI.c
+KMOD= ng_UI
+SRCS= ng_UI.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/async/Makefile b/sys/modules/netgraph/async/Makefile
index 9a64184..cb0e01c 100644
--- a/sys/modules/netgraph/async/Makefile
+++ b/sys/modules/netgraph/async/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
-KMOD= ng_async
-SRCS= ng_async.c
+KMOD= ng_async
+SRCS= ng_async.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/bpf/Makefile b/sys/modules/netgraph/bpf/Makefile
index e453833..40d25fe 100644
--- a/sys/modules/netgraph/bpf/Makefile
+++ b/sys/modules/netgraph/bpf/Makefile
@@ -1,10 +1,10 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.1 1999/12/03 01:44:28 archie Exp $
-KMOD= ng_bpf
-SRCS= ng_bpf.c bpf_filter.c
-NOMAN=
+.PATH: ${.CURDIR}/../../../net
-.PATH: ${.CURDIR}/../../../net
+KMOD= ng_bpf
+SRCS= ng_bpf.c bpf_filter.c
+NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/bridge/Makefile b/sys/modules/netgraph/bridge/Makefile
index 5afd541..91f4df9 100644
--- a/sys/modules/netgraph/bridge/Makefile
+++ b/sys/modules/netgraph/bridge/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-KMOD= ng_bridge
-SRCS= ng_bridge.c
+KMOD= ng_bridge
+SRCS= ng_bridge.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/cisco/Makefile b/sys/modules/netgraph/cisco/Makefile
index ed81334..fdadaf3 100644
--- a/sys/modules/netgraph/cisco/Makefile
+++ b/sys/modules/netgraph/cisco/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
-KMOD= ng_cisco
-SRCS= ng_cisco.c
+KMOD= ng_cisco
+SRCS= ng_cisco.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/echo/Makefile b/sys/modules/netgraph/echo/Makefile
index 8cf7042..1fa83ac 100644
--- a/sys/modules/netgraph/echo/Makefile
+++ b/sys/modules/netgraph/echo/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
-KMOD= ng_echo
-SRCS= ng_echo.c
+KMOD= ng_echo
+SRCS= ng_echo.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/ether/Makefile b/sys/modules/netgraph/ether/Makefile
index b02bc0c..7a3950e 100644
--- a/sys/modules/netgraph/ether/Makefile
+++ b/sys/modules/netgraph/ether/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-KMOD= ng_ether
-SRCS= ng_ether.c
+KMOD= ng_ether
+SRCS= ng_ether.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/frame_relay/Makefile b/sys/modules/netgraph/frame_relay/Makefile
index 65a297cd..d662fe1 100644
--- a/sys/modules/netgraph/frame_relay/Makefile
+++ b/sys/modules/netgraph/frame_relay/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
-KMOD= ng_frame_relay
-SRCS= ng_frame_relay.c
+KMOD= ng_frame_relay
+SRCS= ng_frame_relay.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/hole/Makefile b/sys/modules/netgraph/hole/Makefile
index 881357d..f95f1f1 100644
--- a/sys/modules/netgraph/hole/Makefile
+++ b/sys/modules/netgraph/hole/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
-KMOD= ng_hole
-SRCS= ng_hole.c
+KMOD= ng_hole
+SRCS= ng_hole.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/iface/Makefile b/sys/modules/netgraph/iface/Makefile
index a37c6cc..ec2d911 100644
--- a/sys/modules/netgraph/iface/Makefile
+++ b/sys/modules/netgraph/iface/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
-KMOD= ng_iface
-SRCS= ng_iface.c
+KMOD= ng_iface
+SRCS= ng_iface.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/ksocket/Makefile b/sys/modules/netgraph/ksocket/Makefile
index 79bf539..582b353 100644
--- a/sys/modules/netgraph/ksocket/Makefile
+++ b/sys/modules/netgraph/ksocket/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-KMOD= ng_ksocket
-SRCS= ng_ksocket.c
+KMOD= ng_ksocket
+SRCS= ng_ksocket.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/lmi/Makefile b/sys/modules/netgraph/lmi/Makefile
index bee2ebb..97ce929 100644
--- a/sys/modules/netgraph/lmi/Makefile
+++ b/sys/modules/netgraph/lmi/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
-KMOD= ng_lmi
-SRCS= ng_lmi.c
+KMOD= ng_lmi
+SRCS= ng_lmi.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/mppc/Makefile b/sys/modules/netgraph/mppc/Makefile
index ebd2f82..84086d5 100644
--- a/sys/modules/netgraph/mppc/Makefile
+++ b/sys/modules/netgraph/mppc/Makefile
@@ -1,8 +1,8 @@
# $Whistle: Makefile,v 1.1 1999/12/08 20:20:39 archie Exp $
# $FreeBSD$
-KMOD= ng_mppc
-SRCS= ng_mppc.c opt_netgraph.h
+KMOD= ng_mppc
+SRCS= ng_mppc.c opt_netgraph.h
NOMAN=
NETGRAPH_MPPC_COMPRESSION?= 0
@@ -10,14 +10,14 @@ NETGRAPH_MPPC_ENCRYPTION?= 1
.if ${NETGRAPH_MPPC_COMPRESSION} > 0
# XXX These files don't exist yet, but hopefully someday they will...
-.PATH: ${.CURDIR}/../../../net
-SRCS+= mppcc.c mppcd.c
+.PATH: ${.CURDIR}/../../../net
+SRCS+= mppcc.c mppcd.c
.endif
.if ${NETGRAPH_MPPC_ENCRYPTION} > 0
-.PATH: ${.CURDIR}/../../../crypto
-.PATH: ${.CURDIR}/../../../crypto/rc4
-SRCS+= rc4.c sha1.c
+.PATH: ${.CURDIR}/../../../crypto
+.PATH: ${.CURDIR}/../../../crypto/rc4
+SRCS+= rc4.c sha1.c
.endif
opt_netgraph.h:
diff --git a/sys/modules/netgraph/netgraph/Makefile b/sys/modules/netgraph/netgraph/Makefile
index c7056b2..765155d 100644
--- a/sys/modules/netgraph/netgraph/Makefile
+++ b/sys/modules/netgraph/netgraph/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
-KMOD= netgraph
-SRCS= ng_base.c ng_parse.c
+KMOD= netgraph
+SRCS= ng_base.c ng_parse.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/one2many/Makefile b/sys/modules/netgraph/one2many/Makefile
index a49cfc7..fb7a643 100644
--- a/sys/modules/netgraph/one2many/Makefile
+++ b/sys/modules/netgraph/one2many/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-KMOD= ng_one2many
-SRCS= ng_one2many.c
+KMOD= ng_one2many
+SRCS= ng_one2many.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/ppp/Makefile b/sys/modules/netgraph/ppp/Makefile
index 4e88583..f763341 100644
--- a/sys/modules/netgraph/ppp/Makefile
+++ b/sys/modules/netgraph/ppp/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.1 1999/01/24 02:52:12 archie Exp $
-KMOD= ng_ppp
-SRCS= ng_ppp.c
+KMOD= ng_ppp
+SRCS= ng_ppp.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/pppoe/Makefile b/sys/modules/netgraph/pppoe/Makefile
index 71b1c23..df5c7f0 100644
--- a/sys/modules/netgraph/pppoe/Makefile
+++ b/sys/modules/netgraph/pppoe/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
-KMOD= ng_pppoe
-SRCS= ng_pppoe.c
+KMOD= ng_pppoe
+SRCS= ng_pppoe.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/pptpgre/Makefile b/sys/modules/netgraph/pptpgre/Makefile
index 2014255..391b3f8 100644
--- a/sys/modules/netgraph/pptpgre/Makefile
+++ b/sys/modules/netgraph/pptpgre/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.1 1999/11/29 23:14:33 archie Exp $
-KMOD= ng_pptpgre
-SRCS= ng_pptpgre.c
+KMOD= ng_pptpgre
+SRCS= ng_pptpgre.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/rfc1490/Makefile b/sys/modules/netgraph/rfc1490/Makefile
index 9e6413a..325ce6c 100644
--- a/sys/modules/netgraph/rfc1490/Makefile
+++ b/sys/modules/netgraph/rfc1490/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
-KMOD= ng_rfc1490
-SRCS= ng_rfc1490.c
+KMOD= ng_rfc1490
+SRCS= ng_rfc1490.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/socket/Makefile b/sys/modules/netgraph/socket/Makefile
index 78a736e4..53fe8e9 100644
--- a/sys/modules/netgraph/socket/Makefile
+++ b/sys/modules/netgraph/socket/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
-KMOD= ng_socket
-SRCS= ng_socket.c
+KMOD= ng_socket
+SRCS= ng_socket.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/tee/Makefile b/sys/modules/netgraph/tee/Makefile
index 6506252..df8fa22 100644
--- a/sys/modules/netgraph/tee/Makefile
+++ b/sys/modules/netgraph/tee/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
-KMOD= ng_tee
-SRCS= ng_tee.c
+KMOD= ng_tee
+SRCS= ng_tee.c
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/tty/Makefile b/sys/modules/netgraph/tty/Makefile
index 7052f52..01e4d04 100644
--- a/sys/modules/netgraph/tty/Makefile
+++ b/sys/modules/netgraph/tty/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
-KMOD= ng_tty
-SRCS= ng_tty.c device_if.h bus_if.h pci_if.h
-MFILES= kern/device_if.m kern/bus_if.m pci/agp_if.m dev/pci/pci_if.m
+KMOD= ng_tty
+SRCS= ng_tty.c device_if.h bus_if.h pci_if.h
+MFILES= kern/device_if.m kern/bus_if.m pci/agp_if.m dev/pci/pci_if.m
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/vjc/Makefile b/sys/modules/netgraph/vjc/Makefile
index 7cf62f7..e17fda8 100644
--- a/sys/modules/netgraph/vjc/Makefile
+++ b/sys/modules/netgraph/vjc/Makefile
@@ -1,10 +1,10 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.1 1999/01/24 06:48:07 archie Exp $
-KMOD= ng_vjc
-SRCS= ng_vjc.c slcompress.c
-NOMAN=
+.PATH: ${.CURDIR}/../../../net
-.PATH: ${.CURDIR}/../../../net
+KMOD= ng_vjc
+SRCS= ng_vjc.c slcompress.c
+NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/nfs/Makefile b/sys/modules/nfs/Makefile
index 34d4006..2582f9c 100644
--- a/sys/modules/nfs/Makefile
+++ b/sys/modules/nfs/Makefile
@@ -1,6 +1,7 @@
# $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 \
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index 34d4006..2582f9c 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -1,6 +1,7 @@
# $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 \
diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile
index 34d4006..2582f9c 100644
--- a/sys/modules/nfsserver/Makefile
+++ b/sys/modules/nfsserver/Makefile
@@ -1,6 +1,7 @@
# $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 \
diff --git a/sys/modules/ntfs/Makefile b/sys/modules/ntfs/Makefile
index d13373b..8f663e2 100644
--- a/sys/modules/ntfs/Makefile
+++ b/sys/modules/ntfs/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../ntfs
+.PATH: ${.CURDIR}/../../ntfs
+
KMOD= ntfs
SRCS= vnode_if.h \
ntfs_vfsops.c ntfs_vnops.c ntfs_subr.c ntfs_ihash.c \
diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile
index 5786066..3df3d26 100644
--- a/sys/modules/nullfs/Makefile
+++ b/sys/modules/nullfs/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/nullfs
+.PATH: ${.CURDIR}/../../miscfs/nullfs
+
KMOD= nullfs
SRCS= vnode_if.h \
null_subr.c null_vfsops.c null_vnops.c
diff --git a/sys/modules/nwfs/Makefile b/sys/modules/nwfs/Makefile
index 0046e14..bc0e328 100644
--- a/sys/modules/nwfs/Makefile
+++ b/sys/modules/nwfs/Makefile
@@ -1,6 +1,6 @@
-# $FreeBSD$
+# $FreeBSD$
-.PATH: ${.CURDIR}/../../nwfs
+.PATH: ${.CURDIR}/../../nwfs
KMOD= nwfs
@@ -8,7 +8,7 @@ SRCS= vnode_if.h \
nwfs_node.c nwfs_ioctl.c nwfs_io.c nwfs_vfsops.c nwfs_vnops.c \
nwfs_subr.c opt_ncp.h opt_nwfs.h opt_vmpage.h
-NOMAN=true
+NOMAN= true
.if defined(VNPRINT)
CFLAGS+= -DVNPRINT
diff --git a/sys/modules/oldcard/Makefile b/sys/modules/oldcard/Makefile
index 8f19d22..28ec015 100644
--- a/sys/modules/oldcard/Makefile
+++ b/sys/modules/oldcard/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../pccard ${.CURDIR}/../../pci
-KMOD= oldcard
-SRCS= pccard.c pcic.c pccard_beep.c pccard_nbk.c pcic_p.c \
+.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=
diff --git a/sys/modules/pccard/Makefile b/sys/modules/pccard/Makefile
index 49d4b48..1966e27 100644
--- a/sys/modules/pccard/Makefile
+++ b/sys/modules/pccard/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/pccard
-KMOD= pccard
-SRCS= pccard.c pccard_cis.c pccard_cis_quirks.c \
+.PATH: ${.CURDIR}/../../dev/pccard
+
+KMOD= pccard
+SRCS= pccard.c pccard_cis.c pccard_cis_quirks.c \
device_if.h bus_if.h card_if.h power_if.h
NOMAN=
diff --git a/sys/modules/pccbb/Makefile b/sys/modules/pccbb/Makefile
index 7d0218c..214f5a8 100644
--- a/sys/modules/pccbb/Makefile
+++ b/sys/modules/pccbb/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/pccbb
+.PATH: ${.CURDIR}/../../dev/pccbb
+
KMOD= pccbb
SRCS= pccbb.c \
device_if.h bus_if.h power_if.h card_if.h pci_if.h pcib_if.h
diff --git a/sys/modules/pcfclock/Makefile b/sys/modules/pcfclock/Makefile
index 6d37afe..107a067 100644
--- a/sys/modules/pcfclock/Makefile
+++ b/sys/modules/pcfclock/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../dev/ppbus
+
KMOD= pcfclock
SRCS= pcfclock.c opt_pcfclock.h
SRCS+= bus_if.h device_if.h ppbus_if.h
diff --git a/sys/modules/pcic/Makefile b/sys/modules/pcic/Makefile
index 4202d04..fc8a97a 100644
--- a/sys/modules/pcic/Makefile
+++ b/sys/modules/pcic/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/pcic ${.CURDIR}/../../dev/pccard
-KMOD= pcic
-SRCS= i82365.c i82365_isa.c device_if.h bus_if.h isa_if.h \
+.PATH: ${.CURDIR}/../../dev/pcic ${.CURDIR}/../../dev/pccard
+
+KMOD= pcic
+SRCS= i82365.c i82365_isa.c device_if.h bus_if.h isa_if.h \
power_if.h card_if.h power_if.c card_if.c
NOMAN=
diff --git a/sys/modules/pcn/Makefile b/sys/modules/pcn/Makefile
index 0ef6fae..637692e 100644
--- a/sys/modules/pcn/Makefile
+++ b/sys/modules/pcn/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../pci
-KMOD = if_pcn
-SRCS = if_pcn.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS += miibus_if.h
+.PATH: ${.CURDIR}/../../pci
+
+KMOD= if_pcn
+SRCS= if_pcn.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS+= miibus_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/pecoff/Makefile b/sys/modules/pecoff/Makefile
index 0232d98..c109c6b 100644
--- a/sys/modules/pecoff/Makefile
+++ b/sys/modules/pecoff/Makefile
@@ -1,16 +1,16 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../compat/pecoff
-
MAINTAINER= takawata@FreeBSD.org
+.PATH: ${.CURDIR}/../../compat/pecoff
+
KMOD= pecoff
SRCS= imgact_pecoff.c opt_pecoff.h vnode_if.h
-
-CFLAGS+= -g -DDEBUG
+CFLAGS+= -g -DDEBUG
#EXPORT_SYMS=_pecoff_mod
-opt_pecoff.h:Makefile
+opt_pecoff.h: Makefile
touch opt_pecoff.h
+
.include <bsd.kmod.mk>
diff --git a/sys/modules/portal/Makefile b/sys/modules/portal/Makefile
index 5cc4767..a14a8fa 100644
--- a/sys/modules/portal/Makefile
+++ b/sys/modules/portal/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/portal
+.PATH: ${.CURDIR}/../../miscfs/portal
+
KMOD= portal
SRCS= vnode_if.h \
portal_vfsops.c portal_vnops.c
diff --git a/sys/modules/portalfs/Makefile b/sys/modules/portalfs/Makefile
index 5cc4767..a14a8fa 100644
--- a/sys/modules/portalfs/Makefile
+++ b/sys/modules/portalfs/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/portal
+.PATH: ${.CURDIR}/../../miscfs/portal
+
KMOD= portal
SRCS= vnode_if.h \
portal_vfsops.c portal_vnops.c
diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile
index 902aa66..d132b0d 100644
--- a/sys/modules/procfs/Makefile
+++ b/sys/modules/procfs/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/procfs
+.PATH: ${.CURDIR}/../../miscfs/procfs
+
KMOD= procfs
SRCS= vnode_if.h \
procfs_ctl.c \
diff --git a/sys/modules/random/Makefile b/sys/modules/random/Makefile
index 84021c8..8c46764 100644
--- a/sys/modules/random/Makefile
+++ b/sys/modules/random/Makefile
@@ -1,13 +1,15 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/random
-.PATH: ${.CURDIR}/../../crypto/blowfish
-KMOD = random
-SRCS = bus_if.h device_if.h randomdev.c yarrow.c hash.c
-SRCS += bf_cbc.c bf_skey.c bf_enc.c
-SRCS += vnode_if.h opt_noblockrandom.h
-CFLAGS += -I${.CURDIR}/../..
-NOMAN = yes
+.PATH: ${.CURDIR}/../../dev/random
+.PATH: ${.CURDIR}/../../crypto/blowfish
+
+KMOD= random
+SRCS= bus_if.h device_if.h randomdev.c yarrow.c hash.c
+SRCS+= bf_cbc.c bf_skey.c bf_enc.c
+SRCS+= vnode_if.h opt_noblockrandom.h
+NOMAN= yes
+
+CFLAGS+= -I${.CURDIR}/../..
# Uncomment the below macro to make a /dev/random that will not block at
# boot time. Useful for personal workstations and the like where reboot
diff --git a/sys/modules/ray/Makefile b/sys/modules/ray/Makefile
index 16eb083..7ba0839 100644
--- a/sys/modules/ray/Makefile
+++ b/sys/modules/ray/Makefile
@@ -1,9 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/ray
-KMOD = if_ray
-SRCS = if_ray.c
-SRCS += device_if.h bus_if.h card_if.h opt_inet.h
-NOMAN =
+.PATH: ${.CURDIR}/../../dev/ray
+
+KMOD= if_ray
+SRCS= if_ray.c
+SRCS+= device_if.h bus_if.h card_if.h opt_inet.h
+NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/rl/Makefile b/sys/modules/rl/Makefile
index 136c228..23a06a1 100644
--- a/sys/modules/rl/Makefile
+++ b/sys/modules/rl/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.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
+.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
.include <bsd.kmod.mk>
diff --git a/sys/modules/rp/Makefile b/sys/modules/rp/Makefile
index 706a559..de964ee 100644
--- a/sys/modules/rp/Makefile
+++ b/sys/modules/rp/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/rp
-KMOD = rp
-SRCS = rp.c rp_pci.c device_if.h bus_if.h pci_if.h
+.PATH: ${.CURDIR}/../../dev/rp
+
+KMOD= rp
+SRCS= rp.c rp_pci.c device_if.h bus_if.h pci_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/s3/Makefile b/sys/modules/s3/Makefile
index 6763bb8..6091bee 100644
--- a/sys/modules/s3/Makefile
+++ b/sys/modules/s3/Makefile
@@ -1,9 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/fb
-KMOD = s3
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h \
- s3_pci.c
-KMODDEPS = vesa
+.PATH: ${.CURDIR}/../../dev/fb
+
+KMOD= s3
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h \
+ s3_pci.c
+KMODDEPS= vesa
.include <bsd.kmod.mk>
diff --git a/sys/modules/sf/Makefile b/sys/modules/sf/Makefile
index 05826a0..1725f09 100644
--- a/sys/modules/sf/Makefile
+++ b/sys/modules/sf/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.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
+.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
.include <bsd.kmod.mk>
diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile
index f644291..8fa9ec4 100644
--- a/sys/modules/sis/Makefile
+++ b/sys/modules/sis/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.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
+.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
.include <bsd.kmod.mk>
diff --git a/sys/modules/sk/Makefile b/sys/modules/sk/Makefile
index 350521c..28ad56b 100644
--- a/sys/modules/sk/Makefile
+++ b/sys/modules/sk/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../pci
-KMOD = if_sk
-SRCS = if_sk.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS += miibus_if.h
+.PATH: ${.CURDIR}/../../pci
+
+KMOD= if_sk
+SRCS= if_sk.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS+= miibus_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/sn/Makefile b/sys/modules/sn/Makefile
index d51443e..b443ab2 100644
--- a/sys/modules/sn/Makefile
+++ b/sys/modules/sn/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/sn
-KMOD = if_sn
-SRCS = if_sn.c if_sn_isa.c if_sn_pccard.c device_if.h bus_if.h isa_if.h \
- card_if.h
+.PATH: ${.CURDIR}/../../dev/sn
+
+KMOD= if_sn
+SRCS= if_sn.c if_sn_isa.c if_sn_pccard.c device_if.h bus_if.h isa_if.h \
+ card_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/snc/Makefile b/sys/modules/snc/Makefile
index f161c1e..4b158fb 100644
--- a/sys/modules/snc/Makefile
+++ b/sys/modules/snc/Makefile
@@ -1,9 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/snc
-KMOD = if_snc
-SRCS = if_snc.c if_snc_cbus.c if_snc_pccard.c dp83932.c dp83932subr.c
-SRCS += opt_inet.h opt_bdg.h device_if.h bus_if.h isa_if.h
+.PATH: ${.CURDIR}/../../dev/snc
+
+KMOD= if_snc
+SRCS= if_snc.c if_snc_cbus.c if_snc_pccard.c dp83932.c dp83932subr.c
+SRCS+= opt_inet.h opt_bdg.h device_if.h bus_if.h isa_if.h
opt_inet.h:
echo "#define INET 1" > ${.TARGET}
diff --git a/sys/modules/sound/driver/ad1816/Makefile b/sys/modules/sound/driver/ad1816/Makefile
index a506c30..9c7fa9e 100644
--- a/sys/modules/sound/driver/ad1816/Makefile
+++ b/sys/modules/sound/driver/ad1816/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/isa
-KMOD = snd_ad1816
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += ad1816.c
+.PATH: ${.CURDIR}/../../../../dev/sound/isa
+
+KMOD= snd_ad1816
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= ad1816.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/csa/Makefile b/sys/modules/sound/driver/csa/Makefile
index 2f6ffe1..892856d 100644
--- a/sys/modules/sound/driver/csa/Makefile
+++ b/sys/modules/sound/driver/csa/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/pci
-KMOD = snd_csa
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += csa.c
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
+
+KMOD= snd_csa
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= csa.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/csapcm/Makefile b/sys/modules/sound/driver/csapcm/Makefile
index 42f12c7..28634e9 100644
--- a/sys/modules/sound/driver/csapcm/Makefile
+++ b/sys/modules/sound/driver/csapcm/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/pci
-KMOD = snd_csapcm
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += csapcm.c
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
+
+KMOD= snd_csapcm
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= csapcm.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/driver/Makefile b/sys/modules/sound/driver/driver/Makefile
index 722ef8e..9573cd9 100644
--- a/sys/modules/sound/driver/driver/Makefile
+++ b/sys/modules/sound/driver/driver/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound
-KMOD = snd_driver
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += driver.c
+.PATH: ${.CURDIR}/../../../../dev/sound
+
+KMOD= snd_driver
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= driver.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/ds1/Makefile b/sys/modules/sound/driver/ds1/Makefile
index a703e1c..d47cfac 100644
--- a/sys/modules/sound/driver/ds1/Makefile
+++ b/sys/modules/sound/driver/ds1/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/pci
-KMOD = snd_ds1
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += ds1.c
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
+
+KMOD= snd_ds1
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= ds1.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/emu10k1/Makefile b/sys/modules/sound/driver/emu10k1/Makefile
index 73c6ff3..5d8f7be 100644
--- a/sys/modules/sound/driver/emu10k1/Makefile
+++ b/sys/modules/sound/driver/emu10k1/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/pci
-KMOD = snd_emu10k1
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += emu10k1.c
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
+
+KMOD= snd_emu10k1
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= emu10k1.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/es137x/Makefile b/sys/modules/sound/driver/es137x/Makefile
index b1f7abd..f2861d6 100644
--- a/sys/modules/sound/driver/es137x/Makefile
+++ b/sys/modules/sound/driver/es137x/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/pci
-KMOD = snd_es137x
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += es137x.c
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
+
+KMOD= snd_es137x
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= es137x.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/es1888/Makefile b/sys/modules/sound/driver/es1888/Makefile
index 2a6fc3b..66a73e5 100644
--- a/sys/modules/sound/driver/es1888/Makefile
+++ b/sys/modules/sound/driver/es1888/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/isa
-KMOD = snd_es1888
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += es1888.c
+.PATH: ${.CURDIR}/../../../../dev/sound/isa
+
+KMOD= snd_es1888
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= es1888.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/ess/Makefile b/sys/modules/sound/driver/ess/Makefile
index 3dc1032..73da252 100644
--- a/sys/modules/sound/driver/ess/Makefile
+++ b/sys/modules/sound/driver/ess/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/isa
-KMOD = snd_ess
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += ess.c
+.PATH: ${.CURDIR}/../../../../dev/sound/isa
+
+KMOD= snd_ess
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= ess.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/fm801/Makefile b/sys/modules/sound/driver/fm801/Makefile
index af68e15..3efde20 100644
--- a/sys/modules/sound/driver/fm801/Makefile
+++ b/sys/modules/sound/driver/fm801/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/pci
-KMOD = snd_fm801
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += fm801.c
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
+
+KMOD= snd_fm801
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= fm801.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/gusc/Makefile b/sys/modules/sound/driver/gusc/Makefile
index facf8ac..1b7f529 100644
--- a/sys/modules/sound/driver/gusc/Makefile
+++ b/sys/modules/sound/driver/gusc/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/isa
-KMOD = snd_gusc
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += gusc.c
+.PATH: ${.CURDIR}/../../../../dev/sound/isa
+
+KMOD= snd_gusc
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= gusc.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/maestro/Makefile b/sys/modules/sound/driver/maestro/Makefile
index 01de270..48c6877 100644
--- a/sys/modules/sound/driver/maestro/Makefile
+++ b/sys/modules/sound/driver/maestro/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/pci
-KMOD = snd_maestro
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += maestro.c
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
+
+KMOD= snd_maestro
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= maestro.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/mss/Makefile b/sys/modules/sound/driver/mss/Makefile
index 10e3f6d..0eca1b7 100644
--- a/sys/modules/sound/driver/mss/Makefile
+++ b/sys/modules/sound/driver/mss/Makefile
@@ -1,9 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/isa
-KMOD = snd_mss
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += mss.c
+.PATH: ${.CURDIR}/../../../../dev/sound/isa
+
+KMOD= snd_mss
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= mss.c
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
diff --git a/sys/modules/sound/driver/neomagic/Makefile b/sys/modules/sound/driver/neomagic/Makefile
index be8016c..d974bd7 100644
--- a/sys/modules/sound/driver/neomagic/Makefile
+++ b/sys/modules/sound/driver/neomagic/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/pci
-KMOD = snd_neomagic
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += neomagic.c
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
+
+KMOD= snd_neomagic
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= neomagic.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/sb16/Makefile b/sys/modules/sound/driver/sb16/Makefile
index 57e0e5f..bf009f7 100644
--- a/sys/modules/sound/driver/sb16/Makefile
+++ b/sys/modules/sound/driver/sb16/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/isa
-KMOD = snd_sb16
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += sb16.c
+.PATH: ${.CURDIR}/../../../../dev/sound/isa
+
+KMOD= snd_sb16
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= sb16.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/sb8/Makefile b/sys/modules/sound/driver/sb8/Makefile
index e610d96..f2b0da8 100644
--- a/sys/modules/sound/driver/sb8/Makefile
+++ b/sys/modules/sound/driver/sb8/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/isa
-KMOD = snd_sb8
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += sb8.c
+.PATH: ${.CURDIR}/../../../../dev/sound/isa
+
+KMOD= snd_sb8
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= sb8.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/sbc/Makefile b/sys/modules/sound/driver/sbc/Makefile
index d52e312..c512c8f 100644
--- a/sys/modules/sound/driver/sbc/Makefile
+++ b/sys/modules/sound/driver/sbc/Makefile
@@ -1,9 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/isa
-KMOD = snd_sbc
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += sbc.c
+.PATH: ${.CURDIR}/../../../../dev/sound/isa
+
+KMOD= snd_sbc
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= sbc.c
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
diff --git a/sys/modules/sound/driver/solo/Makefile b/sys/modules/sound/driver/solo/Makefile
index ee73b7b..faddebc 100644
--- a/sys/modules/sound/driver/solo/Makefile
+++ b/sys/modules/sound/driver/solo/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/pci
-KMOD = snd_solo
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += solo.c
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
+
+KMOD= snd_solo
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= solo.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/t4dwave/Makefile b/sys/modules/sound/driver/t4dwave/Makefile
index 6c0bb3f..a02ee59 100644
--- a/sys/modules/sound/driver/t4dwave/Makefile
+++ b/sys/modules/sound/driver/t4dwave/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/pci
-KMOD = snd_t4dwave
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += t4dwave.c
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
+
+KMOD= snd_t4dwave
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= t4dwave.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/via82c686/Makefile b/sys/modules/sound/driver/via82c686/Makefile
index 947eb82..50e6b5c 100644
--- a/sys/modules/sound/driver/via82c686/Makefile
+++ b/sys/modules/sound/driver/via82c686/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../dev/sound/pci
-KMOD = snd_via82c686
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += via82c686.c
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
+
+KMOD= snd_via82c686
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= via82c686.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/pcm/Makefile b/sys/modules/sound/pcm/Makefile
index 14443bf..ea1b8ec 100644
--- a/sys/modules/sound/pcm/Makefile
+++ b/sys/modules/sound/pcm/Makefile
@@ -1,12 +1,13 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../dev/sound/pcm
-KMOD = snd_pcm
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += ac97_if.h channel_if.h feeder_if.h mixer_if.h
-SRCS += ac97_if.c channel_if.c feeder_if.c mixer_if.c
-SRCS += ac97.c buffer.c channel.c dsp.c fake.c
-SRCS += feeder.c feeder_fmt.c
-SRCS += mixer.c sound.c
+.PATH: ${.CURDIR}/../../../dev/sound/pcm
+
+KMOD= snd_pcm
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= ac97_if.h channel_if.h feeder_if.h mixer_if.h
+SRCS+= ac97_if.c channel_if.c feeder_if.c mixer_if.c
+SRCS+= ac97.c buffer.c channel.c dsp.c fake.c
+SRCS+= feeder.c feeder_fmt.c
+SRCS+= mixer.c sound.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile
index 14443bf..ea1b8ec 100644
--- a/sys/modules/sound/sound/Makefile
+++ b/sys/modules/sound/sound/Makefile
@@ -1,12 +1,13 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../dev/sound/pcm
-KMOD = snd_pcm
-SRCS = device_if.h bus_if.h isa_if.h pci_if.h
-SRCS += ac97_if.h channel_if.h feeder_if.h mixer_if.h
-SRCS += ac97_if.c channel_if.c feeder_if.c mixer_if.c
-SRCS += ac97.c buffer.c channel.c dsp.c fake.c
-SRCS += feeder.c feeder_fmt.c
-SRCS += mixer.c sound.c
+.PATH: ${.CURDIR}/../../../dev/sound/pcm
+
+KMOD= snd_pcm
+SRCS= device_if.h bus_if.h isa_if.h pci_if.h
+SRCS+= ac97_if.h channel_if.h feeder_if.h mixer_if.h
+SRCS+= ac97_if.c channel_if.c feeder_if.c mixer_if.c
+SRCS+= ac97.c buffer.c channel.c dsp.c fake.c
+SRCS+= feeder.c feeder_fmt.c
+SRCS+= mixer.c sound.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/splash/bmp/Makefile b/sys/modules/splash/bmp/Makefile
index 9c45c39..950c930 100644
--- a/sys/modules/splash/bmp/Makefile
+++ b/sys/modules/splash/bmp/Makefile
@@ -2,7 +2,6 @@
KMOD= splash_bmp
SRCS= splash_bmp.c
-
NOMAN=
.if ${MACHINE} == "pc98"
diff --git a/sys/modules/sppp/Makefile b/sys/modules/sppp/Makefile
index 19e662c..b8c56f6 100644
--- a/sys/modules/sppp/Makefile
+++ b/sys/modules/sppp/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../net
-KMOD= sppp
-SRCS= if_spppsubr.c
+.PATH: ${.CURDIR}/../../net
+
+KMOD= sppp
+SRCS= if_spppsubr.c
SRCS+= opt_inet.h opt_inet6.h opt_ipx.h
NOMAN=
diff --git a/sys/modules/ste/Makefile b/sys/modules/ste/Makefile
index a21b379..6ad69a8 100644
--- a/sys/modules/ste/Makefile
+++ b/sys/modules/ste/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.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
+.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
.include <bsd.kmod.mk>
diff --git a/sys/modules/streams/Makefile b/sys/modules/streams/Makefile
index 04ed905..9b5cd7d 100644
--- a/sys/modules/streams/Makefile
+++ b/sys/modules/streams/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
+MAINTAINER= newton@atdot.dotat.org
-MAINTAINER = newton@atdot.dotat.org
-.if defined(DEBUG)
-CFLAGS+= -DDEBUG_SVR4
-.endif
-
-.PATH: ${.CURDIR}/../../dev/streams
-KMOD= streams
-SRCS= streams.c opt_streams.h
+.PATH: ${.CURDIR}/../../dev/streams
+KMOD= streams
+SRCS= streams.c opt_streams.h
NOMAN=
-CFLAGS+= -O
+.if defined(DEBUG)
+CFLAGS+= -DDEBUG_SVR4
+.endif
+CFLAGS+= -O
.include <bsd.kmod.mk>
diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile
index 65cd6ae..286b373 100644
--- a/sys/modules/svr4/Makefile
+++ b/sys/modules/svr4/Makefile
@@ -13,20 +13,20 @@ SRCS= svr4_sysent.c svr4_sysvec.c opt_compat.h opt_svr4.h opt_vmpage.h \
svr4_resource.c svr4_ipc.c
OBJS= svr4_locore.o
-EXPORT_SYMS=_svr4_mod
-CLEANFILES= svr4_assym.h svr4_genassym.o
+EXPORT_SYMS= _svr4_mod
+CLEANFILES= svr4_assym.h svr4_genassym.o
-svr4_assym.h: svr4_genassym.o
+svr4_assym.h: svr4_genassym.o
.if exists(@)
-svr4_assym.h: @/kern/genassym.sh
+svr4_assym.h: @/kern/genassym.sh
.endif
sh @/kern/genassym.sh svr4_genassym.o > ${.TARGET}
-svr4_locore.o: svr4_locore.s svr4_assym.h
+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
+svr4_genassym.o: svr4_genassym.c svr4.h @ machine
${CC} -c ${CFLAGS} ${.IMPSRC}
opt_compat.h:
diff --git a/sys/modules/sym/Makefile b/sys/modules/sym/Makefile
index 61fd054..198c982 100644
--- a/sys/modules/sym/Makefile
+++ b/sys/modules/sym/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/sym
-KMOD = sym
-SRCS = sym_hipd.c opt_sym.h opt_cam.h opt_scsi.h
-SRCS += device_if.h bus_if.h pci_if.h
+.PATH: ${.CURDIR}/../../dev/sym
+
+KMOD= sym
+SRCS= sym_hipd.c opt_sym.h opt_cam.h opt_scsi.h
+SRCS+= device_if.h bus_if.h pci_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/apm/Makefile b/sys/modules/syscons/apm/Makefile
index 00a889f..c52cbf9 100644
--- a/sys/modules/syscons/apm/Makefile
+++ b/sys/modules/syscons/apm/Makefile
@@ -2,8 +2,8 @@
KMOD= apm_saver
SRCS= apm_saver.c
-
NOMAN=
+
CFLAGS+= -I${.CURDIR}/..
.include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/blank/Makefile b/sys/modules/syscons/blank/Makefile
index e299c92..de6aac4 100644
--- a/sys/modules/syscons/blank/Makefile
+++ b/sys/modules/syscons/blank/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
KMOD= blank_saver
-SRCS= blank_saver.c
-
+SRCS= blank_saver.c
NOMAN=
+
CFLAGS+= -I${.CURDIR}/..
.include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile
index 930ec59..47868b4 100644
--- a/sys/modules/syscons/daemon/Makefile
+++ b/sys/modules/syscons/daemon/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
KMOD= daemon_saver
-SRCS= daemon_saver.c
-
+SRCS= daemon_saver.c
NOMAN=
+
CFLAGS+= -I${.CURDIR}/..
.if ${MACHINE} == "pc98"
diff --git a/sys/modules/syscons/fade/Makefile b/sys/modules/syscons/fade/Makefile
index 5fc34eb..0109ef6 100644
--- a/sys/modules/syscons/fade/Makefile
+++ b/sys/modules/syscons/fade/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
KMOD= fade_saver
-SRCS= fade_saver.c
-
+SRCS= fade_saver.c
NOMAN=
+
CFLAGS+= -I${.CURDIR}/..
.include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/fire/Makefile b/sys/modules/syscons/fire/Makefile
index d32eec7..8e376a2 100644
--- a/sys/modules/syscons/fire/Makefile
+++ b/sys/modules/syscons/fire/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
KMOD= fire_saver
-SRCS= fire_saver.c
-
+SRCS= fire_saver.c
NOMAN=
+
CFLAGS+= -I${.CURDIR}/..
CWARNFLAGS= -Wall -pedantic
diff --git a/sys/modules/syscons/green/Makefile b/sys/modules/syscons/green/Makefile
index f62b1f4..ccfefdc 100644
--- a/sys/modules/syscons/green/Makefile
+++ b/sys/modules/syscons/green/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
KMOD= green_saver
-SRCS= green_saver.c
-
+SRCS= green_saver.c
NOMAN=
+
CFLAGS+= -I${.CURDIR}/..
.include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/logo/Makefile b/sys/modules/syscons/logo/Makefile
index 2a9ede2..ce1900d 100644
--- a/sys/modules/syscons/logo/Makefile
+++ b/sys/modules/syscons/logo/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
KMOD= logo_saver
-SRCS= logo_saver.c
-
+SRCS= logo_saver.c
NOMAN=
+
CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}
.include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/rain/Makefile b/sys/modules/syscons/rain/Makefile
index ecc5ec3..e39dfc4 100644
--- a/sys/modules/syscons/rain/Makefile
+++ b/sys/modules/syscons/rain/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
KMOD= rain_saver
-SRCS= rain_saver.c
-
+SRCS= rain_saver.c
NOMAN=
+
CFLAGS+= -I${.CURDIR}/..
CWARNFLAGS= -Wall -pedantic
diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile
index 88519b2..6a12d8b 100644
--- a/sys/modules/syscons/snake/Makefile
+++ b/sys/modules/syscons/snake/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
KMOD= snake_saver
-SRCS= snake_saver.c
-
+SRCS= snake_saver.c
NOMAN=
+
CFLAGS+= -I${.CURDIR}/..
.if ${MACHINE} == "pc98"
diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile
index 7f978d5..99ce313 100644
--- a/sys/modules/syscons/star/Makefile
+++ b/sys/modules/syscons/star/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
KMOD= star_saver
-SRCS= star_saver.c
-
+SRCS= star_saver.c
NOMAN=
+
CFLAGS+= -I${.CURDIR}/..
.if ${MACHINE} == "pc98"
diff --git a/sys/modules/syscons/warp/Makefile b/sys/modules/syscons/warp/Makefile
index 45a3af9..8dac3d6 100644
--- a/sys/modules/syscons/warp/Makefile
+++ b/sys/modules/syscons/warp/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
KMOD= warp_saver
-SRCS= warp_saver.c
-
+SRCS= warp_saver.c
NOMAN=
+
CFLAGS+= -I${.CURDIR}/..
CWARNFLAGS= -Wall -pedantic
diff --git a/sys/modules/sysvipc/sysvmsg/Makefile b/sys/modules/sysvipc/sysvmsg/Makefile
index 9392b4b..96def2f 100644
--- a/sys/modules/sysvipc/sysvmsg/Makefile
+++ b/sys/modules/sysvipc/sysvmsg/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../kern
-KMOD = sysvmsg
-SRCS = sysv_msg.c opt_sysvipc.h
+.PATH: ${.CURDIR}/../../../kern
+
+KMOD= sysvmsg
+SRCS= sysv_msg.c opt_sysvipc.h
opt_sysvipc.h:
touch $@
diff --git a/sys/modules/sysvipc/sysvsem/Makefile b/sys/modules/sysvipc/sysvsem/Makefile
index f799802..a67c320 100644
--- a/sys/modules/sysvipc/sysvsem/Makefile
+++ b/sys/modules/sysvipc/sysvsem/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../kern
-KMOD = sysvsem
-SRCS = sysv_sem.c opt_sysvipc.h
+.PATH: ${.CURDIR}/../../../kern
+
+KMOD= sysvsem
+SRCS= sysv_sem.c opt_sysvipc.h
opt_sysvipc.h:
touch $@
diff --git a/sys/modules/sysvipc/sysvshm/Makefile b/sys/modules/sysvipc/sysvshm/Makefile
index d63280e..c59d192 100644
--- a/sys/modules/sysvipc/sysvshm/Makefile
+++ b/sys/modules/sysvipc/sysvshm/Makefile
@@ -1,9 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../kern
-KMOD = sysvshm
-OPTS = opt_sysvipc.h opt_compat.h opt_rlimit.h
-SRCS = sysv_shm.c $(OPTS)
+.PATH: ${.CURDIR}/../../../kern
+
+KMOD= sysvshm
+OPTS= opt_sysvipc.h opt_compat.h opt_rlimit.h
+SRCS= sysv_shm.c $(OPTS)
$(OPTS):
touch $@
diff --git a/sys/modules/ti/Makefile b/sys/modules/ti/Makefile
index 701e914..1768c88 100644
--- a/sys/modules/ti/Makefile
+++ b/sys/modules/ti/Makefile
@@ -1,9 +1,10 @@
# $FreeBSD$
-.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 = vlan.h
+.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= vlan.h
vlan.h:
touch vlan.h
diff --git a/sys/modules/tl/Makefile b/sys/modules/tl/Makefile
index 4c07c3a..bbd30a1 100644
--- a/sys/modules/tl/Makefile
+++ b/sys/modules/tl/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.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
+.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
.include <bsd.kmod.mk>
diff --git a/sys/modules/twe/Makefile b/sys/modules/twe/Makefile
index 2d0639b..052c541 100644
--- a/sys/modules/twe/Makefile
+++ b/sys/modules/twe/Makefile
@@ -23,7 +23,8 @@ CFLAGS+=-DTWE_SHUTDOWN_NOTIFICATION
#
#CFLAGS+=-DTWE_OVERRIDE
-.PATH: ${.CURDIR}/../../dev/twe
+.PATH: ${.CURDIR}/../../dev/twe
+
KMOD= twe
SRCS= bus_if.h device_if.h pci_if.h twe.c twe_freebsd.c
diff --git a/sys/modules/tx/Makefile b/sys/modules/tx/Makefile
index ab06042..c1c1dfa 100644
--- a/sys/modules/tx/Makefile
+++ b/sys/modules/tx/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../pci
-KMOD = if_tx
-SRCS = if_tx.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS += miibus_if.h
+.PATH: ${.CURDIR}/../../pci
+
+KMOD= if_tx
+SRCS= if_tx.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS+= miibus_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/udbp/Makefile b/sys/modules/udbp/Makefile
index ee175ba..8f5b81b 100644
--- a/sys/modules/udbp/Makefile
+++ b/sys/modules/udbp/Makefile
@@ -1,12 +1,13 @@
-# $FreeBSD$
+# $FreeBSD$
-MAINTAINER = n_hibma@freebsd.org
+MAINTAINER= n_hibma@freebsd.org
-.PATH: ${.CURDIR}/../../dev/usb
-KMOD = udbp
-SRCS = bus_if.h device_if.h \
- opt_usb.h \
- udbp.c
-NOMAN =
+.PATH: ${.CURDIR}/../../dev/usb
+
+KMOD= udbp
+SRCS= bus_if.h device_if.h \
+ opt_usb.h \
+ udbp.c
+NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/ugen/Makefile b/sys/modules/ugen/Makefile
index 180f6c7..a342f4f 100644
--- a/sys/modules/ugen/Makefile
+++ b/sys/modules/ugen/Makefile
@@ -1,10 +1,11 @@
-# $FreeBSD$
+# $FreeBSD$
-MAINTAINER = n_hibma@freebsd.org
+MAINTAINER= n_hibma@freebsd.org
-.PATH: ${.CURDIR}/../../dev/usb
-KMOD = ugen
-SRCS = bus_if.h device_if.h vnode_if.h opt_usb.h ugen.c
-NOMAN =
+.PATH: ${.CURDIR}/../../dev/usb
+
+KMOD= ugen
+SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h ugen.c
+NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/uhid/Makefile b/sys/modules/uhid/Makefile
index 4f8af0b..df771a5 100644
--- a/sys/modules/uhid/Makefile
+++ b/sys/modules/uhid/Makefile
@@ -1,10 +1,11 @@
-# $FreeBSD$
+# $FreeBSD$
-MAINTAINER = n_hibma@freebsd.org
+MAINTAINER= n_hibma@freebsd.org
-.PATH: ${.CURDIR}/../../dev/usb
-KMOD = uhid
-SRCS = bus_if.h device_if.h vnode_if.h opt_usb.h uhid.c
-NOMAN =
+.PATH: ${.CURDIR}/../../dev/usb
+
+KMOD= uhid
+SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h uhid.c
+NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/ukbd/Makefile b/sys/modules/ukbd/Makefile
index d5be99b..a73e8ec 100644
--- a/sys/modules/ukbd/Makefile
+++ b/sys/modules/ukbd/Makefile
@@ -1,13 +1,13 @@
-# $FreeBSD$
+# $FreeBSD$
+MAINTAINER= n_hibma@freebsd.org
-MAINTAINER = n_hibma@freebsd.org
+.PATH: ${.CURDIR}/../../dev/usb
-.PATH: ${.CURDIR}/../../dev/usb
-KMOD = ukbd
-SRCS = bus_if.h device_if.h vnode_if.h \
- opt_usb.h opt_kbd.h opt_ukbd.h \
- ukbd.c
-NOMAN =
+KMOD= ukbd
+SRCS= bus_if.h device_if.h vnode_if.h \
+ opt_usb.h opt_kbd.h opt_ukbd.h \
+ ukbd.c
+NOMAN=
opt_kbd.h:
echo '#define KBD_INSTALL_CDEV 1' > opt_kbd.h
diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile
index 873005a..266e78d 100644
--- a/sys/modules/ulpt/Makefile
+++ b/sys/modules/ulpt/Makefile
@@ -1,10 +1,11 @@
-# $FreeBSD$
+# $FreeBSD$
-MAINTAINER = n_hibma@freebsd.org
+MAINTAINER= n_hibma@freebsd.org
-.PATH: ${.CURDIR}/../../dev/usb
-KMOD = ulpt
-SRCS = bus_if.h device_if.h vnode_if.h opt_usb.h ulpt.c
-NOMAN =
+.PATH: ${.CURDIR}/../../dev/usb
+
+KMOD= ulpt
+SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h ulpt.c
+NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/umapfs/Makefile b/sys/modules/umapfs/Makefile
index 488590f..279a3a4 100644
--- a/sys/modules/umapfs/Makefile
+++ b/sys/modules/umapfs/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/umapfs
+.PATH: ${.CURDIR}/../../miscfs/umapfs
+
KMOD= umap
SRCS= vnode_if.h \
umap_subr.c umap_vfsops.c umap_vnops.c
diff --git a/sys/modules/umass/Makefile b/sys/modules/umass/Makefile
index dbf6852..28dcd55 100644
--- a/sys/modules/umass/Makefile
+++ b/sys/modules/umass/Makefile
@@ -1,12 +1,13 @@
-# $FreeBSD$
+# $FreeBSD$
-MAINTAINER = n_hibma@freebsd.org
+MAINTAINER= n_hibma@freebsd.org
-.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 =
+.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=
.include <bsd.kmod.mk>
diff --git a/sys/modules/umodem/Makefile b/sys/modules/umodem/Makefile
index 9b210c1..f002ba0 100644
--- a/sys/modules/umodem/Makefile
+++ b/sys/modules/umodem/Makefile
@@ -1,10 +1,11 @@
-# $FreeBSD$
+# $FreeBSD$
-MAINTAINER = n_hibma@freebsd.org
+MAINTAINER= n_hibma@freebsd.org
-.PATH: ${.CURDIR}/../../dev/usb
-KMOD = umodem
-SRCS = bus_if.h device_if.h vnode_if.h opt_usb.h umodem.c
-NOMAN =
+.PATH: ${.CURDIR}/../../dev/usb
+
+KMOD= umodem
+SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h umodem.c
+NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/ums/Makefile b/sys/modules/ums/Makefile
index a18061e..de8f23a 100644
--- a/sys/modules/ums/Makefile
+++ b/sys/modules/ums/Makefile
@@ -1,10 +1,11 @@
-# $FreeBSD$
+# $FreeBSD$
-MAINTAINER = n_hibma@freebsd.org
+MAINTAINER= n_hibma@freebsd.org
-.PATH: ${.CURDIR}/../../dev/usb
-KMOD = ums
-SRCS = bus_if.h device_if.h vnode_if.h opt_usb.h ums.c
-NOMAN =
+.PATH: ${.CURDIR}/../../dev/usb
+
+KMOD= ums
+SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h ums.c
+NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/union/Makefile b/sys/modules/union/Makefile
index 6825a63..8f3f852 100644
--- a/sys/modules/union/Makefile
+++ b/sys/modules/union/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/union
+.PATH: ${.CURDIR}/../../miscfs/union
+
KMOD= union
SRCS= vnode_if.h \
union_subr.c union_vfsops.c union_vnops.c
diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile
index 6825a63..8f3f852 100644
--- a/sys/modules/unionfs/Makefile
+++ b/sys/modules/unionfs/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/union
+.PATH: ${.CURDIR}/../../miscfs/union
+
KMOD= union
SRCS= vnode_if.h \
union_subr.c union_vfsops.c union_vnops.c
diff --git a/sys/modules/urio/Makefile b/sys/modules/urio/Makefile
index 6d7fba6..e5eb45b 100644
--- a/sys/modules/urio/Makefile
+++ b/sys/modules/urio/Makefile
@@ -1,10 +1,11 @@
-# $FreeBSD$
+# $FreeBSD$
-MAINTAINER = Iwasa Kazmi <kzmi@ca2.so-net.ne.jp>
+MAINTAINER= Iwasa Kazmi <kzmi@ca2.so-net.ne.jp>
-.PATH: ${.CURDIR}/../../dev/usb
-KMOD = urio
-SRCS = bus_if.h device_if.h vnode_if.h opt_usb.h urio.c
-NOMAN =
+.PATH: ${.CURDIR}/../../dev/usb
+
+KMOD= urio
+SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h urio.c
+NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index 6dad16d..a03d2cc 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -1,29 +1,31 @@
-# $FreeBSD$
+# $FreeBSD$
-MAINTAINER = n_hibma@freebsd.org
-S = ${.CURDIR}/../..
+MAINTAINER= n_hibma@freebsd.org
-.PATH: $S/dev/usb $S/pci
-KMOD = usb
-SRCS = bus_if.h device_if.h usb_if.h usb_if.c \
- vnode_if.h \
- opt_usb.h \
- hid.c hid.h usbhid.h \
- uhub.c \
- usb.c usb.h \
- usb_mem.h \
- usb_port.h \
- usb_quirks.c usb_quirks.h \
- usb_subr.c \
- usbdevs.h usbdevs_data.h \
- usbdi.c usbdi.h usbdivar.h \
- usbdi_util.c usbdi_util.h \
- usb_ethersubr.c
+S= ${.CURDIR}/../..
-SRCS += uhci_pci.c uhci.c uhcireg.h uhcivar.h
-SRCS += ohci_pci.c ohci.c ohcireg.h ohcivar.h
-SRCS += opt_bus.h pci_if.h
+.PATH: $S/dev/usb $S/pci
-NOMAN =
+KMOD= usb
+SRCS= bus_if.h device_if.h usb_if.h usb_if.c \
+ vnode_if.h \
+ opt_usb.h \
+ hid.c hid.h usbhid.h \
+ uhub.c \
+ usb.c usb.h \
+ usb_mem.h \
+ usb_port.h \
+ usb_quirks.c usb_quirks.h \
+ usb_subr.c \
+ usbdevs.h usbdevs_data.h \
+ usbdi.c usbdi.h usbdivar.h \
+ usbdi_util.c usbdi_util.h \
+ usb_ethersubr.c
+
+SRCS+= uhci_pci.c uhci.c uhcireg.h uhcivar.h
+SRCS+= ohci_pci.c ohci.c ohcireg.h ohcivar.h
+SRCS+= opt_bus.h pci_if.h
+
+NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/uscanner/Makefile b/sys/modules/uscanner/Makefile
index 2ceac04..239aafe 100644
--- a/sys/modules/uscanner/Makefile
+++ b/sys/modules/uscanner/Makefile
@@ -1,12 +1,13 @@
-# $FreeBSD$
+# $FreeBSD$
-MAINTAINER = n_hibma@freebsd.org
+MAINTAINER= n_hibma@freebsd.org
-.PATH: ${.CURDIR}/../../dev/usb
-KMOD = uscanner
-SRCS = bus_if.h device_if.h vnode_if.h opt_usb.h uscanner.c
-NOMAN =
+.PATH: ${.CURDIR}/../../dev/usb
-CFLAGS += -g
+KMOD= uscanner
+SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h uscanner.c
+NOMAN=
+
+CFLAGS+= -g
.include <bsd.kmod.mk>
diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile
index 3270dbc..4437531 100644
--- a/sys/modules/vesa/Makefile
+++ b/sys/modules/vesa/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/syscons ${.CURDIR}/../../i386/isa
-KMOD = vesa
-SRCS = vesa.c scvesactl.c opt_vga.h opt_vesa.h
-NOMAN =
+.PATH: ${.CURDIR}/../../dev/syscons ${.CURDIR}/../../i386/isa
+
+KMOD= vesa
+SRCS= vesa.c scvesactl.c opt_vga.h opt_vesa.h
+NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/vinum/Makefile b/sys/modules/vinum/Makefile
index b387d9b..2800e82 100644
--- a/sys/modules/vinum/Makefile
+++ b/sys/modules/vinum/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../dev/vinum
-KMOD= vinum
-SRCS= opt_vinum.h request.h vinum.c vinumconfig.c vinumdaemon.c \
+KMOD= vinum
+SRCS= opt_vinum.h request.h vinum.c vinumconfig.c vinumdaemon.c \
vinumext.h vinumhdr.h vinuminterrupt.c vinumio.c vinumio.h \
vinumioctl.c vinumkw.h vinumlock.c vinummemory.c vinumparser.c \
vinumraid5.c vinumrequest.c vinumrevive.c vinumstate.c \
vinumstate.h vinumutil.c vinumvar.h vnode_if.h
-
NOMAN=
# If you remove -DVINUMDEBUG here, you must also do it in src/sbin/Makefile.
diff --git a/sys/modules/vn/Makefile b/sys/modules/vn/Makefile
index e9117dc..7285eff 100644
--- a/sys/modules/vn/Makefile
+++ b/sys/modules/vn/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/vn
-KMOD= vn
-SRCS= vn.c vnode_if.h
+.PATH: ${.CURDIR}/../../dev/vn
+
+KMOD= vn
+SRCS= vn.c vnode_if.h
NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/vpo/Makefile b/sys/modules/vpo/Makefile
index 3934e03..f63e610 100644
--- a/sys/modules/vpo/Makefile
+++ b/sys/modules/vpo/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/ppbus
+.PATH: ${.CURDIR}/../../dev/ppbus
+
KMOD= vpo
SRCS= bus_if.h device_if.h ppbus_if.h \
opt_cam.h opt_scsi.h opt_vpo.h \
diff --git a/sys/modules/vr/Makefile b/sys/modules/vr/Makefile
index 6845bdd..fd58ab0 100644
--- a/sys/modules/vr/Makefile
+++ b/sys/modules/vr/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.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
+.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
.include <bsd.kmod.mk>
diff --git a/sys/modules/vx/Makefile b/sys/modules/vx/Makefile
index c033c6c..53a8472 100644
--- a/sys/modules/vx/Makefile
+++ b/sys/modules/vx/Makefile
@@ -1,11 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/vx
-KMOD = if_vx
-SRCS = if_vx.c if_vx_pci.c
+.PATH: ${.CURDIR}/../../dev/vx
+
+KMOD= if_vx
+SRCS= if_vx.c if_vx_pci.c
.if ${MACHINE_ARCH} == "i386"
-SRCS += if_vx_eisa.c
+SRCS+= if_vx_eisa.c
.endif
-SRCS += opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/wb/Makefile b/sys/modules/wb/Makefile
index e8b15eb..e53d986 100644
--- a/sys/modules/wb/Makefile
+++ b/sys/modules/wb/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.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
+.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
.include <bsd.kmod.mk>
diff --git a/sys/modules/wi/Makefile b/sys/modules/wi/Makefile
index 75a7770..9bf9781 100644
--- a/sys/modules/wi/Makefile
+++ b/sys/modules/wi/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../i386/isa
-KMOD = if_wi
-SRCS = if_wi.c device_if.h bus_if.h
+.PATH: ${.CURDIR}/../../i386/isa
+
+KMOD= if_wi
+SRCS= if_wi.c device_if.h bus_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/wx/Makefile b/sys/modules/wx/Makefile
index 921ec64..8ab88e1 100644
--- a/sys/modules/wx/Makefile
+++ b/sys/modules/wx/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../pci
-KMOD = if_wx
-SRCS = if_wx.c opt_bdg.h device_if.h bus_if.h pci_if.h
+.PATH: ${.CURDIR}/../../pci
+
+KMOD= if_wx
+SRCS= if_wx.c opt_bdg.h device_if.h bus_if.h pci_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile
index 903d486..3c2c162 100644
--- a/sys/modules/xl/Makefile
+++ b/sys/modules/xl/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD$
-.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
+.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
.include <bsd.kmod.mk>
OpenPOWER on IntegriCloud