diff options
| -rwxr-xr-x | lib/util/wscript_build | 56 | ||||
| -rw-r--r-- | libcli/util/wscript_build | 2 | ||||
| -rw-r--r-- | libds/common/wscript_build | 2 | ||||
| -rw-r--r-- | source3/auth/wscript_build | 14 | ||||
| -rw-r--r-- | source3/libgpo/gpext/wscript_build | 2 | ||||
| -rw-r--r-- | source3/modules/wscript_build | 72 | ||||
| -rw-r--r-- | source3/passdb/wscript_build | 6 | ||||
| -rw-r--r-- | source3/rpc_server/wscript_build | 24 | ||||
| -rw-r--r-- | source3/winbindd/wscript_build | 18 | ||||
| -rwxr-xr-x | source3/wscript_build | 61 |
10 files changed, 112 insertions, 145 deletions
diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 8046a8ba07..bdc9d10150 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -1,57 +1,25 @@ #!/usr/bin/env python -common_util_sources = '''talloc_stack.c smb_threads.c xfile.c data_blob.c +bld.SAMBA_LIBRARY('samba-util', + source='''talloc_stack.c smb_threads.c xfile.c data_blob.c util_file.c time.c rbtree.c rfc1738.c select.c genrand.c fsusage.c blocking.c become_daemon.c signal.c system.c params.c util.c util_id.c util_net.c util_strlist.c util_paths.c idtree.c debug.c fault.c base64.c util_str.c util_str_common.c substitute.c ms_fnmatch.c - server_id.c dprintf.c''' - -common_util_headers = 'debug.h' -common_util_public_deps = 'talloc pthread LIBCRYPTO CHARSET' -s4_util_sources = '''parmlist.c''' -s4_util_deps = 'DYNCONFIG' -s4_util_public_deps = 'talloc execinfo uid_wrapper' -s4_util_public_headers = 'attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h' -s4_util_header_path = [ ('dlinklist.h util.h', '.'), ('*', 'util') ] - -if bld.env._SAMBA_BUILD_ == 3: - # as we move files into common between samba-util and samba-util3, move them here. - # Both samba-util and samba-util3 depend on this private library - bld.SAMBA_LIBRARY('samba-util-common', - source=common_util_sources, - public_deps=common_util_public_deps, - # until we get all the dependencies in this library in common - # we need to allow this library to be built with unresolved symbols - allow_undefined_symbols=True, - local_include=False, - public_headers=common_util_headers, - header_path= [('*', 'util') ], - private_library=True - ) - -else: - bld.SAMBA_LIBRARY('samba-util', - source=s4_util_sources + " " + common_util_sources, - deps=s4_util_deps, - public_deps=s4_util_public_deps + ' ' + common_util_public_deps, - public_headers=s4_util_public_headers + ' ' + common_util_headers, - header_path= s4_util_header_path, - local_include=False, - vnum='0.0.1', - pc_files='samba-util.pc' - ) - - # dummy subsystem for avoid wider deps changes. - bld.SAMBA_SUBSYSTEM('samba-util-common', - source=[], - deps='samba-util', - local_include=False,) + server_id.c dprintf.c parmlist.c''', + deps='DYNCONFIG', + public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO CHARSET', + public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h', + header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ], + local_include=False, + vnum='0.0.1', + pc_files='samba-util.pc' + ) bld.SAMBA_LIBRARY('asn1util', source='asn1.c', - deps='talloc samba-util-common', + deps='talloc samba-util', private_library=True, local_include=False) diff --git a/libcli/util/wscript_build b/libcli/util/wscript_build index a364d30f03..43c6cec787 100644 --- a/libcli/util/wscript_build +++ b/libcli/util/wscript_build @@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('errors', public_headers='error.h ntstatus.h doserr.h werror.h', header_path='core', source='doserr.c errormap.c nterr.c errmap_unix.c', - public_deps='talloc samba-util-common', + public_deps='talloc samba-util', private_library=True ) diff --git a/libds/common/wscript_build b/libds/common/wscript_build index 33190bb057..d7f8acb73d 100644 --- a/libds/common/wscript_build +++ b/libds/common/wscript_build @@ -4,4 +4,4 @@ bld.SAMBA_LIBRARY('flag_mapping', source='flag_mapping.c', private_library=True, public_headers='roles.h', - deps='samba-util-common') + deps='samba-util') diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build index 0583f33fa5..74d870fc1b 100644 --- a/source3/auth/wscript_build +++ b/source3/auth/wscript_build @@ -16,7 +16,7 @@ AUTH_SRC = '''auth.c bld.SAMBA3_SUBSYSTEM('TOKEN_UTIL', source='token_util.c', - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('USER_UTIL', @@ -40,7 +40,7 @@ bld.SAMBA3_SUBSYSTEM('auth', bld.SAMBA3_MODULE('auth_sam', subsystem='auth', source=AUTH_SAM_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_sam'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_sam')) @@ -48,7 +48,7 @@ bld.SAMBA3_MODULE('auth_sam', bld.SAMBA3_MODULE('auth_unix', subsystem='auth', source=AUTH_UNIX_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_unix'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_unix')) @@ -56,7 +56,7 @@ bld.SAMBA3_MODULE('auth_unix', bld.SAMBA3_MODULE('auth_winbind', subsystem='auth', source=AUTH_WINBIND_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_winbind'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_winbind')) @@ -64,7 +64,7 @@ bld.SAMBA3_MODULE('auth_winbind', bld.SAMBA3_MODULE('auth_wbc', subsystem='auth', source=AUTH_WBC_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_wbc'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_wbc')) @@ -72,7 +72,7 @@ bld.SAMBA3_MODULE('auth_wbc', bld.SAMBA3_MODULE('auth_server', subsystem='auth', source=AUTH_SERVER_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_server'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_server')) @@ -88,7 +88,7 @@ bld.SAMBA3_MODULE('auth_domain', bld.SAMBA3_MODULE('auth_builtin', subsystem='auth', source=AUTH_BUILTIN_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_builtin'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_builtin')) diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build index 67f15188d8..3c835dd8cd 100644 --- a/source3/libgpo/gpext/wscript_build +++ b/source3/libgpo/gpext/wscript_build @@ -8,7 +8,7 @@ GPEXT_SRC = '''../../../libgpo/gpext/gpext.c''' bld.SAMBA3_SUBSYSTEM('gpext', source=GPEXT_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_MODULE('gpext_registry', diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build index 9a6a6c3c15..8ccc4cac87 100644 --- a/source3/modules/wscript_build +++ b/source3/modules/wscript_build @@ -54,7 +54,7 @@ VFS_TIME_AUDIT_SRC = 'vfs_time_audit.c' bld.SAMBA3_SUBSYSTEM('NFS4_ACLS', source='nfs4_acls.c', - deps='samba-util-common') + deps='samba-util') bld.SAMBA3_SUBSYSTEM('VFS_AIXACL_UTIL', source='vfs_aixacl_util.c', @@ -68,7 +68,7 @@ bld.SAMBA3_SUBSYSTEM('vfs', bld.SAMBA3_MODULE('vfs_default', subsystem='vfs', source=VFS_DEFAULT_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default')) @@ -76,7 +76,7 @@ bld.SAMBA3_MODULE('vfs_default', bld.SAMBA3_MODULE('vfs_audit', subsystem='vfs', source=VFS_AUDIT_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_audit'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_audit')) @@ -84,7 +84,7 @@ bld.SAMBA3_MODULE('vfs_audit', bld.SAMBA3_MODULE('vfs_extd_audit', subsystem='vfs', source=VFS_EXTD_AUDIT_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_extd_audit'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_extd_audit')) @@ -92,7 +92,7 @@ bld.SAMBA3_MODULE('vfs_extd_audit', bld.SAMBA3_MODULE('vfs_full_audit', subsystem='vfs', source=VFS_FULL_AUDIT_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_full_audit'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_full_audit')) @@ -100,7 +100,7 @@ bld.SAMBA3_MODULE('vfs_full_audit', bld.SAMBA3_MODULE('vfs_fake_perms', subsystem='vfs', source=VFS_FAKE_PERMS_SRC, - deps='acl attr samba-util-common', + deps='acl attr samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_perms'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_perms')) @@ -108,7 +108,7 @@ bld.SAMBA3_MODULE('vfs_fake_perms', bld.SAMBA3_MODULE('vfs_recycle', subsystem='vfs', source=VFS_RECYCLE_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_recycle'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_recycle')) @@ -116,7 +116,7 @@ bld.SAMBA3_MODULE('vfs_recycle', bld.SAMBA3_MODULE('vfs_netatalk', subsystem='vfs', source=VFS_NETATALK_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_netatalk'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_netatalk')) @@ -124,7 +124,7 @@ bld.SAMBA3_MODULE('vfs_netatalk', bld.SAMBA3_MODULE('vfs_default_quota', subsystem='vfs', source=VFS_DEFAULT_QUOTA_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default_quota'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default_quota')) @@ -132,7 +132,7 @@ bld.SAMBA3_MODULE('vfs_default_quota', bld.SAMBA3_MODULE('vfs_readonly', subsystem='vfs', source=VFS_READONLY_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readonly'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readonly')) @@ -140,7 +140,7 @@ bld.SAMBA3_MODULE('vfs_readonly', bld.SAMBA3_MODULE('vfs_cap', subsystem='vfs', source=VFS_CAP_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cap'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_cap')) @@ -148,7 +148,7 @@ bld.SAMBA3_MODULE('vfs_cap', bld.SAMBA3_MODULE('vfs_expand_msdfs', subsystem='vfs', source=VFS_EXPAND_MSDFS_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_expand_msdfs'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_expand_msdfs')) @@ -156,7 +156,7 @@ bld.SAMBA3_MODULE('vfs_expand_msdfs', bld.SAMBA3_MODULE('vfs_shadow_copy', subsystem='vfs', source=VFS_SHADOW_COPY_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shadow_copy')) @@ -164,7 +164,7 @@ bld.SAMBA3_MODULE('vfs_shadow_copy', bld.SAMBA3_MODULE('vfs_shadow_copy2', subsystem='vfs', source=VFS_SHADOW_COPY2_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy2'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shadow_copy2')) @@ -172,7 +172,7 @@ bld.SAMBA3_MODULE('vfs_shadow_copy2', bld.SAMBA3_MODULE('vfs_afsacl', subsystem='vfs', source=VFS_AFSACL_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_afsacl'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_afsacl')) @@ -248,7 +248,7 @@ bld.SAMBA3_MODULE('vfs_tru64acl', bld.SAMBA3_MODULE('vfs_catia', subsystem='vfs', source=VFS_CATIA_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_catia'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_catia')) @@ -256,7 +256,7 @@ bld.SAMBA3_MODULE('vfs_catia', bld.SAMBA3_MODULE('vfs_streams_xattr', subsystem='vfs', source=VFS_STREAMS_XATTR_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_xattr'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_streams_xattr')) @@ -264,7 +264,7 @@ bld.SAMBA3_MODULE('vfs_streams_xattr', bld.SAMBA3_MODULE('vfs_streams_depot', subsystem='vfs', source=VFS_STREAMS_DEPOT_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_depot'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_streams_depot')) @@ -272,7 +272,7 @@ bld.SAMBA3_MODULE('vfs_streams_depot', bld.SAMBA3_MODULE('vfs_cacheprime', subsystem='vfs', source=VFS_CACHEPRIME_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cacheprime'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_cacheprime')) @@ -280,7 +280,7 @@ bld.SAMBA3_MODULE('vfs_cacheprime', bld.SAMBA3_MODULE('vfs_prealloc', subsystem='vfs', source=VFS_PREALLOC_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_prealloc'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_prealloc')) @@ -288,7 +288,7 @@ bld.SAMBA3_MODULE('vfs_prealloc', bld.SAMBA3_MODULE('vfs_commit', subsystem='vfs', source=VFS_COMMIT_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_commit'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_commit')) @@ -318,7 +318,7 @@ bld.SAMBA3_MODULE('vfs_notify_fam', bld.SAMBA3_MODULE('vfs_readahead', subsystem='vfs', source=VFS_READAHEAD_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readahead'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readahead')) @@ -326,7 +326,7 @@ bld.SAMBA3_MODULE('vfs_readahead', bld.SAMBA3_MODULE('vfs_tsmsm', subsystem='vfs', source=VFS_TSMSM_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_tsmsm'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_tsmsm')) @@ -334,7 +334,7 @@ bld.SAMBA3_MODULE('vfs_tsmsm', bld.SAMBA3_MODULE('vfs_fileid', subsystem='vfs', source=VFS_FILEID_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fileid'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fileid')) @@ -342,7 +342,7 @@ bld.SAMBA3_MODULE('vfs_fileid', bld.SAMBA3_MODULE('vfs_aio_fork', subsystem='vfs', source=VFS_AIO_FORK_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_fork'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_fork')) @@ -350,7 +350,7 @@ bld.SAMBA3_MODULE('vfs_aio_fork', bld.SAMBA3_MODULE('vfs_preopen', subsystem='vfs', source=VFS_PREOPEN_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_preopen'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_preopen')) @@ -358,7 +358,7 @@ bld.SAMBA3_MODULE('vfs_preopen', bld.SAMBA3_MODULE('vfs_syncops', subsystem='vfs', source=VFS_SYNCOPS_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_syncops'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_syncops')) @@ -366,7 +366,7 @@ bld.SAMBA3_MODULE('vfs_syncops', bld.SAMBA3_MODULE('vfs_acl_xattr', subsystem='vfs', source=VFS_ACL_XATTR_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_acl_xattr'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_acl_xattr')) @@ -382,7 +382,7 @@ bld.SAMBA3_MODULE('vfs_acl_tdb', bld.SAMBA3_MODULE('vfs_smb_traffic_analyzer', subsystem='vfs', source=VFS_SMB_TRAFFIC_ANALYZER_SRC, - deps='samba-util-common', + 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')) @@ -390,7 +390,7 @@ bld.SAMBA3_MODULE('vfs_smb_traffic_analyzer', bld.SAMBA3_MODULE('vfs_onefs', subsystem='vfs', source=VFS_ONEFS_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_onefs'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_onefs')) @@ -398,7 +398,7 @@ bld.SAMBA3_MODULE('vfs_onefs', bld.SAMBA3_MODULE('vfs_onefs_shadow_copy', subsystem='vfs', source=VFS_ONEFS_SHADOW_COPY_SRC, - deps='samba-util-common', + 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')) @@ -406,7 +406,7 @@ bld.SAMBA3_MODULE('vfs_onefs_shadow_copy', bld.SAMBA3_MODULE('vfs_dirsort', subsystem='vfs', source=VFS_DIRSORT_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_dirsort'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_dirsort')) @@ -414,7 +414,7 @@ bld.SAMBA3_MODULE('vfs_dirsort', bld.SAMBA3_MODULE('vfs_scannedonly', subsystem='vfs', source=VFS_SCANNEDONLY_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_scannedonly'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_scannedonly')) @@ -422,7 +422,7 @@ bld.SAMBA3_MODULE('vfs_scannedonly', bld.SAMBA3_MODULE('vfs_crossrename', subsystem='vfs', source=VFS_CROSSRENAME_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_crossrename'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_crossrename')) @@ -430,7 +430,7 @@ bld.SAMBA3_MODULE('vfs_crossrename', bld.SAMBA3_MODULE('vfs_linux_xfs_sgid', subsystem='vfs', source=VFS_LINUX_XFS_SGID_SRC, - deps='samba-util-common', + 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')) @@ -438,7 +438,7 @@ bld.SAMBA3_MODULE('vfs_linux_xfs_sgid', bld.SAMBA3_MODULE('vfs_time_audit', subsystem='vfs', source=VFS_TIME_AUDIT_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_time_audit'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_time_audit')) diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build index ccb6ee7db6..90ce2c4c4d 100644 --- a/source3/passdb/wscript_build +++ b/source3/passdb/wscript_build @@ -14,7 +14,7 @@ bld.SAMBA3_SUBSYSTEM('pdb', bld.SAMBA3_MODULE('pdb_tdbsam', subsystem='pdb', source=PDB_TDBSAM_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_tdbsam'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_tdbsam')) @@ -37,7 +37,7 @@ bld.SAMBA3_MODULE('pdb_ads', bld.SAMBA3_MODULE('pdb_smbpasswd', subsystem='pdb', source=PDB_SMBPASSWD_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_smbpasswd'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_smbpasswd')) @@ -45,7 +45,7 @@ bld.SAMBA3_MODULE('pdb_smbpasswd', bld.SAMBA3_MODULE('pdb_wbc_sam', subsystem='pdb', source=PDB_WBC_SAM_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_wbc_sam'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_wbc_sam')) diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build index 0e557a4bb7..5d21d5e340 100644 --- a/source3/rpc_server/wscript_build +++ b/source3/rpc_server/wscript_build @@ -31,7 +31,7 @@ bld.SAMBA3_SUBSYSTEM('RPC_NCACN_NP', bld.SAMBA3_SUBSYSTEM('RPC_SERVICE', source='rpc_server.c', - deps='samba-util-common') + deps='samba-util') bld.SAMBA3_SUBSYSTEM('RPC_CRYPTO', source='dcesrv_ntlmssp.c dcesrv_gssapi.c dcesrv_spnego.c', @@ -39,19 +39,19 @@ bld.SAMBA3_SUBSYSTEM('RPC_CRYPTO', bld.SAMBA3_SUBSYSTEM('RPC_PIPE_REGISTER', source='srv_pipe_register.c', - deps='samba-util-common') + deps='samba-util') bld.SAMBA3_SUBSYSTEM('RPC_SERVER_REGISTER', source='rpc_ep_setup.c ../librpc/rpc/dcerpc_ep.c', - deps='samba-util-common') + deps='samba-util') bld.SAMBA3_SUBSYSTEM('EPMD', source='epmd.c', - deps='samba-util-common') + deps='samba-util') bld.SAMBA3_SUBSYSTEM('SRV_ACCESS_CHECK', source='srv_access_check.c', - deps='samba-util-common') + deps='samba-util') bld.SAMBA3_SUBSYSTEM('RPC_SAMR', source=RPC_SAMR_SRC, @@ -70,12 +70,12 @@ bld.SAMBA3_SUBSYSTEM('RPC_WINREG', bld.SAMBA3_SUBSYSTEM('RPC_INITSHUTDOWN', source=RPC_INITSHUTDOWN_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('RPC_DSSETUP', source=RPC_DSSETUP_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('RPC_WKSSVC', @@ -90,7 +90,7 @@ bld.SAMBA3_SUBSYSTEM('RPC_SVCCTL', bld.SAMBA3_SUBSYSTEM('RPC_NTSVCS', source=RPC_NTSVCS_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('RPC_NETLOGON', @@ -100,12 +100,12 @@ bld.SAMBA3_SUBSYSTEM('RPC_NETLOGON', bld.SAMBA3_SUBSYSTEM('RPC_NETDFS', source=RPC_NETDFS_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('RPC_SRVSVC', source=RPC_SRVSVC_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('RPC_SPOOLSS', @@ -120,12 +120,12 @@ bld.SAMBA3_SUBSYSTEM('RPC_EVENTLOG', bld.SAMBA3_SUBSYSTEM('RPC_RPCECHO', source=RPC_RPCECHO_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('RPC_EPMAPPER', source=RPC_EPMAPPER_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('RPC_SERVER', diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build index ebee8eaa7f..6754f35410 100644 --- a/source3/winbindd/wscript_build +++ b/source3/winbindd/wscript_build @@ -24,7 +24,7 @@ IDMAP_SRC = 'idmap.c idmap_util.c ${IDMAP_RW_SRC}' bld.SAMBA3_SUBSYSTEM('idmap', source=IDMAP_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('IDMAP_ADEX', @@ -34,7 +34,7 @@ bld.SAMBA3_SUBSYSTEM('IDMAP_ADEX', bld.SAMBA3_SUBSYSTEM('IDMAP_HASH', source=IDMAP_HASH_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('IDMAP_AD', @@ -60,7 +60,7 @@ bld.SAMBA3_MODULE('idmap_rid', bld.SAMBA3_MODULE('idmap_passdb', subsystem='idmap', source=IDMAP_PASSDB_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_passdb'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_passdb')) @@ -75,7 +75,7 @@ bld.SAMBA3_MODULE('idmap_ldap', bld.SAMBA3_MODULE('idmap_nss', subsystem='idmap', source=IDMAP_NSS_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_nss'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_nss')) @@ -83,7 +83,7 @@ bld.SAMBA3_MODULE('idmap_nss', bld.SAMBA3_MODULE('idmap_tdb', subsystem='idmap', source=IDMAP_TDB_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb')) @@ -91,7 +91,7 @@ bld.SAMBA3_MODULE('idmap_tdb', bld.SAMBA3_MODULE('idmap_tdb2', subsystem='idmap', source=IDMAP_TDB2_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb2'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb2')) @@ -115,7 +115,7 @@ bld.SAMBA3_MODULE('idmap_adex', bld.SAMBA3_MODULE('idmap_autorid', subsystem='idmap', source=IDMAP_AUTORID_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_autorid'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_autorid')) @@ -126,13 +126,13 @@ NSS_INFO_SRC = 'nss_info.c' bld.SAMBA3_SUBSYSTEM('nss_info', source=NSS_INFO_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_MODULE('nss_info_template', subsystem='nss_info', source=NSS_INFO_TEMPLATE_SRC, - deps='samba-util-common', + deps='samba-util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('nss_info_template'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('nss_info_template')) diff --git a/source3/wscript_build b/source3/wscript_build index 2f430a9047..12f5fe99a6 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -736,7 +736,7 @@ bld.SAMBA3_LIBRARY('passdb', bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', source=PARAM_UTIL_SRC, - deps='samba-util-common') + deps='samba-util') if bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX', @@ -760,18 +760,18 @@ bld.SAMBA3_SUBSYSTEM('param_service', bld.SAMBA3_SUBSYSTEM('REGFIO', source=REGFIO_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('REG_API_REGF', source=REG_API_REGF_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_LIBRARY('smbregistry', source=REG_BASE_SRC, deps='''LIB_NONSMBD tdb-wrap3 NDR_SECURITY UTIL_TDB talloc - replace util_reg samba-util-common security + replace util_reg samba-util security errors3 adt_tree dbwrap_util util_str util_sec''', vars=locals(), private_library=True) @@ -788,7 +788,7 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL', bld.SAMBA3_LIBRARY('POPT_SAMBA3', source=POPT_LIB_SRC, - deps='popt samba-util-common', + deps='popt samba-util', vars=locals(), private_library=True) @@ -856,23 +856,23 @@ bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER', bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER', source=LIBADS_PRINTER_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBAFS', source=AFS_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN', source=AFS_SETTOKEN_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_LIBRARY('smbconf', source=LIB_SMBCONF_SRC, deps='''LIBSMBCONF smbregistry REG_SMBCONF talloc PARAM_WITHOUT_REG - util_reg samba-util-common errors3 CHARSET SAMBA_VERSION''', + util_reg samba-util errors3 CHARSET SAMBA_VERSION''', public_headers='../lib/smbconf/smbconf.h', vnum='0') @@ -906,12 +906,12 @@ bld.SAMBA3_SUBSYSTEM('LOCKING', bld.SAMBA3_SUBSYSTEM('PROFILE', source='${PROFILE_SRC}', - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('PRINTBASE', source=PRINTBASE_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('PRINTBACKEND', @@ -926,12 +926,12 @@ bld.SAMBA3_SUBSYSTEM('PRINTING', bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL', source=PASSWD_UTIL_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('FNAME_UTIL', source=FNAME_UTIL_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBNET', @@ -966,7 +966,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNBT', bld.SAMBA3_SUBSYSTEM('SERVICES', source=SERVICES_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH', @@ -981,12 +981,12 @@ bld.SAMBA3_SUBSYSTEM('PASSCHANGE', bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION', source=VERSION_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('SLCACHE', source=SLCACHE_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('DCUTIL', @@ -1001,55 +1001,55 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', bld.SAMBA3_LIBRARY('dbwrap_util', source='lib/dbwrap_util.c lib/dbwrap_rbt.c', - deps='samba-util-common UTIL_TDB errors', + deps='samba-util UTIL_TDB errors', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('util_malloc', source='''lib/util_malloc.c''', - deps='samba-util-common', + deps='samba-util', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('string_init', source='''lib/string_init.c''', - deps='samba-util-common', + deps='samba-util', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('util_str', source='''lib/util_str.c''', - deps='samba-util-common CHARSET', + deps='samba-util CHARSET', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('util_sec', source='''lib/util_sec.c''', - deps='samba-util-common', + deps='samba-util', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('bitmap', source='lib/bitmap.c', - deps='samba-util-common', + deps='samba-util', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('namearray', source='lib/namearray.c', - deps='samba-util-common', + deps='samba-util', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('adt_tree', source='lib/adt_tree.c', - deps='samba-util-common', + deps='samba-util', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('memcache', source='lib/memcache.c', - deps='samba-util-common util_malloc', + deps='samba-util util_malloc', private_library=True, allow_undefined_symbols=False) @@ -1062,7 +1062,7 @@ bld.SAMBA3_LIBRARY('CHARSET3', bld.SAMBA3_SUBSYSTEM('ldb3', source='lib/ldb_compat.c', - deps='samba-util-common') + deps='samba-util') bld.SAMBA3_SUBSYSTEM('errors3', source='libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c', @@ -1090,20 +1090,20 @@ bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG', bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL', source=RPC_CLIENT_SCHANNEL_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('INIT_LSA', source='rpc_client/init_lsa.c', - deps='samba-util-common') + deps='samba-util') bld.SAMBA3_SUBSYSTEM('INIT_NETLOGON', source='rpc_client/init_netlogon.c', - deps='samba-util-common') + deps='samba-util') bld.SAMBA3_SUBSYSTEM('INIT_SAMR', source='rpc_client/init_samr.c', - deps='samba-util-common') + deps='samba-util') ########################## BINARIES ################################# @@ -1412,7 +1412,6 @@ bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat') if not bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3') - bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='DYNCONFIG') bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3') bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT') bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT') |