build: list sources of library libsmb directly in def, also removing vars=locals()
[nivanova/samba-autobuild/.git] / source3 / wscript_build
index cee120cf8f182cb35afa1c39d894b8adf4d0ea1a..68fcd1579f19c6c08cd0a007d8255d0690bfc730 100755 (executable)
@@ -3,141 +3,6 @@
 from samba_utils import *
 import samba_version, samba3
 
-TDB_LIB_SRC = '''
-         lib/dbwrap/dbwrap_open.c
-          lib/dbwrap/dbwrap_ctdb.c
-          lib/dbwrap/dbwrap_watch.c
-          lib/g_lock.c'''
-
-TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
-
-SMBLDAP_SRC = '''lib/smbldap.c'''
-
-VERSION_SRC = '''lib/version.c'''
-
-AFS_SRC = 'lib/afs.c'
-
-AFS_SETTOKEN_SRC = 'lib/afs_settoken.c'
-
-AVAHI_SRC = 'lib/avahi.c smbd/avahi_register.c'
-
-SERVER_MUTEX_SRC = 'lib/server_mutex.c'
-
-PASSCHANGE_SRC = '''libsmb/passchange.c'''
-
-LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
-                     rpc_client/init_spoolss.c'''
-
-LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c'''
-
-LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
-
-LIBCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c rpc_client/util_netlogon.c'
-
-# this includes only the low level parse code, not stuff
-# that requires knowledge of security contexts
-REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
-
-LIB_SRC = '''
-          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/id_cache.c
-          lib/talloc_dict.c
-          lib/serverid.c
-          lib/addrchange.c
-          ${TDB_LIB_SRC}
-          ../lib/util/debug_s3.c
-          lib/dumpcore.c
-          lib/interface.c
-          lib/username.c
-          lib/access.c lib/smbrun.c
-          lib/wins_srv.c
-          lib/substitute.c lib/substitute_generic.c
-          lib/ms_fnmatch.c
-          lib/tallocmsg.c lib/dmallocmsg.c
-          intl/lang_tdb.c
-          lib/gencache.c
-          lib/events.c
-          lib/server_contexts.c
-          lib/server_prefork.c
-          lib/server_prefork_util.c
-          lib/ldap_escape.c
-          lib/fncall.c
-          libads/krb5_errs.c lib/system_smbd.c lib/audit.c
-         lib/tevent_wait.c
-          lib/idmap_cache.c
-          lib/util_ea.c'''
-
-LIB_UTIL_SRC = '''
-               lib/system.c
-               lib/sendfile.c
-               lib/recvfile.c
-               lib/time.c
-               lib/util_sid.c
-               lib/util_file.c
-               lib/util.c
-               lib/util_sock.c
-               lib/util_transfer_file.c
-               lib/sock_exec.c'''
-
-POPT_LIB_SRC = '''lib/popt_common.c'''
-
-PARAM_UTIL_SRC = '''param/util.c'''
-
-PARAM_WITHOUT_REG_SRC = '''param/loadparm.c
-                           lib/sharesec.c lib/ldap_debug_handler.c lib/util_names.c'''
-
-KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
-
-LIBGPO_SRC0 = '''../libgpo/gpo_ldap.c ../libgpo/gpo_ini.c ../libgpo/gpo_util.c
-              ../libgpo/gpo_fetch.c libgpo/gpo_filesync.c ../libgpo/gpo_sec.c
-              libgpo/gpo_reg.c'''
-LIBGPO_SRC = '''${LIBGPO_SRC0}'''
-
-LIBADS_SRC = '''libads/ldap.c
-             libads/sasl.c libads/sasl_wrapping.c
-             libads/krb5_setpw.c
-             libads/kerberos_util.c
-             libads/ldap_user.c
-             libads/ads_struct.c libads/kerberos_keytab.c
-             libads/disp_sec.c libads/ldap_utils.c
-             libads/ldap_schema.c libads/util.c libads/ndr.c'''
-
-LIBADS_SERVER_SRC = '''libads/authdata.c'''
-
-LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
-
-SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
-                 passdb/machine_sid.c passdb/secrets_lsa.c'''
-
-LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
-             libsmb/namequery.c libsmb/conncache.c
-
-             libads/sitename_cache.c'''
-
-LIBNTLMSSP_SRC = '''
-               libsmb/ntlmssp.c
-               libsmb/ntlmssp_wrap.c'''
-
-TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
-
-LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
-             libsmb/clispnego.c
-             libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c
-             libsmb/clireadwrite.c libsmb/clilist.c 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/smb2cli_tcon.c
-             libsmb/cli_np_tstream.c
-             libsmb/reparse_symlink.c
-             libsmb/clisymlink.c
-             libsmb/smbsock_connect.c
-             libsmb/cli_smb2_fnum.c'''
-
 LIBMSRPC_SRC = '''
                rpc_client/cli_pipe.c
                rpc_client/rpc_transport_np.c
