talloc: change pytalloc-util to be a public library.

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 3a40d77688f5a5fe86c5cfbb45326fff1ebeec2c..6da1a66783e99893b5abe1e0baedf6bd91982bcc 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -106,10 +106,11 @@ def build(bld):
 
     if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL') and not bld.env.disable_python:
 
-        bld.SAMBA_SUBSYSTEM('PYTALLOC',
+        bld.SAMBA_LIBRARY('pytalloc-util',
             source='pytalloc.c',
             public_deps='talloc',
             pyext=True,
+            vnum=VERSION,
             )
 
     if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:

diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build
index 554b6ce76031c016a35882406a5ebaba211fcb78..d6f522f1a74815d74e128f92df527925f1034241 100644 (file)
--- a/source4/auth/credentials/wscript_build
+++ b/source4/auth/credentials/wscript_build
@@ -24,7 +24,7 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS_NTLM',
 
 bld.SAMBA_PYTHON('pycredentials',
        source='pycredentials.c',
-       public_deps='CREDENTIALS LIBCMDLINE_CREDENTIALS PYTALLOC pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS',
+       public_deps='CREDENTIALS LIBCMDLINE_CREDENTIALS pytalloc-util pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS',
        realname='samba/credentials.so'
        )
 

diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index 31488911add23132293b9d607d3f46f15a859ca3..ddb601a94c28e11cfdbb347100deb65f509524d0 100644 (file)
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -57,7 +57,7 @@ bld.SAMBA_MODULE('gensec_schannel',
 
 bld.SAMBA_PYTHON('pygensec',
        source='pygensec.c',
-       deps='gensec PYTALLOC pyparam_util',
+       deps='gensec pytalloc-util pyparam_util',
        realname='samba/gensec.so'
        )
 

diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build
index eb24459c3cfa6039557cc22f4f238c4d103fc309..2ef3c0daed5e73793f89cae97e630935505aa3fb 100644 (file)
--- a/source4/auth/wscript_build
+++ b/source4/auth/wscript_build
@@ -48,7 +48,7 @@ bld.SAMBA_SUBSYSTEM('auth_sam_reply',
 bld.SAMBA_PYTHON('pyauth',
        source='pyauth.c',
        public_deps='auth_system_session',
-       deps='SAMDB PYTALLOC pyparam_util',
+       deps='SAMDB pytalloc-util pyparam_util',
        realname='samba/auth.so'
        )
 

diff --git a/source4/lib/policy/wscript_build b/source4/lib/policy/wscript_build
index 6d9d8cac0617581efea717ca541ca83148904c1e..bb243cff916164585b90b998bae9a9622261ca06 100644 (file)
--- a/source4/lib/policy/wscript_build
+++ b/source4/lib/policy/wscript_build
@@ -11,6 +11,6 @@ bld.SAMBA_LIBRARY('policy',
 
 bld.SAMBA_PYTHON('py_policy',
        source='pypolicy.c',
-       public_deps='policy PYTALLOC',
+       public_deps='policy pytalloc-util',
        realname='samba/policy.so'
        )

diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build
index f596cce349d720705c925500c63ef55620375dde..ad1139681b3cd51c554fe690c6713cb784c61ac9 100644 (file)
--- 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 pyparam_util',
+       public_deps='registry pytalloc-util pyparam_util',
        realname='samba/registry.so'
        )
 

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 6c0e679e310a6cae3561f3678b1cd984931196fa..d40b80899beb0f490528c61383b895e55574fab6 100755 (executable)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -207,7 +207,7 @@ bld.SAMBA_LIBRARY('dcerpc',
 
 bld.SAMBA_SUBSYSTEM('pyrpc_util',
        source='rpc/pyrpc_util.c',
-       public_deps='PYTALLOC pyparam_util dcerpc',
+       public_deps='pytalloc-util pyparam_util dcerpc',
        pyext=True,
        )
 
@@ -221,155 +221,155 @@ bld.SAMBA_PYTHON('python_dcerpc',
 
 bld.SAMBA_PYTHON('python_echo',
        source='../../librpc/gen_ndr/py_echo.c',
-       deps='RPC_NDR_ECHO PYTALLOC pyrpc_util',
+       deps='RPC_NDR_ECHO pytalloc-util pyrpc_util',
        realname='samba/dcerpc/echo.so'
        )
 
 
 bld.SAMBA_PYTHON('python_winreg',
        source='../../librpc/gen_ndr/py_winreg.c',
-       deps='RPC_NDR_WINREG PYTALLOC pyrpc_util',
+       deps='RPC_NDR_WINREG pytalloc-util pyrpc_util',
        realname='samba/dcerpc/winreg.so'
        )
 
 
 bld.SAMBA_PYTHON('python_dcerpc_misc',
        source='../../librpc/gen_ndr/py_misc.c',
-       deps='PYTALLOC pyrpc_util NDR_KRB5PAC',
+       deps='pytalloc-util pyrpc_util NDR_KRB5PAC',
        realname='samba/dcerpc/misc.so'
        )
 
 
 bld.SAMBA_PYTHON('python_initshutdown',
        source='../../librpc/gen_ndr/py_initshutdown.c',
-       deps='RPC_NDR_INITSHUTDOWN PYTALLOC pyrpc_util',
+       deps='RPC_NDR_INITSHUTDOWN pytalloc-util pyrpc_util',
        realname='samba/dcerpc/initshutdown.so'
        )
 
 
 bld.SAMBA_PYTHON('python_epmapper',
        source='../../librpc/gen_ndr/py_epmapper.c',
-       deps='dcerpc PYTALLOC pyrpc_util',
+       deps='dcerpc pytalloc-util pyrpc_util',
        realname='samba/dcerpc/epmapper.so'
        )
 
 
 bld.SAMBA_PYTHON('python_mgmt',
        source='../../librpc/gen_ndr/py_mgmt.c',
-       deps='PYTALLOC dcerpc pyrpc_util',
+       deps='pytalloc-util dcerpc pyrpc_util',
        realname='samba/dcerpc/mgmt.so'
        )
 
 
 bld.SAMBA_PYTHON('python_atsvc',
        source='../../librpc/gen_ndr/py_atsvc.c',
-       deps='dcerpc-atsvc PYTALLOC pyrpc_util',
+       deps='dcerpc-atsvc pytalloc-util pyrpc_util',
        realname='samba/dcerpc/atsvc.so'
        )
 
 
 bld.SAMBA_PYTHON('python_dcerpc_nbt',
        source='../../librpc/gen_ndr/py_nbt.c',
-       deps='NDR_NBT RPC_NDR_NBT PYTALLOC pyrpc_util',
+       deps='NDR_NBT RPC_NDR_NBT pytalloc-util pyrpc_util',
        realname='samba/dcerpc/nbt.so'
        )
 
 
 bld.SAMBA_PYTHON('python_samr',
        source='../../librpc/gen_ndr/py_samr.c',
-       deps='dcerpc-samr PYTALLOC pyrpc_util',
+       deps='dcerpc-samr pytalloc-util pyrpc_util',
        realname='samba/dcerpc/samr.so'
        )
 
 
 bld.SAMBA_PYTHON('python_svcctl',
        source='../../librpc/gen_ndr/py_svcctl.c',
-       deps='RPC_NDR_SVCCTL PYTALLOC pyrpc_util',
+       deps='RPC_NDR_SVCCTL pytalloc-util pyrpc_util',
        realname='samba/dcerpc/svcctl.so'
        )
 
 
 bld.SAMBA_PYTHON('python_lsa',
        source='../../librpc/gen_ndr/py_lsa.c',
-       deps='RPC_NDR_LSA PYTALLOC pyrpc_util',
+       deps='RPC_NDR_LSA pytalloc-util pyrpc_util',
        realname='samba/dcerpc/lsa.so'
        )
 
 
 bld.SAMBA_PYTHON('python_wkssvc',
        source='../../librpc/gen_ndr/py_wkssvc.c',
-       deps='RPC_NDR_WKSSVC PYTALLOC pyrpc_util',
+       deps='RPC_NDR_WKSSVC pytalloc-util pyrpc_util',
        realname='samba/dcerpc/wkssvc.so'
        )
 
 
 bld.SAMBA_PYTHON('python_dfs',
        source='../../librpc/gen_ndr/py_dfs.c',
-       deps='RPC_NDR_DFS PYTALLOC pyrpc_util',
+       deps='RPC_NDR_DFS pytalloc-util pyrpc_util',
        realname='samba/dcerpc/dfs.so'
        )
 
 
 bld.SAMBA_PYTHON('python_unixinfo',
        source='../../librpc/gen_ndr/py_unixinfo.c',
-       deps='RPC_NDR_UNIXINFO PYTALLOC pyrpc_util',
+       deps='RPC_NDR_UNIXINFO pytalloc-util pyrpc_util',
        realname='samba/dcerpc/unixinfo.so'
        )
 
 
 bld.SAMBA_PYTHON('python_irpc',
        source='gen_ndr/py_irpc.c',
-       deps='RPC_NDR_IRPC PYTALLOC pyrpc_util',
+       deps='RPC_NDR_IRPC pytalloc-util pyrpc_util',
        realname='samba/dcerpc/irpc.so'
        )
 
 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-util pyrpc_util python_netlogon',
        realname='samba/dcerpc/winbind.so'
        )
 
 bld.SAMBA_PYTHON('python_idmap',
        source='../../librpc/gen_ndr/py_idmap.c',
-       deps='NDR_IDMAP PYTALLOC pyrpc_util',
+       deps='NDR_IDMAP pytalloc-util pyrpc_util',
        realname='samba/dcerpc/idmap.so'
        )
 
 
 bld.SAMBA_PYTHON('python_drsuapi',
        source='../../librpc/gen_ndr/py_drsuapi.c',
-       deps='RPC_NDR_DRSUAPI PYTALLOC pyrpc_util',
+       deps='RPC_NDR_DRSUAPI pytalloc-util pyrpc_util',
        realname='samba/dcerpc/drsuapi.so'
        )
 
 bld.SAMBA_PYTHON('python_dcerpc_security',
        source='../../librpc/gen_ndr/py_security.c',
-       deps='PYTALLOC pyrpc_util NDR_SECURITY',
+       deps='pytalloc-util pyrpc_util NDR_SECURITY',
        realname='samba/dcerpc/security.so'
        )
 
 bld.SAMBA_PYTHON('python_dcerpc_drsblobs',
        source='../../librpc/gen_ndr/py_drsblobs.c',
-       deps='PYTALLOC pyrpc_util NDR_SECURITY RPC_NDR_DRSBLOBS',
+       deps='pytalloc-util pyrpc_util NDR_SECURITY RPC_NDR_DRSBLOBS',
        realname='samba/dcerpc/drsblobs.so'
        )
 
 
 bld.SAMBA_PYTHON('python_dcerpc_xattr',
        source='../../librpc/gen_ndr/py_xattr.c',
-       deps='PYTALLOC pyrpc_util RPC_NDR_XATTR',
+       deps='pytalloc-util pyrpc_util RPC_NDR_XATTR',
        realname='samba/dcerpc/xattr.so'
        )
 
 bld.SAMBA_PYTHON('python_dns',
        source='../../librpc/gen_ndr/py_dns.c',
-       deps='PYTALLOC NDR_DNS pyrpc_util RPC_NDR_DNS',
+       deps='pytalloc-util NDR_DNS pyrpc_util RPC_NDR_DNS',
        realname='samba/dcerpc/dns.so'
        )
 
 bld.SAMBA_PYTHON('python_netlogon',
        source='../../librpc/gen_ndr/py_netlogon.c',
-       deps='RPC_NDR_NETLOGON PYTALLOC pyrpc_util',
+       deps='RPC_NDR_NETLOGON pytalloc-util pyrpc_util',
        realname='samba/dcerpc/netlogon.so'
        )
 

diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index c8e3d59407ee82ccdd95b0c0eb5833a890567abe..a6c2bff0804afb6e4e61dbe73677e6359fad053e 100644 (file)
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -13,7 +13,7 @@ bld.SAMBA_LIBRARY('samba-hostconfig',
 
 bld.SAMBA_SUBSYSTEM('PROVISION',
        source='provision.c pyparam.c',
-       deps='LIBPYTHON pyparam_util ldb PYTALLOC',
+       deps='LIBPYTHON pyparam_util ldb pytalloc-util',
        pyext=True,
        )
 
@@ -49,7 +49,7 @@ bld.SAMBA_SUBSYSTEM('SECRETS',
 
 bld.SAMBA_PYTHON('param',
        source='pyparam.c',
-       deps='samba-hostconfig PYTALLOC',
+       deps='samba-hostconfig pytalloc-util',
        realname='samba/param.so'
        )
 

diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 90b56d066a2d4cb740faa408ee2d9361050f0bd9..227c63345d724efe6cb937ce1746ab2e1bddb54e 100644 (file)
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA_LIBRARY('samba_python',
        source=[],
-       deps='LIBPYTHON PYTALLOC pyrpc_util',
+       deps='LIBPYTHON pytalloc-util pyrpc_util',
        grouping_library=True,
        private_library=True,
        pyext=True)
@@ -26,7 +26,7 @@ bld.SAMBA_PYTHON('python_uuid',
 
 bld.SAMBA_PYTHON('python_glue',
        source='pyglue.c',
-       deps='pyparam_util samba-util netif PYTALLOC',
+       deps='pyparam_util samba-util netif pytalloc-util',
        realname='samba/_glue.so'
        )