Create a MACHINE_ARCH == i386 section that first lists modules common

to both i386 and pc98 and then uses MACHINE subsections to list modules
specific to i386/i386 and i386/pc98.

1 files changed, 24 insertions, 59 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index ae05814..b9a7a31 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -149,28 +149,17 @@ SUBDIR+=syscons
 
 # XXX some of these can move to the general case when de-i386'ed
 # XXX some of these can move now, but are untested on other architectures.
-.if ${MACHINE} == "i386"
-SUBDIR+=aac \
-	acpi \
-	aic \
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+=aic \
 	aout \
 	apm \
 	ar \
 	arcnet \
-	asr \
-	atspeaker \
 	bktr \
-	cardbus \
-	cbb \
-	ciss \
-	cm \
 	coff \
-	drm \
 	ed \
-	el \
 	em \
 	ep \
-	exca \
 	fe \
 	firewire \
 	fpu \
@@ -178,12 +167,10 @@ SUBDIR+=aac \
 	hea \
 	hfa \
 	ibcs2 \
-	iir \
 	linprocfs \
 	linux \
 	lnc \
 	lomac \
-	mly \
 	ncv \
 	netgraph \
 	nsp \
@@ -191,8 +178,6 @@ SUBDIR+=aac \
 	pccard \
 	pecoff \
 	ray \
-	rc \
-	s3 \
 	sbni \
 	scsi_low \
 	smbfs \
@@ -202,53 +187,33 @@ SUBDIR+=aac \
 	sr \
 	stg \
 	streams \
-	vesa \
 	vinum \
 	wi \
 	xe
-.endif
 
-.if ${MACHINE} == "pc98"
-SUBDIR+=aic \
-	aout \
-	apm \
-	ar \
-	arcnet \
-	bktr \
-	coff \
-	em \
-	ep \
-	fe \
-	fpu \
-	gnufpu \
-	hea \
-	hfa \
-	ibcs2 \
-	linprocfs \
-	linux \
-	lomac \
-	ncv \
-	netgraph \
-	nsp \
-	oltr \
-	pccard \
-	pcspeaker \
-	pecoff \
+.if ${MACHINE} == "i386"
+SUBDIR+=aac \
+	acpi \
+	asr \
+	atspeaker \
+	cardbus \
+	cbb \
+	ciss \
+	cm \
+	drm \
+	el \
+	exca \
+	iir \
+	mly \
+	rc \
+	s3 \
+	vesa
+	
+.elif ${MACHINE} == "pc98"
+SUBDIR+=pcspeaker \
 	pmc \
-	ray \
-	sbni \
-	scsi_low \
-	smbfs \
-	snc \
-	sound \
-	splash \
-	sppp \
-	sr \
-	stg \
-	streams \
-	vinum \
-	wi \
-	xe
+	snc
+.endif
 .endif
 
 .if ${MACHINE_ARCH} == "ia64"