From b4dd1accc8178bed96ab8606dc655d30826886e6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 21 Oct 2010 14:54:11 +1100 Subject: [PATCH] s4-waf: don't depend directly on python modules build rules should not list dependencies on python modules. Instead, if code needs the module it should use the python API import calls to access the module. Pair-Programmed-With: Andrew Bartlett --- source4/lib/messaging/wscript_build | 2 +- source4/lib/registry/wscript_build | 2 +- source4/librpc/wscript_build | 10 +++++----- source4/ntvfs/posix/wscript_build | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source4/lib/messaging/wscript_build b/source4/lib/messaging/wscript_build index d775d6f7c6a..983895ec26c 100644 --- a/source4/lib/messaging/wscript_build +++ b/source4/lib/messaging/wscript_build @@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM('MESSAGING', bld.SAMBA_PYTHON('python_messaging', source='pymessaging.c', - deps='MESSAGING LIBEVENTS python_irpc pyparam_util', + deps='MESSAGING LIBEVENTS pyparam_util', realname='samba/messaging.so' ) diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build index de36133f053..592d387a2eb 100644 --- a/source4/lib/registry/wscript_build +++ b/source4/lib/registry/wscript_build @@ -63,7 +63,7 @@ bld.SAMBA_SUBSYSTEM('torture_registry', bld.SAMBA_PYTHON('py_registry', source='pyregistry.c', - public_deps='registry PYTALLOC pycredentials pyparam_util', + public_deps='registry PYTALLOC pyparam_util', realname='samba/registry.so' ) diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 92af95ea4d9..88deeb2bea3 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -182,10 +182,10 @@ bld.SAMBA_LIBRARY('dcerpc', ) bld.SAMBA_SUBSYSTEM('pyrpc_util', - source='rpc/pyrpc_util.c', - public_deps='PYTALLOC pyparam_util pycredentials dcerpc', - pyext=True, - ) + source='rpc/pyrpc_util.c', + public_deps='PYTALLOC pyparam_util dcerpc', + pyext=True, + ) bld.SAMBA_PYTHON('python_dcerpc', @@ -301,7 +301,7 @@ bld.SAMBA_PYTHON('python_irpc', bld.SAMBA_PYTHON('python_winbind', source='gen_ndr/py_winbind.c', - deps='RPC_NDR_WINBIND PYTALLOC pyrpc_util python_netlogon', + deps='RPC_NDR_WINBIND PYTALLOC pyrpc_util', realname='samba/dcerpc/winbind.so' ) diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build index 7f8e9cff9d9..ec7c76262c8 100644 --- a/source4/ntvfs/posix/wscript_build +++ b/source4/ntvfs/posix/wscript_build @@ -41,14 +41,14 @@ bld.SAMBA_MODULE('ntvfs_posix', bld.SAMBA_PYTHON('python_xattr_native', source='python/pyxattr_native.c', - deps='LIBNDR ldb SAMDB CREDENTIALS python_dcerpc_security pyparam_util WRAP_XATTR attr', + deps='LIBNDR ldb SAMDB CREDENTIALS pyparam_util WRAP_XATTR attr', realname='samba/xattr_native.so' ) bld.SAMBA_PYTHON('python_xattr_tdb', source='python/pyxattr_tdb.c xattr_tdb.c', - deps='LIBNDR ldb python_dcerpc_security pyparam_util share attr', + deps='LIBNDR ldb pyparam_util share attr', realname='samba/xattr_tdb.so' ) -- 2.34.1