From b0fb567f04240db3e523b5f285f5fe08e01a2a5a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 28 Mar 2010 17:46:25 +1100 Subject: s4-waf: more dependencies on talloc these are needed so we can support a system talloc without using the bundled talloc.h --- lib/smbconf/wscript_build | 9 +++------ lib/util/wscript_build | 9 +++++---- libcli/auth/wscript_build | 3 ++- libcli/nbt/wscript_build | 5 +---- source4/auth/ntlm/wscript_build | 3 ++- source4/auth/wscript_build | 1 + source4/lib/smbreadline/wscript_build | 2 +- source4/lib/socket/wscript_build | 2 +- source4/lib/wscript_build | 2 +- source4/librpc/wscript_build | 3 ++- source4/ntvfs/sysdep/wscript_build | 3 ++- source4/smbd/wscript_build | 1 + source4/utils/wscript_build | 2 +- source4/web_server/wscript_build | 5 +++-- 14 files changed, 26 insertions(+), 24 deletions(-) diff --git a/lib/smbconf/wscript_build b/lib/smbconf/wscript_build index f47d05144f..cf92c3ba6b 100644 --- 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 d2406659dc..6e6dc8eeea 100644 --- 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 fb27bb2e0c..36082319d2 100644 --- 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 6d31ba6214..b85a5d7090 100644 --- 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 611d678635..1ce42e80b4 100644 --- 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 e159292b77..ca9e85d1b8 100644 --- 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 c0aacab076..17699eafa2 100644 --- 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 fdbc96ff09..afa6644fac 100644 --- 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 51c8f4f3eb..789847905e 100644 --- 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 538d9636c3..29fc95dcc0 100644 --- 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 6f0cc521ad..92b284b399 100644 --- 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 6c7a6dee03..932acd79cf 100644 --- 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 9b44c85333..cb9b66ae0b 100644 --- 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 ac2d63078e..5343c2f508 100644 --- 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', -- cgit