s3:lib/afs move afs.c to common lib dir
[samba.git] / source3 / wscript_build
index 5d6c878c07a7767f73ffca0d8f83a5f5c079d07a..1f1b75049aadb1e0b0c8d850b8c5576cf30d1893 100755 (executable)
@@ -3,136 +3,6 @@
 from samba_utils import *
 import samba_version, samba3
 
-LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c
-                        libsmb/libsmb_thread_posix.c'''
-
-LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c'
-
-LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
-
-LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c'
-
-SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
-
-SMBCONFTORT_SRC = '''${SMBCONFTORT_SRC0}'''
-
-LIBNET_SRC = 'libnet/libnet_join.c'
-
-
-LIBNET_DSSYNC_SRC = '''libnet/libnet_dssync.c
-                       libnet/libnet_dssync_passdb.c
-                       libnet/libnet_dssync_keytab.c'''
-
-LIBNET_SAMSYNC_SRC = '''libnet/libnet_samsync.c
-                        libnet/libnet_samsync_ldif.c
-                        libnet/libnet_samsync_passdb.c
-                        libnet/libnet_samsync_display.c
-                        libnet/libnet_samsync_keytab.c'''
-
-NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
-              utils/net_rap.c utils/net_rpc.c utils/net_rpc_samsync.c
-              utils/net_time.c utils/net_lookup.c
-              utils/net_cache.c utils/net_groupmap.c
-              utils/net_idmap.c utils/net_idmap_check.c
-              utils/interact.c
-              utils/net_status.c utils/net_rpc_printer.c utils/net_rpc_rights.c
-              utils/net_rpc_service.c utils/net_rpc_registry.c utils/net_usershare.c
-              utils/netlookup.c utils/net_sam.c utils/net_rpc_shell.c
-              utils/net_util.c utils/net_rpc_sh_acct.c utils/net_rpc_audit.c
-              utils/net_dns.c utils/net_ads_gpo.c
-              utils/net_conf.c utils/net_join.c utils/net_user.c
-              utils/net_group.c utils/net_file.c utils/net_registry.c
-              utils/net_registry_check.c
-              utils/net_dom.c utils/net_share.c
-              utils/net_g_lock.c
-              utils/net_serverid.c
-              utils/net_eventlog.c
-              utils/net_printing.c
-              utils/net_rpc_trust.c
-              utils/net_rpc_conf.c
-              registry/reg_parse.c registry/reg_format.c
-              registry/reg_import.c
-              '''
-
-NET_SRC2 = 'utils/net_registry_util.c utils/net_help_common.c'
-
-NET_SRC = '''${NET_SRC1}
-             ${NET_SRC2}'''
-
-CUPS_SRC = '''client/smbspool.c'''
-
-NMBLOOKUP_SRC = '''utils/nmblookup.c'''
-
-SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/utable.c
-                torture/denytest.c torture/mangle_test.c
-                torture/nbench.c
-                torture/test_async_echo.c
-                torture/test_addrchange.c
-                torture/test_posix_append.c
-                torture/test_nttrans_create.c
-                torture/test_nttrans_fsctl.c
-                torture/test_case_insensitive.c
-                torture/test_notify_online.c
-                torture/test_chain3.c
-                torture/test_smb2.c
-                torture/test_authinfo_structs.c
-                torture/test_smbsock_any_connect.c
-                torture/test_cleanup.c
-                torture/test_ctdbconn.c
-                torture/test_msg.c
-                torture/test_notify.c
-                lib/tevent_barrier.c
-                torture/test_dbwrap_watch.c
-                torture/test_idmap_tdb_common.c
-                torture/test_dbwrap_ctdb.c
-                torture/test_buffersize.c
-                torture/t_strappend.c'''
-
-SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
-        torture/wbc_async.c'''
-
-MSGTEST_SRC = '''torture/msgtest.c'''
-
-PDBTEST_SRC = '''torture/pdbtest.c'''
-
-VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c
-               torture/vfstest_chain.c'''
-
-LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
-
-LOCKTEST2_SRC = '''torture/locktest2.c'''
-
-SMBCACLS_SRC = '''utils/smbcacls.c'''
-
-SMBCQUOTAS_SRC = '''utils/smbcquotas.c'''
-
-EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
-
-EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}'''
-
-SHARESEC_SRC0 = 'utils/sharesec.c'
-SHARESEC_SRC  = '''${SHARESEC_SRC0}'''
-
-DEBUG2HTML_SRC = '''utils/debug2html.c utils/debugparse.c'''
-
-SMBFILTER_SRC = '''utils/smbfilter.c'''
-
-WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c'''
-
-NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
-
-NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}'''
-
-VLP_SRC = '''printing/tests/vlp.c'''
-
-RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
-
-DBWRAP_TOOL_SRC = 'utils/dbwrap_tool.c'
-
-DBWRAP_TORTURE_SRC = 'utils/dbwrap_torture.c'
-
-SPLIT_TOKENS_SRC = 'utils/split_tokens.c'
-
 LIBS='ICONV'
 
 config_h = "../include/config.h"
