From 666d01911042680039276209c1872b5d778e4015 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 21 Feb 2011 11:14:13 +1100 Subject: s3-waf: rename CHARSET to CHARSET3 and add an alias CHARSET when not using a toplevel build Pair-Programmed-With: Andrew Bartlett --- source3/wscript_build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source3/wscript_build b/source3/wscript_build index 6e195adbd2..de774de00a 100644 --- 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') -- cgit