-bld.SAMBA3_SUBSYSTEM('CHARSET3',
- source='''lib/util_str.c lib/charcnv.c lib/fstring.c''',
- public_deps='ICONV_WRAPPER samba3core CHARSET',
- deps='samba-util')
+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''',
+ deps='samba-util CHARSET',
+ private_library=True)
+
+bld.SAMBA3_LIBRARY('util_sec',
+ source='''lib/util_sec.c''',
+ deps='samba-util',
+ private_library=True)
+
+bld.SAMBA3_LIBRARY('bitmap',
+ source='lib/bitmap.c',
+ deps='samba-util',
+ private_library=True)
+
+bld.SAMBA3_LIBRARY('namearray',
+ source='lib/namearray.c',
+ deps='samba-util',
+ private_library=True)
+
+bld.SAMBA3_LIBRARY('adt_tree',
+ source='lib/adt_tree.c',
+ deps='samba-util',
+ private_library=True)
+
+bld.SAMBA3_LIBRARY('memcache',
+ source='lib/memcache.c',
+ deps='samba-util util_malloc',
+ private_library=True)
+
+bld.SAMBA3_LIBRARY('CHARSET3',
+ source='''lib/charcnv.c lib/fstring.c''',
+ public_deps='ICONV_WRAPPER CHARSET',
+ deps='samba-util util_str',
+ private_library=True)