sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

s3-build: Remove SECRETS3 as a samba3core dep

Browse Source 
This resolves the the library loop between libsmbconf and
SECRETS3/passdb, and allows the next commit to require fully defined
symbols in public libraries.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2011-06-23 17:33:04 +10:00
parent b332743ddb
commit 9554fd6e2f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source3/wscript_build
View File

@ -72,7 +72,7 @@ LIB_SRC = '''
lib/wins_srv.c lib/wins_srv.c
lib/util_sid.c lib/util_sid.c
lib/util_file.c lib/util_file.c
lib/util.c lib/util_cmdline.c lib/util.c
lib/util_sock.c lib/sock_exec.c lib/util_sock.c lib/sock_exec.c
lib/substitute.c lib/substitute_generic.c lib/substitute.c lib/substitute_generic.c
lib/ms_fnmatch.c lib/ms_fnmatch.c
@ -743,7 +743,7 @@ if bld.env.toplevel_build:
bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG', bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG',
source=PARAM_WITHOUT_REG_SRC, source=PARAM_WITHOUT_REG_SRC,
deps='''PARAM_UTIL smbd_conn ldap lber LOADPARM_CTX''', deps='''PARAM_UTIL smbd_conn ldap lber LOADPARM_CTX samba3core''',
vars=locals()) vars=locals())
bld.SAMBA3_SUBSYSTEM('param', bld.SAMBA3_SUBSYSTEM('param',
@ -785,10 +785,15 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL',
bld.SAMBA3_LIBRARY('POPT_SAMBA3', bld.SAMBA3_LIBRARY('POPT_SAMBA3',
source=POPT_LIB_SRC, source=POPT_LIB_SRC,
deps='popt samba-util', deps='popt samba-util UTIL_CMDLINE',
vars=locals(), vars=locals(),
private_library=True) private_library=True)
bld.SAMBA3_LIBRARY('UTIL_CMDLINE',
source='lib/util_cmdline.c',
deps='SECRETS3',
private_library=True)
bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
source=KRBCLIENT_SRC, source=KRBCLIENT_SRC,
public_deps='KRB5_WRAP k5crypto', public_deps='KRB5_WRAP k5crypto',
@ -796,7 +801,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
bld.SAMBA3_SUBSYSTEM('samba3core', bld.SAMBA3_SUBSYSTEM('samba3core',
source=LIB_SRC, source=LIB_SRC,
deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util util_sec util_malloc memcache ccan', deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap_util util_sec util_malloc memcache ccan',
vars=locals()) vars=locals())
bld.SAMBA3_LIBRARY('smbd_shim', bld.SAMBA3_LIBRARY('smbd_shim',
@ -816,7 +821,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
bld.SAMBA3_LIBRARY('LIBSMB', bld.SAMBA3_LIBRARY('LIBSMB',
source=LIBSMB_SRC, source=LIBSMB_SRC,
deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON', deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON UTIL_CMDLINE',
vars=locals(), vars=locals(),
private_library=True) private_library=True)