[PATCHSET] tidy up source3 build more
Michael Adam
obnox at samba.org
Tue Sep 24 12:10:44 MDT 2013
Hi,
attached find a second patchset for tidying up the source3 build more.
It gets rid of all uses of source-list variables and occurrences
of vars=locals() in source3 completely.
Please review/comment/push as appropriate.
Thanks - Michael
-------------- next part --------------
From d388fa824ffcd48c6c3aff4b1e60f67b7b55eb74 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 24 Sep 2013 05:03:32 +0200
Subject: [PATCH 1/8] build: get rid of source file variables in
source3/modules/wscript_build
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/modules/wscript_build | 175 ++++++++++++++---------------------------
1 file changed, 59 insertions(+), 116 deletions(-)
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 6583aef..9f0a981 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -1,60 +1,5 @@
#!/usr/bin/env python
-VFS_DEFAULT_SRC = '''vfs_default.c'''
-VFS_AUDIT_SRC = '''vfs_audit.c'''
-VFS_EXTD_AUDIT_SRC = '''vfs_extd_audit.c'''
-VFS_FULL_AUDIT_SRC = '''vfs_full_audit.c'''
-VFS_FAKE_PERMS_SRC = '''vfs_fake_perms.c'''
-VFS_FAKE_ACLS_SRC = '''vfs_fake_acls.c'''
-VFS_RECYCLE_SRC = '''vfs_recycle.c'''
-VFS_NETATALK_SRC = '''vfs_netatalk.c'''
-VFS_DEFAULT_QUOTA_SRC = '''vfs_default_quota.c'''
-VFS_READONLY_SRC = '''vfs_readonly.c getdate.c'''
-VFS_CAP_SRC = '''vfs_cap.c'''
-VFS_EXPAND_MSDFS_SRC = '''vfs_expand_msdfs.c'''
-VFS_SHADOW_COPY_SRC = '''vfs_shadow_copy.c'''
-VFS_SHADOW_COPY2_SRC = '''vfs_shadow_copy2.c'''
-VFS_AFSACL_SRC = '''vfs_afsacl.c'''
-VFS_XATTR_TDB_SRC = '''vfs_xattr_tdb.c'''
-VFS_POSIXACL_SRC = '''vfs_posixacl.c'''
-VFS_AIXACL_SRC = '''vfs_aixacl.c'''
-VFS_AIXACL2_SRC = '''vfs_aixacl2.c'''
-VFS_SOLARISACL_SRC = '''vfs_solarisacl.c'''
-VFS_ZFSACL_SRC = '''vfs_zfsacl.c'''
-VFS_NFS4ACL_XATTR_SRC = 'vfs_nfs4acl_xattr.c'
-VFS_HPUXACL_SRC = '''vfs_hpuxacl.c'''
-VFS_TRU64ACL_SRC = '''vfs_tru64acl.c'''
-VFS_CATIA_SRC = 'vfs_catia.c'
-VFS_STREAMS_XATTR_SRC = 'vfs_streams_xattr.c'
-VFS_STREAMS_DEPOT_SRC = 'vfs_streams_depot.c'
-VFS_CACHEPRIME_SRC = 'vfs_cacheprime.c'
-VFS_PREALLOC_SRC = 'vfs_prealloc.c'
-VFS_COMMIT_SRC = 'vfs_commit.c'
-VFS_GPFS_SRC = 'vfs_gpfs.c gpfs.c'
-VFS_NOTIFY_FAM_SRC = 'vfs_notify_fam.c'
-VFS_READAHEAD_SRC = 'vfs_readahead.c'
-VFS_TSMSM_SRC = 'vfs_tsmsm.c'
-VFS_FILEID_SRC = 'vfs_fileid.c'
-VFS_AIO_FORK_SRC = 'vfs_aio_fork.c'
-VFS_AIO_PTHREAD_SRC = 'vfs_aio_pthread.c'
-VFS_AIO_POSIX_SRC = 'vfs_aio_posix.c'
-VFS_AIO_LINUX_SRC = 'vfs_aio_linux.c'
-VFS_PREOPEN_SRC = 'vfs_preopen.c'
-VFS_SYNCOPS_SRC = 'vfs_syncops.c'
-VFS_ACL_XATTR_SRC = 'vfs_acl_xattr.c'
-VFS_ACL_TDB_SRC = 'vfs_acl_tdb.c'
-VFS_SMB_TRAFFIC_ANALYZER_SRC = 'vfs_smb_traffic_analyzer.c'
-VFS_DIRSORT_SRC = 'vfs_dirsort.c'
-VFS_SCANNEDONLY_SRC = 'vfs_scannedonly.c'
-VFS_CROSSRENAME_SRC = 'vfs_crossrename.c'
-VFS_LINUX_XFS_SGID_SRC = 'vfs_linux_xfs_sgid.c'
-VFS_TIME_AUDIT_SRC = 'vfs_time_audit.c'
-VFS_MEDIA_HARMONY_SRC = 'vfs_media_harmony.c'
-VFS_BTRFS_SRC = 'vfs_btrfs.c'
-VFS_CEPH_SRC = 'vfs_ceph.c'
-VFS_GLUSTERFS_SRC = 'vfs_glusterfs.c'
-
-
bld.SAMBA3_SUBSYSTEM('NFS4_ACLS',
source='nfs4_acls.c',
deps='samba-util tdb')
@@ -75,7 +20,7 @@ bld.SAMBA3_SUBSYSTEM('vfs',
bld.SAMBA3_MODULE('vfs_default',
subsystem='vfs',
- source=VFS_DEFAULT_SRC,
+ source='vfs_default.c',
deps='samba-util NDR_DFSBLOBS',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default'),
@@ -83,7 +28,7 @@ bld.SAMBA3_MODULE('vfs_default',
bld.SAMBA3_MODULE('vfs_audit',
subsystem='vfs',
- source=VFS_AUDIT_SRC,
+ source='vfs_audit.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_audit'),
@@ -91,7 +36,7 @@ bld.SAMBA3_MODULE('vfs_audit',
bld.SAMBA3_MODULE('vfs_extd_audit',
subsystem='vfs',
- source=VFS_EXTD_AUDIT_SRC,
+ source='vfs_extd_audit.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_extd_audit'),
@@ -99,7 +44,7 @@ bld.SAMBA3_MODULE('vfs_extd_audit',
bld.SAMBA3_MODULE('vfs_full_audit',
subsystem='vfs',
- source=VFS_FULL_AUDIT_SRC,
+ source='vfs_full_audit.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_full_audit'),
@@ -107,7 +52,7 @@ bld.SAMBA3_MODULE('vfs_full_audit',
bld.SAMBA3_MODULE('vfs_fake_perms',
subsystem='vfs',
- source=VFS_FAKE_PERMS_SRC,
+ source='vfs_fake_perms.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_perms'),
@@ -115,7 +60,7 @@ bld.SAMBA3_MODULE('vfs_fake_perms',
bld.SAMBA3_MODULE('vfs_fake_acls',
subsystem='vfs',
- source=VFS_FAKE_ACLS_SRC,
+ source='vfs_fake_acls.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_acls'),
@@ -123,7 +68,7 @@ bld.SAMBA3_MODULE('vfs_fake_acls',
bld.SAMBA3_MODULE('vfs_recycle',
subsystem='vfs',
- source=VFS_RECYCLE_SRC,
+ source='vfs_recycle.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_recycle'),
@@ -131,7 +76,7 @@ bld.SAMBA3_MODULE('vfs_recycle',
bld.SAMBA3_MODULE('vfs_netatalk',
subsystem='vfs',
- source=VFS_NETATALK_SRC,
+ source='vfs_netatalk.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_netatalk'),
@@ -139,7 +84,7 @@ bld.SAMBA3_MODULE('vfs_netatalk',
bld.SAMBA3_MODULE('vfs_default_quota',
subsystem='vfs',
- source=VFS_DEFAULT_QUOTA_SRC,
+ source='vfs_default_quota.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default_quota'),
@@ -147,7 +92,7 @@ bld.SAMBA3_MODULE('vfs_default_quota',
bld.SAMBA3_MODULE('vfs_readonly',
subsystem='vfs',
- source=VFS_READONLY_SRC,
+ source='vfs_readonly.c getdate.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readonly'),
@@ -155,7 +100,7 @@ bld.SAMBA3_MODULE('vfs_readonly',
bld.SAMBA3_MODULE('vfs_cap',
subsystem='vfs',
- source=VFS_CAP_SRC,
+ source='vfs_cap.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cap'),
@@ -163,7 +108,7 @@ bld.SAMBA3_MODULE('vfs_cap',
bld.SAMBA3_MODULE('vfs_expand_msdfs',
subsystem='vfs',
- source=VFS_EXPAND_MSDFS_SRC,
+ source='vfs_expand_msdfs.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_expand_msdfs'),
@@ -171,7 +116,7 @@ bld.SAMBA3_MODULE('vfs_expand_msdfs',
bld.SAMBA3_MODULE('vfs_shadow_copy',
subsystem='vfs',
- source=VFS_SHADOW_COPY_SRC,
+ source='vfs_shadow_copy.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy'),
@@ -179,7 +124,7 @@ bld.SAMBA3_MODULE('vfs_shadow_copy',
bld.SAMBA3_MODULE('vfs_shadow_copy2',
subsystem='vfs',
- source=VFS_SHADOW_COPY2_SRC,
+ source='vfs_shadow_copy2.c',
deps='samba-util tdb',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy2'),
@@ -187,7 +132,7 @@ bld.SAMBA3_MODULE('vfs_shadow_copy2',
bld.SAMBA3_MODULE('vfs_afsacl',
subsystem='vfs',
- source=VFS_AFSACL_SRC,
+ source='vfs_afsacl.c',
deps='samba-util LIBAFS_SETTOKEN',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_afsacl'),
@@ -195,7 +140,7 @@ bld.SAMBA3_MODULE('vfs_afsacl',
bld.SAMBA3_MODULE('vfs_xattr_tdb',
subsystem='vfs',
- source=VFS_XATTR_TDB_SRC,
+ source='vfs_xattr_tdb.c',
deps='dbwrap xattr_tdb',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_xattr_tdb'),
@@ -211,7 +156,7 @@ bld.SAMBA3_MODULE('vfs_posix_eadb',
bld.SAMBA3_MODULE('vfs_posixacl',
subsystem='vfs',
- source=VFS_POSIXACL_SRC,
+ source='vfs_posixacl.c',
deps='acl attr',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_posixacl'),
@@ -219,7 +164,7 @@ bld.SAMBA3_MODULE('vfs_posixacl',
bld.SAMBA3_MODULE('vfs_aixacl',
subsystem='vfs',
- source=VFS_AIXACL_SRC,
+ source='vfs_aixacl.c',
deps='VFS_AIXACL_UTIL',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aixacl'),
@@ -227,7 +172,7 @@ bld.SAMBA3_MODULE('vfs_aixacl',
bld.SAMBA3_MODULE('vfs_aixacl2',
subsystem='vfs',
- source=VFS_AIXACL2_SRC,
+ source='vfs_aixacl2.c',
deps='NFS4_ACLS VFS_AIXACL_UTIL',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aixacl2'),
@@ -235,7 +180,7 @@ bld.SAMBA3_MODULE('vfs_aixacl2',
bld.SAMBA3_MODULE('vfs_solarisacl',
subsystem='vfs',
- source=VFS_SOLARISACL_SRC,
+ source='vfs_solarisacl.c',
init_function='',
deps='sec',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_solarisacl'),
@@ -243,37 +188,37 @@ bld.SAMBA3_MODULE('vfs_solarisacl',
bld.SAMBA3_MODULE('vfs_zfsacl',
subsystem='vfs',
- source=VFS_ZFSACL_SRC,
+ source='vfs_zfsacl.c',
deps='NFS4_ACLS sunacl',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_zfsacl'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'))
bld.SAMBA3_MODULE('vfs_nfs4acl_xattr',
- subsystem='vfs',
- source=VFS_NFS4ACL_XATTR_SRC,
- deps='NFS4_ACLS sunacl NDR_NFS4ACL',
- init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_nfs4acl_xattr'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_nfs4acl_xattr'))
+ subsystem='vfs',
+ source='vfs_nfs4acl_xattr.c',
+ deps='NFS4_ACLS sunacl NDR_NFS4ACL',
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_nfs4acl_xattr'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_nfs4acl_xattr'))
bld.SAMBA3_MODULE('vfs_hpuxacl',
subsystem='vfs',
- source=VFS_HPUXACL_SRC,
+ source='vfs_hpuxacl.c',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_hpuxacl'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_hpuxacl'))
bld.SAMBA3_MODULE('vfs_tru64acl',
subsystem='vfs',
- source=VFS_TRU64ACL_SRC,
+ source='vfs_tru64acl.c',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_true64acl'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_true64acl'))
bld.SAMBA3_MODULE('vfs_catia',
subsystem='vfs',
- source=VFS_CATIA_SRC,
+ source='vfs_catia.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_catia'),
@@ -281,7 +226,7 @@ bld.SAMBA3_MODULE('vfs_catia',
bld.SAMBA3_MODULE('vfs_streams_xattr',
subsystem='vfs',
- source=VFS_STREAMS_XATTR_SRC,
+ source='vfs_streams_xattr.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_xattr'),
@@ -289,7 +234,7 @@ bld.SAMBA3_MODULE('vfs_streams_xattr',
bld.SAMBA3_MODULE('vfs_streams_depot',
subsystem='vfs',
- source=VFS_STREAMS_DEPOT_SRC,
+ source='vfs_streams_depot.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_depot'),
@@ -297,7 +242,7 @@ bld.SAMBA3_MODULE('vfs_streams_depot',
bld.SAMBA3_MODULE('vfs_cacheprime',
subsystem='vfs',
- source=VFS_CACHEPRIME_SRC,
+ source='vfs_cacheprime.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cacheprime'),
@@ -305,7 +250,7 @@ bld.SAMBA3_MODULE('vfs_cacheprime',
bld.SAMBA3_MODULE('vfs_prealloc',
subsystem='vfs',
- source=VFS_PREALLOC_SRC,
+ source='vfs_prealloc.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_prealloc'),
@@ -313,7 +258,7 @@ bld.SAMBA3_MODULE('vfs_prealloc',
bld.SAMBA3_MODULE('vfs_commit',
subsystem='vfs',
- source=VFS_COMMIT_SRC,
+ source='vfs_commit.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_commit'),
@@ -321,7 +266,7 @@ bld.SAMBA3_MODULE('vfs_commit',
bld.SAMBA3_MODULE('vfs_gpfs',
subsystem='vfs',
- source=VFS_GPFS_SRC,
+ source='vfs_gpfs.c gpfs.c',
deps='NFS4_ACLS non_posix_acls',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_gpfs'),
@@ -332,7 +277,7 @@ if bld.CONFIG_SET('SAMBA_FAM_LIBS'):
vfs_notify_fam_deps += bld.CONFIG_GET('SAMBA_FAM_LIBS')
bld.SAMBA3_MODULE('vfs_notify_fam',
subsystem='vfs',
- source=VFS_NOTIFY_FAM_SRC,
+ source='vfs_notify_fam.c',
deps=vfs_notify_fam_deps,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_notify_fam'),
@@ -340,7 +285,7 @@ bld.SAMBA3_MODULE('vfs_notify_fam',
bld.SAMBA3_MODULE('vfs_readahead',
subsystem='vfs',
- source=VFS_READAHEAD_SRC,
+ source='vfs_readahead.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readahead'),
@@ -348,7 +293,7 @@ bld.SAMBA3_MODULE('vfs_readahead',
bld.SAMBA3_MODULE('vfs_tsmsm',
subsystem='vfs',
- source=VFS_TSMSM_SRC,
+ source='vfs_tsmsm.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_tsmsm'),
@@ -356,7 +301,7 @@ bld.SAMBA3_MODULE('vfs_tsmsm',
bld.SAMBA3_MODULE('vfs_fileid',
subsystem='vfs',
- source=VFS_FILEID_SRC,
+ source='vfs_fileid.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fileid'),
@@ -364,7 +309,7 @@ bld.SAMBA3_MODULE('vfs_fileid',
bld.SAMBA3_MODULE('vfs_aio_fork',
subsystem='vfs',
- source=VFS_AIO_FORK_SRC,
+ source='vfs_aio_fork.c',
deps='samba-util tevent',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_fork'),
@@ -373,7 +318,7 @@ bld.SAMBA3_MODULE('vfs_aio_fork',
bld.SAMBA3_MODULE('vfs_aio_pthread',
subsystem='vfs',
- source=VFS_AIO_PTHREAD_SRC,
+ source='vfs_aio_pthread.c',
deps='samba-util tevent',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_pthread'),
@@ -382,7 +327,7 @@ bld.SAMBA3_MODULE('vfs_aio_pthread',
bld.SAMBA3_MODULE('vfs_aio_posix',
subsystem='vfs',
- source=VFS_AIO_POSIX_SRC,
+ source='vfs_aio_posix.c',
deps='samba-util tevent',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_posix'),
@@ -391,7 +336,7 @@ bld.SAMBA3_MODULE('vfs_aio_posix',
bld.SAMBA3_MODULE('vfs_aio_linux',
subsystem='vfs',
- source=VFS_AIO_LINUX_SRC,
+ source='vfs_aio_linux.c',
deps='samba-util aio',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_linux'),
@@ -400,7 +345,7 @@ bld.SAMBA3_MODULE('vfs_aio_linux',
bld.SAMBA3_MODULE('vfs_preopen',
subsystem='vfs',
- source=VFS_PREOPEN_SRC,
+ source='vfs_preopen.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_preopen'),
@@ -408,7 +353,7 @@ bld.SAMBA3_MODULE('vfs_preopen',
bld.SAMBA3_MODULE('vfs_syncops',
subsystem='vfs',
- source=VFS_SYNCOPS_SRC,
+ source='vfs_syncops.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_syncops'),
@@ -416,7 +361,7 @@ bld.SAMBA3_MODULE('vfs_syncops',
bld.SAMBA3_MODULE('vfs_acl_xattr',
subsystem='vfs',
- source=VFS_ACL_XATTR_SRC,
+ source='vfs_acl_xattr.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_acl_xattr'),
@@ -424,7 +369,7 @@ bld.SAMBA3_MODULE('vfs_acl_xattr',
bld.SAMBA3_MODULE('vfs_acl_tdb',
subsystem='vfs',
- source=VFS_ACL_TDB_SRC,
+ source='vfs_acl_tdb.c',
deps='NDR_XATTR tdb',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_acl_tdb'),
@@ -432,7 +377,7 @@ bld.SAMBA3_MODULE('vfs_acl_tdb',
bld.SAMBA3_MODULE('vfs_smb_traffic_analyzer',
subsystem='vfs',
- source=VFS_SMB_TRAFFIC_ANALYZER_SRC,
+ source='vfs_smb_traffic_analyzer.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_smb_traffic_analyzer'),
@@ -440,7 +385,7 @@ bld.SAMBA3_MODULE('vfs_smb_traffic_analyzer',
bld.SAMBA3_MODULE('vfs_dirsort',
subsystem='vfs',
- source=VFS_DIRSORT_SRC,
+ source='vfs_dirsort.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_dirsort'),
@@ -448,7 +393,7 @@ bld.SAMBA3_MODULE('vfs_dirsort',
bld.SAMBA3_MODULE('vfs_scannedonly',
subsystem='vfs',
- source=VFS_SCANNEDONLY_SRC,
+ source='vfs_scannedonly.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_scannedonly'),
@@ -456,7 +401,7 @@ bld.SAMBA3_MODULE('vfs_scannedonly',
bld.SAMBA3_MODULE('vfs_crossrename',
subsystem='vfs',
- source=VFS_CROSSRENAME_SRC,
+ source='vfs_crossrename.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_crossrename'),
@@ -464,7 +409,7 @@ bld.SAMBA3_MODULE('vfs_crossrename',
bld.SAMBA3_MODULE('vfs_linux_xfs_sgid',
subsystem='vfs',
- source=VFS_LINUX_XFS_SGID_SRC,
+ source='vfs_linux_xfs_sgid.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_linux_xfs_sgid'),
@@ -472,7 +417,7 @@ bld.SAMBA3_MODULE('vfs_linux_xfs_sgid',
bld.SAMBA3_MODULE('vfs_time_audit',
subsystem='vfs',
- source=VFS_TIME_AUDIT_SRC,
+ source='vfs_time_audit.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_time_audit'),
@@ -480,7 +425,7 @@ bld.SAMBA3_MODULE('vfs_time_audit',
bld.SAMBA3_MODULE('vfs_media_harmony',
subsystem='vfs',
- source=VFS_MEDIA_HARMONY_SRC,
+ source='vfs_media_harmony.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_media_harmony'),
@@ -496,28 +441,26 @@ bld.SAMBA3_MODULE('vfs_dfs_samba4',
bld.SAMBA3_MODULE('vfs_btrfs',
subsystem='vfs',
- source=VFS_BTRFS_SRC,
+ source='vfs_btrfs.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_btrfs'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_btrfs'))
-PERFCOUNT_TEST_SRC = 'perfcount_test.c'
-
bld.SAMBA3_SUBSYSTEM('perfcount',
source='',
deps='smbd_base')
bld.SAMBA3_MODULE('perfcount_test',
subsystem='perfcount',
- source=PERFCOUNT_TEST_SRC,
+ source='perfcount_test.c',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('perfcount_test'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('perfcount_test'))
bld.SAMBA3_MODULE('vfs_ceph',
subsystem='vfs',
- source=VFS_CEPH_SRC,
+ source='vfs_ceph.c',
deps='samba-util cephfs',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_ceph'),
@@ -526,7 +469,7 @@ bld.SAMBA3_MODULE('vfs_ceph',
bld.SAMBA3_MODULE('vfs_glusterfs',
subsystem='vfs',
- source=VFS_GLUSTERFS_SRC,
+ source='vfs_glusterfs.c',
deps='samba-util gfapi',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_glusterfs'),
--
1.7.9.5
From d3c00bea7b5875e3198bf2cc681131037668861f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 24 Sep 2013 05:06:22 +0200
Subject: [PATCH 2/8] build: get rid of source-variables in
source3/auth/wscript_build
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/auth/wscript_build | 31 +++++++++++--------------------
1 file changed, 11 insertions(+), 20 deletions(-)
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index e518de9..127ae08 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -1,17 +1,5 @@
#!/usr/bin/env python
-AUTH_BUILTIN_SRC = 'auth_builtin.c'
-AUTH_DOMAIN_SRC = 'auth_domain.c'
-AUTH_SAM_SRC = 'auth_sam.c'
-AUTH_UNIX_SRC = 'auth_unix.c'
-AUTH_WINBIND_SRC = 'auth_winbind.c'
-AUTH_WBC_SRC = 'auth_wbc.c'
-AUTH_SCRIPT_SRC = 'auth_script.c'
-
-AUTH_SRC = '''auth.c
- user_krb5.c
- auth_ntlmssp.c auth_generic.c'''
-
bld.SAMBA3_SUBSYSTEM('TOKEN_UTIL',
source='token_util.c',
deps='samba-util pdb',
@@ -31,20 +19,23 @@ bld.SAMBA3_SUBSYSTEM('AUTH_COMMON',
vars=locals())
bld.SAMBA3_LIBRARY('auth',
- source=AUTH_SRC,
+ source='''auth.c
+ user_krb5.c
+ auth_ntlmssp.c
+ auth_generic.c''',
deps='''PLAINTEXT_AUTH SLCACHE DCUTIL TOKEN_UTIL AUTH_COMMON libcli_netlogon3 samba-hostconfig''',
private_library=True)
bld.SAMBA3_MODULE('auth_sam',
subsystem='auth',
- source=AUTH_SAM_SRC,
+ source='auth_sam.c',
deps='samba-util',
init_function='',
internal_module=True)
bld.SAMBA3_MODULE('auth_unix',
subsystem='auth',
- source=AUTH_UNIX_SRC,
+ source='auth_unix.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_unix'),
@@ -52,14 +43,14 @@ bld.SAMBA3_MODULE('auth_unix',
bld.SAMBA3_MODULE('auth_winbind',
subsystem='auth',
- source=AUTH_WINBIND_SRC,
+ source='auth_winbind.c',
deps='samba-util',
init_function='',
internal_module=True)
bld.SAMBA3_MODULE('auth_wbc',
subsystem='auth',
- source=AUTH_WBC_SRC,
+ source='auth_wbc.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_wbc'),
@@ -67,21 +58,21 @@ bld.SAMBA3_MODULE('auth_wbc',
bld.SAMBA3_MODULE('auth_domain',
subsystem='auth',
- source=AUTH_DOMAIN_SRC,
+ source='auth_domain.c',
deps='RPC_CLIENT_SCHANNEL trusts_util',
init_function='',
internal_module=True)
bld.SAMBA3_MODULE('auth_builtin',
subsystem='auth',
- source=AUTH_BUILTIN_SRC,
+ source='auth_builtin.c',
deps='samba-util',
init_function='',
internal_module=True)
bld.SAMBA3_MODULE('auth_script',
subsystem='auth',
- source=AUTH_SCRIPT_SRC,
+ source='auth_script.c',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_script'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_script'))
--
1.7.9.5
From 76196010b918c6e2bfb29edbc861fb94ce40c8a9 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 24 Sep 2013 05:07:08 +0200
Subject: [PATCH 3/8] build: get rid of vars=locals() in
source3/auth/wscript_build
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/auth/wscript_build | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index 127ae08..e7a6051 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -2,8 +2,7 @@
bld.SAMBA3_SUBSYSTEM('TOKEN_UTIL',
source='token_util.c',
- deps='samba-util pdb',
- vars=locals())
+ deps='samba-util pdb')
bld.SAMBA3_SUBSYSTEM('USER_UTIL',
source='user_util.c',
@@ -15,8 +14,7 @@ bld.SAMBA3_SUBSYSTEM('AUTH_COMMON',
server_info.c
server_info_sam.c
user_info.c''',
- deps='TOKEN_UTIL DCUTIL USER_UTIL',
- vars=locals())
+ deps='TOKEN_UTIL DCUTIL USER_UTIL')
bld.SAMBA3_LIBRARY('auth',
source='''auth.c
--
1.7.9.5
From a246c69739322b6b39ce79b56d39d7cee9b75a1e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 24 Sep 2013 05:09:38 +0200
Subject: [PATCH 4/8] build: get rid of source variables and vars=locals() in
source3/libgpo/gpext/wscript_build
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/libgpo/gpext/wscript_build | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build
index 7595fff..3a120a5 100644
--- a/source3/libgpo/gpext/wscript_build
+++ b/source3/libgpo/gpext/wscript_build
@@ -1,19 +1,12 @@
#!/usr/bin/env python
-GPEXT_REGISTRY_SRC = 'registry.c'
-GPEXT_SCRIPTS_SRC = 'scripts.c'
-GPEXT_SECURITY_SRC = 'security.c'
-
-GPEXT_SRC = '''../../../libgpo/gpext/gpext.c'''
-
bld.SAMBA3_SUBSYSTEM('gpext',
- source=GPEXT_SRC,
- deps='samba-util samba3core gpo',
- vars=locals())
+ source='../../../libgpo/gpext/gpext.c',
+ deps='samba-util samba3core gpo')
bld.SAMBA3_MODULE('gpext_registry',
subsystem='gpext',
- source=GPEXT_REGISTRY_SRC,
+ source='registry.c',
deps='NDR_PREG',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_registry'),
@@ -21,14 +14,14 @@ bld.SAMBA3_MODULE('gpext_registry',
bld.SAMBA3_MODULE('gpext_scripts',
subsystem='gpext',
- source=GPEXT_SCRIPTS_SRC,
+ source='scripts.c',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_scripts'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('gpext_scripts'))
bld.SAMBA3_MODULE('gpext_security',
subsystem='gpext',
- source=GPEXT_SECURITY_SRC,
+ source='security.c',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_security'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('gpext_security'))
--
1.7.9.5
From 394b69f99d1802f76dfe02e8cdd232a9a74c31c0 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 24 Sep 2013 05:13:55 +0200
Subject: [PATCH 5/8] build: get rid of source strings from
source3/passdb/wscript_build
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/passdb/wscript_build | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index a6620cd..2464b0e 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -1,13 +1,8 @@
#!/usr/bin/env python
-PDB_TDBSAM_SRC = 'pdb_tdb.c'
-PDB_LDAP_SRC = 'pdb_ldap.c pdb_nds.c pdb_ipa.c'
-PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c'
-PDB_WBC_SAM_SRC = 'pdb_wbc_sam.c'
-
bld.SAMBA3_MODULE('pdb_tdbsam',
subsystem='pdb',
- source=PDB_TDBSAM_SRC,
+ source='pdb_tdb.c',
deps='samba-util tdb_compat dbwrap tdb-wrap3',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_tdbsam'),
@@ -16,14 +11,14 @@ bld.SAMBA3_MODULE('pdb_tdbsam',
bld.SAMBA3_MODULE('pdb_ldapsam',
subsystem='pdb',
deps='smbldap smbldaphelper',
- source=PDB_LDAP_SRC,
+ source='pdb_ldap.c pdb_nds.c pdb_ipa.c',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldapsam'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldapsam') and bld.CONFIG_SET('HAVE_LDAP'))
bld.SAMBA3_MODULE('pdb_smbpasswd',
subsystem='pdb',
- source=PDB_SMBPASSWD_SRC,
+ source='pdb_smbpasswd.c',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_smbpasswd'),
@@ -31,7 +26,7 @@ bld.SAMBA3_MODULE('pdb_smbpasswd',
bld.SAMBA3_MODULE('pdb_wbc_sam',
subsystem='pdb',
- source=PDB_WBC_SAM_SRC,
+ source='pdb_wbc_sam.c',
deps='samba-util wbclient',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_wbc_sam'),
--
1.7.9.5
From 66fa9be324df9b4adfc88733cc54ca997930b6df Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 24 Sep 2013 20:02:54 +0200
Subject: [PATCH 6/8] build: get rid of source variables and vars=locals() in
source3/rpc_server/wscript_build
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/rpc_server/wscript_build | 120 +++++++++++++++++---------------------
1 file changed, 52 insertions(+), 68 deletions(-)
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index bd96b92b..cbc8deb 100755
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -1,33 +1,12 @@
#!/usr/bin/env python
-RPC_LSARPC_SRC = '''lsa/srv_lsa_nt.c ../../librpc/gen_ndr/srv_lsa.c'''
-RPC_NETLOGON_SRC = '''netlogon/srv_netlog_nt.c ../../librpc/gen_ndr/srv_netlogon.c'''
-RPC_SAMR_SRC = '''samr/srv_samr_nt.c
- samr/srv_samr_util.c
- samr/srv_samr_chgpasswd.c
- ../../librpc/gen_ndr/srv_samr.c'''
-RPC_INITSHUTDOWN_SRC = '''initshutdown/srv_initshutdown_nt.c ../../librpc/gen_ndr/srv_initshutdown.c'''
-RPC_WINREG_SRC = '''winreg/srv_winreg_nt.c ../../librpc/gen_ndr/srv_winreg.c'''
-RPC_DSSETUP_SRC = '''dssetup/srv_dssetup_nt.c ../../librpc/gen_ndr/srv_dssetup.c'''
-RPC_SRVSVC_SRC = '''srvsvc/srv_srvsvc_nt.c ../../librpc/gen_ndr/srv_srvsvc.c'''
-RPC_WKSSVC_SRC = '''wkssvc/srv_wkssvc_nt.c ../../librpc/gen_ndr/srv_wkssvc.c'''
-RPC_SVCCTL_SRC = '''svcctl/srv_svcctl_nt.c svcctl/srv_svcctl_reg.c ../../librpc/gen_ndr/srv_svcctl.c'''
-RPC_NTSVCS_SRC = '''ntsvcs/srv_ntsvcs_nt.c ../../librpc/gen_ndr/srv_ntsvcs.c'''
-RPC_NETDFS_SRC = '''dfs/srv_dfs_nt.c ../../librpc/gen_ndr/srv_dfs.c'''
-RPC_SPOOLSS_SRC = '''spoolss/srv_spoolss_nt.c ../../librpc/gen_ndr/srv_spoolss.c
- spoolss/srv_spoolss_util.c'''
-RPC_EVENTLOG_SRC = '''eventlog/srv_eventlog_nt.c eventlog/srv_eventlog_reg.c ../../librpc/gen_ndr/srv_eventlog.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.SAMBA3_SUBSYSTEM('rpc',
source='',
- deps='RPC_PIPE_REGISTER',
- vars=locals())
+ deps='RPC_PIPE_REGISTER')
bld.SAMBA3_SUBSYSTEM('RPC_CONFIG',
source='rpc_config.c',
- deps='talloc')
+ deps='talloc')
bld.SAMBA3_SUBSYSTEM('RPC_NCACN_NP',
source='rpc_ncacn_np.c rpc_handles.c rpc_contexts.c',
@@ -62,79 +41,84 @@ bld.SAMBA3_SUBSYSTEM('SRV_ACCESS_CHECK',
deps='samba-util')
bld.SAMBA3_SUBSYSTEM('RPC_SAMR',
- source=RPC_SAMR_SRC,
- deps='PLAINTEXT_AUTH SRV_ACCESS_CHECK',
- vars=locals())
+ source='''samr/srv_samr_nt.c
+ samr/srv_samr_util.c
+ samr/srv_samr_chgpasswd.c
+ ../../librpc/gen_ndr/srv_samr.c''',
+ deps='PLAINTEXT_AUTH SRV_ACCESS_CHECK')
bld.SAMBA3_SUBSYSTEM('RPC_LSARPC',
- source=RPC_LSARPC_SRC,
- deps='SRV_ACCESS_CHECK',
- vars=locals())
+ source='''lsa/srv_lsa_nt.c
+ ../../librpc/gen_ndr/srv_lsa.c''',
+ deps='SRV_ACCESS_CHECK')
bld.SAMBA3_SUBSYSTEM('RPC_WINREG',
- source=RPC_WINREG_SRC,
- deps='REG_FULL REGFIO REG_API_REGF NDR_PERFCOUNT',
- vars=locals())
+ source='''winreg/srv_winreg_nt.c
+ ../../librpc/gen_ndr/srv_winreg.c''',
+ deps='REG_FULL REGFIO REG_API_REGF NDR_PERFCOUNT')
bld.SAMBA3_SUBSYSTEM('RPC_INITSHUTDOWN',
- source=RPC_INITSHUTDOWN_SRC,
- deps='samba-util',
- vars=locals())
+ source='''initshutdown/srv_initshutdown_nt.c
+ ../../librpc/gen_ndr/srv_initshutdown.c''',
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('RPC_DSSETUP',
- source=RPC_DSSETUP_SRC,
- deps='samba-util',
- vars=locals())
+ source='''dssetup/srv_dssetup_nt.c
+ ../../librpc/gen_ndr/srv_dssetup.c''',
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('RPC_WKSSVC',
- source=RPC_WKSSVC_SRC,
- deps='LIBNET',
- vars=locals())
+ source='''wkssvc/srv_wkssvc_nt.c
+ ../../librpc/gen_ndr/srv_wkssvc.c''',
+ deps='LIBNET')
bld.SAMBA3_SUBSYSTEM('RPC_SVCCTL',
- source=RPC_SVCCTL_SRC,
- deps='SERVICES LIBCLI_WINREG_INTERNAL',
- vars=locals())
+ source='''svcctl/srv_svcctl_nt.c
+ svcctl/srv_svcctl_reg.c
+ ../../librpc/gen_ndr/srv_svcctl.c''',
+ deps='SERVICES LIBCLI_WINREG_INTERNAL')
bld.SAMBA3_SUBSYSTEM('RPC_NTSVCS',
- source=RPC_NTSVCS_SRC,
- deps='samba-util',
- vars=locals())
+ source='''ntsvcs/srv_ntsvcs_nt.c
+ ../../librpc/gen_ndr/srv_ntsvcs.c''',
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('RPC_NETLOGON',
- source=RPC_NETLOGON_SRC,
- deps='RPC_NCACN_NP',
- vars=locals())
+ source='''netlogon/srv_netlog_nt.c
+ ../../librpc/gen_ndr/srv_netlogon.c''',
+ deps='RPC_NCACN_NP')
bld.SAMBA3_SUBSYSTEM('RPC_NETDFS',
- source=RPC_NETDFS_SRC,
- deps='samba-util',
- vars=locals())
+ source='''dfs/srv_dfs_nt.c
+ ../../librpc/gen_ndr/srv_dfs.c''',
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('RPC_SRVSVC',
- source=RPC_SRVSVC_SRC,
- deps='samba-util tdb',
- vars=locals())
+ source='''srvsvc/srv_srvsvc_nt.c
+ ../../librpc/gen_ndr/srv_srvsvc.c''',
+ deps='samba-util tdb')
bld.SAMBA3_SUBSYSTEM('RPC_SPOOLSS',
- source=RPC_SPOOLSS_SRC,
- deps='PRINTING PRINTBACKEND LIBCLI_WINREG_INTERNAL RPC_NCACN_NP',
- vars=locals())
+ source='''spoolss/srv_spoolss_nt.c
+ ../../librpc/gen_ndr/srv_spoolss.c
+ spoolss/srv_spoolss_util.c''',
+ deps='PRINTING PRINTBACKEND LIBCLI_WINREG_INTERNAL RPC_NCACN_NP')
bld.SAMBA3_SUBSYSTEM('RPC_EVENTLOG',
- source=RPC_EVENTLOG_SRC,
- deps='LIBEVENTLOG LIBCLI_WINREG_INTERNAL',
- vars=locals())
+ source='''eventlog/srv_eventlog_nt.c
+ eventlog/srv_eventlog_reg.c
+ ../../librpc/gen_ndr/srv_eventlog.c''',
+ deps='LIBEVENTLOG LIBCLI_WINREG_INTERNAL')
bld.SAMBA3_SUBSYSTEM('RPC_RPCECHO',
- source=RPC_RPCECHO_SRC,
- deps='samba-util',
- vars=locals())
+ source='''echo/srv_echo_nt.c
+ ../../librpc/gen_ndr/srv_echo.c''',
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('RPC_EPMAPPER',
- source=RPC_EPMAPPER_SRC,
- deps='samba-util',
- vars=locals())
+ source='''epmapper/srv_epmapper.c
+ ../../librpc/gen_ndr/srv_epmapper.c''',
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('RPC_SERVER',
source='srv_pipe_hnd.c srv_pipe.c rpc_sock_helper.c rpc_service_setup.c',
--
1.7.9.5
From e90cedb63baff5114b34a2d4f7de3b4a8c97f54e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 24 Sep 2013 20:06:37 +0200
Subject: [PATCH 7/8] build: get rid of vars=locals() in
source3/modules/wscript_build
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/modules/wscript_build | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 9f0a981..3607ef0 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -15,8 +15,7 @@ bld.SAMBA3_SUBSYSTEM('VFS_AIXACL_UTIL',
bld.SAMBA3_SUBSYSTEM('vfs',
source='',
- deps='smbd_base',
- vars=locals())
+ deps='smbd_base')
bld.SAMBA3_MODULE('vfs_default',
subsystem='vfs',
--
1.7.9.5
From 0c2784814896b5b183c7d5c7999e48436b5a42e5 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 24 Sep 2013 20:07:06 +0200
Subject: [PATCH 8/8] build: get rid of vars=locals() in
source3/lib/netapi/examples/wscript_build
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/lib/netapi/examples/wscript_build | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/source3/lib/netapi/examples/wscript_build b/source3/lib/netapi/examples/wscript_build
index a445467..06d9a45 100644
--- a/source3/lib/netapi/examples/wscript_build
+++ b/source3/lib/netapi/examples/wscript_build
@@ -59,8 +59,7 @@ names = [
bld.SAMBA_SUBSYSTEM('LIBNETAPI_EXAMPLES_COMMON',
source='common.c',
- deps='netapi popt',
- vars=locals())
+ deps='netapi popt')
for pattern in names:
(subdir, name) = pattern
--
1.7.9.5
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 215 bytes
Desc: Digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20130924/2b28b2f7/attachment.pgp>
More information about the samba-technical
mailing list