summaryrefslogtreecommitdiff
path: root/source3/Makefile.in
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-07-27 12:09:40 -0700
committerJeremy Allison <jra@samba.org>2009-07-27 12:09:40 -0700
commit9297b975f58a6c8a8609e05d0bed7b4846a2be32 (patch)
tree129ac7e913e6b9245c626f6b2b97fb57b21333f6 /source3/Makefile.in
parent67d9130c134e885c17242596aacd2f265737d805 (diff)
downloadsamba-9297b975f58a6c8a8609e05d0bed7b4846a2be32.tar.gz
samba-9297b975f58a6c8a8609e05d0bed7b4846a2be32.tar.bz2
samba-9297b975f58a6c8a8609e05d0bed7b4846a2be32.zip
Fix the build breakage by #including modules/vfs_acl_common.c
into acl_tdb and acl_xattr. Duplicates the code size, but keeps the code in common so I don't have to do bug fixes in two places (which is what I really cared about). Jeremy.
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r--source3/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index b963511b39..e6d0cf00dd 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -706,8 +706,8 @@ VFS_FILEID_OBJ = modules/vfs_fileid.o
VFS_AIO_FORK_OBJ = modules/vfs_aio_fork.o
VFS_PREOPEN_OBJ = modules/vfs_preopen.o
VFS_SYNCOPS_OBJ = modules/vfs_syncops.o
-VFS_ACL_XATTR_OBJ = modules/vfs_acl_xattr.o modules/vfs_acl_common.o
-VFS_ACL_TDB_OBJ = modules/vfs_acl_tdb.o modules/vfs_acl_common.o
+VFS_ACL_XATTR_OBJ = modules/vfs_acl_xattr.o
+VFS_ACL_TDB_OBJ = modules/vfs_acl_tdb.o
VFS_SMB_TRAFFIC_ANALYZER_OBJ = modules/vfs_smb_traffic_analyzer.o
VFS_ONEFS_OBJ = modules/vfs_onefs.o modules/onefs_acl.o modules/onefs_system.o \
modules/onefs_open.o modules/onefs_streams.o modules/onefs_dir.o \