@@ -157,6 +27,7 @@ bld.SAMBA3_LIBRARY('netapi',
                     lib/netapi/libnetapi.c
                     lib/netapi/joindomain.c
                     lib/netapi/serverinfo.c
+                    lib/netapi/wkstainfo.c
                     lib/netapi/getdc.c
                     lib/netapi/user.c
                     lib/netapi/group.c
@@ -185,16 +56,15 @@ bld.SAMBA3_LIBRARY('netapi',
                     vnum='0')
 
 bld.SAMBA3_LIBRARY('smbsharemodes',
-                    source=LIBSMBSHAREMODES_SRC,
+                    source='libsmb/smb_share_modes.c',
                     public_deps='''talloc tdb_compat''',
                     deps='''ccan-hash''',
                     public_headers='include/smb_share_modes.h',
                     pc_files='libsmb/smbsharemodes.pc',
-                    vnum='0',
-                    vars=locals())
+                    vnum='0')
 
 bld.SAMBA3_LIBRARY('nss_wins',
-                  source=WINBIND_WINS_NSS_SRC,
+                  source='../nsswitch/wins.c',
                   deps='''param libsmb LIBTSOCKET''',
                   realname='libnss_wins.so.2',
                   soname='libnss_wins.so',
@@ -214,8 +84,8 @@ bld.SAMBA3_LIBRARY('msrpc3',
                    deps='''ndr ndr-standard
                     RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH
                     LIBTSOCKET gse dcerpc-binding
-                    libsmb
-                    ndr-table''',
+                    libsmb ndr-table NETLOGON_CREDS_CLI
+                   ''',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('gpo',
@@ -302,7 +172,7 @@ bld.SAMBA3_LIBRARY('pdb',
                    passdb/lookup_sid.h''',
                    abi_match=private_pdb_match,
                    abi_directory='passdb/ABI',
-                   vnum='0')
+                   vnum='0.1.0')
 
 bld.SAMBA3_LIBRARY('smbldaphelper',
                    source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',
@@ -315,36 +185,13 @@ bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
                      source='lib/server_mutex.c',
                      deps='talloc')
 
-bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
-                     source='param/util.c',
-                     deps='talloc')
-
-bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX',
-                     source='param/loadparm_ctx.c',
-                     deps='''talloc s3_param_h param''',
-                     vars=locals())
-
-bld.SAMBA_GENERATOR('param/param_global_h',
-                    source= '../script/mkparamdefs.pl param/loadparm.c ../lib/param/param_functions.c',
-                    target='param/param_global.h',
-                    rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
-
 bld.SAMBA3_SUBSYSTEM('param',
                    source='''param/loadparm.c
                    lib/sharesec.c
                    lib/ldap_debug_handler.c
                    lib/util_names.c''',
-                   deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local_h param/param_global_h cups''')
-
-bld.SAMBA3_PYTHON('pys3param',
-                  source='param/pyparam.c',
-                  deps='param',
-                  public_deps='samba-hostconfig pytalloc-util talloc',
-                  realname='samba/samba3/param.so')
-    
-bld.SAMBA3_SUBSYSTEM('param_service',
-                     source='param/service.c',
-                     deps = 'USER_UTIL param PRINTING')
+                   allow_warnings=True,
+                   deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local.h param_global.h cups''')
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
@@ -375,6 +222,7 @@ bld.SAMBA3_LIBRARY('smbregistry',
                    replace util_reg samba-util samba-security
                    errors3 dbwrap samba3-util''',
                    allow_undefined_symbols=True,
+                   allow_warnings=True,
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('REG_SMBCONF',
@@ -409,6 +257,7 @@ bld.SAMBA3_LIBRARY('util_cmdline',
 
 bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
                      source='libads/kerberos.c libads/ads_status.c',
+                     allow_warnings=True,
                      public_deps='krb5samba k5crypto gssapi LIBTSOCKET CLDAP LIBNMB')
 
 bld.SAMBA3_SUBSYSTEM('samba3util',
@@ -424,22 +273,49 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
                    lib/sock_exec.c''',
                    deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash')
 
+if bld.CONFIG_GET("CTDB_CFLAGS") and bld.CONFIG_GET("CTDB_INCLUDE"):
+    SAMBA_CLUSTER_SUPPORT_SOURCES='''
+                     lib/cluster_support.c
+                     lib/dbwrap/dbwrap_ctdb.c
+                     lib/messages_ctdbd.c
+                     lib/ctdb_packet.c
+                     lib/ctdbd_conn.c
+                     lib/ctdb_conn.c
+                     torture/test_ctdbconn.c
+                   '''
+    SAMBA_CLUSTER_SUPPORT_DEPS='''
+                     talloc
+                     tevent
+                     tdb
+                   '''
+else:
+    SAMBA_CLUSTER_SUPPORT_SOURCES='''
+                     lib/cluster_support.c
+                     lib/ctdb_dummy.c
+                   '''
+    SAMBA_CLUSTER_SUPPORT_DEPS='''
+                     talloc
+                     tevent
+                   '''
+
+bld.SAMBA3_LIBRARY('samba-cluster-support',
+                   source=SAMBA_CLUSTER_SUPPORT_SOURCES,
+                   deps=SAMBA_CLUSTER_SUPPORT_DEPS,
+                   cflags=bld.CONFIG_GET("CTDB_CFLAGS"),
+                   includes=bld.CONFIG_GET("CTDB_INCLUDE"),
+                   allow_undefined_symbols=True,
+                   private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('TDB_LIB',
                      source='''lib/dbwrap/dbwrap_open.c
-                     lib/dbwrap/dbwrap_ctdb.c
                      lib/dbwrap/dbwrap_watch.c
                      lib/g_lock.c''',
-                     deps='dbwrap')
+                     deps='dbwrap samba-cluster-support')
 
 bld.SAMBA3_SUBSYSTEM('samba3core',
                    source='''lib/messages.c
-                   lib/messages_local.c
-                   lib/messages_ctdbd.c
-                   lib/ctdb_packet.c
-                   lib/ctdbd_conn.c
-                   lib/ctdb_conn.c
-                   lib/msg_channel.c
+                   lib/messages_dgm.c
+                   lib/util_cluster.c
                    lib/id_cache.c
                    lib/talloc_dict.c
                    lib/serverid.c
@@ -468,7 +344,8 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                    lib/audit.c
                    lib/tevent_wait.c
                    lib/idmap_cache.c
-                   lib/util_ea.c''',
+                   lib/util_ea.c
+                   lib/background.c''',
                    deps='''
                         samba3util
                         LIBTSOCKET
@@ -477,6 +354,8 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                         UTIL_PW
                         SAMBA_VERSION
                         PTHREADPOOL
+                        UNIX_MSG
+                        POLL_FUNCS_TEVENT
                         interfaces
                         param
                         dbwrap
@@ -496,8 +375,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
 
 bld.SAMBA3_SUBSYSTEM('auth_generic',
                     source='libsmb/auth_generic.c',
-                    deps='LIBNTLMSSP gse gensec',
-                    vars=locals())
+                    deps='LIBNTLMSSP gse gensec')
 
 bld.SAMBA3_LIBRARY('libsmb',
                    source='''libsmb/clientgen.c
@@ -521,7 +399,6 @@ bld.SAMBA3_LIBRARY('libsmb',
                    libsmb/clirap2.c
                    libsmb/async_smb.c
                    libsmb/smb2cli_tcon.c
-                   libsmb/cli_np_tstream.c
                    libsmb/reparse_symlink.c
                    libsmb/clisymlink.c
                    libsmb/smbsock_connect.c
@@ -541,8 +418,7 @@ bld.SAMBA3_LIBRARY('libsmb',
 
 bld.SAMBA3_SUBSYSTEM('CLDAP',
                     source='libads/cldap.c',
-                    deps='cli-ldap-common cli_cldap LIBTSOCKET',
-                    vars=locals())
+                    deps='cli-ldap-common cli_cldap LIBTSOCKET')
 
 # NOTE: The secrets3 library is a low level library used by several subsystems.
 # PLEASE DO NOT make it depend on high level libraries like PDB, if you are
@@ -580,6 +456,7 @@ bld.SAMBA3_LIBRARY('ads',
                    libads/ldap_schema.c
                    libads/util.c
                    libads/ndr.c''',
+                   allow_warnings=True,
                    deps='cli-ldap-common krb5samba ldap lber KRBCLIENT param LIBNMB libsmb DCUTIL smbldap',
                    private_library=True)
 
@@ -595,12 +472,9 @@ bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN',
                     source='lib/afs_settoken.c',
                     deps='samba-util')
 
-bld.SAMBA3_SUBSYSTEM('LIBAFS',
-                    source='lib/afs.c',
-                    deps='samba-util LIBAFS_SETTOKEN')
-
 bld.SAMBA3_LIBRARY('smbconf',
-                   source=LIB_SMBCONF_SRC,
+                   source='''lib/smbconf/smbconf_init.c
+                   lib/smbconf/smbconf_reg.c''',
                    deps='''
                    CHARSET3
                    LIBSMBCONF
@@ -624,6 +498,18 @@ bld.SAMBA3_LIBRARY('smbd_conn',
                    deps='samba3-util samba-util',
                    private_library=True)
 
+bld.SAMBA3_SUBSYSTEM('sysquotas',
+                     source='''
+                        lib/sysquotas.c
+                        lib/sysquotas_linux.c
+                        lib/sysquotas_xfs.c
+                        lib/sysquotas_4A.c
+                        lib/sysquotas_4B.c
+                        lib/sysquotas_nfs.c
+                     ''',
+                     allow_warnings=True,
+                     deps='samba3-util samba-util')
+
 bld.SAMBA3_LIBRARY('smbd_base',
                    source='''
                    smbd/server_reload.c
@@ -666,13 +552,6 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    smbd/error.c
                    printing/printspoolss.c
                    printing/spoolssd.c
-                   lib/sysquotas.c
-                   lib/sysquotas_linux.c
-                   lib/sysquotas_xfs.c
-                   lib/sysquotas_4A.c
-                   lib/sysquotas_4B.c
-                   lib/sysquotas_nfs.c
-                   lib/background.c
                    lib/sessionid_tdb.c
                    lib/conn_tdb.c
                    smbd/fake_file.c
@@ -732,6 +611,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    vfs
                    vfs_default
                    vfs_posixacl
+                  inotify
                    popt_samba3
                    samba3core
                    smbd_conn
@@ -742,9 +622,10 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    LOCKING
                    LIBADS_SERVER
                    LIBAFS
-                   RPC_SERVER
+                   RPC_SERVICE
                    NDR_SMBXSRV
                    LIBASYS
+                   sysquotas
                    ccan-hash
                    NDR_SMB_ACL
                    netapi
@@ -783,7 +664,6 @@ bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
 bld.SAMBA3_LIBRARY('printing_migrate',
                     source='printing/nt_printing_migrate.c rpc_client/cli_winreg_spoolss.c printing/nt_printing_os2.c',
                     deps='NDR_NTPRINTING cli_spoolss RPC_NDR_WINREG LIBCLI_WINREG param',
-                    vars=locals(),
                     private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('PRINTING',
@@ -808,26 +688,29 @@ bld.SAMBA3_SUBSYSTEM('FNAME_UTIL',
                     deps='samba-util')
 
 bld.SAMBA3_SUBSYSTEM('LIBNET',
-                    source=LIBNET_SRC,
-                    deps='NDR_LIBNET_JOIN INIT_SAMR net_keytab pdb',
-                    vars=locals())
+                    source='libnet/libnet_join.c',
+                    deps='NDR_LIBNET_JOIN INIT_SAMR net_keytab pdb')
 
 bld.SAMBA3_LIBRARY('net_keytab',
                    source='libnet/libnet_keytab.c',
                    deps='krb5samba ads',
-                   vars=locals(),
                    private_library=True)
 
 
 bld.SAMBA3_SUBSYSTEM('LIBNET_DSSYNC',
-                    source=LIBNET_DSSYNC_SRC,
-                    deps='LIBNET RPC_NDR_DRSUAPI',
-                    vars=locals())
+                    source='''libnet/libnet_dssync.c
+                    libnet/libnet_dssync_passdb.c
+                    libnet/libnet_dssync_keytab.c''',
+                    allow_warnings=True,
+                    deps='LIBNET RPC_NDR_DRSUAPI')
 
 bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
-                    source=LIBNET_SAMSYNC_SRC,
-                    deps='LIBNET LIBCLI_SAMSYNC',
-                    vars=locals())
+                    source='''libnet/libnet_samsync.c
+                    libnet/libnet_samsync_ldif.c
+                    libnet/libnet_samsync_passdb.c
+                    libnet/libnet_samsync_display.c
+                    libnet/libnet_samsync_keytab.c''',
+                    deps='LIBNET LIBCLI_SAMSYNC')
 
 bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
                     source='lib/eventlog/eventlog.c',