@@ -153,8 +18,6 @@ LIBMSRPC_SRC = '''
 REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
 REG_INIT_FULL_SRC = '''registry/reg_init_full.c'''
 
-REGFIO_SRC = '''registry/regfio.c ${REG_PARSE_PRS_SRC}'''
-
 REG_API_REGF_SRC = '''registry/reg_api_regf.c'''
 
 REG_BACKENDS_SMBCONF_SRC = '''registry/reg_backend_smbconf.c'''
@@ -238,95 +101,6 @@ SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
 
 DCUTIL_SRC  = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/dsgetdcname.c'''
 
-WINBINDD_SRC1 = '''winbindd/winbindd.c
-                   winbindd/winbindd_group.c
-                   winbindd/winbindd_util.c
-                   winbindd/winbindd_cache.c
-                   winbindd/winbindd_pam.c
-                   winbindd/winbindd_misc.c
-                   winbindd/winbindd_cm.c
-                   winbindd/winbindd_wins_byip.c
-                   winbindd/winbindd_wins_byname.c
-                   winbindd/winbindd_msrpc.c
-                   winbindd/winbindd_rpc.c
-                   winbindd/winbindd_reconnect.c
-                   winbindd/winbindd_ads.c
-                   winbindd/winbindd_samr.c
-                   winbindd/winbindd_dual.c
-                   winbindd/winbindd_dual_ndr.c
-                   winbindd/winbindd_dual_srv.c
-                   winbindd/winbindd_async.c
-                   winbindd/winbindd_creds.c
-                   winbindd/winbindd_cred_cache.c
-                   winbindd/winbindd_ccache_access.c
-                   winbindd/winbindd_domain.c
-                   winbindd/winbindd_idmap.c
-                   winbindd/winbindd_locator.c
-                   winbindd/winbindd_ndr.c
-                   winbindd/wb_ping.c
-                   winbindd/wb_lookupsid.c
-                   winbindd/wb_lookupsids.c
-                   winbindd/wb_lookupname.c
-                   winbindd/wb_uid2sid.c
-                   winbindd/wb_gid2sid.c
-                   winbindd/wb_sids2xids.c
-                   winbindd/wb_queryuser.c
-                   winbindd/wb_lookupuseraliases.c
-                   winbindd/wb_lookupusergroups.c
-                   winbindd/wb_getpwsid.c
-                   winbindd/wb_gettoken.c
-                   winbindd/wb_seqnum.c
-                   winbindd/wb_seqnums.c
-                   winbindd/wb_group_members.c
-                   winbindd/wb_getgrsid.c
-                   winbindd/wb_query_user_list.c
-                   winbindd/wb_fill_pwent.c
-                   winbindd/wb_next_pwent.c
-                   winbindd/wb_next_grent.c
-                   winbindd/wb_dsgetdcname.c
-                   winbindd/winbindd_lookupsid.c
-                   winbindd/winbindd_lookupsids.c
-                   winbindd/winbindd_lookupname.c
-                   winbindd/winbindd_sid_to_uid.c
-                   winbindd/winbindd_sid_to_gid.c
-                   winbindd/winbindd_uid_to_sid.c
-                   winbindd/winbindd_gid_to_sid.c
-                   winbindd/winbindd_sids_to_xids.c
-                   winbindd/winbindd_allocate_uid.c
-                   winbindd/winbindd_allocate_gid.c
-                   winbindd/winbindd_getpwsid.c
-                   winbindd/winbindd_getpwnam.c
-                   winbindd/winbindd_getpwuid.c
-                   winbindd/winbindd_getsidaliases.c
-                   winbindd/winbindd_getuserdomgroups.c
-                   winbindd/winbindd_getgroups.c
-                   winbindd/winbindd_show_sequence.c
-                   winbindd/winbindd_getgrgid.c
-                   winbindd/winbindd_getgrnam.c
-                   winbindd/winbindd_getusersids.c
-                   winbindd/winbindd_lookuprids.c
-                   winbindd/winbindd_setpwent.c
-                   winbindd/winbindd_getpwent.c
-                   winbindd/winbindd_endpwent.c
-                   winbindd/winbindd_setgrent.c
-                   winbindd/winbindd_getgrent.c
-                   winbindd/winbindd_endgrent.c
-                   winbindd/winbindd_dsgetdcname.c
-                   winbindd/winbindd_getdcname.c
-                   winbindd/winbindd_list_users.c
-                   winbindd/winbindd_list_groups.c
-                   winbindd/winbindd_check_machine_acct.c
-                   winbindd/winbindd_change_machine_acct.c
-                   winbindd/winbindd_ping_dc.c
-                   winbindd/winbindd_pam_auth.c
-                   winbindd/winbindd_pam_logoff.c
-                   winbindd/winbindd_pam_chauthtok.c
-                   winbindd/winbindd_pam_auth_crap.c
-                   winbindd/winbindd_pam_chng_pswd_auth_crap.c'''
-
-WINBINDD_SRC = '''${WINBINDD_SRC1}
-                  ${TDB_VALIDATE_SRC}'''
-
 MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
 
 SMBD_SRC_MAIN = '''smbd/server.c'''
