Don't build unused SBus front-ends for sun4v, don't build EBus front-ends

which are also likely to be irrelevant for sun4v (there's no SBus on sun4v
and only some EBus devices). While at it fix some style bugs according to
style.Makefile(5) where appropriate.

MFC after:	3 days

8 files changed, 26 insertions, 23 deletions

diff --git a/sys/modules/esp/Makefile b/sys/modules/esp/Makefile
index 2685b09..2171d85 100644
--- a/sys/modules/esp/Makefile
+++ b/sys/modules/esp/Makefile
@@ -1,15 +1,13 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../dev/esp ${.CURDIR}/../../sparc64/sbus
+.PATH: ${.CURDIR}/../../dev/esp
 
 KMOD=	esp
+SRCS=	device_if.h ${esp_sbus} bus_if.h ncr53c9x.c ${ofw_bus_if} opt_cam.h
 
-SRCS=	ncr53c9x.c
-SRCS+=	opt_ddb.h opt_cam.h
-SRCS+=	device_if.h bus_if.h
-
-.if ${MACHINE_ARCH} == "sparc64"
-SRCS+=	esp_sbus.c ofw_bus_if.h
+.if ${MACHINE} == "sparc64"
+ofw_bus_if=	ofw_bus_if.h
+esp_sbus=	esp_sbus.c
 .endif
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hfa/Makefile b/sys/modules/hfa/Makefile
index 9640830..5e02623 100644
--- a/sys/modules/hfa/Makefile
+++ b/sys/modules/hfa/Makefile
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
-SUBDIR=	hfa pci
+SUBDIR=	${eisa} hfa pci ${sbus}
 
 .ifdef notyet
 .if ${MACHINE_ARCH} == "i386"
-SUBDIR+=eisa
+eisa=	eisa
 .endif
 
-.if ${MACHINE_ARCH} == "sparc64"
-SUBDIR+=sbus
+.if ${MACHINE} == "sparc64"
+sbus=	sbus
 .endif
 .endif
 
diff --git a/sys/modules/hme/Makefile b/sys/modules/hme/Makefile
index 8f40371..4656281 100644
--- a/sys/modules/hme/Makefile
+++ b/sys/modules/hme/Makefile
@@ -3,10 +3,12 @@
 .PATH: ${.CURDIR}/../../dev/hme
 
 KMOD=	if_hme
-SRCS=	bus_if.h device_if.h if_hme.c if_hme_pci.c miibus_if.h pci_if.h
+SRCS=	bus_if.h device_if.h if_hme.c if_hme_pci.c ${if_hme_sbus} miibus_if.h
+SRCS+=	${ofw_bus_if} pci_if.h
 
-.if ${MACHINE_ARCH} == "sparc64"
-SRCS+=	if_hme_sbus.c ofw_bus_if.h
+.if ${MACHINE} == "sparc64"
+if_hme_sbus=	if_hme_sbus.c
+ofw_bus_if=	ofw_bus_if.h
 .endif
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/isp/Makefile b/sys/modules/isp/Makefile
index fbdf1b4..1caeef6 100644
--- a/sys/modules/isp/Makefile
+++ b/sys/modules/isp/Makefile
@@ -7,7 +7,7 @@ SRCS=	bus_if.h device_if.h pci_if.h \
 	opt_cam.h opt_ddb.h opt_isp.h \
 	isp.c isp_library.c isp_target.c isp_freebsd.c isp_pci.c
 
-.if ${MACHINE_ARCH} == sparc64
+.if ${MACHINE} == sparc64
 SRCS+=	isp_sbus.c ofw_bus_if.h
 .endif
 
diff --git a/sys/modules/ispfw/Makefile b/sys/modules/ispfw/Makefile
index 62bbb2e..5d6263c 100644
--- a/sys/modules/ispfw/Makefile
+++ b/sys/modules/ispfw/Makefile
@@ -39,7 +39,7 @@ SUBDIR += isp_2200
 SUBDIR += isp_2300
 SUBDIR += isp_2322
 SUBDIR += isp_2400
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE} == "sparc64"
 SUBDIR += isp_1000
 .endif
 
diff --git a/sys/modules/le/Makefile b/sys/modules/le/Makefile
index d3101e1..dd202fb 100644
--- a/sys/modules/le/Makefile
+++ b/sys/modules/le/Makefile
@@ -16,7 +16,7 @@ if_le_isa=	if_le_isa.c
 isa_if=		isa_if.h
 .endif
 
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE} == "sparc64"
 if_le_lebuffer=	if_le_lebuffer.c
 if_le_ledma=	if_le_ledma.c
 lebuffer_sbus=	lebuffer_sbus.c
diff --git a/sys/modules/scc/Makefile b/sys/modules/scc/Makefile
index fe38cde..c1678b7 100644
--- a/sys/modules/scc/Makefile
+++ b/sys/modules/scc/Makefile
@@ -2,7 +2,7 @@
 
 .PATH: ${.CURDIR}/../../dev/scc
 
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE} == "sparc64"
 scc_bfe= scc_bfe_ebus.c scc_bfe_sbus.c
 .endif
 .if ${MACHINE_ARCH} == "powerpc"
diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile
index 711f7a8..3bff2ff 100644
--- a/sys/modules/sound/driver/Makefile
+++ b/sys/modules/sound/driver/Makefile
@@ -1,12 +1,15 @@
 # $FreeBSD$
 
 .if ${MACHINE_ARCH} == "sparc64"
-SUBDIR  = audiocs es137x
+.if ${MACHINE} == "sparc64"
+audiocs=	audiocs
+.endif
+SUBDIR=	${audiocs} es137x
 .else
-SUBDIR  = ad1816 als4000 atiixp cmi cs4281 csa ds1 emu10k1 emu10kx envy24
-SUBDIR += envy24ht es137x ess fm801 hda ich maestro maestro3 mss neomagic
-SUBDIR += sb16 sb8 sbc solo spicds t4dwave via8233 via82c686 vibes
-SUBDIR += driver uaudio
+SUBDIR=	ad1816 als4000 atiixp cmi cs4281 csa ds1 emu10k1 emu10kx envy24
+SUBDIR=	envy24ht es137x ess fm801 hda ich maestro maestro3 mss neomagic
+SUBDIR=	sb16 sb8 sbc solo spicds t4dwave via8233 via82c686 vibes
+SUBDIR=	driver uaudio
 .endif
 
 .include <bsd.subdir.mk>