lib/util: move memcache.[ch] to the toplevel 'samba-util' library

[nivanova/samba-autobuild/.git] / lib / util / wscript_build

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index bdc9d1015096e11ed0fe2edfa6580d32a0b6581d..bcb7b66c7717fa07dc12b515b26dac9817b664dc 100755 (executable)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -2,21 +2,28 @@
 
 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
+                    util_file.c time.c rbtree.c rfc1738.c select.c getpass.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''',
+                    server_id.c dprintf.c parmlist.c bitmap.c pidfile.c
+                    tevent_debug.c util_process.c memcache.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') ],
+                  public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid 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',
+                  header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
                   local_include=False,
                   vnum='0.0.1',
                   pc_files='samba-util.pc'
                   )
 
+bld.SAMBA_LIBRARY('samba-modules',
+                 source='modules.c',
+                 deps='errors samba-util',
+                 local_include=False,
+                 private_library=True)
+
 bld.SAMBA_LIBRARY('asn1util',
                   source='asn1.c',
                   deps='talloc samba-util',
@@ -32,38 +39,43 @@ bld.SAMBA_SUBSYSTEM('UNIX_PRIVS',
        )
 
 
-bld.SAMBA_LIBRARY('wrap_xattr',
-       source='wrap_xattr.c',
-       public_deps='attr',
-       deps='talloc',
+bld.SAMBA_LIBRARY('util_tdb',
+       source='util_tdb.c',
        local_include=False,
+       public_deps='tdb talloc samba-util',
        private_library=True
        )
 
+if not bld.env.disable_ntdb:
+    bld.SAMBA_LIBRARY('util_ntdb',
+               source='util_ntdb.c',
+               local_include=False,
+               public_deps='ntdb talloc samba-util samba-hostconfig',
+               private_library=True
+               )
 
-bld.SAMBA_LIBRARY('UTIL_TDB',
-       source='util_tdb.c',
-       local_include=False,
-       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_deps='tevent errors',
        public_headers='tevent_ntstatus.h tevent_unix.h tevent_werror.h',
        header_path=[ ('*', 'util') ],
+       pc_files=[],
+       vnum='0.0.1'
        )
 
+bld.SAMBA_LIBRARY('util_setid',
+       source='setid.c',
+       local_include=False,
+       private_library=True
+       )
 
-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',
@@ -78,11 +90,3 @@ bld.SAMBA_SUBSYSTEM('UTIL_PW',
        public_deps='talloc'
        )
 
-
-bld.SAMBA_LIBRARY('tdb-wrap',
-                  source='tdb_wrap.c',
-                  deps='tdb_compat talloc samba-util',
-                  private_library=True,
-                  local_include=False
-                  )
-