build: provide tevent-util as a public library

This is needed so that OpenChange can get at _tevent_req_nterr(), which is referenced
by generated PIDL output.

Andrew Bartlett

7 files changed, 9 insertions, 9 deletions

diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index 4eed751408..94244191eb 100644
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('gensec',
 	source='gensec_start.c socket.c gensec_tstream.c',
 	pc_files='gensec.pc',
 	autoproto='gensec_proto.h',
-	public_deps='UTIL_TEVENT samba-util errors LIBPACKET auth_system_session gensec_runtime',
+	public_deps='tevent-util samba-util errors LIBPACKET auth_system_session gensec_runtime',
 	deps='com_err',
 	vnum='0.0.1'
 	)
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index 29e54fd314..b8634c8944 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -51,7 +51,7 @@ bld.SAMBA_MODULE('auth4_unix',
 bld.SAMBA_LIBRARY('auth4',
 	source='auth.c auth_util.c auth_simple.c',
 	autoproto='auth_proto.h',
-	deps='samba-util security samdb credentials UTIL_TEVENT LIBWBCLIENT_OLD auth_unix_token',
+	deps='samba-util security samdb credentials tevent-util LIBWBCLIENT_OLD auth_unix_token',
 	private_library=True
 	)
 
diff --git a/source4/lib/tls/wscript b/source4/lib/tls/wscript
index fc6fd8864f..f34d7e8a08 100644
--- a/source4/lib/tls/wscript
+++ b/source4/lib/tls/wscript
@@ -49,5 +49,5 @@ def configure(conf):
 def build(bld):
     bld.SAMBA_SUBSYSTEM('LIBTLS',
                         source='tls.c tlscert.c tls_tstream.c',
-                        public_deps='talloc gnutls gcrypt samba-hostconfig samba_socket LIBTSOCKET tevent UTIL_TEVENT'
+                        public_deps='talloc gnutls gcrypt samba-hostconfig samba_socket LIBTSOCKET tevent tevent-util'
                         )
diff --git a/source4/libcli/smb2/wscript_build b/source4/libcli/smb2/wscript_build
index fc8e7b4f36..1f3d7ef3b5 100644
--- a/source4/libcli/smb2/wscript_build
+++ b/source4/libcli/smb2/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_SUBSYSTEM('LIBCLI_SMB2',
 	source='transport.c request.c negprot.c session.c tcon.c create.c close.c connect.c getinfo.c write.c read.c setinfo.c find.c ioctl.c logoff.c tdis.c flush.c lock.c notify.c cancel.c keepalive.c break.c util.c signing.c lease_break.c',
 	autoproto='smb2_proto.h',
-	deps='UTIL_TEVENT',
+	deps='tevent-util',
 	public_deps='cli_raw LIBPACKET gensec tevent'
 	)
 
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 2522ccc9ff..3184a19c04 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -5,7 +5,7 @@ bld.RECURSE('wbclient')
 
 bld.SAMBA_SUBSYSTEM('LIBSAMBA_TSOCKET',
 	source='../../libcli/util/tstream.c',
-	public_deps='LIBTSOCKET UTIL_TEVENT'
+	public_deps='LIBTSOCKET tevent-util'
 	)
 
 
@@ -27,13 +27,13 @@ bld.SAMBA_SUBSYSTEM('cli_composite',
 bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE',
 	source='smb_composite/loadfile.c smb_composite/savefile.c smb_composite/connect.c smb_composite/sesssetup.c smb_composite/fetchfile.c smb_composite/appendacl.c smb_composite/fsinfo.c smb_composite/smb2.c',
 	autoproto='smb_composite/proto.h',
-	deps='LIBCLI_SMB2 UTIL_TEVENT',
+	deps='LIBCLI_SMB2 tevent-util',
 	public_deps='cli_composite credentials gensec LIBCLI_RESOLVE tevent'
 	)
 
 bld.SAMBA_PYTHON('pysmb',
     source='pysmb.c',
-    deps='LIBCLI_SMB_COMPOSITE LIBCLI_SMB2 UTIL_TEVENT pyparam_util',
+    deps='LIBCLI_SMB_COMPOSITE LIBCLI_SMB2 tevent-util pyparam_util',
 	public_deps='cli_composite credentials gensec LIBCLI_RESOLVE tevent',
     realname='samba/smb.so'
     )
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 68141f6193..35b0d4dca5 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -138,7 +138,7 @@ bld.SAMBA_LIBRARY('dcerpc',
 	rpc/dcerpc_util.c rpc/dcerpc_smb.c rpc/dcerpc_smb2.c rpc/dcerpc_sock.c
 	rpc/dcerpc_connect.c rpc/dcerpc_secondary.c''',
 	pc_files='dcerpc.pc',
-	deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH cli_raw LP_RESOLVE UTIL_TEVENT rpccommon',
+	deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH cli_raw LP_RESOLVE tevent-util rpccommon',
 	autoproto='rpc/dcerpc_proto.h',
 	public_deps='credentials tevent talloc',
 	public_headers='''rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h
diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build
index 09fee43809..8bf5d766e0 100644
--- a/source4/winbind/wscript_build
+++ b/source4/winbind/wscript_build
@@ -26,5 +26,5 @@ bld.SAMBA_SUBSYSTEM('IDMAP',
 
 bld.SAMBA_BINARY('wbinfo',
 	source='../../nsswitch/wbinfo.c',
-	deps='samba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent UTIL_TEVENT LIBASYNC_REQ security ndr NDR_SECURITY'
+	deps='samba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent tevent-util LIBASYNC_REQ security ndr NDR_SECURITY'
 	)