diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-06-28 22:04:19 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-06-28 22:04:19 +1000 |
| commit | 43bf8f4546c94d19c4bb203835e91c640b553116 (patch) | |
| tree | a6707ff36ed0a8f6ab0e7d9d663d9f1d785c6666 /source4/ntvfs/posix/config.mk | |
| parent | b5808e5d65ef100a4a54e720ab4f4e1ffd80a057 (diff) | |
| parent | 98014c5668e3269a059658e433d636213e2b06e6 (diff) | |
| download | samba-43bf8f4546c94d19c4bb203835e91c640b553116.tar.gz samba-43bf8f4546c94d19c4bb203835e91c640b553116.tar.bz2 samba-43bf8f4546c94d19c4bb203835e91c640b553116.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 6479f481dbf2f5c83edec0702ece73e83b6c810e)
Diffstat (limited to 'source4/ntvfs/posix/config.mk')
| -rw-r--r-- | source4/ntvfs/posix/config.mk | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk index 0ee3e3be16..1ea4e8f97d 100644 --- a/source4/ntvfs/posix/config.mk +++ b/source4/ntvfs/posix/config.mk @@ -1,9 +1,16 @@ + +[SUBSYSTEM::pvfs_acl] + +pvfs_acl_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_acl.o + +$(eval $(call proto_header_template,$(ntvfssrcdir)/posix/vfs_acl_proto.h,$(pvfs_acl_OBJ_FILES:.o=.c))) + ################################################ # Start MODULE pvfs_acl_xattr [MODULE::pvfs_acl_xattr] INIT_FUNCTION = pvfs_acl_xattr_init -SUBSYSTEM = ntvfs -PRIVATE_DEPENDENCIES = NDR_XATTR ntvfs_posix +SUBSYSTEM = pvfs_acl +PRIVATE_DEPENDENCIES = NDR_XATTR # End MODULE pvfs_acl_xattr ################################################ @@ -13,16 +20,15 @@ pvfs_acl_xattr_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_acl_xattr.o # Start MODULE pvfs_acl_nfs4 [MODULE::pvfs_acl_nfs4] INIT_FUNCTION = pvfs_acl_nfs4_init -SUBSYSTEM = ntvfs -PRIVATE_DEPENDENCIES = NDR_NFS4ACL SAMDB ntvfs_posix +SUBSYSTEM = pvfs_acl +PRIVATE_DEPENDENCIES = NDR_NFS4ACL SAMDB # End MODULE pvfs_acl_nfs4 ################################################ pvfs_acl_nfs4_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_acl_nfs4.o ################################################ -[MODULE::pvfs_aio] -SUBSYSTEM = ntvfs +[SUBSYSTEM::pvfs_aio] PRIVATE_DEPENDENCIES = LIBAIO_LINUX ################################################ @@ -35,8 +41,8 @@ SUBSYSTEM = ntvfs OUTPUT_TYPE = MERGED_OBJ INIT_FUNCTION = ntvfs_posix_init #PRIVATE_DEPENDENCIES = pvfs_acl_xattr pvfs_acl_nfs4 -PRIVATE_DEPENDENCIES = NDR_XATTR WRAP_XATTR BLKID ntvfs_common MESSAGING pvfs_aio \ - LIBWBCLIENT +PRIVATE_DEPENDENCIES = NDR_XATTR WRAP_XATTR BLKID ntvfs_common MESSAGING \ + LIBWBCLIENT pvfs_acl pvfs_aio # End MODULE ntvfs_posix ################################################ @@ -65,7 +71,6 @@ ntvfs_posix_OBJ_FILES = $(addprefix $(ntvfssrcdir)/posix/, \ pvfs_ioctl.o \ pvfs_xattr.o \ pvfs_streams.o \ - pvfs_acl.o \ pvfs_notify.o \ xattr_system.o \ xattr_tdb.o) |