From c8b2b109760b366bee6dcf7c6c306936d271f508 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 9 Feb 2011 15:56:20 +1100 Subject: 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 --- source3/modules/wscript_build | 116 +++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'source3/modules') 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='', -- cgit