vfs: Remove smb_traffic_analyzer
[samba.git] / source3 / modules / wscript_build
index 8b6af85b90506f561b0614264098f71bcd507c79..635b780cb9f1d28eac1bc82862cf8f0096c8a609 100644 (file)
 #!/usr/bin/env python
 
-VFS_DEFAULT_SRC = '''vfs_default.c'''
-VFS_AUDIT_SRC = '''vfs_audit.c'''
-VFS_EXTD_AUDIT_SRC = '''vfs_extd_audit.c'''
-VFS_FULL_AUDIT_SRC = '''vfs_full_audit.c'''
-VFS_FAKE_PERMS_SRC = '''vfs_fake_perms.c'''
-VFS_RECYCLE_SRC = '''vfs_recycle.c'''
-VFS_NETATALK_SRC = '''vfs_netatalk.c'''
-VFS_DEFAULT_QUOTA_SRC = '''vfs_default_quota.c'''
-VFS_READONLY_SRC = '''vfs_readonly.c getdate.c'''
-VFS_CAP_SRC = '''vfs_cap.c'''
-VFS_EXPAND_MSDFS_SRC = '''vfs_expand_msdfs.c'''
-VFS_SHADOW_COPY_SRC = '''vfs_shadow_copy.c'''
-VFS_SHADOW_COPY2_SRC = '''vfs_shadow_copy2.c'''
-VFS_AFSACL_SRC = '''vfs_afsacl.c'''
-VFS_XATTR_TDB_SRC = '''vfs_xattr_tdb.c'''
-VFS_POSIXACL_SRC = '''vfs_posixacl.c'''
-VFS_AIXACL_SRC = '''vfs_aixacl.c'''
-VFS_AIXACL2_SRC = '''vfs_aixacl2.c'''
-VFS_SOLARISACL_SRC = '''vfs_solarisacl.c'''
-VFS_ZFSACL_SRC = '''vfs_zfsacl.c'''
-VFS_HPUXACL_SRC = '''vfs_hpuxacl.c'''
-VFS_IRIXACL_SRC = '''vfs_irixacl.c'''
-VFS_TRU64ACL_SRC = '''vfs_tru64acl.c'''
-VFS_CATIA_SRC = 'vfs_catia.c'
-VFS_STREAMS_XATTR_SRC = 'vfs_streams_xattr.c'
-VFS_STREAMS_DEPOT_SRC = 'vfs_streams_depot.c'
-VFS_CACHEPRIME_SRC = 'vfs_cacheprime.c'
-VFS_PREALLOC_SRC = 'vfs_prealloc.c'
-VFS_COMMIT_SRC = 'vfs_commit.c'
-VFS_GPFS_SRC = 'vfs_gpfs.c gpfs.c'
-VFS_NOTIFY_FAM_SRC = 'vfs_notify_fam.c'
-VFS_READAHEAD_SRC = 'vfs_readahead.c'
-VFS_TSMSM_SRC = 'vfs_tsmsm.c'
-VFS_FILEID_SRC = 'vfs_fileid.c'
-VFS_AIO_FORK_SRC = 'vfs_aio_fork.c'
-VFS_PREOPEN_SRC = 'vfs_preopen.c'
-VFS_SYNCOPS_SRC = 'vfs_syncops.c'
-VFS_ACL_XATTR_SRC = 'vfs_acl_xattr.c'
-VFS_ACL_TDB_SRC = 'vfs_acl_tdb.c'
-VFS_SMB_TRAFFIC_ANALYZER_SRC = 'vfs_smb_traffic_analyzer.c'
-VFS_ONEFS_SRC = '''vfs_onefs.c onefs_acl.c onefs_system.c
-                onefs_open.c onefs_streams.c onefs_dir.c
-                onefs_cbrl.c onefs_notify.c onefs_config.c'''
-VFS_ONEFS_SHADOW_COPY_SRC = 'vfs_onefs_shadow_copy.c onefs_shadow_copy.c'
-VFS_DIRSORT_SRC = 'vfs_dirsort.c'
-VFS_SCANNEDONLY_SRC = 'vfs_scannedonly.c'
-VFS_CROSSRENAME_SRC = 'vfs_crossrename.c'
-VFS_LINUX_XFS_SGID_SRC = 'vfs_linux_xfs_sgid.c'
-VFS_TIME_AUDIT_SRC = 'vfs_time_audit.c'
-
-
-bld.SAMBA_SUBSYSTEM('NFS4_ACLS',
-                    source='nfs4_acls.c')
-
-bld.SAMBA_SUBSYSTEM('VFS_AIXACL_UTIL',
+bld.SAMBA3_SUBSYSTEM('NFS4_ACLS',
+                    source='nfs4_acls.c',
+                    deps='samba-util tdb')
+
+bld.SAMBA3_LIBRARY('non_posix_acls',
+                   source='non_posix_acls.c',
+                   deps='samba-util vfs',
+                   private_library=True)
+
+bld.SAMBA3_SUBSYSTEM('VFS_AIXACL_UTIL',
                     source='vfs_aixacl_util.c',
-                    enabled=False) #fixme
+                    enabled=(bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl') or bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl2')))
 
