Instead of making a single geom_part.ko module, make a module

for each partitioning scheme. The gpart code is currently non-
optional.

6 files changed, 66 insertions, 15 deletions

diff --git a/sys/modules/geom/geom_part/Makefile b/sys/modules/geom/geom_part/Makefile
index 59656d6..9d9e385 100644
--- a/sys/modules/geom/geom_part/Makefile
+++ b/sys/modules/geom/geom_part/Makefile
@@ -1,18 +1,9 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../geom/part
+SUBDIR=	geom_part_apm \
+	geom_part_bsd \
+	geom_part_gpt \
+	geom_part_mbr \
+	geom_part_vtoc8
 
-KMOD=	geom_part
-SRCS=	g_part.c \
-	g_part_if.c g_part_if.h \
-	g_part_apm.c \
-	g_part_bsd.c \
-	g_part_gpt.c \
-	g_part_mbr.c \
-	g_part_vtoc8.c
-
-SRCS+=	bus_if.h device_if.h
-
-MFILES=	kern/bus_if.m kern/device_if.m geom/part/g_part_if.m
-
-.include <bsd.kmod.mk>
+.include <bsd.subdir.mk>
diff --git a/sys/modules/geom/geom_part/geom_part_apm/Makefile b/sys/modules/geom/geom_part/geom_part_apm/Makefile
new file mode 100644
index 0000000..666cf92
--- /dev/null
+++ b/sys/modules/geom/geom_part/geom_part_apm/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../../geom/part
+
+KMOD=	geom_part_apm
+SRCS=	g_part_apm.c
+
+SRCS+=	bus_if.h device_if.h g_part_if.h
+
+MFILES=	kern/bus_if.m kern/device_if.m geom/part/g_part_if.m
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_part/geom_part_bsd/Makefile b/sys/modules/geom/geom_part/geom_part_bsd/Makefile
new file mode 100644
index 0000000..2a10b34
--- /dev/null
+++ b/sys/modules/geom/geom_part/geom_part_bsd/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../../geom/part
+
+KMOD=	geom_part_bsd
+SRCS=	g_part_bsd.c
+
+SRCS+=	bus_if.h device_if.h g_part_if.h
+
+MFILES=	kern/bus_if.m kern/device_if.m geom/part/g_part_if.m
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_part/geom_part_gpt/Makefile b/sys/modules/geom/geom_part/geom_part_gpt/Makefile
new file mode 100644
index 0000000..05f77c0
--- /dev/null
+++ b/sys/modules/geom/geom_part/geom_part_gpt/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../../geom/part
+
+KMOD=	geom_part_gpt
+SRCS=	g_part_gpt.c
+
+SRCS+=	bus_if.h device_if.h g_part_if.h
+
+MFILES=	kern/bus_if.m kern/device_if.m geom/part/g_part_if.m
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_part/geom_part_mbr/Makefile b/sys/modules/geom/geom_part/geom_part_mbr/Makefile
new file mode 100644
index 0000000..98ae1da
--- /dev/null
+++ b/sys/modules/geom/geom_part/geom_part_mbr/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../../geom/part
+
+KMOD=	geom_part_mbr
+SRCS=	g_part_mbr.c
+
+SRCS+=	bus_if.h device_if.h g_part_if.h
+
+MFILES=	kern/bus_if.m kern/device_if.m geom/part/g_part_if.m
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile b/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile
new file mode 100644
index 0000000..1f13bdf
--- /dev/null
+++ b/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../../geom/part
+
+KMOD=	geom_part_vtoc8
+SRCS=	g_part_vtoc8.c
+
+SRCS+=	bus_if.h device_if.h g_part_if.h
+
+MFILES=	kern/bus_if.m kern/device_if.m geom/part/g_part_if.m
+
+.include <bsd.kmod.mk>