summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-09 15:56:20 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-18 16:46:41 +1100
commitc8b2b109760b366bee6dcf7c6c306936d271f508 (patch)
treef09769354164d60db9e0b237c9a8c4e0028aef2f /source3
parente92922308b5636d1b23fa44f1f8aa50413d48d77 (diff)
downloadsamba-c8b2b109760b366bee6dcf7c6c306936d271f508.tar.gz
samba-c8b2b109760b366bee6dcf7c6c306936d271f508.tar.bz2
samba-c8b2b109760b366bee6dcf7c6c306936d271f508.zip
s3-waf: use SAMBA3_*() build rules in source3/build
this brings the s3 waf build much closer to the proposed s3build top level build, using the same bld.SAMBA3_*() rules There are a few renames of subsystems in here, with a 3 suffix where it would create a conflict. Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/auth/wscript_build22
-rw-r--r--source3/build/wscript4
-rw-r--r--source3/libgpo/gpext/wscript_build8
-rw-r--r--source3/librpc/wscript_build20
-rw-r--r--source3/modules/wscript_build116
-rw-r--r--source3/pam_smbpass/wscript_build2
-rw-r--r--source3/passdb/wscript_build12
-rw-r--r--source3/rpc_server/wscript_build44
-rw-r--r--source3/winbindd/wscript_build42
-rw-r--r--source3/wscript_build279
10 files changed, 274 insertions, 275 deletions
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index e9010fffcb..21e8058269 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -18,51 +18,51 @@ AUTH_SRC = '''auth.c auth_util.c
user_krb5.c
auth_compat.c auth_ntlmssp.c'''
-bld.SAMBA_SUBSYSTEM('TOKEN_UTIL',
+bld.SAMBA3_SUBSYSTEM('TOKEN_UTIL',
source='token_util.c',
vars=locals())
-bld.SAMBA_SUBSYSTEM('auth',
+bld.SAMBA3_SUBSYSTEM('auth',
source=AUTH_SRC,
deps='''PLAINTEXT_AUTH SLCACHE DCUTIL TOKEN_UTIL''',
vars=locals())
-bld.SAMBA_MODULE('auth_sam',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_MODULE('auth_domain',
subsystem='auth',
source=AUTH_DOMAIN_SRC,
deps='RPC_CLIENT_SCHANNEL',
@@ -70,21 +70,21 @@ bld.SAMBA_MODULE('auth_domain',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_domain'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_domain'))
-bld.SAMBA_MODULE('auth_builtin',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_MODULE('auth_script',
subsystem='auth',
source=AUTH_SCRIPT_SRC,
init_function='',
diff --git a/source3/build/wscript b/source3/build/wscript
index c6eb55fc29..70219bc10a 100644
--- a/source3/build/wscript
+++ b/source3/build/wscript
@@ -41,11 +41,11 @@ def configure(conf):
def build(bld):
cflags = dynconfig_cflags(bld)
- bld.SAMBA_SUBSYSTEM('DYNCONFIG',
+ bld.SAMBA3_SUBSYSTEM('DYNCONFIG',
'../dynconfig.c',
deps='replace talloc tdb popt',
cflags=cflags)
- bld.SAMBA_SUBSYSTEM('LOCALE_DIR',
+ bld.SAMBA3_SUBSYSTEM('LOCALE_DIR',
'../localedir.c',
cflags='-DLOCALEDIR=\"%s\"' % bld.env.LOCALEDIR)
diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build
index 1f6e8df0fe..bfdb4d0bf6 100644
--- a/source3/libgpo/gpext/wscript_build
+++ b/source3/libgpo/gpext/wscript_build
@@ -6,11 +6,11 @@ GPEXT_SECURITY_SRC = 'security.c'
GPEXT_SRC = '''../../../libgpo/gpext/gpext.c'''
-bld.SAMBA_SUBSYSTEM('gpext',
+bld.SAMBA3_SUBSYSTEM('gpext',
source=GPEXT_SRC,
vars=locals())
-bld.SAMBA_MODULE('gpext_registry',
+bld.SAMBA3_MODULE('gpext_registry',
subsystem='gpext',
source=GPEXT_REGISTRY_SRC,
deps='NDR_PREG',
@@ -18,14 +18,14 @@ bld.SAMBA_MODULE('gpext_registry',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_registry'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('gpext_registry'))
-bld.SAMBA_MODULE('gpext_scripts',
+bld.SAMBA3_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',
+bld.SAMBA3_MODULE('gpext_security',
subsystem='gpext',
source=GPEXT_SECURITY_SRC,
init_function='',
diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build
index 4cd98a74b9..d99936cc16 100644
--- a/source3/librpc/wscript_build
+++ b/source3/librpc/wscript_build
@@ -1,51 +1,51 @@
#!/usr/bin/env python
-bld.SAMBA_SUBSYSTEM('NDR_LIBNETAPI',
+bld.SAMBA3_SUBSYSTEM('NDR_LIBNETAPI',
source='gen_ndr/ndr_libnetapi.c',
public_deps='ndr'
)
-bld.SAMBA_SUBSYSTEM('NDR_LIBNET_JOIN',
+bld.SAMBA3_SUBSYSTEM('NDR_LIBNET_JOIN',
source='gen_ndr/ndr_libnet_join.c',
public_deps='ndr'
)
-bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID',
+bld.SAMBA3_SUBSYSTEM('NDR_SERVER_ID',
source='gen_ndr/ndr_server_id.c',
public_deps='ndr'
)
-bld.SAMBA_SUBSYSTEM('NDR_MESSAGING',
+bld.SAMBA3_SUBSYSTEM('NDR_MESSAGING',
source='gen_ndr/ndr_messaging.c',
public_deps='ndr NDR_SERVER_ID'
)
-bld.SAMBA_SUBSYSTEM('NDR_NOTIFY',
+bld.SAMBA3_SUBSYSTEM('NDR_NOTIFY3',
source='gen_ndr/ndr_notify.c',
public_deps='ndr NDR_FILE_ID NDR_SERVER_ID'
)
-bld.SAMBA_SUBSYSTEM('NDR_SECRETS',
+bld.SAMBA3_SUBSYSTEM('NDR_SECRETS',
source='gen_ndr/ndr_secrets.c',
public_deps='ndr'
)
-bld.SAMBA_SUBSYSTEM('NDR_PERFCOUNT',
+bld.SAMBA3_SUBSYSTEM('NDR_PERFCOUNT',
source='gen_ndr/ndr_perfcount.c',
public_deps='ndr'
)
-bld.SAMBA_SUBSYSTEM('NDR_WBINT',
+bld.SAMBA3_SUBSYSTEM('NDR_WBINT',
source='gen_ndr/ndr_wbint.c',
public_deps='ndr'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_WBINT',
+bld.SAMBA3_SUBSYSTEM('RPC_NDR_WBINT',
source='../librpc/gen_ndr/ndr_wbint_c.c',
public_deps='dcerpc NDR_WBINT'
)
-bld.SAMBA_SUBSYSTEM('SRV_NDR_WBINT',
+bld.SAMBA3_SUBSYSTEM('SRV_NDR_WBINT',
source='../librpc/gen_ndr/srv_wbint.c',
public_deps='NDR_WBINT'
)
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 29d4d8f234..201610e8a2 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -51,47 +51,47 @@ VFS_LINUX_XFS_SGID_SRC = 'vfs_linux_xfs_sgid.c'
VFS_TIME_AUDIT_SRC = 'vfs_time_audit.c'
-bld.SAMBA_SUBSYSTEM('NFS4_ACLS',
+bld.SAMBA3_SUBSYSTEM('NFS4_ACLS',
source='nfs4_acls.c')
-bld.SAMBA_SUBSYSTEM('VFS_AIXACL_UTIL',
+bld.SAMBA3_SUBSYSTEM('VFS_AIXACL_UTIL',
source='vfs_aixacl_util.c',
enabled=False) #fixme
-bld.SAMBA_SUBSYSTEM('vfs',
+bld.SAMBA3_SUBSYSTEM('vfs',
source='',
deps='',
vars=locals())
-bld.SAMBA_MODULE('vfs_default',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_MODULE('vfs_fake_perms',
subsystem='vfs',
source=VFS_FAKE_PERMS_SRC,
deps='acl attr',
@@ -99,70 +99,70 @@ bld.SAMBA_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_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_MODULE('vfs_xattr_tdb',
subsystem='vfs',
source=VFS_XATTR_TDB_SRC,
deps='NDR_XATTR',
@@ -170,7 +170,7 @@ bld.SAMBA_MODULE('vfs_xattr_tdb',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_xattr_tdb'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_xattr_tdb'))
-bld.SAMBA_MODULE('vfs_posixacl',
+bld.SAMBA3_MODULE('vfs_posixacl',
subsystem='vfs',
source=VFS_POSIXACL_SRC,
deps='acl attr',
@@ -178,7 +178,7 @@ bld.SAMBA_MODULE('vfs_posixacl',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_posixacl'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_posixacl'))
-bld.SAMBA_MODULE('vfs_aixacl',
+bld.SAMBA3_MODULE('vfs_aixacl',
subsystem='vfs',
source=VFS_AIXACL_SRC,
deps='VFS_AIXACL_UTIL',
@@ -186,7 +186,7 @@ bld.SAMBA_MODULE('vfs_aixacl',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aixacl'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl'))
-bld.SAMBA_MODULE('vfs_aixacl2',
+bld.SAMBA3_MODULE('vfs_aixacl2',
subsystem='vfs',
source=VFS_AIXACL2_SRC,
deps='NFS4_ACLS VFS_AIXACL_UTIL',
@@ -194,14 +194,14 @@ bld.SAMBA_MODULE('vfs_aixacl2',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aixacl2'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl2'))
-bld.SAMBA_MODULE('vfs_solarisacl',
+bld.SAMBA3_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',
+bld.SAMBA3_MODULE('vfs_zfsacl',
subsystem='vfs',
source=VFS_ZFSACL_SRC,
deps='NFS4_ACLS sunacl',
@@ -209,70 +209,70 @@ bld.SAMBA_MODULE('vfs_zfsacl',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_zfsacl'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'))
-bld.SAMBA_MODULE('vfs_hpuxacl',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_MODULE('vfs_gpfs',
subsystem='vfs',
source=VFS_GPFS_SRC,
deps='NFS4_ACLS',
@@ -280,63 +280,63 @@ bld.SAMBA_MODULE('vfs_gpfs',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_gpfs'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_gpfs'))
-bld.SAMBA_MODULE('vfs_notify_fam',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_MODULE('vfs_acl_tdb',
subsystem='vfs',
source=VFS_ACL_TDB_SRC,
deps='NDR_XATTR',
@@ -344,56 +344,56 @@ bld.SAMBA_MODULE('vfs_acl_tdb',
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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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'),
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,
init_function='',
@@ -408,32 +408,32 @@ CHARSET_CP437_SRC = 'CP437.c'
CHARSET_MACOSXFS_SRC = 'charset_macosxfs.c'
-bld.SAMBA_SUBSYSTEM('charset',
+bld.SAMBA3_SUBSYSTEM('charset',
source='',
vars=locals())
-bld.SAMBA_MODULE('charset_weird',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_MODULE('charset_macosxfs',
subsystem='charset',
source=CHARSET_MACOSXFS_SRC,
init_function='',
@@ -444,18 +444,18 @@ bld.SAMBA_MODULE('charset_macosxfs',
PERFCOUNT_ONEFS_SRC = 'perfcount_onefs.c'
PERFCOUNT_TEST_SRC = 'perfcount_test.c'
-bld.SAMBA_SUBSYSTEM('perfcount',
+bld.SAMBA3_SUBSYSTEM('perfcount',
source='',
vars=locals())
-bld.SAMBA_MODULE('perfcount_onefs',
+bld.SAMBA3_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',
+bld.SAMBA3_MODULE('perfcount_test',
subsystem='perfcount',
source=PERFCOUNT_TEST_SRC,
init_function='',
diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build
index 2eaee2ea98..d027979321 100644
--- a/source3/pam_smbpass/wscript_build
+++ b/source3/pam_smbpass/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
if bld.CONFIG_SET('WITH_PAM_MODULES'):
- bld.SAMBA_LIBRARY('pamsmbpass',
+ bld.SAMBA3_LIBRARY('pamsmbpass',
source='''pam_smb_auth.c
pam_smb_passwd.c
pam_smb_acct.c
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index fc53ee5a38..2c0416f681 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -6,26 +6,26 @@ PDB_ADS_SRC = 'pdb_ads.c'
PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c'
PDB_WBC_SAM_SRC = 'pdb_wbc_sam.c'
-bld.SAMBA_SUBSYSTEM('pdb',
+bld.SAMBA3_SUBSYSTEM('pdb',
source='pdb_interface.c',
deps='',
vars=locals())
-bld.SAMBA_MODULE('pdb_tdbsam',
+bld.SAMBA3_MODULE('pdb_tdbsam',
subsystem='pdb',
source=PDB_TDBSAM_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_tdbsam'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_tdbsam'))
-bld.SAMBA_MODULE('pdb_ldap',
+bld.SAMBA3_MODULE('pdb_ldap',
subsystem='pdb',
source=PDB_LDAP_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldap'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldap') and bld.env.HAVE_LDAP)
-bld.SAMBA_MODULE('pdb_ads',
+bld.SAMBA3_MODULE('pdb_ads',
subsystem='pdb',
source=PDB_ADS_SRC,
deps='LIBCLI_LDAP_NDR TLDAP',
@@ -33,14 +33,14 @@ bld.SAMBA_MODULE('pdb_ads',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ads'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ads'))
-bld.SAMBA_MODULE('pdb_smbpasswd',
+bld.SAMBA3_MODULE('pdb_smbpasswd',
subsystem='pdb',
source=PDB_SMBPASSWD_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_smbpasswd'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_smbpasswd'))
-bld.SAMBA_MODULE('pdb_wbc_sam',
+bld.SAMBA3_MODULE('pdb_wbc_sam',
subsystem='pdb',
source=PDB_WBC_SAM_SRC,
init_function='',
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index 2eb5b3af0a..96801b5d83 100644
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -20,94 +20,94 @@ RPC_EVENTLOG_SRC = '''eventlog/srv_eventlog_nt.c eventlog/srv_eventlog_reg.c ../
RPC_RPCECHO_SRC = '''echo/srv_echo_nt.c ../../librpc/gen_ndr/srv_echo.c'''
RPC_EPMAPPER_SRC = '''epmapper/srv_epmapper.c ../../librpc/gen_ndr/srv_epmapper.c'''
-bld.SAMBA_SUBSYSTEM('rpc',
+bld.SAMBA3_SUBSYSTEM('rpc',
source='',
deps='RPC_PIPE_REGISTER',
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_NCACN_NP',
+bld.SAMBA3_SUBSYSTEM('RPC_NCACN_NP',
source='rpc_ncacn_np.c rpc_handles.c',
deps='auth_sam_reply')
-bld.SAMBA_SUBSYSTEM('RPC_SERVICE',
+bld.SAMBA3_SUBSYSTEM('RPC_SERVICE',
source='rpc_server.c')
-bld.SAMBA_SUBSYSTEM('RPC_CRYPTO',
+bld.SAMBA3_SUBSYSTEM('RPC_CRYPTO',
source='dcesrv_ntlmssp.c dcesrv_gssapi.c dcesrv_spnego.c')
-bld.SAMBA_SUBSYSTEM('RPC_PIPE_REGISTER',
+bld.SAMBA3_SUBSYSTEM('RPC_PIPE_REGISTER',
source='srv_pipe_register.c')
-bld.SAMBA_SUBSYSTEM('RPC_SERVER_REGISTER',
+bld.SAMBA3_SUBSYSTEM('RPC_SERVER_REGISTER',
source='srv_rpc_register.c ../librpc/rpc/dcerpc_ep.c')
-bld.SAMBA_SUBSYSTEM('RPC_SAMR',
+bld.SAMBA3_SUBSYSTEM('RPC_SAMR',
source=RPC_SAMR_SRC,
deps='PLAINTEXT_AUTH',
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_LSARPC',
+bld.SAMBA3_SUBSYSTEM('RPC_LSARPC',
source=RPC_LSARPC_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_WINREG',
+bld.SAMBA3_SUBSYSTEM('RPC_WINREG',
source=RPC_WINREG_SRC,
deps='REGFIO REG_API_REGF NDR_PERFCOUNT',
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_INITSHUTDOWN',
+bld.SAMBA3_SUBSYSTEM('RPC_INITSHUTDOWN',
source=RPC_INITSHUTDOWN_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_DSSETUP',
+bld.SAMBA3_SUBSYSTEM('RPC_DSSETUP',
source=RPC_DSSETUP_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_WKSSVC',
+bld.SAMBA3_SUBSYSTEM('RPC_WKSSVC',
source=RPC_WKSSVC_SRC,
deps='LIBNET',
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_SVCCTL',
+bld.SAMBA3_SUBSYSTEM('RPC_SVCCTL',
source=RPC_SVCCTL_SRC,
deps='SERVICES LIBCLI_WINREG',
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_NTSVCS',
+bld.SAMBA3_SUBSYSTEM('RPC_NTSVCS',
source=RPC_NTSVCS_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_NETLOGON',
+bld.SAMBA3_SUBSYSTEM('RPC_NETLOGON',
source=RPC_NETLOGON_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_NETDFS',
+bld.SAMBA3_SUBSYSTEM('RPC_NETDFS',
source=RPC_NETDFS_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_SRVSVC',
+bld.SAMBA3_SUBSYSTEM('RPC_SRVSVC',
source=RPC_SRVSVC_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_SPOOLSS',
+bld.SAMBA3_SUBSYSTEM('RPC_SPOOLSS',
source=RPC_SPOOLSS_SRC,
deps='cups PRINTING PRINTBACKEND LIBCLI_WINREG',
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_EVENTLOG',
+bld.SAMBA3_SUBSYSTEM('RPC_EVENTLOG',
source=RPC_EVENTLOG_SRC,
deps='LIBEVENTLOG LIBCLI_WINREG',
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_RPCECHO',
+bld.SAMBA3_SUBSYSTEM('RPC_RPCECHO',
source=RPC_RPCECHO_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_EPMAPPER',
+bld.SAMBA3_SUBSYSTEM('RPC_EPMAPPER',
source=RPC_EPMAPPER_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('RPC_SERVER',
+bld.SAMBA3_SUBSYSTEM('RPC_SERVER',
source='srv_pipe_hnd.c srv_pipe.c',
deps='''RPC_NCACN_NP RPC_SERVICE RPC_CRYPTO
RPC_SAMR RPC_LSARPC RPC_WINREG RPC_INITSHUTDOWN
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index bb2ae3f52f..dbae11697e 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -22,25 +22,25 @@ IDMAP_AUTORID_SRC = '''idmap_autorid.c'''
IDMAP_RW_SRC = 'idmap_rw.c'
IDMAP_SRC = 'idmap.c idmap_util.c ${IDMAP_RW_SRC}'
-bld.SAMBA_SUBSYSTEM('idmap',
+bld.SAMBA3_SUBSYSTEM('idmap',
source=IDMAP_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('IDMAP_ADEX',
+bld.SAMBA3_SUBSYSTEM('IDMAP_ADEX',
source=IDMAP_ADEX_SRC,
vars=locals(),
enabled=bld.env.HAVE_LDAP)
-bld.SAMBA_SUBSYSTEM('IDMAP_HASH',
+bld.SAMBA3_SUBSYSTEM('IDMAP_HASH',
source=IDMAP_HASH_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('IDMAP_AD',
+bld.SAMBA3_SUBSYSTEM('IDMAP_AD',
source=IDMAP_AD_SRC,
vars=locals(),
enabled=bld.env.HAVE_LDAP)
-bld.SAMBA_MODULE('idmap_ad',
+bld.SAMBA3_MODULE('idmap_ad',
subsystem='idmap',
source='',
deps='IDMAP_AD',
@@ -48,49 +48,49 @@ bld.SAMBA_MODULE('idmap_ad',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad' and bld.env.HAVE_LDAP))
-bld.SAMBA_MODULE('idmap_rid',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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') and bld.env.HAVE_LDAP)
-bld.SAMBA_MODULE('idmap_nss',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_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',
+bld.SAMBA3_MODULE('idmap_hash',
subsystem='idmap',
source='',
deps='IDMAP_HASH',
@@ -98,7 +98,7 @@ bld.SAMBA_MODULE('idmap_hash',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_hash'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_hash'))
-bld.SAMBA_MODULE('idmap_adex',
+bld.SAMBA3_MODULE('idmap_adex',
subsystem='idmap',
source='',
deps='IDMAP_ADEX',
@@ -106,7 +106,7 @@ bld.SAMBA_MODULE('idmap_adex',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_adex'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_adex') and bld.env.HAVE_LDAP)
-bld.SAMBA_MODULE('idmap_autorid',
+bld.SAMBA3_MODULE('idmap_autorid',
subsystem='idmap',
source=IDMAP_AUTORID_SRC,
init_function='',
@@ -117,18 +117,18 @@ bld.SAMBA_MODULE('idmap_autorid',
NSS_INFO_TEMPLATE_SRC = 'nss_info_template.c'
NSS_INFO_SRC = 'nss_info.c'
-bld.SAMBA_SUBSYSTEM('nss_info',
+bld.SAMBA3_SUBSYSTEM('nss_info',
source=NSS_INFO_SRC,
vars=locals())
-bld.SAMBA_MODULE('nss_info_template',
+bld.SAMBA3_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',
+bld.SAMBA3_MODULE('nss_info_adex',
subsystem='nss_info',
source='',
deps='IDMAP_ADEX',
@@ -136,7 +136,7 @@ bld.SAMBA_MODULE('nss_info_adex',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_adex'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_adex') and bld.env.HAVE_LDAP)
-bld.SAMBA_MODULE('nss_info_hash',
+bld.SAMBA3_MODULE('nss_info_hash',
subsystem='nss_info',
source='',
deps='IDMAP_HASH',
@@ -144,7 +144,7 @@ bld.SAMBA_MODULE('nss_info_hash',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_hash'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_hash'))
-bld.SAMBA_MODULE('nss_info_rfc2307',
+bld.SAMBA3_MODULE('nss_info_rfc2307',
subsystem='nss_info',
source='',
deps='IDMAP_AD',
@@ -152,7 +152,7 @@ bld.SAMBA_MODULE('nss_info_rfc2307',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.env.HAVE_LDAP)
-bld.SAMBA_MODULE('nss_info_sfu20',
+bld.SAMBA3_MODULE('nss_info_sfu20',
subsystem='nss_info',
source='',
deps='IDMAP_AD',
@@ -160,7 +160,7 @@ bld.SAMBA_MODULE('nss_info_sfu20',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.env.HAVE_LDAP)
-bld.SAMBA_MODULE('nss_info_sfu',
+bld.SAMBA3_MODULE('nss_info_sfu',
subsystem='nss_info',
source='',
deps='IDMAP_AD',
diff --git a/source3/wscript_build b/source3/wscript_build
index 1c29bd7c2b..c84787bf06 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from samba_utils import *
-import samba_version
+import samba_version, samba3
TDB_LIB_SRC = '''
lib/dbwrap.c lib/dbwrap_tdb.c
@@ -686,59 +686,58 @@ samba_version.load_version(bld.env)
bld.SAMBA_MKVERSION('include/version.h')
bld.RECURSE('../lib/replace')
-print "SBINDIR=%s" % bld.env.SBINDIR
bld.RECURSE('build')
######################## SUBSYSTEMS #################################
-bld.SAMBA_LIBRARY('netapi',
+bld.SAMBA3_LIBRARY('netapi',
source=LIBNETAPI_SRC,
public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT
PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI
RPC_CLIENT_SCHANNEL LIB_SMBCONF REG_SMBCONF TOKEN_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON
+ LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_INITSHUTDOWN
INIT_NETLOGON INIT_SAMR''',
- public_headers='lib/netapi/netapi.h',
+ public_headers='../source3/lib/netapi/netapi.h',
vnum='0',
vars=locals())
-bld.SAMBA_LIBRARY('smbclient',
+bld.SAMBA3_LIBRARY('libsmb/smbclient',
source=LIBSMBCLIENT_SRC,
public_deps='''talloc tdb wbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB
- LIBMSRPC_GEN LIBMSRPC LIBCLI_LSA RPC_NDR_SRVSVC''',
+ LIBMSRPC_GEN LIBMSRPC LIBCLI_LSA3 RPC_NDR_SRVSVC''',
public_headers='include/libsmbclient.h',
vnum='0',
vars=locals())
-bld.SAMBA_LIBRARY('smbsharemodes',
+bld.SAMBA3_LIBRARY('smbsharemodes',
source=LIBSMBSHAREMODES_SRC,
public_deps='''talloc tdb''',
public_headers='include/smb_share_modes.h',
vnum='0',
vars=locals())
-bld.SAMBA_LIBRARY('nss_wins',
+bld.SAMBA3_LIBRARY('nss_wins',
source=WINBIND_WINS_NSS_SRC,
deps='''winbind-client PARAM LIBSMB LIB_NONSMBD LIBTSOCKET KRBCLIENT
cap wbclient''',
realname='libnss_wins.so.2',
vnum='2')
-bld.SAMBA_SUBSYSTEM('LIBMSRPC',
+bld.SAMBA3_SUBSYSTEM('LIBMSRPC',
source='${LIBMSRPC_SRC}',
- deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
+ deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC3 NDR_SCHANNEL
RPC_NDR_EPMAPPER COMMON_SCHANNELDB LIBCLI_AUTH
LIBTSOCKET''',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
+bld.SAMBA3_SUBSYSTEM('LIBMSRPC_GEN',
source='',
deps='''ndr-standard NDR_DSSETUP NDR_SPOOLSS''',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBGPO',
+bld.SAMBA3_SUBSYSTEM('LIBGPO',
source='${LIBGPO_SRC}',
deps='gpext',
vars=locals())
@@ -748,54 +747,54 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
deps='talloc',
local_include=False)
-bld.SAMBA_SUBSYSTEM('AVAHI',
+bld.SAMBA3_SUBSYSTEM('AVAHI',
source=AVAHI_SRC,
deps='avahi-common avahi-client',
enabled=bld.env.with_avahi)
-bld.SAMBA_SUBSYSTEM('GROUPDB',
+bld.SAMBA3_SUBSYSTEM('GROUPDB',
source=GROUPDB_SRC)
-bld.SAMBA_SUBSYSTEM('TLDAP',
+bld.SAMBA3_SUBSYSTEM('TLDAP',
source=TLDAP_SRC,
deps='ASN1_UTIL LIBTSOCKET')
-bld.SAMBA_SUBSYSTEM('PASSDB',
+bld.SAMBA3_SUBSYSTEM('PASSDB',
source=PASSDB_SRC,
- deps='''GROUPDB SECRETS SMBLDAP pdb''',
+ deps='''GROUPDB SECRETS3 SMBLDAP pdb''',
vars=locals())
-bld.SAMBA_SUBSYSTEM('PARAM_UTIL',
+bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
source=PARAM_UTIL_SRC)
-bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
+bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG',
source=PARAM_WITHOUT_REG_SRC,
deps='''PARAM_UTIL''',
vars=locals())
-bld.SAMBA_SUBSYSTEM('PARAM',
+bld.SAMBA3_SUBSYSTEM('PARAM',
source='',
deps='PARAM_WITHOUT_REG DYNCONFIG LIB_SMBCONF',
vars=locals())
-bld.SAMBA_SUBSYSTEM('REGFIO',
+bld.SAMBA3_SUBSYSTEM('REGFIO',
source=REGFIO_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('REG_API_REGF',
+bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
source=REG_API_REGF_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('REG_BASE',
+bld.SAMBA3_SUBSYSTEM('REG_BASE',
source=REG_BASE_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('REG_SMBCONF',
+bld.SAMBA3_SUBSYSTEM('REG_SMBCONF',
source=REG_SMBCONF_SRC,
deps='REG_BASE',
vars=locals())
-bld.SAMBA_SUBSYSTEM('REG_FULL',
+bld.SAMBA3_SUBSYSTEM('REG_FULL',
source=REG_FULL_SRC,
deps='REG_SMBCONF',
vars=locals())
@@ -804,130 +803,130 @@ bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
source=POPT_LIB_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('KRBCLIENT',
+bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
source=KRBCLIENT_SRC,
deps='krb5 k5crypto com_err gssapi gssapi_krb5',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBS',
+bld.SAMBA3_SUBSYSTEM('LIBS',
source=LIB_SRC,
deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET UTIL_TDB SAMBA_VERSION',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
+bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD',
source=LIB_NONSMBD_SRC,
deps='LIBS',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBSMB_ERR',
+bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR',
source=LIBSMB_ERR_SRC,
- deps='errors SECRETS ldap lber MSRPC_PARSE LIBCLI_AUTH',
+ deps='errors SECRETS3 ldap lber MSRPC_PARSE LIBCLI_AUTH',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBSAMBA',
+bld.SAMBA3_SUBSYSTEM('LIBSAMBA',
source=LIBSAMBA_SRC,
deps='LIBSMB_ERR NDR_NTLMSSP ntlm_check',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBSMB',
+bld.SAMBA3_SUBSYSTEM('LIBSMB',
source=LIBSMB_SRC,
deps='LIBSAMBA CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBDRSUAPI',
+bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI',
source=DRSUAPI_SRC,
deps='z LZXPRESS NDR_DRSUAPI NDR_DRSBLOBS',
vars=locals())
-bld.SAMBA_SUBSYSTEM('CLDAP',
+bld.SAMBA3_SUBSYSTEM('CLDAP',
source=CLDAP_SRC,
deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBTSOCKET',
vars=locals())
-bld.SAMBA_SUBSYSTEM('SECRETS',
+bld.SAMBA3_SUBSYSTEM('SECRETS3',
source=SECRETS_SRC,
deps='NDR_SECRETS',
vars=locals())
-bld.SAMBA_SUBSYSTEM('SMBLDAP',
+bld.SAMBA3_SUBSYSTEM('SMBLDAP',
source=SMBLDAP_SRC,
deps='ldap lber',
vars=locals(),
enabled=bld.env.HAVE_LDAP)
-bld.SAMBA_SUBSYSTEM('LIBADS',
+bld.SAMBA3_SUBSYSTEM('LIBADS',
source=LIBADS_SRC,
deps='LIBCLI_LDAP_NDR',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBADS_SERVER',
+bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
source=LIBADS_SERVER_SRC,
deps='ndr-krb5pac',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBADS_PRINTER',
+bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
source=LIBADS_PRINTER_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBAFS',
+bld.SAMBA3_SUBSYSTEM('LIBAFS',
source=AFS_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBAFS_SETTOKEN',
+bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN',
source=AFS_SETTOKEN_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIB_SMBCONF',
+bld.SAMBA3_SUBSYSTEM('LIB_SMBCONF',
source=LIB_SMBCONF_SRC,
deps='LIBSMBCONF REG_BASE REG_SMBCONF',
vars=locals())
-bld.SAMBA_SUBSYSTEM('SMBD_BASE',
+bld.SAMBA3_SUBSYSTEM('SMBD_BASE',
source=SMBD_SRC_BASE,
deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
DYNCONFIG wbclient crypt nsl cups cap resolv z PASSDB
PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
- PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO
+ PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY3 REGFIO
LIB_SMBCONF REG_FULL FNAME_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+ LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
RPC_NDR_SRVSVC NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON INIT_SAMR
LIBCLI_SMB_COMMON RPC_SERVER
''',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LOCKING',
+bld.SAMBA3_SUBSYSTEM('LOCKING',
source='${LOCKING_SRC}',
deps='''tdb talloc''',
vars=locals())
-bld.SAMBA_SUBSYSTEM('PROFILE',
+bld.SAMBA3_SUBSYSTEM('PROFILE',
source='${PROFILE_SRC}',
vars=locals())
-bld.SAMBA_SUBSYSTEM('PRINTBASE',
+bld.SAMBA3_SUBSYSTEM('PRINTBASE',
source=PRINTBASE_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('PRINTBACKEND',
+bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
source=PRINTBACKEND_SRC,
deps='PRINTBASE NDR_NTPRINTING LIBADS_PRINTER',
vars=locals())
-bld.SAMBA_SUBSYSTEM('PRINTING',
+bld.SAMBA3_SUBSYSTEM('PRINTING',
source=PRINTING_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('PASSWD_UTIL',
+bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
source=PASSWD_UTIL_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('FNAME_UTIL',
+bld.SAMBA3_SUBSYSTEM('FNAME_UTIL',
source=FNAME_UTIL_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('UTIL_TDB',
+bld.SAMBA3_SUBSYSTEM('UTIL_TDB3',
source='../lib/util/util_tdb.c',
local_include=False,
public_deps='tdb talloc'
@@ -941,84 +940,84 @@ bld.SAMBA_SUBSYSTEM('UTIL_TEVENT',
header_path=[ ('*', 'util') ],
)
-bld.SAMBA_SUBSYSTEM('LIBNET',
+bld.SAMBA3_SUBSYSTEM('LIBNET',
source=LIBNET_SRC,
deps='NDR_LIBNET_JOIN',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBNET_DSSYNC',
+bld.SAMBA3_SUBSYSTEM('LIBNET_DSSYNC',
source=LIBNET_DSSYNC_SRC,
deps='LIBNET LIBCLI_DRSUAPI',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBNET_SAMSYNC',
+bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
source=LIBNET_SAMSYNC_SRC,
deps='LIBNET LIBCLI_SAMSYNC',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBEVENTLOG',
+bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
source=LIB_EVENTLOG_SRC,
deps='NDR_EVENTLOG',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBNMB',
+bld.SAMBA3_SUBSYSTEM('LIBNMB',
source=LIBNMB_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBNBT',
+bld.SAMBA3_SUBSYSTEM('LIBNBT',
source='',
deps='NDR_SVCCTL NDR_NBT NDR_NBT_BUF LIBCLI_NETLOGON LIBCLI_NDR_NETLOGON',
vars=locals())
-bld.SAMBA_SUBSYSTEM('SERVICES',
+bld.SAMBA3_SUBSYSTEM('SERVICES',
source=SERVICES_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('PLAINTEXT_AUTH',
+bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH',
source=PLAINTEXT_AUTH_SRC,
deps='pam PAM_ERRORS',
vars=locals())
-bld.SAMBA_SUBSYSTEM('PASSCHANGE',
+bld.SAMBA3_SUBSYSTEM('PASSCHANGE',
source=PASSCHANGE_SRC,
deps='LIBCLI_SAMR',
vars=locals())
-bld.SAMBA_SUBSYSTEM('SAMBA_VERSION',
+bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
source=VERSION_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('SLCACHE',
+bld.SAMBA3_SUBSYSTEM('SLCACHE',
source=SLCACHE_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('SPNEGO_PARSE',
+bld.SAMBA3_SUBSYSTEM('SPNEGO_PARSE',
source='../libcli/auth/spnego_parse.c',
vars=locals())
-bld.SAMBA_SUBSYSTEM('DCUTIL',
+bld.SAMBA3_SUBSYSTEM('DCUTIL',
source=DCUTIL_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('ndr-util',
+bld.SAMBA3_SUBSYSTEM('ndr-util',
source=LIBNDR_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('tdb-wrap',
+bld.SAMBA3_SUBSYSTEM('tdb-wrap',
source='lib/util_tdb.c',
vars=locals())
-bld.SAMBA_SUBSYSTEM('CHARSET',
+bld.SAMBA3_SUBSYSTEM('CHARSET',
source='''lib/util_str.c lib/util_unistr.c lib/charcnv.c lib/iconv.c''',
public_deps='iconv',
deps='DYNCONFIG')
-bld.SAMBA_SUBSYSTEM('samba-util',
+bld.SAMBA3_SUBSYSTEM('samba-util',
source=UTIL_SRC,
deps='talloc CHARSET LIBCRYPTO',
vars=locals())
#FIXME
-bld.SAMBA_SUBSYSTEM('ndr-standard',
+bld.SAMBA3_SUBSYSTEM('ndr-standard',
source='',
deps='''
NDR_SECURITY NDR_LSA NDR_SAMR NDR_NETLOGON NDR_EVENTLOG NDR_DFS
@@ -1028,70 +1027,70 @@ bld.SAMBA_SUBSYSTEM('ndr-standard',
vars=locals())
#FIXME
-bld.SAMBA_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
+bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
-bld.SAMBA_SUBSYSTEM('ldb',
+bld.SAMBA3_SUBSYSTEM('ldb',
source='lib/ldb_compat.c')
-bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
+bld.SAMBA3_SUBSYSTEM('NDR_SECURITY',
source='''../librpc/gen_ndr/ndr_security.c ../librpc/ndr/ndr_sec_helper.c''',
deps='ndr',
vars=locals())
-bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
+bld.SAMBA3_SUBSYSTEM('NDR_DCERPC3',
source='../librpc/gen_ndr/ndr_dcerpc.c',
vars=locals())
-bld.SAMBA_SUBSYSTEM('errors',
- source='../libcli/util/doserr.c libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c')
+bld.SAMBA3_SUBSYSTEM('errors',
+ source='../libcli/util/doserr.c libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c')
-bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
+bld.SAMBA3_SUBSYSTEM('NDR_NBT_BUF',
source='../libcli/nbt/nbtname.c',
deps='talloc',
autoproto='nbtname.h')
-bld.SAMBA_SUBSYSTEM('LIBCLI_SAMR',
+bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
source=LIBCLI_SAMR_SRC,
deps='RPC_NDR_SAMR')
-bld.SAMBA_SUBSYSTEM('LIBCLI_LSA',
+bld.SAMBA3_SUBSYSTEM('LIBCLI_LSA3',
source=LIBCLI_LSA_SRC,
deps='RPC_NDR_LSA INIT_LSA')
-bld.SAMBA_SUBSYSTEM('LIBRPCCLI_NETLOGON',
+bld.SAMBA3_SUBSYSTEM('LIBRPCCLI_NETLOGON',
source=LIBRPCCLI_NETLOGON_SRC,
deps='RPC_NDR_NETLOGON')
-bld.SAMBA_SUBSYSTEM('LIBCLI_SPOOLSS',
+bld.SAMBA3_SUBSYSTEM('LIBCLI_SPOOLSS',
source=LIBCLI_SPOOLSS_SRC,
deps='RPC_NDR_SPOOLSS')
-bld.SAMBA_SUBSYSTEM('LIBCLI_WINREG',
+bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG',
source=LIBCLI_WINREG_SRC,
deps='RPC_NDR_WINREG')
-bld.SAMBA_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
+bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
source=RPC_CLIENT_SCHANNEL_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('INIT_LSA',
+bld.SAMBA3_SUBSYSTEM('INIT_LSA',
source='rpc_client/init_lsa.c')
-bld.SAMBA_SUBSYSTEM('INIT_NETLOGON',
+bld.SAMBA3_SUBSYSTEM('INIT_NETLOGON',
source='rpc_client/init_netlogon.c')
-bld.SAMBA_SUBSYSTEM('INIT_SAMR',
+bld.SAMBA3_SUBSYSTEM('INIT_SAMR',
source='rpc_client/init_samr.c')
########################## BINARIES #################################
-bld.SAMBA_BINARY('smbd/smbd',
+bld.SAMBA3_BINARY('smbd/smbd',
source='${SMBD_SRC_MAIN}',
deps='''SMBD_BASE''',
install_path='${SBINDIR}',
vars=locals())
-bld.SAMBA_BINARY('nmbd/nmbd',
+bld.SAMBA3_BINARY('nmbd/nmbd',
source=NMBD_SRC,
deps='''talloc tdb tevent z cap resolv wbclient dl
PASSDB PARAM ldap LIB_NONSMBD LIBSMB
@@ -1099,7 +1098,7 @@ bld.SAMBA_BINARY('nmbd/nmbd',
install_path='${SBINDIR}',
vars=locals())
-bld.SAMBA_BINARY('winbindd/winbindd',
+bld.SAMBA3_BINARY('winbindd/winbindd',
source=WINBINDD_SRC,
deps='''talloc tdb tevent cap dl z
wbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
@@ -1107,7 +1106,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
SRV_NDR_WBINT RPC_NDR_WBINT LIBAFS
LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
TOKEN_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON
+ LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON
RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
PAM_ERRORS WB_REQTRANS
@@ -1116,7 +1115,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
install_path='${SBINDIR}',
vars=locals())
-bld.SAMBA_BINARY('web/swat',
+bld.SAMBA3_BINARY('web/swat',
source=SWAT_SRC,
deps='''talloc tevent cap LIBS LIBSMB wbclient PARAM
LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups
@@ -1126,27 +1125,27 @@ bld.SAMBA_BINARY('web/swat',
install_path='${SBINDIR}',
vars=locals())
-bld.SAMBA_BINARY('rpcclient/rpcclient',
+bld.SAMBA3_BINARY('rpcclient/rpcclient',
source=RPCCLIENT_SRC,
deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC
LIBADS SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO
RPC_CLIENT_SCHANNEL
- LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+ LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_DSSETUP RPC_NDR_DFS
RPC_NDR_DRSUAPI RPC_NDR_NTSVCS RPC_NDR_EVENTLOG INIT_NETLOGON
INIT_SAMR
''',
vars=locals())
-bld.SAMBA_BINARY('client/smbclient',
+bld.SAMBA3_BINARY('client/smbclient',
source=CLIENT_SRC,
deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN
- LIBMSRPC SMBREADLINE smbclient RPC_NDR_SRVSVC INIT_LSA''',
+ LIBMSRPC SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA''',
vars=locals())
-bld.SAMBA_BINARY('net',
+bld.SAMBA3_BINARY('net',
source=NET_SRC,
deps='''talloc tdb netapi addns cap resolv intl POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBGPO LIBADS LIBADS_SERVER LIBADS_PRINTER
@@ -1154,182 +1153,182 @@ bld.SAMBA_BINARY('net',
LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
REGFIO NDR_NTPRINTING RPC_NDR_WINREG
RPC_CLIENT_SCHANNEL TOKEN_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+ LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_SVCCTL RPC_NDR_DSSETUP
RPC_NDR_INITSHUTDOWN RPC_NDR_DRSUAPI INIT_NETLOGON INIT_SAMR
''',
vars=locals())
-bld.SAMBA_BINARY('profiles',
+bld.SAMBA3_BINARY('profiles',
source=PROFILES_SRC,
deps='''talloc tdb cap tevent POPT_SAMBA PARAM LIBS LIBSMB_ERR LIB_NONSMBD REGFIO''',
vars=locals())
-bld.SAMBA_BINARY('smbspool',
+bld.SAMBA3_BINARY('smbspool',
source=CUPS_SRC,
deps='''talloc tdb tevent resolv cap wbclient POPT_SAMBA PARAM LIBSMB LIB_NONSMBD LIBS
KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
vars=locals())
-bld.SAMBA_BINARY('testparm',
+bld.SAMBA3_BINARY('testparm',
source=TESTPARM_SRC,
deps='''talloc tevent ldap cap
wbclient ASN1_UTIL LIBTSOCKET PASSDB PARAM LIB_NONSMBD
LIBSMB_ERR POPT_SAMBA''',
vars=locals())
-bld.SAMBA_BINARY('smbta-util',
+bld.SAMBA3_BINARY('smbta-util',
source=SMBTA_UTIL_SRC,
deps='''talloc tdb tevent cap PARAM POPT_SAMBA LIB_NONSMBD
LIBSMB_ERR''',
vars=locals())
-bld.SAMBA_BINARY('smbstatus',
+bld.SAMBA3_BINARY('smbstatus',
source=STATUS_SRC,
deps='''talloc tdb tevent cap PARAM POPT_SAMBA LIB_NONSMBD
LIBSMB_ERR LOCKING PROFILE FNAME_UTIL''',
vars=locals())
-bld.SAMBA_BINARY('smbcontrol',
+bld.SAMBA3_BINARY('smbcontrol',
source=SMBCONTROL_SRC,
deps='''talloc tdb tevent cap PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA PRINTBASE''',
vars=locals())
-bld.SAMBA_BINARY('smbtree',
+bld.SAMBA3_BINARY('smbtree',
source=SMBTREE_SRC,
deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD
LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PROFILE
RPC_NDR_SRVSVC''',
vars=locals())
-bld.SAMBA_BINARY('smbpasswd',
+bld.SAMBA3_BINARY('smbpasswd',
source=SMBPASSWD_SRC,
deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD
LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PASSWD_UTIL
LIBCLI_SAMR INIT_LSA PASSCHANGE''',
vars=locals())
-bld.SAMBA_BINARY('pdbedit',
+bld.SAMBA3_BINARY('pdbedit',
source=PDBEDIT_SRC,
deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD
LIBSAMBA LIBSMB_ERR POPT_SAMBA PASSDB SMBLDAP GROUPDB
PASSWD_UTIL LIBCLI_LDAP_NDR''',
vars=locals())
-bld.SAMBA_BINARY('smbget',
+bld.SAMBA3_BINARY('smbget',
source=SMBGET_SRC,
- deps='''talloc tdb smbclient POPT_SAMBA''',
+ deps='''talloc tdb libsmb/smbclient POPT_SAMBA''',
vars=locals())
-bld.SAMBA_BINARY('nmblookup',
+bld.SAMBA3_BINARY('nmblookup',
source=NMBLOOKUP_SRC,
deps='''talloc tdb tevent cap resolv PARAM LIB_NONSMBD POPT_SAMBA LIBSMB_ERR LIBNMB''',
vars=locals())
-bld.SAMBA_BINARY('smbtorture',
+bld.SAMBA3_BINARY('smbtorture',
source=SMBTORTURE_SRC,
deps='''talloc tdb tevent cap resolv wbclient PARAM LIBSMB KRBCLIENT TLDAP
LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''',
vars=locals())
-bld.SAMBA_BINARY('smbconftort',
+bld.SAMBA3_BINARY('smbconftort',
source=SMBCONFTORT_SRC,
deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA''',
vars=locals())
-bld.SAMBA_BINARY('masktest',
+bld.SAMBA3_BINARY('masktest',
source=MASKTEST_SRC,
deps='''talloc tdb cap resolv wbclient PARAM LIB_NONSMBD LIBSMB KRBCLIENT
ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
vars=locals())
-bld.SAMBA_BINARY('msgtest',
+bld.SAMBA3_BINARY('msgtest',
source=MSGTEST_SRC,
deps='''talloc tdb tevent cap resolv PARAM LIBSMB_ERR LIB_NONSMBD''',
vars=locals())
-bld.SAMBA_BINARY('smbcacls',
+bld.SAMBA3_BINARY('smbcacls',
source=SMBCACLS_SRC,
deps='''talloc tdb cap resolv wbclient PARAM LIBSMB KRBCLIENT
LIB_NONSMBD PASSDB GROUPDB POPT_SAMBA SMBLDAP LIBMSRPC_GEN
- LIBMSRPC LIBCLI_LSA''',
+ LIBMSRPC LIBCLI_LSA3''',
vars=locals())
-bld.SAMBA_BINARY('smbcquotas',
+bld.SAMBA3_BINARY('smbcquotas',
source=SMBCQUOTAS_SRC,
deps='''talloc tdb cap resolv wbclient PARAM LIB_NONSMBD LIBSMB KRBCLIENT
POPT_SAMBA PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC
- LIBCLI_LSA''',
+ LIBCLI_LSA3''',
vars=locals())
-bld.SAMBA_BINARY('eventlogadm',
+bld.SAMBA3_BINARY('eventlogadm',
source=EVTLOGADM_SRC,
deps='''talloc tevent cap POPT_SAMBA LIBS PARAM
LIB_NONSMBD LIBSMB_ERR PASSDB wbclient LIBEVENTLOG''',
vars=locals())
-bld.SAMBA_BINARY('sharesec',
+bld.SAMBA3_BINARY('sharesec',
source=SHARESEC_SRC,
deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA''',
vars=locals())
-bld.SAMBA_BINARY('locktest',
+bld.SAMBA3_BINARY('locktest',
source=LOCKTEST_SRC,
deps='''talloc tdb tevent cap resolv wbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
vars=locals())
-bld.SAMBA_BINARY('pdbtest',
+bld.SAMBA3_BINARY('pdbtest',
source=PDBTEST_SRC,
deps='''talloc tdb cap resolv wbclient PARAM LIBSMB KRBCLIENT LIB_NONSMBD PASSDB GROUPDB
SMBLDAP POPT_SAMBA NDR_SAMR NDR_LSA''',
vars=locals())
-bld.SAMBA_BINARY('vfstest',
+bld.SAMBA3_BINARY('vfstest',
source=VFSTEST_SRC,
deps='''SMBD_BASE SMBREADLINE''',
vars=locals())
-bld.SAMBA_BINARY('smbiconv',
+bld.SAMBA3_BINARY('smbiconv',
source=SMBICONV_SRC,
deps='''talloc tdb tevent cap PARAM LIB_NONSMBD POPT_SAMBA LIBSMB_ERR''',
vars=locals())
-bld.SAMBA_BINARY('log2pcap',
+bld.SAMBA3_BINARY('log2pcap',
source=LOG2PCAP_SRC,
deps='''talloc popt''',
vars=locals())
-bld.SAMBA_BINARY('locktest2',
+bld.SAMBA3_BINARY('locktest2',
source=LOCKTEST2_SRC,
deps='''talloc tdb tevent cap resolv wbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
vars=locals())
-bld.SAMBA_BINARY('debug2html',
+bld.SAMBA3_BINARY('debug2html',
source=DEBUG2HTML_SRC,
deps='''talloc popt''',
vars=locals())
-bld.SAMBA_BINARY('smbfilter',
+bld.SAMBA3_BINARY('smbfilter',
source=SMBFILTER_SRC,
deps='''talloc tevent cap resolv wbclient PARAM LIBSMB LIB_NONSMBD KRBCLIENT ASN1_UTIL LIBTSOCKET
NDR_SAMR NDR_LSA''',
vars=locals())
-bld.SAMBA_BINARY('versiontest',
+bld.SAMBA3_BINARY('versiontest',
source='lib/version_test.c',
deps='SAMBA_VERSION',
vars=locals())
-bld.SAMBA_BINARY('wbinfo',
+bld.SAMBA3_BINARY('wbinfo',
source=WBINFO_SRC,
deps='''talloc wbclient tevent cap
ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
LIBSAMBA POPT_SAMBA LIBAFS_SETTOKEN''',
vars=locals())
-bld.SAMBA_BINARY('ntlm_auth',
+bld.SAMBA3_BINARY('ntlm_auth',
source=NTLM_AUTH_SRC,
deps='''tdb talloc cap resolv krb5 k5crypto com_err wbclient PARAM LIB_NONSMBD
LIBS LIBSAMBA POPT_SAMBA ASN1_UTIL LIBTSOCKET
@@ -1337,41 +1336,41 @@ bld.SAMBA_BINARY('ntlm_auth',
NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''',
vars=locals())
-bld.SAMBA_BINARY('timelimit',
+bld.SAMBA3_BINARY('timelimit',
source='script/tests/timelimit.c',
vars=locals())
-bld.SAMBA_BINARY('rpc_open_tcp',
+bld.SAMBA3_BINARY('rpc_open_tcp',
source=RPC_OPEN_TCP_SRC,
deps='''talloc tdb tevent resolv cap wbclient KRBCLIENT PARAM LIBS LIBSMB LIB_NONSMBD
LIBSMB_ERR ASN1_UTIL LIBTSOCKET LIBMSRPC_GEN LIBMSRPC''',
vars=locals())
-bld.SAMBA_BINARY('test_lp_load',
+bld.SAMBA3_BINARY('test_lp_load',
source=TEST_LP_LOAD_SRC,
deps='''talloc tdb tevent cap wbclient PARAM LIB_NONSMBD POPT_SAMBA LIBSAMBA''',
vars=locals())
-bld.SAMBA_BINARY('dbwrap_tool',
+bld.SAMBA3_BINARY('dbwrap_tool',
source=DBWRAP_TOOL_SRC,
deps='''talloc tdb tevent cap PARAM LIB_NONSMBD LIBSMB_ERR''',
vars=locals())
-bld.SAMBA_BINARY('dbwrap_torture',
+bld.SAMBA3_BINARY('dbwrap_torture',
source=DBWRAP_TORTURE_SRC,
deps='''talloc tdb tevent cap PARAM LIB_NONSMBD LIBSMB_ERR
POPT_SAMBA''',
vars=locals())
-bld.SAMBA_BINARY('split_tokens',
+bld.SAMBA3_BINARY('split_tokens',
source=SPLIT_TOKENS_SRC,
deps='''talloc tdb tevent cap wbclient PARAM LIB_NONSMBD POPT_SAMBA
LIBSAMBA''',
vars=locals())
-bld.SAMBA_BINARY('vlp',
+bld.SAMBA3_BINARY('vlp',
source=VLP_SRC,
- deps='''talloc tdb PARAM_UTIL UTIL_TDB''',
+ deps='''talloc tdb PARAM_UTIL UTIL_TDB3''',
vars=locals())
swat_files=recursive_dirlist('../swat', '../swat', '*')