s4-waf: more dependencies on talloc

these are needed so we can support a system talloc without using the
bundled talloc.h

diff --git a/lib/smbconf/wscript_build b/lib/smbconf/wscript_build
index f47d05144f7f092494564534296c4b89784254bf..cf92c3ba6b73c598f4694dc3c8ecaf0dcd0c28e2 100644 (file)
--- a/lib/smbconf/wscript_build
+++ b/lib/smbconf/wscript_build
@@ -1,10 +1,7 @@
 #!/usr/bin/env python
 
-# AUTOGENERATED by mktowscript.pl from ../../lib/smbconf/config.mk
-# Please remove this notice if hand editing
-
-
 bld.SAMBA_SUBSYSTEM('LIBSMBCONF',
-       source='smbconf.c smbconf_txt.c smbconf_util.c'
-       )
+                    source='smbconf.c smbconf_txt.c smbconf_util.c',
+                    deps='talloc'
+                    )
 

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index d2406659dc4876115054f01f62b2fe5f3fe78300..6e6dc8eeea531be51f7822298f788534574d59e7 100644 (file)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -11,9 +11,9 @@ bld.SAMBA_LIBRARY('LIBSAMBA-UTIL',
 
 
 bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
-       source='asn1.c',
-        local_include=False,
-       )
+                    source='asn1.c',
+                    deps='talloc',
+                    local_include=False)
 
 
 bld.SAMBA_SUBSYSTEM('UNIX_PRIVS',
@@ -27,6 +27,7 @@ bld.SAMBA_SUBSYSTEM('UNIX_PRIVS',
 bld.SAMBA_SUBSYSTEM('WRAP_XATTR',
        source='wrap_xattr.c',
        public_deps='XATTR',
+        deps='talloc',
         local_include=False
        )
 
@@ -34,7 +35,7 @@ bld.SAMBA_SUBSYSTEM('WRAP_XATTR',
 bld.SAMBA_SUBSYSTEM('UTIL_TDB',
        source='util_tdb.c',
         local_include=False,
-       public_deps='tdb'
+       public_deps='tdb talloc'
        )
 
 

diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index fb27bb2e0c920c88b4ca40c65af58ca935beced2..36082319d25390266e6daf33917731288485ae67 100644 (file)
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -7,7 +7,8 @@ bld.SAMBA_SUBSYSTEM('ntlm_check',
 
 
 bld.SAMBA_SUBSYSTEM('MSRPC_PARSE',
-       source='msrpc_parse.c'
+       source='msrpc_parse.c',
+        deps='talloc'
        )
 
 

diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index 6d31ba62143e94a4149ddd46b7b753452c7d8a2c..b85a5d7090217c23acedcad4a5e69c432e33c625 100644 (file)
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -1,11 +1,8 @@
 #!/usr/bin/env python
 
-# AUTOGENERATED by mktowscript.pl from ../../libcli/nbt/config.mk
-# Please remove this notice if hand editing
-
-
 bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
        source='nbtname.c',
+        deps='talloc',
        autoproto='nbtname.h'
        )
 

diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index 611d678635f4d447c484a9a7ac46edf2b15c50d5..1ce42e80b4ea3f9b3690adf828a17d647200bf1a 100644 (file)
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -47,7 +47,8 @@ bld.SAMBA_MODULE('auth_unix',
 
 
 bld.SAMBA_SUBSYSTEM('PAM_ERRORS',
-       source='pam_errors.c'
+       source='pam_errors.c',
+        deps='talloc'
        )
 
 

diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build
index e159292b77116aae98985cd44988ec69ad4733f4..ca9e85d1b83d2acbeb0744d76ca674d3ff371dc2 100644 (file)
--- a/source4/auth/wscript_build
+++ b/source4/auth/wscript_build
@@ -43,6 +43,7 @@ bld.SAMBA_SUBSYSTEM('auth_sam',
 
 bld.SAMBA_SUBSYSTEM('auth_sam_reply',
        source='auth_sam_reply.c',
+        deps='talloc',
        autoproto='auth_sam_reply.h'
        )
 

diff --git a/source4/lib/smbreadline/wscript_build b/source4/lib/smbreadline/wscript_build
index c0aacab076fae768ca67eb7163d319bc98e4ae7b..17699eafa2a0f403dd7ad3845c36345da29a0d97 100644 (file)
--- a/source4/lib/smbreadline/wscript_build
+++ b/source4/lib/smbreadline/wscript_build
@@ -5,4 +5,4 @@ termlib=bld.env.READLINE_TERMLIB or ''
 
 bld.SAMBA_SUBSYSTEM('SMBREADLINE',
                     source='smbreadline.c',
-                    deps=termlib + ' readline')
+                    deps=termlib + ' readline talloc')

diff --git a/source4/lib/socket/wscript_build b/source4/lib/socket/wscript_build
index fdbc96ff091459cb626ec82f30e24c4b3f51def1..afa6644fac3ddf5633b68829719e52c8a611630a 100644 (file)
--- a/source4/lib/socket/wscript_build
+++ b/source4/lib/socket/wscript_build
@@ -22,7 +22,7 @@ bld.SAMBA_MODULE('socket_ip',
 bld.SAMBA_MODULE('socket_unix',
        source='socket_unix.c',
        subsystem='samba_socket',
-       deps='LIBREPLACE_NETWORK',
+       deps='LIBREPLACE_NETWORK talloc',
        internal_module=True
        )
 

diff --git a/source4/lib/wscript_build b/source4/lib/wscript_build
index 51c8f4f3ebe403546f98c732c3f0825ddbf1db48..789847905ea6fce88120b5cdbb5b18f650979f4f 100644 (file)
--- a/source4/lib/wscript_build
+++ b/source4/lib/wscript_build
@@ -26,7 +26,7 @@ bld.SAMBA_SUBSYSTEM('LDB_WRAP',
 
 bld.SAMBA_SUBSYSTEM('TDB_WRAP',
        source='tdb_wrap.c',
-       public_deps='tdb',
+       public_deps='tdb talloc',
        public_headers='tdb_wrap.h'
        )
 

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 538d9636c36bc6b74d3af54f6482ef4978371a56..29fc95dcc0ea5cb3d08142e979c252c50d3b0d72 100644 (file)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -164,7 +164,8 @@ bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS',
 
 
 bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS_BUF',
-       source='../../librpc/ndr/ndr_spoolss_buf.c'
+       source='../../librpc/ndr/ndr_spoolss_buf.c',
+        deps='talloc'
        )
 
 

diff --git a/source4/ntvfs/sysdep/wscript_build b/source4/ntvfs/sysdep/wscript_build
index 6f0cc521ad7c0ea8f853ef498f400a0432c27d58..92b284b39985d79d62b8a86f2162d2922894ee10 100644 (file)
--- a/source4/ntvfs/sysdep/wscript_build
+++ b/source4/ntvfs/sysdep/wscript_build
@@ -10,7 +10,8 @@ bld.SAMBA_MODULE('sys_notify_inotify',
 
 
 bld.SAMBA_SUBSYSTEM('sys_notify',
-                    source='sys_notify.c'
+                    source='sys_notify.c',
+                    deps='talloc'
                     )
 
 

diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 6c7a6dee03cf6b634b4f2f61fc9921f7f27990fc..932acd79cfdb574491cc46e4054bccc5e33c3b69 100644 (file)
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -13,6 +13,7 @@ bld.SAMBA_SUBSYSTEM('service',
 
 bld.SAMBA_SUBSYSTEM('PIDFILE',
        source='pidfile.c',
+        deps='talloc',
        autoproto='pidfile.h'
        )
 

diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build
index 9b44c853337335bbe17ba7ba6035922b962aaf66..cb9b66ae0b1a78589afeb2d5a8379f07915fbfb3 100644 (file)
--- a/source4/utils/wscript_build
+++ b/source4/utils/wscript_build
@@ -16,7 +16,7 @@ bld.SAMBA_BINARY('ntlm_auth',
 bld.SAMBA_BINARY('setnttoken',
        source='setnttoken.c',
        installdir='BINDIR',
-       deps='replace'
+       deps='talloc'
        )
 
 

diff --git a/source4/web_server/wscript_build b/source4/web_server/wscript_build
index ac2d63078e19b2c84b7d38f61828998091122d86..5343c2f508737875568ce53dc464779da9eb7e1e 100644 (file)
--- a/source4/web_server/wscript_build
+++ b/source4/web_server/wscript_build
@@ -2,8 +2,9 @@
 
 
 bld.SAMBA_PYTHON('WEB_WSGI',
-                 source='wsgi.c'
-       )
+                 source='wsgi.c',
+                 deps='talloc'
+                 )
 
 
 bld.SAMBA_MODULE('WEB',