lib/util Remove samba-util-common!

[ira/wip.git] / lib / util / wscript_build

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 8046a8ba07ef417c7db01a057c5c8a54ae4e7a13..bdc9d1015096e11ed0fe2edfa6580d32a0b6581d 100755 (executable)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -1,57 +1,25 @@
 #!/usr/bin/env python
 
-common_util_sources = '''talloc_stack.c smb_threads.c xfile.c data_blob.c
+bld.SAMBA_LIBRARY('samba-util',
+                  source='''talloc_stack.c smb_threads.c xfile.c data_blob.c
                     util_file.c time.c rbtree.c rfc1738.c select.c
                     genrand.c fsusage.c blocking.c become_daemon.c
                     signal.c system.c params.c util.c util_id.c util_net.c
                     util_strlist.c util_paths.c idtree.c debug.c fault.c base64.c
                     util_str.c util_str_common.c substitute.c ms_fnmatch.c
-                    server_id.c dprintf.c'''
-
-common_util_headers = 'debug.h'
-common_util_public_deps = 'talloc pthread LIBCRYPTO CHARSET'
-s4_util_sources = '''parmlist.c'''
-s4_util_deps = 'DYNCONFIG'
-s4_util_public_deps = 'talloc execinfo uid_wrapper'
-s4_util_public_headers = 'attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h'
-s4_util_header_path = [ ('dlinklist.h util.h', '.'), ('*', 'util') ]
-
-if bld.env._SAMBA_BUILD_ == 3:
-    # 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=common_util_sources,
-                    public_deps=common_util_public_deps,
-                    # 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,
-                    public_headers=common_util_headers,
-                    header_path= [('*', 'util') ],
-                    private_library=True
-                    )
-
-else:
-    bld.SAMBA_LIBRARY('samba-util',
-                      source=s4_util_sources + " " + common_util_sources,
-                      deps=s4_util_deps,
-                      public_deps=s4_util_public_deps + ' ' + common_util_public_deps,
-                      public_headers=s4_util_public_headers + ' ' + common_util_headers,
-                      header_path= s4_util_header_path,
-                      local_include=False,
-                      vnum='0.0.1',
-                      pc_files='samba-util.pc'
-                      )
-
-    # dummy subsystem for avoid wider deps changes.
-    bld.SAMBA_SUBSYSTEM('samba-util-common',
-                        source=[],
-                        deps='samba-util',
-                        local_include=False,)
+                    server_id.c dprintf.c parmlist.c''',
+                  deps='DYNCONFIG',
+                  public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO CHARSET',
+                  public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h',
+                  header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
+                  local_include=False,
+                  vnum='0.0.1',
+                  pc_files='samba-util.pc'
+                  )
 
 bld.SAMBA_LIBRARY('asn1util',
                   source='asn1.c',
-                  deps='talloc samba-util-common',
+                  deps='talloc samba-util',
                   private_library=True,
                   local_include=False)