diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 10:24:58 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 18:41:00 +1100 |
commit | 8afc271e2a9950fda68e99928746623093cbd6ac (patch) | |
tree | e2a685a3929cea74a5d1b7f09ca6508e2b60fa30 /lib/util/charset/wscript_build | |
parent | bed374215ff040cc995659d42938be35412a794a (diff) | |
download | samba-8afc271e2a9950fda68e99928746623093cbd6ac.tar.gz samba-8afc271e2a9950fda68e99928746623093cbd6ac.tar.bz2 samba-8afc271e2a9950fda68e99928746623093cbd6ac.zip |
lib/util/charset Use top level iconv.c in source3
The two files were very similar already, the only change required was
to adopt the s3 module registration fucntion name.
(NTSTATUS wasn't used as the charset code does not otherwise use that
type).
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'lib/util/charset/wscript_build')
-rw-r--r-- | lib/util/charset/wscript_build | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/util/charset/wscript_build b/lib/util/charset/wscript_build index 4137bf6cee..18479a9978 100644 --- a/lib/util/charset/wscript_build +++ b/lib/util/charset/wscript_build @@ -3,11 +3,15 @@ if bld.env._SAMBA_BUILD_ == 4: bld.SAMBA_SUBSYSTEM('CHARSET', - source='iconv.c charcnv.c util_unistr.c', - public_deps='iconv CODEPOINTS', + source='charcnv.c util_unistr.c', + public_deps='ICONV_WRAPPER CODEPOINTS', public_headers='charset.h', ) +bld.SAMBA_SUBSYSTEM('ICONV_WRAPPER', + source='iconv.c', + public_deps='iconv') + bld.SAMBA_SUBSYSTEM('CODEPOINTS', source='codepoints.c', deps='DYNCONFIG' |