lib/util: consolidate module loading into common code

[samba.git] / lib / util / wscript_build

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index bdc9d1015096e11ed0fe2edfa6580d32a0b6581d..f4bd8852311ec8012dc7c1ea49024dcbd682e8a1 100755 (executable)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -7,16 +7,22 @@ bld.SAMBA_LIBRARY('samba-util',
                     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''',
                   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 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 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',
@@ -48,12 +54,14 @@ bld.SAMBA_LIBRARY('UTIL_TDB',
                   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'
        )
 
 
@@ -84,5 +92,4 @@ bld.SAMBA_LIBRARY('tdb-wrap',
                   deps='tdb_compat talloc samba-util',
                   private_library=True,
                   local_include=False
-                  )
-
+                 )