sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3-waf: move charset subsystem to modules/wscript_build.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2010-09-26 20:07:03 +02:00
parent 6465dbce6d
commit 3e35cc42b5
2 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
source3/modules/wscript_build
View File

@ -401,3 +401,44 @@ bld.SAMBA_MODULE('VFS_LINUX_XFS_SGID',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_LINUX_XFS_SGID'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_LINUX_XFS_SGID'))
CHARSET_WEIRD_SRC = 'weird.c'
CHARSET_CP850_SRC = 'CP850.c'
CHARSET_CP437_SRC = 'CP437.c'
CHARSET_MACOSXFS_SRC = 'charset_macosxfs.c'
bld.SAMBA_SUBSYSTEM('CHARSET',
source='',
deps='''CHARSET_WEIRD CHARSET_CP850 CHARSET_CP437 CHARSET_MACOSXFS''',
vars=locals())
bld.SAMBA_MODULE('CHARSET_WEIRD',
subsystem='CHARSET',
source=CHARSET_WEIRD_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_WEIRD'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_WEIRD'))
bld.SAMBA_MODULE('CHARSET_CP850',
subsystem='CHARSET',
source=CHARSET_CP850_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_CP850'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_CP850'))
bld.SAMBA_MODULE('CHARSET_CP437',
subsystem='CHARSET',
source=CHARSET_CP437_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_CP437'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_CP437'))
bld.SAMBA_MODULE('CHARSET_MACOSXFS',
subsystem='CHARSET',
source=CHARSET_MACOSXFS_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_MACOSXFS'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_MACOSXFS'))

43
source3/wscript_build
View File

@ -221,7 +221,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
lib/sessionid_tdb.c
lib/module.c lib/events.c ${LIBTEVENT_SRC0}
lib/server_contexts.c
lib/ldap_escape.c ${CHARSET_STATIC}
lib/ldap_escape.c
lib/secdesc.c lib/util_seaccess.c ../libcli/security/secace.c
../libcli/security/sddl.c
../libcli/security/secacl.c ${PTHREADPOOL_SRC}
@ -492,12 +492,6 @@ PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c passdb/pdb_interface.c
lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}'''
#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
CHARSET_STATIC = ''
CHARSET_WEIRD_SRC = 'modules/weird.c'
CHARSET_CP850_SRC = 'modules/CP850.c'
CHARSET_CP437_SRC = 'modules/CP437.c'
CHARSET_MACOSXFS_SRC = 'modules/charset_macosxfs.c'
GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
PROFILE_SRC = '''profile/profile.c'''
@ -1135,39 +1129,6 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
deps='talloc',
local_include=False)
bld.SAMBA_SUBSYSTEM('CHARSET',
source='',
deps='''CHARSET_WEIRD CHARSET_CP850 CHARSET_CP437 CHARSET_MACOSXFS''',
vars=locals())
bld.SAMBA_MODULE('CHARSET_WEIRD',
subsystem='CHARSET',
source=CHARSET_WEIRD_SRC,
init_function='',
internal_module=True,
enabled=True)
bld.SAMBA_MODULE('CHARSET_CP850',
subsystem='CHARSET',
source=CHARSET_CP850_SRC,
init_function='',
internal_module=True,
enabled=True)
bld.SAMBA_MODULE('CHARSET_CP437',
subsystem='CHARSET',
source=CHARSET_CP437_SRC,
init_function='',
internal_module=True,
enabled=True)
bld.SAMBA_MODULE('CHARSET_MACOSXFS',
subsystem='CHARSET',
source=CHARSET_MACOSXFS_SRC,
init_function='',
internal_module=True,
enabled=False) #fixme
bld.SAMBA_SUBSYSTEM('PERFCOUNT',
source='',
deps='''PERFCOUNT_ONEFS PERFCOUNT_TEST''',
@ -1249,7 +1210,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY',
deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY CHARSET',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',