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

diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index 2745094b8aa96a4d46f3edb3404347a59be645e9..f9e39001c05b95ba723b9cdfca84644a6c2ec5f0 100644 (file)
--- 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 ae184dc71e5d625ebb4c4baae68f4f98668da1f7..f6bb5e6774d9f0d8e4b2543eda4451b31426926f 100755 (executable)
--- 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 38f1fab331b670d6499e021c1a976b66759b8571..4f352a7564eb3611649bcf9226c5d6c6021eb88e 100644 (file)
--- 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 bf36d1d18acac1542b8280fa8abe8773ad67990c..494ff1237c5f898a01c7fe54ce0bb61d34110cc8 100755 (executable)
--- 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 c0f003dec538137a2921166410756cf7bf526985..70829f54a6fb49a4661fb069acc7e2d34d613280 100755 (executable)
--- 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 3996a12098ecb504b9637cb6be1356b6673c4d6c..af71e80e17fb83de3e4411c5a5cc5cd3129502af 100644 (file)
--- 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'
        )