Use a consistent style and one much closer to the rest of /usr/src

22 files changed, 118 insertions, 96 deletions

diff --git a/sys/modules/sound/driver/ad1816/Makefile b/sys/modules/sound/driver/ad1816/Makefile
index a506c30edf6a..9c7fa9ec5d85 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 2f6ffe173d17..892856d77c02 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 42f12c7aad8c..28634e9b0cbd 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 722ef8ef7209..9573cd9cf0c6 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 a703e1ce8138..d47cfac553a2 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 73c6ff3a36f5..5d8f7bee5616 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 b1f7abdf95a2..f2861d6d810f 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 2a6fc3be1ed3..66a73e5a0739 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 3dc1032d1528..73da252e9fd3 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 af68e151bf85..3efde20ab34e 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 facf8acec9f2..1b7f529cfb05 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 01de2704a9bb..48c68776f370 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 10e3f6d5ccbd..0eca1b772477 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 be8016c2ce18..d974bd7d88bb 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 57e0e5f3a075..bf009f7035b8 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 e610d962814d..f2b0da834c7a 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 d52e31267382..c512c8f2a8f0 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 ee73b7b356a0..faddebc49db1 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 6c0bb3fa1dc5..a02ee59d2b6d 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 947eb826304b..50e6b5c1c720 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 14443bf8c584..ea1b8ecdb1ea 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 14443bf8c584..ea1b8ecdb1ea 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>