@@ -407,21 +181,6 @@ PRINTBACKEND_SRC = '''printing/printing.c
                       printing/nt_printing_ads.c
                       printing/queue_process.c'''
 
-NMBD_SRC1 = '''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c
-            nmbd/nmbd_become_lmb.c nmbd/nmbd_browserdb.c
-            nmbd/nmbd_browsesync.c nmbd/nmbd_elections.c
-            nmbd/nmbd_incomingdgrams.c nmbd/nmbd_incomingrequests.c
-            nmbd/nmbd_lmhosts.c nmbd/nmbd_logonnames.c nmbd/nmbd_mynames.c
-            nmbd/nmbd_namelistdb.c nmbd/nmbd_namequery.c
-            nmbd/nmbd_nameregister.c nmbd/nmbd_namerelease.c
-            nmbd/nmbd_nodestatus.c nmbd/nmbd_packets.c
-            nmbd/nmbd_processlogon.c nmbd/nmbd_responserecordsdb.c
-            nmbd/nmbd_sendannounce.c nmbd/nmbd_serverlistdb.c
-            nmbd/nmbd_subnetdb.c nmbd/nmbd_winsproxy.c nmbd/nmbd_winsserver.c
-            nmbd/nmbd_workgroupdb.c nmbd/nmbd_synclists.c'''
-
-NMBD_SRC = '${NMBD_SRC1}'
-
 STATUS_SRC = '''utils/status.c utils/status_profile.c smbd/notify_internal.c'''
 
 SMBCONTROL_SRC = '''utils/smbcontrol.c'''
