Use _OBJ_FILES variables in a couple more places.

[samba.git] / source4 / ntvfs / posix / config.mk

diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index 88048c2af7baf842b73afb0cf10f478c561f5cf9..865a0ffd4a3941d67b01eceb8af3f30aaf21edd4 100644 (file)
--- a/source4/ntvfs/posix/config.mk
+++ b/source4/ntvfs/posix/config.mk
@@ -3,30 +3,31 @@
 [MODULE::pvfs_acl_xattr]
 INIT_FUNCTION = pvfs_acl_xattr_init 
 SUBSYSTEM = ntvfs
-OBJ_FILES = \
-               pvfs_acl_xattr.o
 PRIVATE_DEPENDENCIES = NDR_XATTR ntvfs_posix
 # End MODULE pvfs_acl_xattr
 ################################################
 
+pvfs_acl_xattr_OBJ_FILES = ntvfs/posix/pvfs_acl_xattr.o
+
 ################################################
 # Start MODULE pvfs_acl_nfs4
 [MODULE::pvfs_acl_nfs4]
 INIT_FUNCTION = pvfs_acl_nfs4_init 
 SUBSYSTEM = ntvfs
-OBJ_FILES = \
-               pvfs_acl_nfs4.o
 PRIVATE_DEPENDENCIES = NDR_NFS4ACL SAMDB ntvfs_posix
 # End MODULE pvfs_acl_nfs4
 ################################################
 
+pvfs_acl_nfs4_OBJ_FILES = ntvfs/posix/pvfs_acl_nfs4.o
+
 ################################################
 [MODULE::pvfs_aio]
 SUBSYSTEM = ntvfs
-OBJ_FILES = pvfs_aio.o
 PRIVATE_DEPENDENCIES = LIBAIO_LINUX
 ################################################
 
+pvfs_aio_OBJ_FILES = ntvfs/posix/pvfs_aio.o
+
 ################################################
 # Start MODULE ntvfs_posix
 [MODULE::ntvfs_posix]
@@ -34,7 +35,13 @@ SUBSYSTEM = ntvfs
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = ntvfs_posix_init 
 PRIVATE_PROTO_HEADER = vfs_posix_proto.h
-OBJ_FILES = \
+#PRIVATE_DEPENDENCIES = pvfs_acl_xattr pvfs_acl_nfs4
+PRIVATE_DEPENDENCIES = NDR_XATTR WRAP_XATTR BLKID ntvfs_common MESSAGING pvfs_aio \
+                                          LIBWBCLIENT
+# End MODULE ntvfs_posix
+################################################
+
+ntvfs_posix_OBJ_FILES = $(addprefix ntvfs/posix/, \
                vfs_posix.o \
                pvfs_util.o \
                pvfs_search.o \
@@ -62,8 +69,5 @@ OBJ_FILES = \
                pvfs_acl.o \
                pvfs_notify.o \
                xattr_system.o \
-               xattr_tdb.o
-#PRIVATE_DEPENDENCIES = pvfs_acl_xattr pvfs_acl_nfs4
-PRIVATE_DEPENDENCIES = NDR_XATTR WRAP_XATTR BLKID ntvfs_common MESSAGING pvfs_aio
-# End MODULE ntvfs_posix
-################################################
+               xattr_tdb.o)
+