lib: Remove poll_funcs

[samba.git] / source3 / wscript_build

diff --git a/source3/wscript_build b/source3/wscript_build
index e348e653815eec912785b2d60ef5471547f9ad26..66fcaac1b67d79b8a2abb374ad0aaa88539c5990 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -246,7 +246,7 @@ bld.SAMBA3_LIBRARY('util_cmdline',
 
 bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
                      source='libads/kerberos.c libads/ads_status.c',
-                     public_deps='krb5samba k5crypto gssapi LIBTSOCKET CLDAP LIBNMB')
+                     public_deps='krb5samba asn1util k5crypto gssapi LIBTSOCKET CLDAP LIBNMB')
 
 bld.SAMBA3_SUBSYSTEM('samba3util',
                    source='''lib/system.c
@@ -302,8 +302,7 @@ bld.SAMBA3_SUBSYSTEM('TDB_LIB',
 
 bld.SAMBA3_LIBRARY('messages_dgm',
                    source='''lib/messages_dgm.c lib/messages_dgm_ref.c''',
-                   deps='''talloc UNIX_MSG POLL_FUNCS_TEVENT samba-debug
-                           genrand''',
+                   deps='''talloc samba-debug PTHREADPOOL msghdr genrand''',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('messages_util',
@@ -317,6 +316,7 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                    lib/id_cache.c
                    lib/talloc_dict.c
                    lib/serverid.c
+                   lib/server_id_watch.c
                    lib/server_id_db_util.c
                    lib/addrchange.c
                    ../lib/util/debug_s3.c
@@ -332,7 +332,7 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                    lib/dmallocmsg.c
                    intl/lang_tdb.c
                    lib/gencache.c
-                   lib/events.c
+                   lib/util_event.c
                    lib/server_contexts.c
                    lib/server_prefork.c
                    lib/server_prefork_util.c
@@ -344,7 +344,8 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                    lib/tevent_wait.c
                    lib/idmap_cache.c
                    lib/util_ea.c
-                   lib/background.c''',
+                   lib/background.c
+                   lib/cleanupdb.c''',
                    deps='''
                         samba3util
                         LIBTSOCKET
@@ -353,8 +354,6 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                         UTIL_PW
                         SAMBA_VERSION
                         PTHREADPOOL
-                        UNIX_MSG
-                        POLL_FUNCS_TEVENT
                         interfaces
                         param
                         dbwrap
@@ -627,7 +626,6 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    RPC_SERVICE
                    NDR_SMBXSRV
                    LEASES_DB
-                   LIBASYS
                    sysquotas
                    NDR_SMB_ACL
                    netapi
@@ -997,58 +995,6 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}')
 
-bld.SAMBA3_BINARY('rpcclient/rpcclient',
-                 source='''rpcclient/rpcclient.c
-                 rpcclient/cmd_lsarpc.c
-                 rpcclient/cmd_samr.c
-                 rpcclient/cmd_spoolss.c
-                 rpcclient/cmd_netlogon.c
-                 rpcclient/cmd_srvsvc.c
-                 rpcclient/cmd_dfs.c
-                 rpcclient/cmd_epmapper.c
-                 rpcclient/cmd_dssetup.c
-                 rpcclient/cmd_echo.c
-                 rpcclient/cmd_shutdown.c
-                 rpcclient/cmd_test.c
-                 rpcclient/cmd_wkssvc.c
-                 rpcclient/cmd_ntsvcs.c
-                 rpcclient/cmd_drsuapi.c
-                 rpcclient/cmd_eventlog.c
-                 rpcclient/cmd_winreg.c
-                 rpcclient/cmd_fss.c
-                 rpcclient/cmd_witness.c
-                 rpcclient/cmd_clusapi.c''',
-                 deps='''
-                 talloc
-                 popt_samba3
-                 pdb
-                 libsmb
-                 param
-                 ndr-standard
-                 msrpc3
-                 SMBREADLINE
-                 trusts_util
-                 RPC_NDR_WINREG
-                 RPC_NDR_ECHO
-                 RPC_CLIENT_SCHANNEL
-                 DCUTIL
-                 LIBCLI_SAMR
-                 libcli_lsa3
-                 libcli_netlogon3
-                 cli_spoolss
-                 RPC_NDR_SRVSVC
-                 RPC_NDR_WKSSVC
-                 RPC_NDR_DSSETUP
-                 RPC_NDR_DFS
-                 RPC_NDR_DRSUAPI
-                 RPC_NDR_NTSVCS
-                 RPC_NDR_EVENTLOG
-                 INIT_SAMR
-                 RPC_NDR_FSRVP
-                 RPC_NDR_WITNESS
-                 RPC_NDR_CLUSAPI
-                 ''')
-
 bld.SAMBA3_BINARY('client/smbclient',
                  source='''client/client.c
                  client/clitar.c
@@ -1286,7 +1232,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                  torture/test_messaging_read.c
                  torture/test_messaging_fd_passing.c
                  torture/test_oplock_cancel.c
-                 torture/t_strappend.c
+                 torture/test_pthreadpool_tevent.c
                  torture/bench_pthreadpool.c
                  torture/wbc_async.c''',
                  deps='''
@@ -1510,9 +1456,6 @@ bld.SAMBA3_BINARY('spotlight2sparql',
 bld.RECURSE('auth')
 bld.RECURSE('libgpo/gpext')
 bld.RECURSE('lib/pthreadpool')
-bld.RECURSE('lib/asys')
-bld.RECURSE('lib/poll_funcs')
-bld.RECURSE('lib/unix_msg')
 bld.RECURSE('librpc')
 bld.RECURSE('librpc/idl')
 bld.RECURSE('libsmb')
@@ -1529,6 +1472,7 @@ bld.RECURSE('../examples/VFS')
 bld.RECURSE('lib/netapi/tests')
 bld.RECURSE('lib/netapi/examples')
 bld.RECURSE('smbd/notifyd')
+bld.RECURSE('rpcclient')
 
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()