@@ -667,13 +426,18 @@ bld.SAMBA3_LIBRARY('msrpc3',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('gpo',
-                   source='${LIBGPO_SRC}',
+                   source='''../libgpo/gpo_ldap.c
+                   ../libgpo/gpo_ini.c
+                   ../libgpo/gpo_util.c
+                   ../libgpo/gpo_fetch.c
+                   libgpo/gpo_filesync.c
+                   ../libgpo/gpo_sec.c
+                   libgpo/gpo_reg.c''',
                    deps='talloc ads TOKEN_UTIL gpext auth',
-                   vars=locals(),
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('AVAHI',
-                    source=AVAHI_SRC,
+                    source='lib/avahi.c smbd/avahi_register.c',
                     deps='avahi-common avahi-client',
                     enabled=bld.env.with_avahi)
 
@@ -682,7 +446,9 @@ bld.SAMBA3_SUBSYSTEM('GROUPDB',
                     deps='tdb_compat')
 
 bld.SAMBA3_SUBSYSTEM('TLDAP',
-                    source=TLDAP_SRC,
+                    source='''lib/tldap.c
+                    lib/tldap_util.c
+                    lib/util_tsock.c''',
                     deps='asn1util LIBTSOCKET')
 
 # libpdb.so should not expose internal symbols that are only usable
@@ -738,12 +504,12 @@ bld.SAMBA3_LIBRARY('smbldaphelper',
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
-                     source=SERVER_MUTEX_SRC,
-                    deps='talloc')
+                     source='lib/server_mutex.c',
+                     deps='talloc')
 
 bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
-                    source=PARAM_UTIL_SRC,
-                   deps='talloc')
+                     source='param/util.c',
+                     deps='talloc')
 
 bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX',
                      source='param/loadparm_ctx.c',
@@ -756,7 +522,10 @@ bld.SAMBA_GENERATOR('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_WITHOUT_REG_SRC,
+                   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',
@@ -769,10 +538,14 @@ bld.SAMBA3_SUBSYSTEM('param_service',
                      source='param/service.c',
                      deps = 'USER_UTIL param PRINTING')
 
+# this includes only the low level parse code, not stuff
+# that requires knowledge of security contexts
+bld.SAMBA3_SUBSYSTEM('REG_PARSE_PRS',
+                     source='registry/reg_parse_prs.c')
+
 bld.SAMBA3_SUBSYSTEM('REGFIO',
-                    source=REGFIO_SRC,
-                    deps='samba-util',
-                    vars=locals())
+                    source='registry/regfio.c',
+                    deps='samba-util REG_PARSE_PRS')
 
 bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
                     source=REG_API_REGF_SRC,
