6 files changed, 7 insertions, 22 deletions
diff --git a/source4/ntvfs/config.m4 b/source4/ntvfs/config.m4
deleted file mode 100644
index dd8e60adde..0000000000
--- a/source4/ntvfs/config.m4
+++ /dev/null
@@ -1,19 +0,0 @@
-dnl # NTVFS Server subsystem
-
-SMB_INCLUDE_M4(ntvfs/posix/config.m4)
-SMB_MODULE_MK(ntvfs_posix, NTVFS, STATIC, ntvfs/posix/config.mk)
-
-SMB_INCLUDE_M4(ntvfs/unixuid/config.m4)
-SMB_MODULE_MK(ntvfs_unixuid, NTVFS, STATIC, ntvfs/unixuid/config.mk)
-
-SMB_MODULE_MK(ntvfs_cifs, NTVFS, STATIC, ntvfs/config.mk)
-
-SMB_MODULE_MK(ntvfs_simple, NTVFS, STATIC, ntvfs/config.mk)
-
-SMB_MODULE_MK(ntvfs_print, NTVFS, STATIC, ntvfs/config.mk)
-
-SMB_MODULE_MK(ntvfs_ipc, NTVFS, STATIC, ntvfs/config.mk)
-
-SMB_MODULE_MK(ntvfs_nbench, NTVFS, STATIC, ntvfs/config.mk)
-
-SMB_SUBSYSTEM_MK(NTVFS,ntvfs/config.mk)
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index c15470076f..14215004ea 100644
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -4,6 +4,7 @@
 # Start MODULE ntvfs_cifs
 [MODULE::ntvfs_cifs]
 INIT_FUNCTION = ntvfs_cifs_init 
+SUBSYSTEM = NTVFS
 INIT_OBJ_FILES = \
 		ntvfs/cifs/vfs_cifs.o
 REQUIRED_SUBSYSTEMS = \
@@ -15,6 +16,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE ntvfs_simple
 [MODULE::ntvfs_simple]
 INIT_FUNCTION = ntvfs_simple_init 
+SUBSYSTEM = NTVFS
 INIT_OBJ_FILES = \
 		ntvfs/simple/vfs_simple.o
 ADD_OBJ_FILES = \
@@ -26,6 +28,7 @@ ADD_OBJ_FILES = \
 # Start MODULE ntvfs_print
 [MODULE::ntvfs_print]
 INIT_FUNCTION = ntvfs_print_init 
+SUBSYSTEM = NTVFS
 INIT_OBJ_FILES = \
 		ntvfs/print/vfs_print.o
 # End MODULE ntvfs_print
@@ -34,6 +37,7 @@ INIT_OBJ_FILES = \
 ################################################
 # Start MODULE ntvfs_ipc
 [MODULE::ntvfs_ipc]
+SUBSYSTEM = NTVFS
 INIT_FUNCTION = ntvfs_ipc_init 
 INIT_OBJ_FILES = \
 		ntvfs/ipc/vfs_ipc.o \
@@ -47,6 +51,7 @@ INIT_OBJ_FILES = \
 ################################################
 # Start MODULE ntvfs_nbench
 [MODULE::ntvfs_nbench]
+SUBSYSTEM = NTVFS
 INIT_FUNCTION = ntvfs_nbench_init 
 INIT_OBJ_FILES = \
 		ntvfs/nbench/vfs_nbench.o
diff --git a/source4/ntvfs/posix/config.m4 b/source4/ntvfs/posix/config.m4
index 975da5f2a9..d39acbe85e 100644
--- a/source4/ntvfs/posix/config.m4
+++ b/source4/ntvfs/posix/config.m4
@@ -30,5 +30,3 @@ AC_SEARCH_LIBS(flistxattr, [attr])
 if test x"$ac_cv_func_flistxattr" = x"yes"; then
 	AC_DEFINE(HAVE_XATTR_SUPPORT,1,[Whether we have xattr support])
 fi
-
-SMB_MODULE_MK(ntvfs_posix, NTVFS, STATIC, ntvfs/config.mk)
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index f54d2e24fb..74e991d9bd 100644
--- a/source4/ntvfs/posix/config.mk
+++ b/source4/ntvfs/posix/config.mk
@@ -1,6 +1,7 @@
 ################################################
 # Start MODULE ntvfs_posix
 [MODULE::ntvfs_posix]
+SUBSYSTEM = NTVFS
 INIT_FUNCTION = ntvfs_posix_init 
 INIT_OBJ_FILES = \
 		ntvfs/posix/vfs_posix.o
diff --git a/source4/ntvfs/unixuid/config.m4 b/source4/ntvfs/unixuid/config.m4
index 61e7db3d91..2c6777f68e 100644
--- a/source4/ntvfs/unixuid/config.m4
+++ b/source4/ntvfs/unixuid/config.m4
@@ -1,4 +1,3 @@
-SMB_MODULE_MK(ntvfs_unixuid, NTVFS, STATIC, ntvfs/config.mk)
 
 
 ################################################
diff --git a/source4/ntvfs/unixuid/config.mk b/source4/ntvfs/unixuid/config.mk
index 611be650d1..3df3194688 100644
--- a/source4/ntvfs/unixuid/config.mk
+++ b/source4/ntvfs/unixuid/config.mk
@@ -2,6 +2,7 @@
 # Start MODULE ntvfs_unixuid
 [MODULE::ntvfs_unixuid]
 INIT_FUNCTION = ntvfs_unixuid_init
+SUBSYSTEM = NTVFS
 INIT_OBJ_FILES = \
 		ntvfs/unixuid/vfs_unixuid.o
 # End MODULE ntvfs_unixuid