-bld.SAMBA3_LIBRARY('dbwrap',
- source='lib/dbwrap/dbwrap.c lib/dbwrap/dbwrap_util.c lib/dbwrap/dbwrap_rbt.c',
- deps='samba-util UTIL_TDB errors',
- private_library=True)
-
-bld.SAMBA3_LIBRARY('util_malloc',
- source='''lib/util_malloc.c''',
- deps='samba-util',
- private_library=True)
-
-bld.SAMBA3_LIBRARY('string_init',
- source='''lib/string_init.c''',
- deps='samba-util',
- private_library=True)
-
-bld.SAMBA3_LIBRARY('util_str',
- source='''lib/util_str.c''',
+bld.SAMBA3_LIBRARY('samba3-util',
+ source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/memcache.c lib/namearray.c lib/file_id.c''',