lib: Remove unused client_addr()

[samba.git] / source3 / wscript_build

diff --git a/source3/wscript_build b/source3/wscript_build
index e94e9b5ac1090fa4d24904609e55d35b5457e1a1..cf2dd1a4120ff072e946d15dfe1f82a4ef6b2d29 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -177,6 +177,7 @@ bld.SAMBA3_SUBSYSTEM('pdb',
                         LIBCLI_AUTH
                         flag_mapping
                         samba-credentials
+                        samba-modules
                         nscd
                         ''')
 
@@ -278,7 +279,7 @@ bld.SAMBA3_LIBRARY('popt_samba3_cmdline',
 
 bld.SAMBA3_LIBRARY('util_cmdline',
                    source='lib/util_cmdline.c',
-                   deps='secrets3',
+                   deps='secrets3 samba-credentials',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('cmdline_contexts',
@@ -359,21 +360,6 @@ bld.SAMBA3_SUBSYSTEM('TDB_LIB',
                           samba-cluster-support
                           ''')
 
-bld.SAMBA3_LIBRARY('messages_dgm',
-                   source='''
-                          lib/messages_dgm.c
-                          lib/messages_dgm_ref.c
-                          ''',
-                   deps='''
-                        talloc
-                        samba-debug
-                        PTHREADPOOL
-                        msghdr
-                        genrand
-                       samba-util
-                        ''',
-                   private_library=True)
-
 bld.SAMBA3_LIBRARY('messages_util',
                    source='''lib/messages_util.c''',
                    deps='samba-util',
@@ -405,10 +391,8 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                           lib/server_prefork.c
                           lib/server_prefork_util.c
                           lib/ldap_escape.c
-                          libads/krb5_errs.c
                           lib/system_smbd.c
                           lib/audit.c
-                          lib/tevent_wait.c
                           lib/idmap_cache.c
                           lib/namemap_cache.c
                           lib/util_ea.c
@@ -459,13 +443,11 @@ bld.SAMBA3_LIBRARY('libsmb',
                           libsmb/cliprint.c
                           libsmb/clitrans.c
                           libsmb/clisecdesc.c
-                          libsmb/clidgram.c
                           libsmb/clistr.c
                           libsmb/cliquota.c
                           libsmb/clifsinfo.c
                           libsmb/clidfs.c
                           libsmb/clioplock.c
-                          libsmb/clirap2.c
                           libsmb/async_smb.c
                           libsmb/reparse_symlink.c
                           libsmb/clisymlink.c
@@ -506,6 +488,8 @@ bld.SAMBA3_LIBRARY('secrets3',
                         smbconf
                         samba3util
                         dbwrap
+                        krb5samba
+                        LIBCLI_AUTH
                         ''',
                    private_library=True)
 
@@ -517,7 +501,7 @@ bld.SAMBA3_LIBRARY('smbldap',
                     abi_directory='lib/ABI',
                     abi_match='smbldap_*',
                     pc_files=[],
-                    vnum='2',
+                    vnum='2.1.0',
                     public_headers='include/smbldap.h include/smb_ldap.h')
 
 bld.SAMBA3_LIBRARY('ads',
@@ -592,7 +576,7 @@ bld.SAMBA3_LIBRARY('smbconf',
                         SAMBA_VERSION
                         cap
                         charset
-                        cli_smb_common
+                        samba-hostconfig
                         errors3
                         SMBCONF_PARAM
                         samba-util
@@ -605,7 +589,7 @@ bld.SAMBA3_LIBRARY('smbconf',
 
 bld.SAMBA3_LIBRARY('smbd_conn',
                    source='smbd/conn.c',
-                   deps='samba3-util samba-util',
+                   deps='samba3-util samba-util FNAME_UTIL',
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('sysquotas',
@@ -891,12 +875,14 @@ bld.SAMBA3_SUBSYSTEM('LIBNMB',
                             libsmb/unexpected.c
                             libsmb/namecache.c
                             libsmb/nmblib.c
+                            libsmb/clidgram.c
                             libsmb/namequery.c
                             libsmb/conncache.c
                             libads/sitename_cache.c
                             ''',
                      deps='''
                           LIBTSOCKET
+                          LIBCLI_NETLOGON
                           samba3util
                           addns
                           lmhosts
@@ -945,13 +931,22 @@ bld.SAMBA3_SUBSYSTEM('SLCACHE',
                          tdb
                          ''')
 
+bld.SAMBA3_SUBSYSTEM('dsgetdcname',
+                    source='''
+                           libsmb/dsgetdcname.c
+                           ''',
+                    deps='''
+                         CLDAP
+                         LIBNMB
+                         ''')
+
 bld.SAMBA3_SUBSYSTEM('DCUTIL',
                     source='''
                            libsmb/namequery_dc.c
-                           libsmb/dsgetdcname.c
                            ''',
                     deps='''
                          ads
+                         dsgetdcname
                          msrpc3
                          libcli_lsa3
                          ''')
@@ -1171,6 +1166,11 @@ bld.SAMBA3_BINARY('locktest2',
                       ''',
                  for_selftest=True)
 
+TORTURE3_ADDITIONAL_SOURCE=""
+
+if bld.env.with_ctdb:
+    TORTURE3_ADDITIONAL_SOURCE += ' torture/test_ctdbd_conn.c'
+
 bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                  source='''
                         torture/torture.c
@@ -1210,7 +1210,8 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                         torture/test_namemap_cache.c
                         torture/test_idmap_cache.c
                         torture/test_hidenewfiles.c
-                        ''',
+                        torture/test_readdir_timestamp.c
+                        ''' + TORTURE3_ADDITIONAL_SOURCE,
                  deps='''
                       talloc
                       smbconf