From 943f485ef187d66fdc98dcc30b91968b30c3dc5a Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 14 Dec 2010 13:50:30 +0100
Subject: s3-waf: convert UTIL_SRC into a subsystem samba-util, similar to the
 s4 one.

Guenther
---
 source3/wscript_build | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source3/wscript_build')

diff --git a/source3/wscript_build b/source3/wscript_build
index ce1bf2bca6..cb1978a3d4 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -78,7 +78,7 @@ PTHREADPOOL_SRC = ''
 
 LIBREPLACE_SRCS = ''
 
-LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
+LIB_SRC = '''${LIBSAMBAUTIL_SRC}
           lib/messages.c lib/messages_local.c
           lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
           lib/interfaces.c lib/memcache.c
@@ -889,7 +889,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA_SUBSYSTEM('LIBS',
                     source=LIB_SRC,
-                    deps='iconv LIBCRYPTO ndr security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap',
+                    deps='iconv LIBCRYPTO ndr security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -1060,6 +1060,10 @@ bld.SAMBA_SUBSYSTEM('ndr',
 bld.SAMBA_SUBSYSTEM('tdb-wrap',
                     source='lib/util_tdb.c',
                     vars=locals())
+
+bld.SAMBA_SUBSYSTEM('samba-util',
+                    source=UTIL_SRC,
+                    vars=locals())
 #FIXME
 bld.SAMBA_SUBSYSTEM('ndr-standard',
                     source='',
-- 
cgit