build: moved more files into samba-util-common

this removes UTIL_SRC from the s3 waf build, as it is now all in
common with samba-util-common

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 2fbb8a63902aee3313cabd4f88716412de6e6168..646100e7cd1127b5103a42c203a41adddc44abba 100644 (file)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -1,10 +1,13 @@
 #!/usr/bin/env python
 
-# as we move files into common between samba-util and samba-util3, move them here
-# both samba-util and samba-util3 depend on this private library
+# as we move files into common between samba-util and samba-util3, move them here.
+# Both samba-util and samba-util3 depend on this private library
 bld.SAMBA_LIBRARY('samba-util-common',
-                  source='''talloc_stack.c smb_threads.c xfile.c util_file.c time.c
-                  rbtree.c rfc1738.c select.c''',
+                  source='''talloc_stack.c smb_threads.c xfile.c
+                  util_file.c time.c rbtree.c rfc1738.c select.c
+                  genrand.c fsusage.c blocking.c become_daemon.c
+                  data_blob.c signal.c system.c params.c util.c util_id.c util_net.c
+                  util_strlist.c''',
                   public_deps='talloc pthread',
                   # until we get all the dependencies in this library in common
                   # we need to allow this library to be built with unresolved symbols
@@ -15,13 +18,10 @@ bld.SAMBA_LIBRARY('samba-util-common',
 
 if bld.env._SAMBA_BUILD_ == 4:
     bld.SAMBA_LIBRARY('samba-util',
-                      source=''' become_daemon.c blocking.c
-                      data_blob.c debug.c dprintf.c fault.c fsusage.c
-                      genrand.c idtree.c ms_fnmatch.c params.c
-                      parmlist.c signal.c
-                      substitute.c system.c
-                      util.c util_id.c util_net.c util_str.c
-                      util_strlist.c xfile.c ''',
+                      source='''debug.c dprintf.c fault.c
+                      idtree.c ms_fnmatch.c
+                      parmlist.c substitute.c util_str.c
+                      ''',
                       deps='samba-util-common',
                       public_deps='talloc LIBCRYPTO CHARSET execinfo uid_wrapper',
                       public_headers='attr.h byteorder.h data_blob.h debug.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h',

diff --git a/source3/wscript_build b/source3/wscript_build
index fa02ee0649e8ec6189aac29edbe229ee81b28187..86a7509c0b008112a7740af5b0a165a3747c74bd 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -51,21 +51,6 @@ LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
 
 LIBSAMBAUTIL_SRC = '''${LIBREPLACE_SRC}'''
 
-UTIL_SRC = '''
-       ../lib/util/become_daemon.c
-       ../lib/util/blocking.c
-       ../lib/util/data_blob.c
-       ../lib/util/fsusage.c
-       ../lib/util/genrand.c
-       ../lib/util/params.c
-       ../lib/util/signal.c
-       ../lib/util/system.c
-       ../lib/util/util.c
-       ../lib/util/util_id.c
-       ../lib/util/util_net.c
-       ../lib/util/util_strlist.c
-       '''
-
 LIBTEVENT_SRC0 = ''
 
 PTHREADPOOL_SRC = ''
@@ -999,9 +984,8 @@ bld.SAMBA3_SUBSYSTEM('CHARSET3',
                     deps='DYNCONFIG')
 
 bld.SAMBA3_SUBSYSTEM('samba-util3',
-                    source=UTIL_SRC,
-                    deps='talloc CHARSET3 LIBCRYPTO samba-util-common',
-                    vars=locals())
+                    source='',
+                    deps='talloc CHARSET3 LIBCRYPTO samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('ldb3',
                     source='lib/ldb_compat.c')