summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-02-08 08:56:45 +0100
committerGünther Deschner <gd@samba.org>2011-02-14 13:38:53 +0100
commit89db591b2a79a85cc9127c67a2697bbc6f326ec6 (patch)
tree894edbdde0abd2c8e79f7e505c20c54cfc408df4
parent850bf67c452bcb8570e2fb0af77296754bec98cc (diff)
downloadsamba-89db591b2a79a85cc9127c67a2697bbc6f326ec6.tar.gz
samba-89db591b2a79a85cc9127c67a2697bbc6f326ec6.tar.bz2
samba-89db591b2a79a85cc9127c67a2697bbc6f326ec6.zip
s3-waf: add UTIL_TEVENT subsystem (as in ../lib/util/wscript)
Guenther
-rw-r--r--lib/async_req/wscript_build3
-rw-r--r--source3/wscript_build13
2 files changed, 11 insertions, 5 deletions
diff --git a/lib/async_req/wscript_build b/lib/async_req/wscript_build
index f3ac7f0d00..352861c958 100644
--- a/lib/async_req/wscript_build
+++ b/lib/async_req/wscript_build
@@ -3,6 +3,7 @@
bld.SAMBA_SUBSYSTEM('LIBASYNC_REQ',
source='async_sock.c',
- public_deps='talloc tevent'
+ public_deps='talloc tevent',
+ deps='UTIL_TEVENT'
)
diff --git a/source3/wscript_build b/source3/wscript_build
index 83fbbdb125..19b8f4a615 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -67,9 +67,6 @@ UTIL_SRC = '''
../lib/util/smb_threads.c
../lib/util/system.c
../lib/util/talloc_stack.c
- ../lib/util/tevent_ntstatus.c
- ../lib/util/tevent_unix.c
- ../lib/util/tevent_werror.c
../lib/util/time.c
../lib/util/util.c
../lib/util/util_file.c
@@ -969,6 +966,14 @@ bld.SAMBA_SUBSYSTEM('UTIL_TDB',
public_deps='tdb talloc'
)
+bld.SAMBA_SUBSYSTEM('UTIL_TEVENT',
+ source='../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c ../lib/util/tevent_werror.c',
+ local_include=False,
+ public_deps='tevent',
+ public_headers='../lib/util/tevent_ntstatus.h ../lib/util/tevent_unix.h ../lib/util/tevent_werror.h',
+ header_path=[ ('*', 'util') ],
+ )
+
bld.SAMBA_SUBSYSTEM('LIBNET',
source=LIBNET_SRC,
deps='NDR_LIBNET_JOIN',
@@ -1056,7 +1061,7 @@ bld.SAMBA_SUBSYSTEM('ndr-standard',
vars=locals())
#FIXME
-bld.SAMBA_SUBSYSTEM('dcerpc', '')
+bld.SAMBA_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
bld.SAMBA_SUBSYSTEM('ldb',
source='lib/ldb_compat.c')