sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

build: moved more files into samba-util-common

Browse Source 
this removes UTIL_SRC from the s3 waf build, as it is now all in
common with samba-util-common
This commit is contained in:
Andrew Tridgell 2011-02-22 14:33:06 +11:00
parent 457025eee7
commit 9174d73173
2 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/util/wscript_build
View File

@ -1,10 +1,13 @@
#!/usr/bin/env python #!/usr/bin/env python
# as we move files into common between samba-util and samba-util3, move them here # as we move files into common between samba-util and samba-util3, move them here.
# both samba-util and samba-util3 depend on this private library # Both samba-util and samba-util3 depend on this private library
bld.SAMBA_LIBRARY('samba-util-common', bld.SAMBA_LIBRARY('samba-util-common',
source='''talloc_stack.c smb_threads.c xfile.c util_file.c time.c source='''talloc_stack.c smb_threads.c xfile.c
rbtree.c rfc1738.c select.c''', util_file.c time.c rbtree.c rfc1738.c select.c
genrand.c fsusage.c blocking.c become_daemon.c
data_blob.c signal.c system.c params.c util.c util_id.c util_net.c
util_strlist.c''',
public_deps='talloc pthread', public_deps='talloc pthread',
# until we get all the dependencies in this library in common # until we get all the dependencies in this library in common
# we need to allow this library to be built with unresolved symbols # we need to allow this library to be built with unresolved symbols
@ -15,13 +18,10 @@ bld.SAMBA_LIBRARY('samba-util-common',
if bld.env._SAMBA_BUILD_ == 4: if bld.env._SAMBA_BUILD_ == 4:
bld.SAMBA_LIBRARY('samba-util', bld.SAMBA_LIBRARY('samba-util',
source=''' become_daemon.c blocking.c source='''debug.c dprintf.c fault.c
data_blob.c debug.c dprintf.c fault.c fsusage.c idtree.c ms_fnmatch.c
genrand.c idtree.c ms_fnmatch.c params.c parmlist.c substitute.c util_str.c
parmlist.c signal.c ''',
substitute.c system.c
util.c util_id.c util_net.c util_str.c
util_strlist.c xfile.c ''',
deps='samba-util-common', deps='samba-util-common',
public_deps='talloc LIBCRYPTO CHARSET execinfo uid_wrapper', public_deps='talloc LIBCRYPTO CHARSET execinfo uid_wrapper',
public_headers='attr.h byteorder.h data_blob.h debug.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h', public_headers='attr.h byteorder.h data_blob.h debug.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h',

20
source3/wscript_build
View File

@ -51,21 +51,6 @@ LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
LIBSAMBAUTIL_SRC = '''${LIBREPLACE_SRC}''' LIBSAMBAUTIL_SRC = '''${LIBREPLACE_SRC}'''
UTIL_SRC = '''
../lib/util/become_daemon.c
../lib/util/blocking.c
../lib/util/data_blob.c
../lib/util/fsusage.c
../lib/util/genrand.c
../lib/util/params.c
../lib/util/signal.c
../lib/util/system.c
../lib/util/util.c
../lib/util/util_id.c
../lib/util/util_net.c
../lib/util/util_strlist.c
'''
LIBTEVENT_SRC0 = '' LIBTEVENT_SRC0 = ''
PTHREADPOOL_SRC = '' PTHREADPOOL_SRC = ''
@ -999,9 +984,8 @@ bld.SAMBA3_SUBSYSTEM('CHARSET3',
deps='DYNCONFIG') deps='DYNCONFIG')
bld.SAMBA3_SUBSYSTEM('samba-util3', bld.SAMBA3_SUBSYSTEM('samba-util3',
source=UTIL_SRC, source='',
deps='talloc CHARSET3 LIBCRYPTO samba-util-common', deps='talloc CHARSET3 LIBCRYPTO samba-util-common')
vars=locals())
bld.SAMBA3_SUBSYSTEM('ldb3', bld.SAMBA3_SUBSYSTEM('ldb3',
source='lib/ldb_compat.c') source='lib/ldb_compat.c')