wafsamba: Require public libraries to have a pc file specified, or explicitly specifi...

[samba.git] / lib / util / wscript_build

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 7f5b1d2c6788ae9a1a7a8cc1d20f517da37a7490..553748a22ec8a19bdf03166fe234a2bac5acd89c 100755 (executable)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -1,42 +1,27 @@
 #!/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
-                  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 idtree.c debug.c fault.c''',
-                  public_deps='talloc pthread LIBCRYPTO',
-                  # 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,
+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 parmlist.c bitmap.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,
-                  public_headers='debug.h',
-                  header_path= [('*', 'util') ],
-                  private_library=True
+                  vnum='0.0.1',
+                  pc_files='samba-util.pc'
                   )
 
-if bld.env._SAMBA_BUILD_ == 4:
-    bld.SAMBA_LIBRARY('samba-util',
-                      source='''dprintf.c data_blob.c
-                      ms_fnmatch.c parmlist.c substitute.c util_str.c
-                      ''',
-                      deps='samba-util-common',
-                      public_deps='talloc CHARSET execinfo uid_wrapper',
-                      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',
-                      header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
-                      local_include=False,
-                      vnum='0.0.1',
-                      pc_files='samba-util.pc'
-                      )
-
-
-bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
-                    source='asn1.c',
-                    deps='talloc',
-                    local_include=False)
+bld.SAMBA_LIBRARY('asn1util',
+                  source='asn1.c',
+                  deps='talloc samba-util',
+                  private_library=True,
+                  local_include=False)
 
 
 bld.SAMBA_SUBSYSTEM('UNIX_PRIVS',
@@ -56,28 +41,31 @@ bld.SAMBA_LIBRARY('wrap_xattr',
        )
 
 
-bld.SAMBA_SUBSYSTEM('UTIL_TDB',
+bld.SAMBA_LIBRARY('UTIL_TDB',
        source='util_tdb.c',
        local_include=False,
-       public_deps='tdb talloc'
+       public_deps='tdb_compat talloc',
+                  private_library=True
        )
 
-bld.SAMBA_SUBSYSTEM('UTIL_TEVENT',
+bld.SAMBA_LIBRARY('tevent-util',
        source='tevent_unix.c tevent_ntstatus.c tevent_werror.c',
        local_include=False,
        public_deps='tevent',
        public_headers='tevent_ntstatus.h tevent_unix.h tevent_werror.h',
        header_path=[ ('*', 'util') ],
+       pc_files=[],
+       vnum='0.0.1'
        )
 
 
 if bld.env._SAMBA_BUILD_ == 4:
-    bld.SAMBA_SUBSYSTEM('UTIL_LDB',
-       source='util_ldb.c',
-        local_include=False,
-       public_deps='ldb',
-        public_headers='util_ldb.h'
-       )
+       bld.SAMBA_SUBSYSTEM('util_ldb',
+               source='util_ldb.c',
+               local_include=False,
+               public_deps='ldb',
+               public_headers='util_ldb.h'
+               )
 
 
 bld.SAMBA_SUBSYSTEM('UTIL_RUNCMD',
@@ -86,3 +74,16 @@ bld.SAMBA_SUBSYSTEM('UTIL_RUNCMD',
        public_deps='tevent'
        )
 
+bld.SAMBA_SUBSYSTEM('UTIL_PW',
+       source='util_pw.c',
+       local_include=False,
+       public_deps='talloc'
+       )
+
+
+bld.SAMBA_LIBRARY('tdb-wrap',
+                  source='tdb_wrap.c',
+                  deps='tdb_compat talloc samba-util',
+                  private_library=True,
+                  local_include=False
+                 )