charset Remove use of {isupper,islower,toupper,tolower}_w functions

[metze/samba/wip.git] / source3 / wscript_build

diff --git a/source3/wscript_build b/source3/wscript_build
index c84787bf06c70d9e0d7735baa17d46542cbfbcf9..9a78d5a676debc29a370234f092d362256ddbcdb 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -742,11 +742,6 @@ bld.SAMBA3_SUBSYSTEM('LIBGPO',
                     deps='gpext',
                     vars=locals())
 
-bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
-                    source='../lib/util/asn1.c',
-                    deps='talloc',
-                    local_include=False)
-
 bld.SAMBA3_SUBSYSTEM('AVAHI',
                     source=AVAHI_SRC,
                     deps='avahi-common avahi-client',
@@ -926,20 +921,6 @@ bld.SAMBA3_SUBSYSTEM('FNAME_UTIL',
                     source=FNAME_UTIL_SRC,
                     vars=locals())
 
-bld.SAMBA3_SUBSYSTEM('UTIL_TDB3',
-       source='../lib/util/util_tdb.c',
-       local_include=False,
-       public_deps='tdb talloc'
-       )
-
-bld.SAMBA_SUBSYSTEM('UTIL_TEVENT',
-       source='../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c ../lib/util/tevent_werror.c',
-       local_include=False,
-       public_deps='tevent',
-       public_headers='../lib/util/tevent_ntstatus.h ../lib/util/tevent_unix.h ../lib/util/tevent_werror.h',
-       header_path=[ ('*', 'util') ],
-       )
-
 bld.SAMBA3_SUBSYSTEM('LIBNET',
                     source=LIBNET_SRC,
                     deps='NDR_LIBNET_JOIN',
@@ -1009,13 +990,14 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap',
 
 bld.SAMBA3_SUBSYSTEM('CHARSET',
                     source='''lib/util_str.c lib/util_unistr.c lib/charcnv.c lib/iconv.c''',
-                    public_deps='iconv',
+                    public_deps='iconv CODEPOINTS',
                     deps='DYNCONFIG')
 
 bld.SAMBA3_SUBSYSTEM('samba-util',
                     source=UTIL_SRC,
                     deps='talloc CHARSET LIBCRYPTO',
                     vars=locals())
+
 #FIXME
 bld.SAMBA3_SUBSYSTEM('ndr-standard',
                     source='',
@@ -1370,7 +1352,7 @@ bld.SAMBA3_BINARY('split_tokens',
 
 bld.SAMBA3_BINARY('vlp',
                  source=VLP_SRC,
-                 deps='''talloc tdb PARAM_UTIL UTIL_TDB3''',
+                 deps='''talloc tdb PARAM_UTIL UTIL_TDB''',
                  vars=locals())
 
 swat_files=recursive_dirlist('../swat', '../swat', '*')
@@ -1378,6 +1360,7 @@ bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
 
 ########################## INCLUDES #################################
 
+bld.RECURSE('../lib/util/charset')
 bld.RECURSE('../auth')
 bld.RECURSE('../lib/addns')
 bld.RECURSE('../lib/async_req')
@@ -1397,8 +1380,10 @@ bld.RECURSE('../lib/popt')
 bld.RECURSE('../librpc')
 bld.RECURSE('../lib/smbconf')
 bld.RECURSE('../lib/socket_wrapper')
+bld.RECURSE('../lib/uid_wrapper')
 bld.RECURSE('../lib/talloc')
 bld.RECURSE('../lib/tdb')
+bld.RECURSE('../lib/util')
 bld.RECURSE('../lib/tevent')
 bld.RECURSE('../lib/tsocket')
 bld.RECURSE('../lib/zlib')