@@ -879,13 +762,11 @@ bld.SAMBA3_SUBSYSTEM('DCUTIL',
 bld.SAMBA3_LIBRARY('trusts_util',
                    source='libsmb/trusts_util.c',
                    deps='libcli_netlogon3 msrpc3 pdb',
-                   vars=locals(),
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
                     source='lib/util_tdb.c',
-                    deps='talloc samba3-util',
-                    vars=locals())
+                    deps='talloc samba3-util')
 
 bld.SAMBA3_LIBRARY('samba3-util',
                    source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/memcache.c lib/namearray.c lib/file_id.c''',
@@ -918,7 +799,7 @@ bld.SAMBA3_LIBRARY('libcli_lsa3',
 
 bld.SAMBA3_LIBRARY('libcli_netlogon3',
                    source='rpc_client/cli_netlogon.c rpc_client/util_netlogon.c',
-                   deps='RPC_NDR_NETLOGON INIT_NETLOGON cliauth param',
+                   deps='msrpc3 RPC_NDR_NETLOGON INIT_NETLOGON cliauth param NETLOGON_CREDS_CLI',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('cli_spoolss',
@@ -933,7 +814,7 @@ bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG',
 
 bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG_INTERNAL',
                     source='rpc_client/cli_winreg_int.c',
-                    deps='LIBCLI_WINREG RPC_NCACN_NP')
+                    deps='LIBCLI_WINREG RPC_SERVER')
 
 bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
                     source='rpc_client/cli_pipe_schannel.c',
@@ -1090,8 +971,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  SRV_NDR_WBINT
                  RPC_SAMR
                  RPC_LSARPC
-                 RPC_NCACN_NP
-                 RPC_PIPE_REGISTER
+                 RPC_SERVER
                  WB_REQTRANS
                  TDB_VALIDATE
                  ''',
@@ -1116,7 +996,8 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient',
                  rpcclient/cmd_drsuapi.c
                  rpcclient/cmd_eventlog.c
                  rpcclient/cmd_winreg.c
-                 rpcclient/cmd_fss.c''',
+                 rpcclient/cmd_fss.c
+                 rpcclient/cmd_witness.c''',
                  deps='''
                  talloc
                  popt_samba3
@@ -1144,6 +1025,7 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient',
                  RPC_NDR_EVENTLOG
                  INIT_SAMR
                  RPC_NDR_FSRVP
+                 RPC_NDR_WITNESS
                  ''')
 
 bld.SAMBA3_BINARY('client/smbclient',
@@ -1159,10 +1041,58 @@ bld.SAMBA3_BINARY('client/smbclient',
                  libsmb
                  msrpc3
                  RPC_NDR_SRVSVC
-                 cli_smb_common''')
+                 cli_smb_common
+                 ''' + bld.env['archive_lib'])
 
 bld.SAMBA3_BINARY('net',
-                 source=NET_SRC,
+                 source='''utils/net.c
+                 utils/net_ads.c
+                 utils/net_help.c
+                 utils/net_rap.c
+                 utils/net_rpc.c
+                 utils/net_rpc_samsync.c
+                 utils/net_time.c
+                 utils/net_lookup.c
+                 utils/net_cache.c
+                 utils/net_groupmap.c
+                 utils/net_idmap.c
+                 utils/net_idmap_check.c
+                 utils/interact.c
+                 utils/net_status.c
+                 utils/net_rpc_printer.c
+                 utils/net_rpc_rights.c
+                 utils/net_rpc_service.c
+                 utils/net_rpc_registry.c
+                 utils/net_usershare.c
+                 utils/netlookup.c
+                 utils/net_sam.c
+                 utils/net_rpc_shell.c
+                 utils/net_util.c
+                 utils/net_rpc_sh_acct.c
+                 utils/net_rpc_audit.c
+                 utils/net_dns.c
+                 utils/net_ads_gpo.c
+                 utils/net_conf.c
+                 utils/net_conf_util.c
+                 utils/net_join.c
+                 utils/net_user.c
+                 utils/net_group.c
+                 utils/net_file.c
+                 utils/net_registry.c
+                 utils/net_registry_check.c
+                 utils/net_dom.c
+                 utils/net_share.c
+                 utils/net_g_lock.c
+                 utils/net_serverid.c
+                 utils/net_eventlog.c
+                 utils/net_printing.c
+                 utils/net_rpc_trust.c
+                 utils/net_rpc_conf.c
+                 registry/reg_parse.c
+                 registry/reg_format.c
+                 registry/reg_import.c
+                 utils/net_registry_util.c
+                 utils/net_help_common.c''',
                  deps='''
                  talloc
                  netapi
@@ -1199,8 +1129,8 @@ bld.SAMBA3_BINARY('net',
                  RPC_NDR_DSSETUP
                  RPC_NDR_INITSHUTDOWN
                  printing_migrate
-                 trusts_util''',
-                 vars=locals())
+                 trusts_util
+                 IDMAP_AUTORID_TDB''')
 
 bld.SAMBA3_BINARY('profiles',
                  source='utils/profiles.c',
@@ -1211,14 +1141,13 @@ bld.SAMBA3_BINARY('profiles',
                  REGFIO''')
 
 bld.SAMBA3_BINARY('smbspool',
-                 source=CUPS_SRC,
+                 source='client/smbspool.c',
                  deps='''
                  talloc
                  popt_samba3
                  param
                  libsmb
-                 samba3core''',
-                 vars=locals())
+                 samba3core''')
 
 bld.SAMBA3_BINARY('testparm',
                  source='utils/testparm.c',
@@ -1291,16 +1220,43 @@ bld.SAMBA3_BINARY('smbget',
                  smbclient''')
 
 bld.SAMBA3_BINARY('nmblookup',
-                 source=NMBLOOKUP_SRC,
+                 source='utils/nmblookup.c',
                  deps='''
                  talloc
                  param
                  popt_samba3
-                 LIBNMB''',
-                 vars=locals())
+                 LIBNMB''')
 
 bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
-                 source=SMBTORTURE_SRC,
+                 source='''torture/torture.c
+                 torture/nbio.c
+                 torture/scanner.c
+                 torture/utable.c
+                 torture/denytest.c
+                 torture/mangle_test.c
+                 torture/nbench.c
+                 torture/test_async_echo.c
+                 torture/test_addrchange.c
+                 torture/test_posix_append.c
+                 torture/test_nttrans_create.c
+                 torture/test_nttrans_fsctl.c
+                 torture/test_case_insensitive.c
+                 torture/test_notify_online.c
+                 torture/test_chain3.c
+                 torture/test_smb2.c
+                 torture/test_authinfo_structs.c
+                 torture/test_smbsock_any_connect.c
+                 torture/test_cleanup.c
+                 torture/test_notify.c
+                 lib/tevent_barrier.c
+                 torture/test_dbwrap_watch.c
+                 torture/test_idmap_tdb_common.c
+                 torture/test_dbwrap_ctdb.c
+                 torture/test_buffersize.c
+                 torture/test_messaging_read.c
+                 torture/t_strappend.c
+                 torture/bench_pthreadpool.c
+                 torture/wbc_async.c''',
                  deps='''
                  talloc
                  param
