summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/config.mk32
-rw-r--r--source4/ntvfs/posix/config.mk52
-rw-r--r--source4/ntvfs/unixuid/config.mk2
3 files changed, 44 insertions, 42 deletions
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index 55f8270de2..a61c84770d 100644
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -1,4 +1,6 @@
# NTVFS Server subsystem
+include posix/config.mk
+include unixuid/config.mk
################################################
# Start MODULE ntvfs_cifs
@@ -6,7 +8,7 @@
INIT_FUNCTION = ntvfs_cifs_init
SUBSYSTEM = NTVFS
INIT_OBJ_FILES = \
- ntvfs/cifs/vfs_cifs.o
+ cifs/vfs_cifs.o
REQUIRED_SUBSYSTEMS = \
LIBCLI
# End MODULE ntvfs_cifs
@@ -18,9 +20,9 @@ REQUIRED_SUBSYSTEMS = \
INIT_FUNCTION = ntvfs_simple_init
SUBSYSTEM = NTVFS
INIT_OBJ_FILES = \
- ntvfs/simple/vfs_simple.o
+ simple/vfs_simple.o
ADD_OBJ_FILES = \
- ntvfs/simple/svfs_util.o
+ simple/svfs_util.o
# End MODULE ntvfs_cifs
################################################
@@ -30,7 +32,7 @@ ADD_OBJ_FILES = \
INIT_FUNCTION = ntvfs_print_init
SUBSYSTEM = NTVFS
INIT_OBJ_FILES = \
- ntvfs/print/vfs_print.o
+ print/vfs_print.o
# End MODULE ntvfs_print
################################################
@@ -40,9 +42,9 @@ INIT_OBJ_FILES = \
SUBSYSTEM = NTVFS
INIT_FUNCTION = ntvfs_ipc_init
INIT_OBJ_FILES = \
- ntvfs/ipc/vfs_ipc.o \
- ntvfs/ipc/ipc_rap.o \
- ntvfs/ipc/rap_server.o
+ ipc/vfs_ipc.o \
+ ipc/ipc_rap.o \
+ ipc/rap_server.o
# End MODULE ntvfs_ipc
################################################
@@ -54,7 +56,7 @@ INIT_OBJ_FILES = \
SUBSYSTEM = NTVFS
INIT_FUNCTION = ntvfs_nbench_init
INIT_OBJ_FILES = \
- ntvfs/nbench/vfs_nbench.o
+ nbench/vfs_nbench.o
# End MODULE ntvfs_nbench
################################################
@@ -62,9 +64,9 @@ INIT_OBJ_FILES = \
# Start SUBSYSTEM ntvfs_common
[SUBSYSTEM::ntvfs_common]
ADD_OBJ_FILES = \
- ntvfs/common/brlock.o \
- ntvfs/common/opendb.o \
- ntvfs/common/sidmap.o
+ common/brlock.o \
+ common/opendb.o \
+ common/sidmap.o
# End SUBSYSTEM ntvfs_common
################################################
@@ -73,11 +75,11 @@ ADD_OBJ_FILES = \
# Start SUBSYSTEM NTVFS
[SUBSYSTEM::NTVFS]
INIT_OBJ_FILES = \
- ntvfs/ntvfs_base.o
+ ntvfs_base.o
ADD_OBJ_FILES = \
- ntvfs/ntvfs_generic.o \
- ntvfs/ntvfs_interface.o \
- ntvfs/ntvfs_util.o
+ ntvfs_generic.o \
+ ntvfs_interface.o \
+ ntvfs_util.o
#
# End SUBSYSTEM NTVFS
################################################
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index 9be3723056..cf406890c9 100644
--- a/source4/ntvfs/posix/config.mk
+++ b/source4/ntvfs/posix/config.mk
@@ -4,33 +4,33 @@
SUBSYSTEM = NTVFS
INIT_FUNCTION = ntvfs_posix_init
INIT_OBJ_FILES = \
- ntvfs/posix/vfs_posix.o
+ vfs_posix.o
ADD_OBJ_FILES = \
- ntvfs/posix/pvfs_util.o \
- ntvfs/posix/pvfs_search.o \
- ntvfs/posix/pvfs_dirlist.o \
- ntvfs/posix/pvfs_fileinfo.o \
- ntvfs/posix/pvfs_unlink.o \
- ntvfs/posix/pvfs_mkdir.o \
- ntvfs/posix/pvfs_open.o \
- ntvfs/posix/pvfs_read.o \
- ntvfs/posix/pvfs_flush.o \
- ntvfs/posix/pvfs_write.o \
- ntvfs/posix/pvfs_fsinfo.o \
- ntvfs/posix/pvfs_qfileinfo.o \
- ntvfs/posix/pvfs_setfileinfo.o \
- ntvfs/posix/pvfs_rename.o \
- ntvfs/posix/pvfs_resolve.o \
- ntvfs/posix/pvfs_shortname.o \
- ntvfs/posix/pvfs_lock.o \
- ntvfs/posix/pvfs_wait.o \
- ntvfs/posix/pvfs_seek.o \
- ntvfs/posix/pvfs_ioctl.o \
- ntvfs/posix/pvfs_xattr.o \
- ntvfs/posix/pvfs_streams.o \
- ntvfs/posix/pvfs_acl.o \
- ntvfs/posix/xattr_system.o \
- ntvfs/posix/xattr_tdb.o
+ pvfs_util.o \
+ pvfs_search.o \
+ pvfs_dirlist.o \
+ pvfs_fileinfo.o \
+ pvfs_unlink.o \
+ pvfs_mkdir.o \
+ pvfs_open.o \
+ pvfs_read.o \
+ pvfs_flush.o \
+ pvfs_write.o \
+ pvfs_fsinfo.o \
+ pvfs_qfileinfo.o \
+ pvfs_setfileinfo.o \
+ pvfs_rename.o \
+ pvfs_resolve.o \
+ pvfs_shortname.o \
+ pvfs_lock.o \
+ pvfs_wait.o \
+ pvfs_seek.o \
+ pvfs_ioctl.o \
+ pvfs_xattr.o \
+ pvfs_streams.o \
+ pvfs_acl.o \
+ xattr_system.o \
+ xattr_tdb.o
REQUIRED_SUBSYSTEMS = NDR_XATTR ntvfs_common EXT_LIB_XATTR EXT_LIB_BLKID
# End MODULE ntvfs_posix
################################################
diff --git a/source4/ntvfs/unixuid/config.mk b/source4/ntvfs/unixuid/config.mk
index 34c8f0c2b4..b9c8000384 100644
--- a/source4/ntvfs/unixuid/config.mk
+++ b/source4/ntvfs/unixuid/config.mk
@@ -4,7 +4,7 @@
INIT_FUNCTION = ntvfs_unixuid_init
SUBSYSTEM = NTVFS
INIT_OBJ_FILES = \
- ntvfs/unixuid/vfs_unixuid.o
+ vfs_unixuid.o
REQUIRED_SUBSYSTEMS = \
ntvfs_common
# End MODULE ntvfs_unixuid