build: created samba-util-common library

this library will contain files that can be built in common between s3
and s4. Both samba-util and samba-util3 depend on it.

Currently this library needs to be marked as allow_undefined_symbols,
in order to allow s4 to build it. We can remove that flag once we have
all the needed symbols in common

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index dfb5623b15b4686e9ead6ba92bd4d31cbe38c360..2fbb8a63902aee3313cabd4f88716412de6e6168 100644 (file)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -1,37 +1,28 @@
 #!/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
+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''',
+                  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
+                  allow_undefined_symbols=True,
+                  local_include=False,
+                  private_library=True
+                  )
+
 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
-                      rbtree.c
-                      rfc1738.c
-                      select.c
-                      signal.c
-                      smb_threads.c
-                      substitute.c
-                      system.c
-                      talloc_stack.c
-                      time.c
-                      util.c
-                      util_file.c
-                      util_id.c
-                      util_net.c
-                      util_str.c
-                      util_strlist.c
-                      xfile.c
-                      ''',
+                      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 ''',
+                      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',
                       header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],

diff --git a/source3/wscript_build b/source3/wscript_build
index 0d82cb4186dfcde88d7ec306652b7db40e5685a4..fa02ee0649e8ec6189aac29edbe229ee81b28187 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -58,20 +58,12 @@ UTIL_SRC = '''
        ../lib/util/fsusage.c
        ../lib/util/genrand.c
        ../lib/util/params.c
-       ../lib/util/rbtree.c
-       ../lib/util/rfc1738.c
-       ../lib/util/select.c
        ../lib/util/signal.c
-       ../lib/util/smb_threads.c
        ../lib/util/system.c
-       ../lib/util/talloc_stack.c
-       ../lib/util/time.c
        ../lib/util/util.c
-       ../lib/util/util_file.c
        ../lib/util/util_id.c
        ../lib/util/util_net.c
        ../lib/util/util_strlist.c
-       ../lib/util/xfile.c
        '''
 
 LIBTEVENT_SRC0 = ''
@@ -1008,7 +1000,7 @@ bld.SAMBA3_SUBSYSTEM('CHARSET3',
 
 bld.SAMBA3_SUBSYSTEM('samba-util3',
                     source=UTIL_SRC,
-                    deps='talloc CHARSET3 LIBCRYPTO',
+                    deps='talloc CHARSET3 LIBCRYPTO samba-util-common',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('ldb3',