@@ -1310,20 +1266,20 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                  RPC_NDR_ECHO
                  WB_REQTRANS
                  LOCKING
-                NDR_OPEN_FILES
-                idmap
+                 NDR_OPEN_FILES
+                 idmap
+                 samba-cluster-support
                  ''',
-                 install=False,
-                 vars=locals())
+                 cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
+                 install=False)
 
 bld.SAMBA3_BINARY('smbconftort',
-                 source=SMBCONFTORT_SRC,
+                 source='lib/smbconf/testsuite.c',
                  deps='''
                  talloc
                  param
                  popt_samba3''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('replacetort',
                  source='../lib/replace/test/main.c',
@@ -1331,169 +1287,144 @@ bld.SAMBA3_BINARY('replacetort',
                  install=False)
 
 bld.SAMBA3_BINARY('msgtest',
-                 source=MSGTEST_SRC,
+                 source='torture/msgtest.c',
                  deps='''
                  talloc
                  param''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('smbcacls',
-                 source=SMBCACLS_SRC,
+                 source='utils/smbcacls.c',
                  deps='''
                  talloc
                  popt_samba3
                  msrpc3
                  libcli_lsa3
-                 krb5samba''',
-                 vars=locals())
+                 krb5samba''')
 
 bld.SAMBA3_BINARY('smbcquotas',
-                 source=SMBCQUOTAS_SRC,
+                 source='utils/smbcquotas.c',
                  deps='''
                  talloc
                  popt_samba3
                  libsmb
                  msrpc3
-                 libcli_lsa3''',
-                 vars=locals())
+                 libcli_lsa3''')
 
 bld.SAMBA3_BINARY('eventlogadm',
-                 source=EVTLOGADM_SRC,
+                 source='utils/eventlogadm.c',
                  deps='''
                  talloc
                  param
-                 LIBEVENTLOG''',
-                 vars=locals())
+                 LIBEVENTLOG''')
 
 bld.SAMBA3_BINARY('sharesec',
-                 source=SHARESEC_SRC,
+                 source='utils/sharesec.c',
                  deps='''
                  talloc
-                 popt_samba3''',
-                 vars=locals())
+                 popt_samba3''')
 
 bld.SAMBA3_BINARY('pdbtest',
-                 source=PDBTEST_SRC,
+                 source='torture/pdbtest.c',
                  deps='''
                  talloc
                  pdb
                  popt_samba3
                  AUTH_COMMON
                  auth''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('vfstest',
-                 source=VFSTEST_SRC,
+                 source='''torture/cmd_vfs.c
+                 torture/vfstest.c
+                 torture/vfstest_chain.c''',
                  deps='''
                  vfs
                  popt_samba3
                  SMBREADLINE''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('log2pcap',
-                 source=LOG2PCAP_SRC,
+                 source='utils/log2pcaphex.c',
                  deps='''talloc popt''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('locktest2',
-                 source=LOCKTEST2_SRC,
+                 source='torture/locktest2.c',
                  deps='''
                  talloc
                  param
                  libsmb
                  LOCKING''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('debug2html',
-                 source=DEBUG2HTML_SRC,
+                 source='''utils/debug2html.c utils/debugparse.c''',
                  deps='''talloc popt''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('smbfilter',
-                 source=SMBFILTER_SRC,
+                 source='utils/smbfilter.c',
                  deps='''
                  talloc
                  param
                  LIBNMB''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('versiontest',
                  source='lib/version_test.c',
                  deps='''
                  SAMBA_VERSION
                  param''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('ntlm_auth',
-                 source=NTLM_AUTH_SRC,
+                 source='''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c''',
                  deps='''
                  talloc
                  krb5samba
                  iniparser
                  libsmb
                  popt_samba3
-                 LIBNTLMSSP gse gensec''',
-                 vars=locals())
+                 LIBNTLMSSP gse gensec''')
 
 bld.SAMBA3_BINARY('timelimit',
                  source='script/tests/timelimit.c',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('rpc_open_tcp',
-                 source=RPC_OPEN_TCP_SRC,
+                 source='torture/rpc_open_tcp.c',
                  deps='''
                  talloc
                  msrpc3''',
-                 install=False,
-                 vars=locals())
-
-bld.SAMBA3_BINARY('test_lp_load',
-                 source='param/test_lp_load.c',
-                 deps='''
-                 talloc
-                 param
-                 popt_samba3''',
                  install=False)
 
 bld.SAMBA3_BINARY('dbwrap_tool',
-                 source=DBWRAP_TOOL_SRC,
+                 source='utils/dbwrap_tool.c',
                  deps='''
                  talloc
-                 popt_samba3''',
-                 vars=locals())
+                 popt_samba3''')
 
 bld.SAMBA3_BINARY('dbwrap_torture',
-                 source=DBWRAP_TORTURE_SRC,
+                 source='utils/dbwrap_torture.c',
                  deps='''
                  talloc
                  popt_samba3''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('split_tokens',
-                 source=SPLIT_TOKENS_SRC,
+                 source='utils/split_tokens.c',
                  deps='''
                  talloc
                  popt_samba3''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('vlp',
-                 source=VLP_SRC,
+                 source='printing/tests/vlp.c',
                  deps='''
                  talloc
                  param''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_PYTHON('pysmbd',
                   source='smbd/pysmbd.c',
@@ -1513,8 +1444,7 @@ bld.SAMBA3_BINARY('samba-regedit',
                             utils/regedit_valuelist.c utils/regedit_dialog.c
                             utils/regedit_hexedit.c""",
                   deps='ncurses menu panel form registry param popt_samba3 smbregistry',
-                  enabled=bld.env.build_regedit,
-                  vars=locals())
+                  enabled=bld.env.build_regedit)
 
 ########################## INCLUDES #################################
 
@@ -1522,11 +1452,14 @@ 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')
 bld.RECURSE('modules')
 bld.RECURSE('pam_smbpass')
+bld.RECURSE('param')
 bld.RECURSE('passdb')
 bld.RECURSE('rpc_server')
 bld.RECURSE('script')