s3-waf: fix dependencies in most of our module subsystems.

Guenther

diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index bdfa5828c3c221fc4281f21774160767568b418d..af5b984c75c1a08c5ef1aa544cd9f3ffa0907d8c 100644 (file)
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -10,8 +10,7 @@ AUTH_WBC_SRC = 'auth_wbc.c'
 AUTH_SCRIPT_SRC = 'auth_script.c'
 AUTH_NETLOGOND_SRC = 'auth_netlogond.c'
 
-AUTH_STATIC = ''
-AUTH_SRC = '''${AUTH_STATIC} auth.c auth_util.c token_util.c
+AUTH_SRC = '''auth.c auth_util.c token_util.c
            server_info.c
            server_info_sam.c
            user_info.c
@@ -21,10 +20,7 @@ AUTH_SRC = '''${AUTH_STATIC} auth.c auth_util.c token_util.c
 
 bld.SAMBA_SUBSYSTEM('AUTH',
                     source=AUTH_SRC,
-                    deps='''AUTH_SAM AUTH_UNIX AUTH_WINBIND AUTH_WBC
-                            AUTH_SERVER AUTH_DOMAIN AUTH_BUILTIN
-                            AUTH_NETLOGOND
-                            PLAINTEXT_AUTH SLCACHE DCUTIL''',
+                    deps='''PLAINTEXT_AUTH SLCACHE DCUTIL''',
                     vars=locals())
 
 bld.SAMBA_MODULE('AUTH_SAM',

diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build
index c2cca3d410109d331dbc42f3634dec785d2c05cd..8f7164ab0d723c16b862722c9d3711a608599d72 100644 (file)
--- a/source3/libgpo/gpext/wscript_build
+++ b/source3/libgpo/gpext/wscript_build
@@ -8,7 +8,6 @@ GPEXT_SRC = '''../../../libgpo/gpext/gpext.c'''
 
 bld.SAMBA_SUBSYSTEM('GPEXT',
                     source=GPEXT_SRC,
-                    deps='''GPEXT_REGISTRY GPEXT_SCRIPTS GPEXT_SECURITY''',
                     vars=locals())
 
 bld.SAMBA_MODULE('GPEXT_REGISTRY',

diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 8f0e547dfa0a593c161286a7bec19e7c4ae94dae..eebac9d4e02f45b12039ea80109461e38eaf8877 100644 (file)
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -59,19 +59,7 @@ bld.SAMBA_SUBSYSTEM('VFS_AIXACL_UTIL',
 
 bld.SAMBA_SUBSYSTEM('VFS',
                     source='',
-                    deps='''VFS_DEFAULT VFS_AUDIT VFS_EXTD_AUDIT
-                   VFS_FULL_AUDIT VFS_FAKE_PERMS VFS_RECYCLE
-                   VFS_NETATALK VFS_DEFAULT_QUOTA VFS_READONLY
-                   VFS_CAP VFS_EXPAND_MSDFS VFS_SHADOW_COPY VFS_SHADOW_COPY2
-                   VFS_AFSACL VFS_XATTR_TDB VFS_POSIXACL VFS_AIXACL VFS_AIXACL2
-                   VFS_SOLARISACL VFS_ZFSACL VFS_HPUXACL VFS_IRIXACL
-                   VFS_TRU64ACL VFS_CATIA VFS_STREAMS_XATTR VFS_STREAMS_DEPOT
-                   VFS_CACHEPRIME VFS_PREALLOC VFS_COMMIT VFS_GPFS
-                   VFS_NOTIFY_FAM VFS_READAHEAD VFS_TSMSM VFS_FILEID
-                   VFS_AIO_FORK VFS_PREOPEN VFS_SYNCOPS VFS_ACL_XATTR
-                   VFS_ACL_TDB VFS_SMB_TRAFFIC_ANALYZER VFS_ONEFS
-                   VFS_ONEFS_SHADOW_COPY VFS_DIRSORT VFS_SCANNEDONLY
-                   VFS_CROSSRENAME VFS_LINUX_XFS_SGID''',
+                    deps='''VFS_DEFAULT''',
                     vars=locals())
 
 bld.SAMBA_MODULE('VFS_DEFAULT',
@@ -414,7 +402,6 @@ CHARSET_MACOSXFS_SRC = 'charset_macosxfs.c'
 
 bld.SAMBA_SUBSYSTEM('CHARSET',
                     source='',
-                    deps='''CHARSET_WEIRD CHARSET_CP850 CHARSET_CP437 CHARSET_MACOSXFS''',
                     vars=locals())
 
 bld.SAMBA_MODULE('CHARSET_WEIRD',
@@ -451,7 +438,6 @@ PERFCOUNT_TEST_SRC = 'perfcount_test.c'
 
 bld.SAMBA_SUBSYSTEM('PERFCOUNT',
                     source='',
-                    deps='''PERFCOUNT_ONEFS PERFCOUNT_TEST''',
                     vars=locals())
 
 bld.SAMBA_MODULE('PERFCOUNT_ONEFS',

diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index 3f215e7ca2886d570992a5520117f76dbfcbe27e..5a9aa2ab68114669c0f351813e32e27bab389dd2 100644 (file)
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -23,7 +23,6 @@ IDMAP_SRC = 'idmap.c idmap_util.c ${IDMAP_RW_SRC}'
 
 bld.SAMBA_SUBSYSTEM('IDMAP',
                     source=IDMAP_SRC,
-                    deps='''IDMAP_AD IDMAP_RID IDMAP_PASSDB IDMAP_LDAP IDMAP_TDB2 IDMAP_HASH IDMAP_ADEX''',
                     vars=locals())
 
 bld.SAMBA_MODULE('IDMAP_AD',