diff options
| -rw-r--r-- | source3/auth/wscript_build | 38 | ||||
| -rw-r--r-- | source3/libgpo/gpext/wscript_build | 14 | ||||
| -rw-r--r-- | source3/modules/wscript_build | 216 | ||||
| -rw-r--r-- | source3/winbindd/wscript_build | 64 | ||||
| -rw-r--r-- | source3/wscript_build | 8 |
5 files changed, 170 insertions, 170 deletions
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build index a8da5e0e0f..62a730ccd9 100644 --- a/source3/auth/wscript_build +++ b/source3/auth/wscript_build @@ -18,69 +18,69 @@ AUTH_SRC = '''auth.c auth_util.c token_util.c user_krb5.c auth_compat.c auth_ntlmssp.c''' -bld.SAMBA_SUBSYSTEM('AUTH', +bld.SAMBA_SUBSYSTEM('auth', source=AUTH_SRC, deps='''PLAINTEXT_AUTH SLCACHE DCUTIL''', vars=locals()) -bld.SAMBA_MODULE('AUTH_SAM', - subsystem='AUTH', +bld.SAMBA_MODULE('auth_sam', + subsystem='auth', source=AUTH_SAM_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_SAM'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_SAM')) -bld.SAMBA_MODULE('AUTH_UNIX', - subsystem='AUTH', +bld.SAMBA_MODULE('auth_unix', + subsystem='auth', source=AUTH_UNIX_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_UNIX'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_UNIX')) -bld.SAMBA_MODULE('AUTH_WINBIND', - subsystem='AUTH', +bld.SAMBA_MODULE('auth_winbind', + subsystem='auth', source=AUTH_WINBIND_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_WINBIND'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_WINBIND')) -bld.SAMBA_MODULE('AUTH_WBC', - subsystem='AUTH', +bld.SAMBA_MODULE('auth_wbc', + subsystem='auth', source=AUTH_WBC_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_WBC'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_WBC')) -bld.SAMBA_MODULE('AUTH_SERVER', - subsystem='AUTH', +bld.SAMBA_MODULE('auth_server', + subsystem='auth', source=AUTH_SERVER_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_SERVER'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_SERVER')) -bld.SAMBA_MODULE('AUTH_DOMAIN', - subsystem='AUTH', +bld.SAMBA_MODULE('auth_domain', + subsystem='auth', source=AUTH_DOMAIN_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_DOMAIN'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_DOMAIN')) -bld.SAMBA_MODULE('AUTH_BUILTIN', - subsystem='AUTH', +bld.SAMBA_MODULE('auth_builtin', + subsystem='auth', source=AUTH_BUILTIN_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_BUILTIN'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_BUILTIN')) -bld.SAMBA_MODULE('AUTH_NETLOGOND', - subsystem='AUTH', +bld.SAMBA_MODULE('auth_netlogond', + subsystem='auth', source=AUTH_NETLOGOND_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_NETLOGOND'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_NETLOGOND')) -bld.SAMBA_MODULE('AUTH_SCRIPT', - subsystem='AUTH', +bld.SAMBA_MODULE('auth_script', + subsystem='auth', source=AUTH_SCRIPT_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_SCRIPT'), diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build index 8f7164ab0d..b35396d021 100644 --- a/source3/libgpo/gpext/wscript_build +++ b/source3/libgpo/gpext/wscript_build @@ -6,27 +6,27 @@ GPEXT_SECURITY_SRC = 'security.c' GPEXT_SRC = '''../../../libgpo/gpext/gpext.c''' -bld.SAMBA_SUBSYSTEM('GPEXT', +bld.SAMBA_SUBSYSTEM('gpext', source=GPEXT_SRC, vars=locals()) -bld.SAMBA_MODULE('GPEXT_REGISTRY', - subsystem='GPEXT', +bld.SAMBA_MODULE('gpext_registry', + subsystem='gpext', source=GPEXT_REGISTRY_SRC, deps='NDR_PREG', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('GPEXT_REGISTRY'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('GPEXT_REGISTRY')) -bld.SAMBA_MODULE('GPEXT_SCRIPTS', - subsystem='GPEXT', +bld.SAMBA_MODULE('gpext_scripts', + subsystem='gpext', source=GPEXT_SCRIPTS_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('GPEXT_SCRIPTS'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('GPEXT_SCRIPTS')) -bld.SAMBA_MODULE('GPEXT_SECURITY', - subsystem='GPEXT', +bld.SAMBA_MODULE('gpext_security', + subsystem='gpext', source=GPEXT_SECURITY_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('GPEXT_SECURITY'), diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build index eebac9d4e0..d916ec9a81 100644 --- a/source3/modules/wscript_build +++ b/source3/modules/wscript_build @@ -57,336 +57,336 @@ bld.SAMBA_SUBSYSTEM('VFS_AIXACL_UTIL', source='vfs_aixacl_util.c', enabled=False) #fixme -bld.SAMBA_SUBSYSTEM('VFS', +bld.SAMBA_SUBSYSTEM('vfs', source='', - deps='''VFS_DEFAULT''', + deps='', vars=locals()) -bld.SAMBA_MODULE('VFS_DEFAULT', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_default', + subsystem='vfs', source=VFS_DEFAULT_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_DEFAULT'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_DEFAULT')) -bld.SAMBA_MODULE('VFS_AUDIT', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_audit', + subsystem='vfs', source=VFS_AUDIT_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AUDIT'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AUDIT')) -bld.SAMBA_MODULE('VFS_EXTD_AUDIT', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_extd_audit', + subsystem='vfs', source=VFS_EXTD_AUDIT_SRC, init_function='', 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', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_full_audit', + subsystem='vfs', source=VFS_FULL_AUDIT_SRC, init_function='', 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', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_fake_perms', + subsystem='vfs', source=VFS_FAKE_PERMS_SRC, deps='acl attr', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_FAKE_PERMS'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_FAKE_PERMS')) -bld.SAMBA_MODULE('VFS_RECYCLE', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_recycle', + subsystem='vfs', source=VFS_RECYCLE_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_RECYCLE'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_RECYCLE')) -bld.SAMBA_MODULE('VFS_NETATALK', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_netatalk', + subsystem='vfs', source=VFS_NETATALK_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_NETATALK'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_NETATALK')) -bld.SAMBA_MODULE('VFS_DEFAULT_QUOTA', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_default_quota', + subsystem='vfs', source=VFS_DEFAULT_QUOTA_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_DEFAULT_QUOTA'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_DEFAULT_QUOTA')) -bld.SAMBA_MODULE('VFS_READONLY', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_readonly', + subsystem='vfs', source=VFS_READONLY_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_READONLY'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_READONLY')) -bld.SAMBA_MODULE('VFS_CAP', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_cap', + subsystem='vfs', source=VFS_CAP_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CAP'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CAP')) -bld.SAMBA_MODULE('VFS_EXPAND_MSDFS', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_expand_msdfs', + subsystem='vfs', source=VFS_EXPAND_MSDFS_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_EXPAND_MSDFS'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_EXPAND_MSDFS')) -bld.SAMBA_MODULE('VFS_SHADOW_COPY', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_shadow_copy', + subsystem='vfs', source=VFS_SHADOW_COPY_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SHADOW_COPY'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SHADOW_COPY')) -bld.SAMBA_MODULE('VFS_SHADOW_COPY2', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_shadow_copy2', + subsystem='vfs', source=VFS_SHADOW_COPY2_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SHADOW_COPY2'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SHADOW_COPY2')) -bld.SAMBA_MODULE('VFS_AFSACL', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_afsacl', + subsystem='vfs', source=VFS_AFSACL_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AFSACL'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AFSACL')) -bld.SAMBA_MODULE('VFS_XATTR_TDB', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_xattr_tdb', + subsystem='vfs', source=VFS_XATTR_TDB_SRC, deps='NDR_XATTR', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_XATTR_TDB'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_XATTR_TDB')) -bld.SAMBA_MODULE('VFS_POSIXACL', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_posixacl', + subsystem='vfs', source=VFS_POSIXACL_SRC, deps='acl attr', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_POSIXACL'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_POSIXACL')) -bld.SAMBA_MODULE('VFS_AIXACL', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_aixacl', + subsystem='vfs', source=VFS_AIXACL_SRC, deps='VFS_AIXACL_UTIL', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AIXACL'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AIXACL')) -bld.SAMBA_MODULE('VFS_AIXACL2', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_aixacl2', + subsystem='vfs', source=VFS_AIXACL2_SRC, deps='NFS4_ACLS VFS_AIXACL_UTIL', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AIXACL2'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AIXACL2')) -bld.SAMBA_MODULE('VFS_SOLARISACL', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_solarisacl', + subsystem='vfs', source=VFS_SOLARISACL_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SOLARISACL'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SOLARISACL')) -bld.SAMBA_MODULE('VFS_ZFSACL', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_zfsacl', + subsystem='vfs', source=VFS_ZFSACL_SRC, deps='NFS4_ACLS', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ZFSACL'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ZFSACL')) -bld.SAMBA_MODULE('VFS_HPUXACL', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_hpuxacl', + subsystem='vfs', source=VFS_HPUXACL_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_HPUXACL'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_HPUXACL')) -bld.SAMBA_MODULE('VFS_IRIXACL', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_irixacl', + subsystem='vfs', source=VFS_IRIXACL_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_IRIXACL'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_IRIXACL')) -bld.SAMBA_MODULE('VFS_TRU64ACL', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_tru64acl', + subsystem='vfs', source=VFS_TRU64ACL_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_TRUE64ACL'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_TRUE64ACL')) -bld.SAMBA_MODULE('VFS_CATIA', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_catia', + subsystem='vfs', source=VFS_CATIA_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CATIA'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CATIA')) -bld.SAMBA_MODULE('VFS_STREAMS_XATTR', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_streams_xattr', + subsystem='vfs', source=VFS_STREAMS_XATTR_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_STREAMS_XATTR'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_STREAMS_XATTR')) -bld.SAMBA_MODULE('VFS_STREAMS_DEPOT', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_streams_depot', + subsystem='vfs', source=VFS_STREAMS_DEPOT_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_STREAMS_DEPOT'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_STREAMS_DEPOT')) -bld.SAMBA_MODULE('VFS_CACHEPRIME', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_cacheprime', + subsystem='vfs', source=VFS_CACHEPRIME_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CACHEPRIME'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CACHEPRIME')) -bld.SAMBA_MODULE('VFS_PREALLOC', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_prealloc', + subsystem='vfs', source=VFS_PREALLOC_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_PREALLOC'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_PREALLOC')) -bld.SAMBA_MODULE('VFS_COMMIT', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_commit', + subsystem='vfs', source=VFS_COMMIT_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_COMMIT'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_COMMIT')) -bld.SAMBA_MODULE('VFS_GPFS', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_gpfs', + subsystem='vfs', source=VFS_GPFS_SRC, deps='NFS4_ACLS', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_GPFS'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_GPFS')) -bld.SAMBA_MODULE('VFS_NOTIFY_FAM', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_notify_fam', + subsystem='vfs', source=VFS_NOTIFY_FAM_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_NOTIFY_FAM'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_NOTIFY_FAM')) -bld.SAMBA_MODULE('VFS_READAHEAD', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_readahead', + subsystem='vfs', source=VFS_READAHEAD_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_READAHEAD'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_READAHEAD')) -bld.SAMBA_MODULE('VFS_TSMSM', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_tsmsm', + subsystem='vfs', source=VFS_TSMSM_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_TSMSM'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_TSMSM')) -bld.SAMBA_MODULE('VFS_FILEID', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_fileid', + subsystem='vfs', source=VFS_FILEID_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_FILEID'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_FILEID')) -bld.SAMBA_MODULE('VFS_AIO_FORK', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_aio_fork', + subsystem='vfs', source=VFS_AIO_FORK_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AIO_FORK'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AIO_FORK')) -bld.SAMBA_MODULE('VFS_PREOPEN', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_preopen', + subsystem='vfs', source=VFS_PREOPEN_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_PREOPEN'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_PREOPEN')) -bld.SAMBA_MODULE('VFS_SYNCOPS', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_syncops', + subsystem='vfs', source=VFS_SYNCOPS_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SYNCOPS'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SYNCOPS')) -bld.SAMBA_MODULE('VFS_ACL_XATTR', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_acl_xattr', + subsystem='vfs', source=VFS_ACL_XATTR_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ACL_XATTR'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ACL_XATTR')) -bld.SAMBA_MODULE('VFS_ACL_TDB', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_acl_tdb', + subsystem='vfs', source=VFS_ACL_TDB_SRC, deps='NDR_XATTR', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ACL_TDB'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ACL_TDB')) -bld.SAMBA_MODULE('VFS_SMB_TRAFFIC_ANALYZER', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_smb_traffic_analyzer', + subsystem='vfs', source=VFS_SMB_TRAFFIC_ANALYZER_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SMB_TRAFFIC_ANALYZER'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SMB_TRAFFIC_ANALYZER')) -bld.SAMBA_MODULE('VFS_ONEFS', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_onefs', + subsystem='vfs', source=VFS_ONEFS_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ONEFS'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ONEFS')) -bld.SAMBA_MODULE('VFS_ONEFS_SHADOW_COPY', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_onefs_shadow_copy', + subsystem='vfs', source=VFS_ONEFS_SHADOW_COPY_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ONEFS_SHADOW_COPY'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ONEFS_SHADOW_COPY')) -bld.SAMBA_MODULE('VFS_DIRSORT', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_dirsort', + subsystem='vfs', source=VFS_DIRSORT_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_DIRSORT'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_DIRSORT')) -bld.SAMBA_MODULE('VFS_SCANNEDONLY', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_scannedonly', + subsystem='vfs', source=VFS_SCANNEDONLY_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SCANNEDONLY'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SCANNEDONLY')) -bld.SAMBA_MODULE('VFS_CROSSRENAME', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_crossrename', + subsystem='vfs', source=VFS_CROSSRENAME_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CROSSRENAME'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CROSSRENAME')) -bld.SAMBA_MODULE('VFS_LINUX_XFS_SGID', - subsystem='VFS', +bld.SAMBA_MODULE('vfs_linux_xfs_sgid', + subsystem='vfs', source=VFS_LINUX_XFS_SGID_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_LINUX_XFS_SGID'), @@ -400,33 +400,33 @@ CHARSET_CP437_SRC = 'CP437.c' CHARSET_MACOSXFS_SRC = 'charset_macosxfs.c' -bld.SAMBA_SUBSYSTEM('CHARSET', +bld.SAMBA_SUBSYSTEM('charset', source='', vars=locals()) -bld.SAMBA_MODULE('CHARSET_WEIRD', - subsystem='CHARSET', +bld.SAMBA_MODULE('charset_weird', + subsystem='charset', source=CHARSET_WEIRD_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_WEIRD'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_WEIRD')) -bld.SAMBA_MODULE('CHARSET_CP850', - subsystem='CHARSET', +bld.SAMBA_MODULE('charset_CP850', + subsystem='charset', source=CHARSET_CP850_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_CP850'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_CP850')) -bld.SAMBA_MODULE('CHARSET_CP437', - subsystem='CHARSET', +bld.SAMBA_MODULE('charset_CP437', + subsystem='charset', source=CHARSET_CP437_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_CP437'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_CP437')) -bld.SAMBA_MODULE('CHARSET_MACOSXFS', - subsystem='CHARSET', +bld.SAMBA_MODULE('charset_macosxfs', + subsystem='charset', source=CHARSET_MACOSXFS_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_MACOSXFS'), @@ -436,19 +436,19 @@ bld.SAMBA_MODULE('CHARSET_MACOSXFS', PERFCOUNT_ONEFS_SRC = 'perfcount_onefs.c' PERFCOUNT_TEST_SRC = 'perfcount_test.c' -bld.SAMBA_SUBSYSTEM('PERFCOUNT', +bld.SAMBA_SUBSYSTEM('perfcount', source='', vars=locals()) -bld.SAMBA_MODULE('PERFCOUNT_ONEFS', - subsystem='PERFCOUNT', +bld.SAMBA_MODULE('perfcount_onefs', + subsystem='perfcount', source=PERFCOUNT_ONEFS_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('PERFCOUNT_ONEFS'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('PERFCOUNT_ONEFS')) -bld.SAMBA_MODULE('PERFCOUNT_TEST', - subsystem='PERFCOUNT', +bld.SAMBA_MODULE('perfcount_test', + subsystem='perfcount', source=PERFCOUNT_TEST_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('PERFCOUNT_TEST'), diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build index db7d5e08a6..ddc9543b92 100644 --- a/source3/winbindd/wscript_build +++ b/source3/winbindd/wscript_build @@ -21,68 +21,68 @@ IDMAP_ADEX_SRC = '''idmap_adex/idmap_adex.c IDMAP_RW_SRC = 'idmap_rw.c' IDMAP_SRC = 'idmap.c idmap_util.c ${IDMAP_RW_SRC}' -bld.SAMBA_SUBSYSTEM('IDMAP', +bld.SAMBA_SUBSYSTEM('idmap', source=IDMAP_SRC, vars=locals()) -bld.SAMBA_MODULE('IDMAP_AD', - subsystem='IDMAP', +bld.SAMBA_MODULE('idmap_ad', + subsystem='idmap', source=IDMAP_AD_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD')) -bld.SAMBA_MODULE('IDMAP_RID', - subsystem='IDMAP', +bld.SAMBA_MODULE('idmap_rid', + subsystem='idmap', source=IDMAP_RID_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_RID'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_RID')) -bld.SAMBA_MODULE('IDMAP_PASSDB', - subsystem='IDMAP', +bld.SAMBA_MODULE('idmap_passdb', + subsystem='idmap', source=IDMAP_PASSDB_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_PASSDB'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_PASSDB')) -bld.SAMBA_MODULE('IDMAP_LDAP', - subsystem='IDMAP', +bld.SAMBA_MODULE('idmap_ldap', + subsystem='idmap', source=IDMAP_LDAP_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_LDAP'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_LDAP')) -bld.SAMBA_MODULE('IDMAP_NSS', - subsystem='IDMAP', +bld.SAMBA_MODULE('idmap_nss', + subsystem='idmap', source=IDMAP_NSS_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_NSS'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_NSS')) -bld.SAMBA_MODULE('IDMAP_TDB', - subsystem='IDMAP', +bld.SAMBA_MODULE('idmap_tdb', + subsystem='idmap', source=IDMAP_TDB_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_TDB'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_TDB')) -bld.SAMBA_MODULE('IDMAP_TDB2', - subsystem='IDMAP', +bld.SAMBA_MODULE('idmap_tdb2', + subsystem='idmap', source=IDMAP_TDB2_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_TDB2'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_TDB2')) -bld.SAMBA_MODULE('IDMAP_HASH', - subsystem='IDMAP', +bld.SAMBA_MODULE('idmap_hash', + subsystem='idmap', source=IDMAP_HASH_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_HASH'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_HASH')) -bld.SAMBA_MODULE('IDMAP_ADEX', - subsystem='IDMAP', +bld.SAMBA_MODULE('idmap_adex', + subsystem='idmap', source=IDMAP_ADEX_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'), @@ -91,47 +91,47 @@ bld.SAMBA_MODULE('IDMAP_ADEX', NSS_INFO_TEMPLATE_SRC = 'nss_info_template.c' NSS_INFO_SRC = 'nss_info.c' -bld.SAMBA_SUBSYSTEM('NSS_INFO', +bld.SAMBA_SUBSYSTEM('nss_info', source=NSS_INFO_SRC, vars=locals()) -bld.SAMBA_MODULE('NSS_INFO_TEMPLATE', - subsystem='NSS_INFO', +bld.SAMBA_MODULE('nss_info_template', + subsystem='nss_info', source=NSS_INFO_TEMPLATE_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('NSS_INFO_TEMPLATE'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('NSS_INFO_TEMPLATE')) -bld.SAMBA_MODULE('NSS_INFO_ADEX', - subsystem='NSS_INFO', +bld.SAMBA_MODULE('nss_info_adex', + subsystem='nss_info', source=IDMAP_ADEX_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_ADEX')) -bld.SAMBA_MODULE('NSS_INFO_HASH', - subsystem='NSS_INFO', +bld.SAMBA_MODULE('nss_info_hash', + subsystem='nss_info', source=IDMAP_HASH_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_HASH'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_HASH')) -bld.SAMBA_MODULE('NSS_INFO_RFC2307', - subsystem='NSS_INFO', +bld.SAMBA_MODULE('nss_info_rfc2307', + subsystem='nss_info', source=IDMAP_AD_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD')) -bld.SAMBA_MODULE('NSS_INFO_SFU20', - subsystem='NSS_INFO', +bld.SAMBA_MODULE('nss_info_sfu20', + subsystem='nss_info', source=IDMAP_AD_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD')) -bld.SAMBA_MODULE('NSS_INFO_SFU', - subsystem='NSS_INFO', +bld.SAMBA_MODULE('nss_info_sfu', + subsystem='nss_info', source=IDMAP_AD_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'), diff --git a/source3/wscript_build b/source3/wscript_build index 5a6bab6bfd..dce16e3871 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1058,7 +1058,7 @@ bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN', bld.SAMBA_SUBSYSTEM('LIBGPO', source='${LIBGPO_SRC}', - deps='GPEXT', + deps='gpext', vars=locals()) bld.SAMBA_SUBSYSTEM('ASN1_UTIL', @@ -1116,7 +1116,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT', bld.SAMBA_SUBSYSTEM('LIBS', source=LIB_SRC, - deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY CHARSET NDR_MESSAGING', + deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY charset NDR_MESSAGING', vars=locals()) bld.SAMBA_SUBSYSTEM('LIB_NONSMBD', @@ -1182,7 +1182,7 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE', NSS_WRAPPER DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER - VFS RPC_MODULES AUTH LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET LIBEVENTLOG + vfs vfs_default vfs_posixacl RPC_MODULES auth LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET LIBEVENTLOG REGFIO REG_API_REGF PRINTING PRINTBACKEND SERVICES NDR_XATTR NDR_PERFCOUNT SOCKET_WRAPPER RPCCLI_WINREG''', vars=locals()) @@ -1327,7 +1327,7 @@ bld.SAMBA_BINARY('winbindd/winbindd', libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS - LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL IDMAP NSS_INFO + LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info ''', enabled=bld.env.build_winbind, install_path='${SBINDIR}', |