s4-waf: don't depend directly on python modules
authorAndrew Tridgell <tridge@samba.org>
Thu, 21 Oct 2010 03:54:11 +0000 (14:54 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 21 Oct 2010 08:03:26 +0000 (19:03 +1100)
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 <abartlet@samba.org>

source4/lib/messaging/wscript_build
source4/lib/registry/wscript_build
source4/librpc/wscript_build
source4/ntvfs/posix/wscript_build

index d775d6f7c6af5203414bbcb4b126e72663940be8..983895ec26c63157b6a3d654b59a2bd6a22466bf 100644 (file)
@@ -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'
        )
 
index de36133f05383a36625f94d515189aff12efc83c..592d387a2ebdf0134da2f577cc6b0adf5fb21768 100644 (file)
@@ -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'
        )
 
index 92af95ea4d93ed71b9304901f2ae3744518c5553..88deeb2bea315c4d4ef18ab66f7a260de15a2d3f 100755 (executable)
@@ -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'
        )
 
index 7f8e9cff9d95a8774cc8f2ae663b0c8b14ce7666..ec7c76262c867953ee4e2ede15c64c8a94b5d2f7 100644 (file)
@@ -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'
        )