@@ -798,9 +571,8 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL',
                     vars=locals())
 
 bld.SAMBA3_LIBRARY('popt_samba3',
-                   source=POPT_LIB_SRC,
+                   source='lib/popt_common.c',
                    deps='popt samba-util util_cmdline',
-                   vars=locals(),
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('util_cmdline',
@@ -809,17 +581,67 @@ bld.SAMBA3_LIBRARY('util_cmdline',
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
-                    source=KRBCLIENT_SRC,
-                    public_deps='krb5samba k5crypto gssapi LIBTSOCKET CLDAP LIBNMB',
-                    vars=locals())
+                     source='libads/kerberos.c libads/ads_status.c',
+                     public_deps='krb5samba k5crypto gssapi LIBTSOCKET CLDAP LIBNMB')
 
 bld.SAMBA3_SUBSYSTEM('samba3util',
-                   source=LIB_UTIL_SRC,
-                   deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash',
-                   vars=locals())
+                   source='''lib/system.c
+                   lib/sendfile.c
+                   lib/recvfile.c
+                   lib/time.c
+                   lib/util_sid.c
+                   lib/util_file.c
+                   lib/util.c
+                   lib/util_sock.c
+                   lib/util_transfer_file.c
+                   lib/sock_exec.c''',
+                   deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash')
+
+
+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')
 
 bld.SAMBA3_SUBSYSTEM('samba3core',
-                   source=LIB_SRC,
+                   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/id_cache.c
+                   lib/talloc_dict.c
+                   lib/serverid.c
+                   lib/addrchange.c
+                   ../lib/util/debug_s3.c
+                   lib/dumpcore.c
+                   lib/interface.c
+                   lib/username.c
+                   lib/access.c lib/smbrun.c
+                   lib/wins_srv.c
+                   lib/substitute.c
+                   lib/substitute_generic.c
+                   lib/ms_fnmatch.c
+                   lib/tallocmsg.c
+                   lib/dmallocmsg.c
+                   intl/lang_tdb.c
+                   lib/gencache.c
+                   lib/events.c
+                   lib/server_contexts.c
+                   lib/server_prefork.c
+                   lib/server_prefork_util.c
+                   lib/ldap_escape.c
+                   lib/fncall.c
+                   libads/krb5_errs.c
+                   lib/system_smbd.c
+                   lib/audit.c
+                   lib/tevent_wait.c
+                   lib/idmap_cache.c
+                   lib/util_ea.c''',
                    deps='''
                         samba3util
                         LIBTSOCKET
@@ -832,8 +654,8 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                         param
                         dbwrap
                         samba3-util
-                        errors3''',
-                   vars=locals())
+                        errors3
+                        TDB_LIB''')
 
 bld.SAMBA3_LIBRARY('smbd_shim',
                    source='''lib/smbd_shim.c''',
@@ -841,9 +663,9 @@ bld.SAMBA3_LIBRARY('smbd_shim',
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
-                    source=LIBNTLMSSP_SRC,
-                    deps='NDR_NTLMSSP NTLMSSP_COMMON wbclient',
-                    vars=locals())
+                    source='''libsmb/ntlmssp.c
+                    libsmb/ntlmssp_wrap.c''',
+                    deps='NDR_NTLMSSP NTLMSSP_COMMON wbclient')
 
 bld.SAMBA3_SUBSYSTEM('auth_generic',
                     source='libsmb/auth_generic.c',
@@ -851,7 +673,32 @@ bld.SAMBA3_SUBSYSTEM('auth_generic',
                     vars=locals())
 
 bld.SAMBA3_LIBRARY('libsmb',
-                   source=LIBSMB_SRC,
+                   source='''libsmb/clientgen.c
+                   libsmb/cliconnect.c
+                   libsmb/clifile.c
+                   libsmb/clispnego.c
+                   libsmb/clirap.c
+                   libsmb/clierror.c
+                   libsmb/climessage.c
+                   libsmb/clireadwrite.c
+                   libsmb/clilist.c
+                   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/smb2cli_tcon.c
+                   libsmb/cli_np_tstream.c
+                   libsmb/reparse_symlink.c
+                   libsmb/clisymlink.c
+                   libsmb/smbsock_connect.c
+                   libsmb/cli_smb2_fnum.c''',
                    deps='''
                    LIBNTLMSSP
                    auth_generic
@@ -863,7 +710,6 @@ bld.SAMBA3_LIBRARY('libsmb',
                    cli_smb_common
                    util_cmdline
                    tevent''',
-                   vars=locals(),
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('CLDAP',
@@ -875,15 +721,16 @@ bld.SAMBA3_SUBSYSTEM('CLDAP',
 # PLEASE DO NOT make it depend on high level libraries like PDB, if you are
 # doing that your design is wrong and needs changing. -SSS
 bld.SAMBA3_LIBRARY('secrets3',
-                   source=SECRETS_SRC,
+                   source='''passdb/secrets.c
+                   passdb/machine_account_secrets.c
+                   passdb/machine_sid.c
+                   passdb/secrets_lsa.c''',
                    deps='NDR_SECRETS param samba3util dbwrap',
-                   private_library=True,
-                   vars=locals())
+                   private_library=True)
 
 bld.SAMBA3_LIBRARY('smbldap',
-                    source=SMBLDAP_SRC,
+                    source='lib/smbldap.c',
                     deps='ldap lber samba-util param',
-                    vars=locals(),
                     enabled=bld.CONFIG_SET("HAVE_LDAP"),
                     private_library=False,
                     abi_directory='lib/ABI',
@@ -893,30 +740,37 @@ bld.SAMBA3_LIBRARY('smbldap',
                     public_headers='include/smbldap.h include/smb_ldap.h')
 
 bld.SAMBA3_LIBRARY('ads',
-                   source=LIBADS_SRC,
+                   source='''libads/ldap.c
+                   libads/sasl.c
+                   libads/sasl_wrapping.c
+                   libads/krb5_setpw.c
+                   libads/kerberos_util.c
+                   libads/ldap_user.c
+                   libads/ads_struct.c
+                   libads/kerberos_keytab.c
+                   libads/disp_sec.c
+                   libads/ldap_utils.c
+                   libads/ldap_schema.c
+                   libads/util.c
+                   libads/ndr.c''',
                    deps='cli-ldap-common krb5samba ldap lber KRBCLIENT param LIBNMB libsmb DCUTIL smbldap',
-                   private_library=True,
-                   vars=locals())
+                   private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
-                    source=LIBADS_SERVER_SRC,
-                    deps='SERVER_MUTEX ndr-krb5pac krb5samba gssapi',
-                   vars=locals())
+                     source='libads/authdata.c',
+                     deps='SERVER_MUTEX ndr-krb5pac krb5samba gssapi')
 
 bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
-                    source=LIBADS_PRINTER_SRC,
-                    deps='samba-util krb5samba',
-                   vars=locals())
-
-bld.SAMBA3_SUBSYSTEM('LIBAFS',
-                    source=AFS_SRC,
-                    deps='samba-util',
-                    vars=locals())
+                    source='libads/ldap_printer.c',
+                    deps='samba-util krb5samba')
 
 bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN',
-                    source=AFS_SETTOKEN_SRC,
-                    deps='samba-util',
-                    vars=locals())
+                    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,
@@ -964,7 +818,6 @@ bld.SAMBA3_LIBRARY('smbd_base',
                     LOCKING
                     LIBADS_SERVER
                     LIBAFS
-                    LIBAFS_SETTOKEN
                     RPC_SERVER
                     NDR_SMBXSRV
                    LIBASYS
@@ -1049,9 +902,13 @@ bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBNMB',
-                     source=LIBNMB_SRC,
-                     deps='addns lmhosts resolv',
-                     vars=locals())
+                     source='''libsmb/unexpected.c
+                     libsmb/namecache.c
+                     libsmb/nmblib.c
+                     libsmb/namequery.c
+                     libsmb/conncache.c
+                     libads/sitename_cache.c''',
+                     deps='addns lmhosts resolv')
 
 bld.SAMBA3_SUBSYSTEM('SERVICES',
                     source=SERVICES_SRC,
@@ -1064,17 +921,15 @@ bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('PASSCHANGE',
-                    source=PASSCHANGE_SRC,
+                    source='libsmb/passchange.c',
                     deps='''LIBCLI_SAMR
                     INIT_LSA
                     msrpc3
-                    krb5samba''',
-                    vars=locals())
+                    krb5samba''')
 
 bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
-                    source=VERSION_SRC,
-                    deps='samba-util',
-                    vars=locals())
+                    source='lib/version.c',
+                    deps='samba-util')
 
 bld.SAMBA3_SUBSYSTEM('SLCACHE',
                     source=SLCACHE_SRC,
@@ -1118,21 +973,22 @@ bld.SAMBA3_SUBSYSTEM('errors3',
                      deps='errors')
 
 bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
-                    source=LIBCLI_SAMR_SRC,
+                    source='rpc_client/cli_samr.c',
                     deps='RPC_NDR_SAMR')
 
 bld.SAMBA3_LIBRARY('libcli_lsa3',
-                   source=LIBCLI_LSA_SRC,
+                   source='rpc_client/cli_lsarpc.c',
                    deps='RPC_NDR_LSA INIT_LSA',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('libcli_netlogon3',
-                   source=LIBCLI_NETLOGON_SRC,
+                   source='rpc_client/cli_netlogon.c rpc_client/util_netlogon.c',
                    deps='RPC_NDR_NETLOGON INIT_NETLOGON cliauth param',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('cli_spoolss',
-                   source=LIBCLI_SPOOLSS_SRC,
+                   source='''rpc_client/cli_spoolss.c
+                   rpc_client/init_spoolss.c''',
                    deps='RPC_NDR_SPOOLSS param secrets3',
                    private_library=True)
 
@@ -1170,7 +1026,18 @@ bld.SAMBA3_BINARY('smbd/smbd',
                  vars=locals())
 
 bld.SAMBA3_BINARY('nmbd/nmbd',
-                 source=NMBD_SRC,
+                 source='''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c
+                 nmbd/nmbd_become_lmb.c nmbd/nmbd_browserdb.c
+                 nmbd/nmbd_browsesync.c nmbd/nmbd_elections.c
+                 nmbd/nmbd_incomingdgrams.c nmbd/nmbd_incomingrequests.c
+                 nmbd/nmbd_lmhosts.c nmbd/nmbd_logonnames.c nmbd/nmbd_mynames.c
+                 nmbd/nmbd_namelistdb.c nmbd/nmbd_namequery.c
+                 nmbd/nmbd_nameregister.c nmbd/nmbd_namerelease.c
+                 nmbd/nmbd_nodestatus.c nmbd/nmbd_packets.c
+                 nmbd/nmbd_processlogon.c nmbd/nmbd_responserecordsdb.c
+                 nmbd/nmbd_sendannounce.c nmbd/nmbd_serverlistdb.c
+                 nmbd/nmbd_subnetdb.c nmbd/nmbd_winsproxy.c nmbd/nmbd_winsserver.c
+                 nmbd/nmbd_workgroupdb.c nmbd/nmbd_synclists.c''',
                  deps='''
                  talloc
                  tevent
@@ -1178,11 +1045,100 @@ bld.SAMBA3_BINARY('nmbd/nmbd',
                  libsmb
                  popt_samba3
                  PROFILE''',
-                 install_path='${SBINDIR}',
-                 vars=locals())
+                 install_path='${SBINDIR}')
+
+
+bld.SAMBA3_SUBSYSTEM('TDB_VALIDATE',
+                     source='lib/tdb_validate.c',
+                     deps='samba-util')
+
 
 bld.SAMBA3_BINARY('winbindd/winbindd',
-                 source=WINBINDD_SRC,
+                 source='''winbindd/winbindd.c
+                 winbindd/winbindd_group.c
+                 winbindd/winbindd_util.c
+                 winbindd/winbindd_cache.c
+                 winbindd/winbindd_pam.c
+                 winbindd/winbindd_misc.c
+                 winbindd/winbindd_cm.c
+                 winbindd/winbindd_wins_byip.c
+                 winbindd/winbindd_wins_byname.c
+                 winbindd/winbindd_msrpc.c
+                 winbindd/winbindd_rpc.c
+                 winbindd/winbindd_reconnect.c
+                 winbindd/winbindd_ads.c
+                 winbindd/winbindd_samr.c
+                 winbindd/winbindd_dual.c
+                 winbindd/winbindd_dual_ndr.c
+                 winbindd/winbindd_dual_srv.c
+                 winbindd/winbindd_async.c
+                 winbindd/winbindd_creds.c
+                 winbindd/winbindd_cred_cache.c
+                 winbindd/winbindd_ccache_access.c
+                 winbindd/winbindd_domain.c
+                 winbindd/winbindd_idmap.c
+                 winbindd/winbindd_locator.c
+                 winbindd/winbindd_ndr.c
+                 winbindd/wb_ping.c
+                 winbindd/wb_lookupsid.c
+                 winbindd/wb_lookupsids.c
+                 winbindd/wb_lookupname.c
+                 winbindd/wb_uid2sid.c
+                 winbindd/wb_gid2sid.c
+                 winbindd/wb_sids2xids.c
+                 winbindd/wb_queryuser.c
+                 winbindd/wb_lookupuseraliases.c
+                 winbindd/wb_lookupusergroups.c
+                 winbindd/wb_getpwsid.c
+                 winbindd/wb_gettoken.c
+                 winbindd/wb_seqnum.c
+                 winbindd/wb_seqnums.c
+                 winbindd/wb_group_members.c
+                 winbindd/wb_getgrsid.c
+                 winbindd/wb_query_user_list.c
+                 winbindd/wb_fill_pwent.c
+                 winbindd/wb_next_pwent.c
+                 winbindd/wb_next_grent.c
+                 winbindd/wb_dsgetdcname.c
+                 winbindd/winbindd_lookupsid.c
+                 winbindd/winbindd_lookupsids.c
+                 winbindd/winbindd_lookupname.c
+                 winbindd/winbindd_sid_to_uid.c
+                 winbindd/winbindd_sid_to_gid.c
+                 winbindd/winbindd_uid_to_sid.c
+                 winbindd/winbindd_gid_to_sid.c
+                 winbindd/winbindd_sids_to_xids.c
+                 winbindd/winbindd_allocate_uid.c
+                 winbindd/winbindd_allocate_gid.c
+                 winbindd/winbindd_getpwsid.c
+                 winbindd/winbindd_getpwnam.c
+                 winbindd/winbindd_getpwuid.c
+                 winbindd/winbindd_getsidaliases.c
+                 winbindd/winbindd_getuserdomgroups.c
+                 winbindd/winbindd_getgroups.c
+                 winbindd/winbindd_show_sequence.c
+                 winbindd/winbindd_getgrgid.c
+                 winbindd/winbindd_getgrnam.c
+                 winbindd/winbindd_getusersids.c
+                 winbindd/winbindd_lookuprids.c
+                 winbindd/winbindd_setpwent.c
+                 winbindd/winbindd_getpwent.c
+                 winbindd/winbindd_endpwent.c
+                 winbindd/winbindd_setgrent.c
+                 winbindd/winbindd_getgrent.c
+                 winbindd/winbindd_endgrent.c
+                 winbindd/winbindd_dsgetdcname.c
+                 winbindd/winbindd_getdcname.c
+                 winbindd/winbindd_list_users.c
+                 winbindd/winbindd_list_groups.c
+                 winbindd/winbindd_check_machine_acct.c
+                 winbindd/winbindd_change_machine_acct.c
+                 winbindd/winbindd_ping_dc.c
+                 winbindd/winbindd_pam_auth.c
+                 winbindd/winbindd_pam_logoff.c
+                 winbindd/winbindd_pam_chauthtok.c
+                 winbindd/winbindd_pam_auth_crap.c
+                 winbindd/winbindd_pam_chng_pswd_auth_crap.c''',
                  deps='''
                  talloc
                  tevent
@@ -1204,10 +1160,10 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  RPC_NCACN_NP
                  RPC_PIPE_REGISTER
                  WB_REQTRANS
+                 TDB_VALIDATE
                  ''',
                  enabled=bld.env.build_winbind,
-                 install_path='${SBINDIR}',
-                 vars=locals())
+                 install_path='${SBINDIR}')
 
 bld.SAMBA3_BINARY('rpcclient/rpcclient',
                  source=RPCCLIENT_SRC,