Rename 'errors' to 'samba-errors' and make it public.

[obnox/samba/samba-obnox.git] / lib / util / wscript_build

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index a1287b7e0b7b720bbc81b97ffe67d4c58d56acca..31e29581e6ac4ae68a562aa871f6314eb785ca77 100755 (executable)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -30,6 +30,7 @@ bld.SAMBA_SUBSYSTEM('close-low-fd',
                     local_include=False)
 
 samba_debug_add_deps = ''
+samba_debug_add_inc  = ''
 
 if bld.CONFIG_SET('HAVE_GPFS'):
     bld.SAMBA_SUBSYSTEM('gpfswrap',
@@ -38,12 +39,14 @@ if bld.CONFIG_SET('HAVE_GPFS'):
                         local_include=False,
                         includes=bld.CONFIG_GET('CPPPATH_GPFS'))
     samba_debug_add_deps += ' gpfswrap'
+    samba_debug_add_inc  += bld.CONFIG_GET('CPPPATH_GPFS')
 
 bld.SAMBA_LIBRARY('samba-debug',
                   source='debug.c',
                   deps='replace time-basic close-low-fd talloc socket-blocking' + samba_debug_add_deps,
                   public_deps='systemd systemd-journal lttng-ust',
                   local_include=False,
+                  includes=samba_debug_add_inc,
                   private_library=True)
 
 bld.SAMBA_LIBRARY('socket-blocking',
@@ -51,31 +54,58 @@ bld.SAMBA_LIBRARY('socket-blocking',
                   local_include=False,
                   private_library=True)
 
+bld.SAMBA_LIBRARY('talloc_report',
+                  source='talloc_report.c',
+                  local_include=False,
+                  public_deps='talloc',
+                  private_library=True
+                  )
+
 bld.SAMBA_SUBSYSTEM('samba-util-core',
                     source='''xfile.c data_blob.c util_file.c time.c
                               signal.c util.c idtree.c fault.c
-                              substitute.c''',
+                              substitute.c util_process.c''',
                     deps='''time-basic samba-debug socket-blocking talloc
                             tevent execinfo pthread''',
                     local_include=False)
 
+bld.SAMBA_LIBRARY('tevent-unix-util',
+                  source='tevent_unix.c',
+                  local_include=False,
+                  deps='tevent',
+                  public_headers='tevent_unix.h',
+                  header_path=[ ('*', 'util') ],
+                  pc_files=[],
+                  vnum='0.0.1')
+
 if not bld.env.SAMBA_UTIL_CORE_ONLY:
 
     bld.env.public_headers_skip.append('charset_compat.h')
 
+    bld.SAMBA_LIBRARY('genrand',
+                      source='genrand.c',
+                      deps='replace socket-blocking sys_rw',
+                      local_include=False,
+                      private_library=True)
+
+    bld.SAMBA_BINARY('genrandperf',
+                     source='tests/genrandperf.c',
+                     deps='genrand replace',
+                     local_include=False,
+                     install=False)
+
     bld.SAMBA_LIBRARY('samba-util',
                   source='''talloc_stack.c smb_threads.c
                     rbtree.c rfc1738.c become_daemon.c system.c select.c getpass.c
-                    genrand.c genrand_util.c fsusage.c
+                    genrand_util.c fsusage.c
                     params.c util_id.c util_net.c
                     util_strlist.c util_paths.c idtree_random.c base64.c
                     util_str.c util_str_common.c ms_fnmatch.c
-                    server_id.c dprintf.c parmlist.c bitmap.c pidfile.c
-                    tevent_debug.c util_process.c memcache.c''',
-                  deps='samba-util-core DYNCONFIG close-low-fd tini tiniparser',
-
+                    server_id.c dprintf.c bitmap.c pidfile.c
+                    tevent_debug.c memcache.c''',
+                  deps='samba-util-core DYNCONFIG close-low-fd tini tiniparser genrand',
                   public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid systemd systemd-daemon',
-                  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 samba_util.h string_wrappers.h idtree.h idtree_random.h blocking.h signal.h substitute.h fault.h genrand.h',
+                  public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h string_wrappers.h idtree.h idtree_random.h blocking.h signal.h substitute.h fault.h genrand.h',
                   header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
                   local_include=False,
                   vnum='0.0.1',
@@ -84,7 +114,7 @@ if not bld.env.SAMBA_UTIL_CORE_ONLY:
 
     bld.SAMBA_LIBRARY('samba-modules',
                       source='modules.c',
-                      deps='errors samba-util',
+                      deps='samba-errors samba-util',
                       local_include=False,
                       private_library=True)
 
@@ -110,18 +140,11 @@ if not bld.env.SAMBA_UTIL_CORE_ONLY:
                       private_library=True
                       )
 
-    bld.SAMBA_LIBRARY('talloc_report',
-                      source='talloc_report.c',
-                      local_include=False,
-                      public_deps='talloc',
-                      private_library=True
-                      )
-
     bld.SAMBA_LIBRARY('tevent-util',
-                      source='tevent_unix.c tevent_ntstatus.c tevent_werror.c',
+                      source='tevent_ntstatus.c tevent_werror.c',
                       local_include=False,
-                      public_deps='tevent errors',
-                      public_headers='tevent_ntstatus.h tevent_unix.h tevent_werror.h',
+                      public_deps='tevent samba-errors tevent-unix-util',
+                      public_headers='tevent_ntstatus.h tevent_werror.h',
                       header_path=[ ('*', 'util') ],
                       pc_files=[],
                       vnum='0.0.1'
@@ -163,3 +186,9 @@ if not bld.env.SAMBA_UTIL_CORE_ONLY:
                       source='iov_buf.c',
                       local_include=False,
                       private_library=True)
+
+    bld.SAMBA3_LIBRARY('sys_rw',
+                       source='sys_rw.c sys_rw_data.c',
+                       deps='replace iov_buf',
+                       local_include=False,
+                       private_library=True)