diff options
| -rw-r--r-- | lib/util/charset/wscript_build | 10 | ||||
| -rwxr-xr-x | lib/util/wscript_build | 2 | ||||
| -rwxr-xr-x | source3/wscript_build | 6 | ||||
| -rw-r--r-- | source4/libcli/wscript_build | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/lib/util/charset/wscript_build b/lib/util/charset/wscript_build index 1f2c8dfa7a..7a9918046d 100644 --- a/lib/util/charset/wscript_build +++ b/lib/util/charset/wscript_build @@ -4,14 +4,14 @@ bld.SAMBA_SUBSYSTEM('ICONV_WRAPPER', source='iconv.c', public_deps='iconv replace talloc') -bld.SAMBA_SUBSYSTEM('CHARSET', +bld.SAMBA_SUBSYSTEM('charset', public_headers='charset.h', source='codepoints.c convert_string.c util_str.c util_unistr_w.c charcnv.c pull_push.c util_unistr.c', deps='DYNCONFIG ICONV_WRAPPER', public_deps='talloc') bld.SAMBA_MODULE('charset_weird', - subsystem='CHARSET', + subsystem='charset', source='weird.c', init_function='', deps='samba-util', @@ -19,7 +19,7 @@ bld.SAMBA_MODULE('charset_weird', enabled=bld.SAMBA3_IS_ENABLED_MODULE('charset_weird')) bld.SAMBA_MODULE('charset_CP850', - subsystem='CHARSET', + subsystem='charset', source='CP850.c', init_function='', deps='samba-util', @@ -27,7 +27,7 @@ bld.SAMBA_MODULE('charset_CP850', enabled=bld.SAMBA3_IS_ENABLED_MODULE('charset_CP850')) bld.SAMBA_MODULE('charset_CP437', - subsystem='CHARSET', + subsystem='charset', source='CP437.c', init_function='', deps='samba-util', @@ -35,7 +35,7 @@ bld.SAMBA_MODULE('charset_CP437', enabled=bld.SAMBA3_IS_ENABLED_MODULE('charset_CP437')) bld.SAMBA_MODULE('charset_macosxfs', - subsystem='CHARSET', + subsystem='charset', source='charset_macosxfs.c', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('charset_macosxfs'), diff --git a/lib/util/wscript_build b/lib/util/wscript_build index f8386fa73f..659cb5455c 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -9,7 +9,7 @@ bld.SAMBA_LIBRARY('samba-util', util_str.c util_str_common.c substitute.c ms_fnmatch.c server_id.c dprintf.c parmlist.c''', deps='DYNCONFIG', - public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO CHARSET', + public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO charset', public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h', header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ], local_include=False, diff --git a/source3/wscript_build b/source3/wscript_build index 51dc3997c4..414cf83474 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -874,7 +874,7 @@ bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN', bld.SAMBA3_LIBRARY('smbconf', source=LIB_SMBCONF_SRC, deps='''LIBSMBCONF smbregistry REG_SMBCONF talloc param - util_reg samba-util errors3 CHARSET SAMBA_VERSION''', + util_reg samba-util errors3 charset SAMBA_VERSION''', public_headers='../lib/smbconf/smbconf.h', vnum='0') @@ -1023,7 +1023,7 @@ bld.SAMBA3_LIBRARY('string_init', bld.SAMBA3_LIBRARY('util_str', source='''lib/util_str.c''', - deps='samba-util CHARSET', + deps='samba-util charset', private_library=True) bld.SAMBA3_LIBRARY('util_sec', @@ -1048,7 +1048,7 @@ bld.SAMBA3_LIBRARY('memcache', bld.SAMBA3_LIBRARY('CHARSET3', source='''lib/charcnv.c lib/fstring.c''', - public_deps='ICONV_WRAPPER CHARSET', + public_deps='ICONV_WRAPPER charset', deps='samba-util util_str', private_library=True) diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index 1799bcabad..0a7b85ed01 100644 --- a/source4/libcli/wscript_build +++ b/source4/libcli/wscript_build @@ -78,7 +78,7 @@ bld.SAMBA_LIBRARY('LIBCLI_RAW', source='raw/rawfile.c raw/smb_signing.c raw/clisocket.c raw/clitransport.c raw/clisession.c raw/clitree.c raw/clierror.c raw/rawrequest.c raw/rawreadwrite.c raw/rawsearch.c raw/rawsetfileinfo.c raw/raweas.c raw/rawtrans.c raw/clioplock.c raw/rawnegotiate.c raw/rawfsinfo.c raw/rawfileinfo.c raw/rawnotify.c raw/rawioctl.c raw/rawacl.c raw/rawdate.c raw/rawlpq.c raw/rawshadow.c', autoproto='raw/raw_proto.h', public_deps='samba_socket LIBPACKET LIBCRYPTO', - deps='LIBCLI_COMPOSITE LIBCLI_RESOLVE security ndr samba-util errors CHARSET talloc LIBCLI_SMB_COMPOSITE tevent NDR_NBT_BUF LIBCLI_SMB_COMMON', + deps='LIBCLI_COMPOSITE LIBCLI_RESOLVE security ndr samba-util errors charset talloc LIBCLI_SMB_COMPOSITE tevent NDR_NBT_BUF LIBCLI_SMB_COMMON', private_library=True ) |