-bld.SAMBA_SUBSYSTEM('vfs',
+bld.SAMBA3_SUBSYSTEM('vfs',
                     source='',
-                    deps='',
-                    vars=locals())
+                    deps='smbd_base')
 
-bld.SAMBA_MODULE('vfs_default',
+bld.SAMBA3_MODULE('vfs_default',
                  subsystem='vfs',
-                 source=VFS_DEFAULT_SRC,
+                 source='vfs_default.c',
+                 deps='samba-util NDR_DFSBLOBS',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_DEFAULT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_DEFAULT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default'))
 
-bld.SAMBA_MODULE('vfs_audit',
+bld.SAMBA3_MODULE('vfs_audit',
                  subsystem='vfs',
-                 source=VFS_AUDIT_SRC,
+                 source='vfs_audit.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AUDIT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AUDIT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_audit'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_audit'))
 
-bld.SAMBA_MODULE('vfs_extd_audit',
+bld.SAMBA3_MODULE('vfs_extd_audit',
                  subsystem='vfs',
-                 source=VFS_EXTD_AUDIT_SRC,
+                 source='vfs_extd_audit.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_EXTD_AUDIT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_EXTD_AUDIT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_extd_audit'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_extd_audit'))
 
-bld.SAMBA_MODULE('vfs_full_audit',
+bld.SAMBA3_MODULE('vfs_full_audit',
                  subsystem='vfs',
-                 source=VFS_FULL_AUDIT_SRC,
+                 source='vfs_full_audit.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_FULL_AUDIT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_FULL_AUDIT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_full_audit'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_full_audit'))
 
-bld.SAMBA_MODULE('vfs_fake_perms',
+bld.SAMBA3_MODULE('vfs_fake_perms',
                  subsystem='vfs',
-                 source=VFS_FAKE_PERMS_SRC,
-                 deps='acl attr',
+                 source='vfs_fake_perms.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_FAKE_PERMS'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_FAKE_PERMS'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_perms'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_perms'))
 
-bld.SAMBA_MODULE('vfs_recycle',
+bld.SAMBA3_MODULE('vfs_fake_acls',
                  subsystem='vfs',
-                 source=VFS_RECYCLE_SRC,
+                 source='vfs_fake_acls.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_RECYCLE'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_RECYCLE'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_acls'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_acls'))
 
-bld.SAMBA_MODULE('vfs_netatalk',
+bld.SAMBA3_MODULE('vfs_recycle',
                  subsystem='vfs',
-                 source=VFS_NETATALK_SRC,
+                 source='vfs_recycle.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_NETATALK'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_NETATALK'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_recycle'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_recycle'))
 
-bld.SAMBA_MODULE('vfs_default_quota',
+bld.SAMBA3_MODULE('vfs_netatalk',
                  subsystem='vfs',
-                 source=VFS_DEFAULT_QUOTA_SRC,
+                 source='vfs_netatalk.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_DEFAULT_QUOTA'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_DEFAULT_QUOTA'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_netatalk'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_netatalk'))
 
-bld.SAMBA_MODULE('vfs_readonly',
+bld.SAMBA3_MODULE('vfs_fruit',
                  subsystem='vfs',
-                 source=VFS_READONLY_SRC,
+                 source='vfs_fruit.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_READONLY'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_READONLY'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fruit'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fruit'))
 
-bld.SAMBA_MODULE('vfs_cap',
+bld.SAMBA3_MODULE('vfs_default_quota',
                  subsystem='vfs',
-                 source=VFS_CAP_SRC,
+                 source='vfs_default_quota.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CAP'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CAP'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default_quota'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default_quota'))
 
-bld.SAMBA_MODULE('vfs_expand_msdfs',
+bld.SAMBA3_MODULE('vfs_readonly',
                  subsystem='vfs',
-                 source=VFS_EXPAND_MSDFS_SRC,
+                 source='vfs_readonly.c getdate.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_EXPAND_MSDFS'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_EXPAND_MSDFS'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readonly'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readonly'))
 
-bld.SAMBA_MODULE('vfs_shadow_copy',
+bld.SAMBA3_MODULE('vfs_cap',
                  subsystem='vfs',
-                 source=VFS_SHADOW_COPY_SRC,
+                 source='vfs_cap.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SHADOW_COPY'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SHADOW_COPY'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cap'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_cap'))
 
-bld.SAMBA_MODULE('vfs_shadow_copy2',
+bld.SAMBA3_MODULE('vfs_expand_msdfs',
                  subsystem='vfs',
-                 source=VFS_SHADOW_COPY2_SRC,
+                 source='vfs_expand_msdfs.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SHADOW_COPY2'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SHADOW_COPY2'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_expand_msdfs'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_expand_msdfs'))
 
-bld.SAMBA_MODULE('vfs_afsacl',
+bld.SAMBA3_MODULE('vfs_shadow_copy',
                  subsystem='vfs',
-                 source=VFS_AFSACL_SRC,
+                 source='vfs_shadow_copy.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AFSACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AFSACL'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shadow_copy'))
 
-bld.SAMBA_MODULE('vfs_xattr_tdb',
+bld.SAMBA3_MODULE('vfs_shadow_copy2',
                  subsystem='vfs',
-                 source=VFS_XATTR_TDB_SRC,
-                 deps='NDR_XATTR',
+                 source='vfs_shadow_copy2.c',
+                 allow_warnings=True,
+                 deps='samba-util tdb',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_XATTR_TDB'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_XATTR_TDB'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy2'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shadow_copy2'))
 
-bld.SAMBA_MODULE('vfs_posixacl',
+bld.SAMBA3_MODULE('vfs_afsacl',
                  subsystem='vfs',
-                 source=VFS_POSIXACL_SRC,
-                 deps='acl attr',
+                 source='vfs_afsacl.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_POSIXACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_POSIXACL'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_afsacl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_afsacl'))
 
-bld.SAMBA_MODULE('vfs_aixacl',
+bld.SAMBA3_MODULE('vfs_xattr_tdb',
                  subsystem='vfs',
-                 source=VFS_AIXACL_SRC,
-                 deps='VFS_AIXACL_UTIL',
+                 source='vfs_xattr_tdb.c',
+                 deps='dbwrap xattr_tdb',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AIXACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AIXACL'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_xattr_tdb'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_xattr_tdb'))
 
-bld.SAMBA_MODULE('vfs_aixacl2',
+bld.SAMBA3_MODULE('vfs_posix_eadb',
                  subsystem='vfs',
-                 source=VFS_AIXACL2_SRC,
-                 deps='NFS4_ACLS VFS_AIXACL_UTIL',
+                 source='vfs_posix_eadb.c',
+                 deps='tdb-wrap posix_eadb',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AIXACL2'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AIXACL2'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_posix_eadb') and bld.AD_DC_BUILD_IS_ENABLED(),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_posix_eadb') and bld.AD_DC_BUILD_IS_ENABLED())
 
-bld.SAMBA_MODULE('vfs_solarisacl',
+bld.SAMBA3_MODULE('vfs_posixacl',
                  subsystem='vfs',
-                 source=VFS_SOLARISACL_SRC,
+                 source='vfs_posixacl.c',
+                 deps='acl attr',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SOLARISACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SOLARISACL'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_posixacl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_posixacl'))
 
-bld.SAMBA_MODULE('vfs_zfsacl',
+bld.SAMBA3_MODULE('vfs_aixacl',
                  subsystem='vfs',
-                 source=VFS_ZFSACL_SRC,
-                 deps='NFS4_ACLS',
+                 source='vfs_aixacl.c',
+                 deps='VFS_AIXACL_UTIL',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ZFSACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ZFSACL'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aixacl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl'))
 
-bld.SAMBA_MODULE('vfs_hpuxacl',
+bld.SAMBA3_MODULE('vfs_aixacl2',
                  subsystem='vfs',
-                 source=VFS_HPUXACL_SRC,
+                 source='vfs_aixacl2.c',
+                 deps='NFS4_ACLS VFS_AIXACL_UTIL',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_HPUXACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_HPUXACL'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aixacl2'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl2'))
 
-bld.SAMBA_MODULE('vfs_irixacl',
+bld.SAMBA3_MODULE('vfs_solarisacl',
                  subsystem='vfs',
-                 source=VFS_IRIXACL_SRC,
+                 source='vfs_solarisacl.c',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_IRIXACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_IRIXACL'))
+                 deps='sec',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_solarisacl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_solarisacl'))
 
-bld.SAMBA_MODULE('vfs_tru64acl',
+bld.SAMBA3_MODULE('vfs_zfsacl',
                  subsystem='vfs',
-                 source=VFS_TRU64ACL_SRC,
+                 source='vfs_zfsacl.c',
+                 deps='NFS4_ACLS sunacl',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_TRUE64ACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_TRUE64ACL'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_zfsacl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'))
+
+bld.SAMBA3_MODULE('vfs_nfs4acl_xattr',
+                  subsystem='vfs',
+                  source='vfs_nfs4acl_xattr.c',
+                  deps='NFS4_ACLS sunacl NDR_NFS4ACL',
+                  init_function='',
+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_nfs4acl_xattr'),
+                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_nfs4acl_xattr'))
 
-bld.SAMBA_MODULE('vfs_catia',
+bld.SAMBA3_MODULE('vfs_hpuxacl',
                  subsystem='vfs',
-                 source=VFS_CATIA_SRC,
+                 source='vfs_hpuxacl.c',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CATIA'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CATIA'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_hpuxacl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_hpuxacl'))
 
-bld.SAMBA_MODULE('vfs_streams_xattr',
+bld.SAMBA3_MODULE('vfs_tru64acl',
                  subsystem='vfs',
-                 source=VFS_STREAMS_XATTR_SRC,
+                 source='vfs_tru64acl.c',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_STREAMS_XATTR'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_STREAMS_XATTR'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_true64acl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_true64acl'))
 
-bld.SAMBA_MODULE('vfs_streams_depot',
+bld.SAMBA3_MODULE('vfs_catia',
                  subsystem='vfs',
-                 source=VFS_STREAMS_DEPOT_SRC,
+                 source='vfs_catia.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_STREAMS_DEPOT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_STREAMS_DEPOT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_catia'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_catia'))
 
-bld.SAMBA_MODULE('vfs_cacheprime',
+bld.SAMBA3_MODULE('vfs_streams_xattr',
                  subsystem='vfs',
-                 source=VFS_CACHEPRIME_SRC,
+                 source='vfs_streams_xattr.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CACHEPRIME'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CACHEPRIME'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_xattr'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_streams_xattr'))
 
-bld.SAMBA_MODULE('vfs_prealloc',
+bld.SAMBA3_MODULE('vfs_streams_depot',
                  subsystem='vfs',
-                 source=VFS_PREALLOC_SRC,
+                 source='vfs_streams_depot.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_PREALLOC'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_PREALLOC'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_depot'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_streams_depot'))
 
-bld.SAMBA_MODULE('vfs_commit',
+bld.SAMBA3_MODULE('vfs_cacheprime',
                  subsystem='vfs',
-                 source=VFS_COMMIT_SRC,
+                 source='vfs_cacheprime.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_COMMIT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_COMMIT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cacheprime'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_cacheprime'))
 
-bld.SAMBA_MODULE('vfs_gpfs',
+bld.SAMBA3_MODULE('vfs_prealloc',
                  subsystem='vfs',
-                 source=VFS_GPFS_SRC,
-                 deps='NFS4_ACLS',
+                 source='vfs_prealloc.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_GPFS'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_GPFS'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_prealloc'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_prealloc'))
 
-bld.SAMBA_MODULE('vfs_notify_fam',
+bld.SAMBA3_MODULE('vfs_commit',
                  subsystem='vfs',
-                 source=VFS_NOTIFY_FAM_SRC,
+                 source='vfs_commit.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_NOTIFY_FAM'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_NOTIFY_FAM'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_commit'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_commit'))
 
-bld.SAMBA_MODULE('vfs_readahead',
+bld.SAMBA3_MODULE('vfs_gpfs',
                  subsystem='vfs',
-                 source=VFS_READAHEAD_SRC,
+                 source='vfs_gpfs.c',
+                 deps='NFS4_ACLS non_posix_acls gpfswrap',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_READAHEAD'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_READAHEAD'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_gpfs'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_gpfs'),
+                 includes=bld.CONFIG_GET('CPPPATH_GPFS'))
 
-bld.SAMBA_MODULE('vfs_tsmsm',
+bld.SAMBA3_MODULE('vfs_readahead',
                  subsystem='vfs',
-                 source=VFS_TSMSM_SRC,
+                 source='vfs_readahead.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_TSMSM'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_TSMSM'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readahead'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readahead'))
 
-bld.SAMBA_MODULE('vfs_fileid',
+bld.SAMBA3_MODULE('vfs_tsmsm',
                  subsystem='vfs',
-                 source=VFS_FILEID_SRC,
+                 source='vfs_tsmsm.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_FILEID'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_FILEID'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_tsmsm'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_tsmsm'))
 
-bld.SAMBA_MODULE('vfs_aio_fork',
+bld.SAMBA3_MODULE('vfs_fileid',
                  subsystem='vfs',
-                 source=VFS_AIO_FORK_SRC,
+                 source='vfs_fileid.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AIO_FORK'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AIO_FORK'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fileid'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fileid'))
 
-bld.SAMBA_MODULE('vfs_preopen',
+bld.SAMBA3_MODULE('vfs_aio_fork',
                  subsystem='vfs',
-                 source=VFS_PREOPEN_SRC,
+                 source='vfs_aio_fork.c',
+                 deps='samba-util tevent',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_PREOPEN'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_PREOPEN'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_fork'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_fork'))
 
-bld.SAMBA_MODULE('vfs_syncops',
+bld.SAMBA3_MODULE('vfs_aio_pthread',
                  subsystem='vfs',
-                 source=VFS_SYNCOPS_SRC,
+                 source='vfs_aio_pthread.c',
+                 deps='samba-util tevent',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SYNCOPS'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SYNCOPS'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_pthread'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_pthread'))
 
-bld.SAMBA_MODULE('vfs_acl_xattr',
+bld.SAMBA3_MODULE('vfs_aio_posix',
                  subsystem='vfs',
-                 source=VFS_ACL_XATTR_SRC,
+                 source='vfs_aio_posix.c',
+                 deps='samba-util tevent',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ACL_XATTR'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ACL_XATTR'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_posix'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_posix'))
 
-bld.SAMBA_MODULE('vfs_acl_tdb',
+bld.SAMBA3_MODULE('vfs_aio_linux',
                  subsystem='vfs',
-                 source=VFS_ACL_TDB_SRC,
-                 deps='NDR_XATTR',
+                 source='vfs_aio_linux.c',
+                 deps='samba-util aio',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ACL_TDB'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ACL_TDB'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_linux'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_linux'))
 
-bld.SAMBA_MODULE('vfs_smb_traffic_analyzer',
+bld.SAMBA3_MODULE('vfs_preopen',
                  subsystem='vfs',
-                 source=VFS_SMB_TRAFFIC_ANALYZER_SRC,
+                 source='vfs_preopen.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SMB_TRAFFIC_ANALYZER'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SMB_TRAFFIC_ANALYZER'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_preopen'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_preopen'))
 
-bld.SAMBA_MODULE('vfs_onefs',
+bld.SAMBA3_MODULE('vfs_syncops',
                  subsystem='vfs',
-                 source=VFS_ONEFS_SRC,
+                 source='vfs_syncops.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ONEFS'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ONEFS'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_syncops'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_syncops'))
 
-bld.SAMBA_MODULE('vfs_onefs_shadow_copy',
+bld.SAMBA3_MODULE('vfs_acl_xattr',
                  subsystem='vfs',
-                 source=VFS_ONEFS_SHADOW_COPY_SRC,
+                 source='vfs_acl_xattr.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ONEFS_SHADOW_COPY'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ONEFS_SHADOW_COPY'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_acl_xattr'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_acl_xattr'))
 
-bld.SAMBA_MODULE('vfs_dirsort',
+bld.SAMBA3_MODULE('vfs_acl_tdb',
                  subsystem='vfs',
-                 source=VFS_DIRSORT_SRC,
+                 source='vfs_acl_tdb.c',
+                 deps='NDR_XATTR tdb',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_DIRSORT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_DIRSORT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_acl_tdb'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_acl_tdb'))
 
-bld.SAMBA_MODULE('vfs_scannedonly',
+bld.SAMBA3_MODULE('vfs_dirsort',
                  subsystem='vfs',
-                 source=VFS_SCANNEDONLY_SRC,
+                 source='vfs_dirsort.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SCANNEDONLY'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SCANNEDONLY'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_dirsort'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_dirsort'))
 
-bld.SAMBA_MODULE('vfs_crossrename',
+bld.SAMBA3_MODULE('vfs_crossrename',
                  subsystem='vfs',
-                 source=VFS_CROSSRENAME_SRC,
+                 source='vfs_crossrename.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CROSSRENAME'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CROSSRENAME'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_crossrename'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_crossrename'))
 
-bld.SAMBA_MODULE('vfs_linux_xfs_sgid',
+bld.SAMBA3_MODULE('vfs_linux_xfs_sgid',
                  subsystem='vfs',
-                 source=VFS_LINUX_XFS_SGID_SRC,
+                 source='vfs_linux_xfs_sgid.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_LINUX_XFS_SGID'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_LINUX_XFS_SGID'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_linux_xfs_sgid'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_linux_xfs_sgid'))
 
-bld.SAMBA_MODULE('vfs_time_audit',
+bld.SAMBA3_MODULE('vfs_time_audit',
                  subsystem='vfs',
-                 source=VFS_TIME_AUDIT_SRC,
+                 source='vfs_time_audit.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_TIME_AUDIT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_TIME_AUDIT'))
-
-
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_time_audit'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_time_audit'))
 
-CHARSET_WEIRD_SRC = 'weird.c'
-CHARSET_CP850_SRC = 'CP850.c'
-CHARSET_CP437_SRC = 'CP437.c'
-CHARSET_MACOSXFS_SRC = 'charset_macosxfs.c'
+bld.SAMBA3_MODULE('vfs_media_harmony',
+                 subsystem='vfs',
+                 source='vfs_media_harmony.c',
+                 deps='samba-util',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_media_harmony'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_media_harmony'))
 
+bld.SAMBA3_MODULE('vfs_unityed_media',
+                 subsystem='vfs',
+                 source='vfs_unityed_media.c',
+                 deps='samba-util',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_unityed_media'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_unityed_media'))
 
-bld.SAMBA_SUBSYSTEM('charset',
-                    source='',
-                    vars=locals())
+bld.SAMBA3_MODULE('vfs_dfs_samba4',
+                 subsystem='vfs',
+                 source='vfs_dfs_samba4.c',
+                 deps='samba-util dfs_server_ad samdb tevent',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_dfs_samba4') and bld.AD_DC_BUILD_IS_ENABLED(),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_dfs_samba4') and bld.AD_DC_BUILD_IS_ENABLED())
 
-bld.SAMBA_MODULE('charset_weird',
-                 subsystem='charset',
-                 source=CHARSET_WEIRD_SRC,
+bld.SAMBA3_MODULE('vfs_btrfs',
+                 subsystem='vfs',
+                 source='vfs_btrfs.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_WEIRD'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_WEIRD'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_btrfs'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_btrfs'))
 
-bld.SAMBA_MODULE('charset_CP850',
-                 subsystem='charset',
-                 source=CHARSET_CP850_SRC,
+bld.SAMBA3_MODULE('vfs_shell_snap',
+                 subsystem='vfs',
+                 source='vfs_shell_snap.c',
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_CP850'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_CP850'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shell_snap'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shell_snap'))
+
+bld.SAMBA3_SUBSYSTEM('perfcount',
+                    source='',
+                     deps='smbd_base')
 
-bld.SAMBA_MODULE('charset_CP437',
-                 subsystem='charset',
-                 source=CHARSET_CP437_SRC,
+bld.SAMBA3_MODULE('perfcount_test',
+                 subsystem='perfcount',
+                 source='perfcount_test.c',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_CP437'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_CP437'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('perfcount_test'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('perfcount_test'))
 
-bld.SAMBA_MODULE('charset_macosxfs',
-                 subsystem='charset',
-                 source=CHARSET_MACOSXFS_SRC,
+bld.SAMBA3_MODULE('vfs_ceph',
+                 subsystem='vfs',
+                 source='vfs_ceph.c',
+                 deps='samba-util cephfs',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_MACOSXFS'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_MACOSXFS'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_ceph'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_ceph'),
+                 cflags=bld.CONFIG_GET('CCFLAGS_CEPHFS'))
 
+bld.SAMBA3_MODULE('vfs_glusterfs',
+                  subsystem='vfs',
+                  source='vfs_glusterfs.c',
+                  deps='samba-util gfapi',
+                  init_function='',
+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_glusterfs'),
+                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_glusterfs'))
 
-PERFCOUNT_ONEFS_SRC = 'perfcount_onefs.c'
-PERFCOUNT_TEST_SRC = 'perfcount_test.c'
+bld.SAMBA3_MODULE('vfs_worm',
+                  subsystem='vfs',
+                  source='vfs_worm.c',
+                  deps='samba-util',
+                  init_function='',
+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_worm'),
+                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_worm'))
 
-bld.SAMBA_SUBSYSTEM('perfcount',
-                    source='',
-                    vars=locals())
+bld.SAMBA3_MODULE('vfs_snapper',
+                 subsystem='vfs',
+                 source='vfs_snapper.c',
+                 deps='samba-util dbus-1',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_snapper'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_snapper'))
 
-bld.SAMBA_MODULE('perfcount_onefs',
-                 subsystem='perfcount',
-                 source=PERFCOUNT_ONEFS_SRC,
+bld.SAMBA3_MODULE('vfs_vxfs',
+                 subsystem='vfs',
+                 source='vfs_vxfs.c',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('PERFCOUNT_ONEFS'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('PERFCOUNT_ONEFS'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_vxfs'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_vxfs'))
 
-bld.SAMBA_MODULE('perfcount_test',
-                 subsystem='perfcount',
-                 source=PERFCOUNT_TEST_SRC,
+bld.SAMBA3_MODULE('vfs_offline',
+                 subsystem='vfs',
+                 source='vfs_offline.c',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('PERFCOUNT_TEST'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('PERFCOUNT_TEST'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_offline'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_offline'))