sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

build: Add missing deps and make MESSAGING a private library

Browse Source 
To remove finddcs_nbt these missing deps need to be added.  These
subsystems linked to to implicit dependencies provided by finddcs.
Due to the new arrangmenet of subsystems, MESSAGING needs to be a
private library to avoid being a source of duplicate symbols.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-06-07 14:19:43 +10:00
parent 15cebf38c1
commit 1e28aa147f
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/auth/ntlm/wscript_build
View File

@ -4,7 +4,7 @@ bld.SAMBA_MODULE('auth4_sam_module',
source='auth_sam.c',
subsystem='auth4',
init_function='auth4_sam_init',
deps='samdb auth4_sam NTLMSSP_COMMON samba-hostconfig'
deps='samdb auth4_sam NTLMSSP_COMMON samba-hostconfig RPC_NDR_IRPC MESSAGING'
)

2
source4/dsdb/samdb/ldb_modules/wscript_build_server
View File

@ -106,7 +106,7 @@ bld.SAMBA_MODULE('ldb_rootdse',
init_function='ldb_rootdse_module_init',
module_init_name='ldb_init_module',
internal_module=False,
deps='talloc samdb MESSAGING security DSDB_MODULE_HELPERS'
deps='talloc samdb MESSAGING security DSDB_MODULE_HELPERS RPC_NDR_IRPC'
)

5
source4/lib/messaging/wscript_build
View File

@ -1,9 +1,10 @@
#!/usr/bin/env python
bld.SAMBA_SUBSYSTEM('MESSAGING',
bld.SAMBA_LIBRARY('MESSAGING',
source='messaging.c',
public_deps='samba-util tdb-wrap NDR_IRPC UNIX_PRIVS util_tdb cluster ndr samba_socket dcerpc'
public_deps='samba-util tdb-wrap NDR_IRPC UNIX_PRIVS util_tdb cluster ndr samba_socket dcerpc',
private_library=True
)

2
source4/librpc/wscript_build
View File

@ -158,7 +158,7 @@ bld.SAMBA_LIBRARY('dcerpc',
bld.SAMBA_SUBSYSTEM('pyrpc_util',
source='rpc/pyrpc_util.c',
public_deps='pytalloc-util pyparam_util dcerpc',
public_deps='pytalloc-util pyparam_util dcerpc MESSAGING',
pyext=True,
)

6
source4/torture/wscript_build
View File

@ -165,14 +165,14 @@ bld.SAMBA_BINARY('smbtorture',
bld.SAMBA_BINARY('gentest',
source='gentest.c',
manpages='man/gentest.1',
deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB smbclient-raw'
deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB smbclient-raw param_options'
)
bld.SAMBA_BINARY('masktest',
source='masktest.c',
manpages='man/masktest.1',
deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB'
deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB param_options'
)
@ -183,6 +183,6 @@ bld.SAMBA_BINARY('locktest',
#cflags='--coverage',
# GCOV='1',
manpages='man/locktest.1',
deps='popt POPT_SAMBA POPT_CREDENTIALS samba-util LIBCLI_SMB samba-hostconfig',
deps='popt POPT_SAMBA POPT_CREDENTIALS samba-util LIBCLI_SMB samba-hostconfig param_options',
)

2
source4/wscript_build
View File

@ -2,7 +2,7 @@
bld.SAMBA_BINARY('client/smbclient' + bld.env.suffix4,
source='client/client.c',
deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw param_options'
deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw param_options dcerpc'
)