s3-waf: rename CHARSET to CHARSET3

and add an alias CHARSET when not using a toplevel build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/source3/wscript_build b/source3/wscript_build
index 6e195adbd2ac1bab1e5693681e99f115349bce62..de774de00aa6914957254cdb5bae6efb5838c14d 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -996,14 +996,14 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
                     source='lib/util_tdb.c',
                     vars=locals())
 
-bld.SAMBA3_SUBSYSTEM('CHARSET',
+bld.SAMBA3_SUBSYSTEM('CHARSET3',
                     source='''lib/util_str.c lib/util_unistr.c lib/charcnv.c''',
                     public_deps='ICONV_WRAPPER CODEPOINTS',
                     deps='DYNCONFIG')
 
 bld.SAMBA3_SUBSYSTEM('samba-util3',
                     source=UTIL_SRC,
-                    deps='talloc CHARSET LIBCRYPTO',
+                    deps='talloc CHARSET3 LIBCRYPTO',
                     vars=locals())
 
 #FIXME
@@ -1351,6 +1351,7 @@ if not bld.env.toplevel_build:
     bld.SAMBA3_SUBSYSTEM('tdb-wrap', source='', deps='tdb-wrap3')
     bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3')
     bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='samba-util3')
+    bld.SAMBA3_SUBSYSTEM('CHARSET', source='', deps='CHARSET3')