Move the pseudofs, procfs and linprocfs modules out from the fs directory.

Keeping them there seemed like a good idea at the time, but it annoys bde
and confuses people who do not understand how MODULES_OVERRIDE works.

6 files changed, 34 insertions, 31 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 355f33c..5a0e063 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -27,7 +27,6 @@ SUBDIR=	3dfx \
 	ed \
 	fdescfs \
 	fdc \
-	fs \
 	fxp \
 	gx \
 	if_disc \
@@ -50,6 +49,7 @@ SUBDIR=	3dfx \
 	lge \
 	libiconv \
 	libmchain \
+	linprocfs \
 	lnc \
 	lomac \
 	lpt \
@@ -69,6 +69,8 @@ SUBDIR=	3dfx \
 	ppbus \
 	ppi \
 	pps \
+	procfs \
+	pseudofs \
 	${_random} \
 	rl \
 	rp \
diff --git a/sys/modules/fs/Makefile b/sys/modules/fs/Makefile
deleted file mode 100644
index bedaa5a..0000000
--- a/sys/modules/fs/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-SUBDIR =
-SUBDIR += linprocfs
-SUBDIR += procfs
-SUBDIR += pseudofs
-
-.include <bsd.subdir.mk>
diff --git a/sys/modules/fs/procfs/Makefile b/sys/modules/fs/procfs/Makefile
deleted file mode 100644
index ffb2ae7..0000000
--- a/sys/modules/fs/procfs/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../../fs/procfs
-
-KMOD=	procfs
-SRCS=	vnode_if.h \
-	procfs_ctl.c \
-	procfs_dbregs.c \
-	procfs_fpregs.c \
-	procfs_ioctl.c \
-	procfs_map.c \
-	procfs_mem.c \
-	procfs_note.c \
-	procfs_regs.c \
-	procfs_rlimit.c \
-	procfs_status.c \
-	procfs_type.c \
-	procfs.c
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/fs/linprocfs/Makefile b/sys/modules/linprocfs/Makefile
index e7dced9..d26c40b 100644
--- a/sys/modules/fs/linprocfs/Makefile
+++ b/sys/modules/linprocfs/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../compat/linprocfs
+.PATH: ${.CURDIR}/../../compat/linprocfs
 
 KMOD=	linprocfs
 SRCS=	vnode_if.h \
diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile
new file mode 100644
index 0000000..75e23a0
--- /dev/null
+++ b/sys/modules/procfs/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../fs/procfs
+
+KMOD=		procfs
+SRCS=
+SRCS+=		vnode_if.h
+SRCS+=		procfs_ctl.c
+SRCS+=		procfs_dbregs.c
+SRCS+=		procfs_fpregs.c
+SRCS+=		procfs_ioctl.c
+SRCS+=		procfs_map.c
+SRCS+=		procfs_mem.c
+SRCS+=		procfs_note.c
+SRCS+=		procfs_regs.c
+SRCS+=		procfs_rlimit.c
+SRCS+=		procfs_status.c
+SRCS+=		procfs_type.c
+SRCS+=		procfs.c
+
+EXPORT_SYMS=
+EXPORT_SYMS+=	procfs_attr
+EXPORT_SYMS+=	procfs_candebug
+EXPORT_SYMS+=	procfs_docurproc
+EXPORT_SYMS+=	procfs_doprocfile
+EXPORT_SYMS+=	procfs_doprocmem
+EXPORT_SYMS+=	procfs_notsystem
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/fs/pseudofs/Makefile b/sys/modules/pseudofs/Makefile
index 906014f..d0c41ce 100644
--- a/sys/modules/fs/pseudofs/Makefile
+++ b/sys/modules/pseudofs/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../fs/pseudofs
+.PATH: ${.CURDIR}/../../fs/pseudofs
 
 KMOD=	pseudofs
 SRCS=	vnode_if.h \