specify some deps on private libs actually used directly

Lots of samba libraries has incomplete dependencies listed
in wscript files.  This usually is not a problem since the
link line includes dependencies of their dependencies of
their dependencies, and somewhere down that line all immediate
dependencies which are missing are actually present.  But
sometimes this becomes a problem when a library does not
declare direct dependency on at least one private library
which it actually uses: in case no private library is
listed as direct dependency, private library directory is
not put into RUNPATH of the resulting binary, so the binary
can not find its own dependencies.

Fix a few such places, including some libraries which are
a part of public abi (libsmbldap, libndr).

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>

diff --git a/lib/param/wscript_build b/lib/param/wscript_build
index 864975a588467d7c27ad5f7f3cdc06e347984ab9..0ea874b9f6e2b08e6614fd218e9324d21c075ae7 100644 (file)
--- a/lib/param/wscript_build
+++ b/lib/param/wscript_build
@@ -32,7 +32,7 @@ bld.SAMBA_GENERATOR('param_table_gen.c',
 
 bld.SAMBA_LIBRARY('server-role',
                   source='loadparm_server_role.c',
-                  deps='samba-util samba-debug',
+                  deps='samba-util time-basic samba-debug',
                   private_library=True)
 
 bld.SAMBA_LIBRARY('samba-hostconfig',

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 7de9c0b7b172d7a9a6f2c34d5c5af1968f1a8e87..1eab2bb5805e0b560857ad033f5e2465a5c18390 100644 (file)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -243,7 +243,7 @@ else:
 
     bld.SAMBA_LIBRARY('samba-modules',
                       source='modules.c',
-                      deps='samba-errors samba-util',
+                      deps='samba-errors samba-util samba-debug',
                       local_include=False,
                       private_library=True)
 
@@ -283,7 +283,7 @@ else:
                           tevent_req_profile.c
                       ''',
                       local_include=False,
-                      public_deps='tevent samba-errors',
+                      public_deps='tevent time-basic samba-errors',
                       public_headers='tevent_ntstatus.h tevent_unix.h tevent_werror.h',
                       header_path=[ ('*', 'util') ],
                       pc_files=[],

diff --git a/librpc/wscript_build b/librpc/wscript_build
index a4cdfd9f508c181628ca2b727f70c7f116fb1a35..dedba157d9f6095a84c66e0169c0242587eee075 100644 (file)
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -672,6 +672,7 @@ bld.SAMBA_LIBRARY('ndr',
     source='ndr/ndr_string.c ndr/ndr_basic.c ndr/uuid.c ndr/ndr.c ndr/ndr_misc.c gen_ndr/ndr_misc.c ndr/util.c',
     pc_files='ndr.pc',
     public_deps='samba-errors talloc samba-util util_str_hex',
+    deps='genrand',
     public_headers='gen_ndr/misc.h gen_ndr/ndr_misc.h ndr/libndr.h:ndr.h',
     header_path= [('*gen_ndr*', 'gen_ndr')],
     vnum='6.0.0',

diff --git a/source3/wscript_build b/source3/wscript_build
index 0c9f6ad3143a739e87650740ae6497f694363ba5..3ed3b550960af0ffe5ee15b63779475298ae0c51 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -192,7 +192,7 @@ bld.SAMBA3_LIBRARY('smbldaphelper',
                           passdb/pdb_ldap_schema.c
                           passdb/pdb_ldap_util.c
                           ''',
-                   deps='smbldap secrets3',
+                   deps='smbldap secrets3 samba-security samba3-util',
                    allow_undefined_symbols=True,
                    enabled=bld.CONFIG_SET('HAVE_LDAP'),
                    private_library=True)
@@ -500,7 +500,7 @@ bld.SAMBA3_LIBRARY('secrets3',
 
 bld.SAMBA3_LIBRARY('smbldap',
                     source='lib/smbldap.c',
-                    deps='ldap lber samba-util smbconf',
+                    deps='ldap lber samba-util smbconf samba-security genrand smbd_shim',
                     enabled=bld.CONFIG_SET("HAVE_LDAP"),
                     private_library=False,
                     abi_directory='lib/ABI',

diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build_server b/source4/dsdb/samdb/ldb_modules/wscript_build_server
index 16d9b31a9825e5c6d5e07d255a922b69baab1b05..800ed2954c418de9312247d401e983ce2c9433f2 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/wscript_build_server
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build_server
@@ -345,7 +345,7 @@ bld.SAMBA_MODULE('ldb_anr',
        init_function='ldb_anr_module_init',
        module_init_name='ldb_init_module',
        internal_module=False,
-       deps='talloc samba-util samdb'
+       deps='talloc samba-util samdb ldbsamba'
        )
 
 
@@ -385,7 +385,7 @@ bld.SAMBA_MODULE('ldb_resolve_oids',
        init_function='ldb_resolve_oids_module_init',
        module_init_name='ldb_init_module',
        internal_module=False,
-       deps='samdb talloc ndr'
+       deps='samdb talloc ndr ldbsamba'
        )
 
 

diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index d1b852c0c73d177b53180c5776c459d85af9865c..80341369337680faf5a89e580a3f020985c1f5e3 100644 (file)
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -39,7 +39,7 @@ libpython = bld.pyembed_libname('LIBPYTHON')
 
 bld.SAMBA_PYTHON('pyparam',
                 source='pyparam.c',
-                deps='samba-hostconfig %s' % pytalloc_util,
+                deps='samba-hostconfig server-role samba-util samba-debug %s' % pytalloc_util,
                 realname='samba/param.so'
                 )