summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-07 14:19:43 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-07 06:45:06 +0200
commit1e28aa147f23439273d892c1223969091b3ca90a (patch)
tree27225b435165c901753b94bcd68682f292f42398
parent15cebf38c173db0d255010528eaff11e8aa4f258 (diff)
downloadsamba-1e28aa147f23439273d892c1223969091b3ca90a.tar.gz
samba-1e28aa147f23439273d892c1223969091b3ca90a.tar.bz2
samba-1e28aa147f23439273d892c1223969091b3ca90a.zip
build: Add missing deps and make MESSAGING a private library
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
-rw-r--r--source4/auth/ntlm/wscript_build2
-rwxr-xr-xsource4/dsdb/samdb/ldb_modules/wscript_build_server2
-rw-r--r--source4/lib/messaging/wscript_build5
-rwxr-xr-xsource4/librpc/wscript_build2
-rwxr-xr-xsource4/torture/wscript_build6
-rw-r--r--source4/wscript_build2
6 files changed, 10 insertions, 9 deletions
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index 2745094b8a..f9e39001c0 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -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'
)
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build_server b/source4/dsdb/samdb/ldb_modules/wscript_build_server
index ae184dc71e..f6bb5e6774 100755
--- a/source4/dsdb/samdb/ldb_modules/wscript_build_server
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build_server
@@ -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'
)
diff --git a/source4/lib/messaging/wscript_build b/source4/lib/messaging/wscript_build
index 38f1fab331..4f352a7564 100644
--- a/source4/lib/messaging/wscript_build
+++ b/source4/lib/messaging/wscript_build
@@ -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
)
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index bf36d1d18a..494ff1237c 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -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,
)
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index c0f003dec5..70829f54a6 100755
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -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',
)
diff --git a/source4/wscript_build b/source4/wscript_build
index 3996a12098..af71e80e17 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -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'
)