build: list sources of library smbsharemodes directly in def, remov vars=locals()
[nivanova/samba-autobuild/.git] / source3 / wscript_build
index 039b6b795e29ce52a6a3ba013b61a72bba60240f..b1ca2cf26861e3d9116589c24d94dd08d134c8e9 100755 (executable)
@@ -3,487 +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_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'''
-
-LIBMSRPC_SRC = '''
-               rpc_client/cli_pipe.c
-               librpc/rpc/rpc_common.c
-               rpc_client/rpc_transport_np.c
-               rpc_client/rpc_transport_sock.c
-               rpc_client/rpc_transport_tstream.c
-               librpc/rpc/dcerpc_helpers.c
-               '''
-
-#
-# registry-related objects
-#
-
-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'''
-
-REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c
-                         registry/reg_backend_shares.c
-                         registry/reg_backend_netlogon_params.c
-                         registry/reg_backend_prod_options.c
-                         registry/reg_backend_tcpip_params.c
-                         registry/reg_backend_hkpt_params.c
-                         registry/reg_backend_current_version.c
-                         registry/reg_backend_perflib.c'''
-
-REG_BASE_SRC = '''registry/reg_api.c
-               registry/reg_dispatcher.c
-               registry/reg_cachehook.c
-               registry/reg_objects.c
-               registry/reg_util_internal.c
-               lib/util_nttoken.c
-               registry/reg_backend_db.c
-               registry/reg_parse_internal.c
-               lib/cbuf.c
-               lib/srprs.c
-               registry/reg_init_basic.c'''
-
-REG_SMBCONF_SRC = '''
-                  ${REG_BACKENDS_SMBCONF_SRC}
-                  ${REG_INIT_SMBCONF_SRC}
-                  registry/reg_util_token.c
-                  registry/reg_api_util.c'''
-
-REG_FULL_SRC = '''
-               ${REG_BACKENDS_EXTRA_SRC}
-               ${REG_INIT_FULL_SRC}
-               registry/reg_perfcount.c'''
-
-SERVICES_SRC = '''services/svc_spoolss.c
-                  services/svc_rcinit.c
-                  services/svc_winreg_glue.c
-                  services/svc_netlogon.c
-                  services/svc_winreg.c
-                  services/svc_wins.c'''
-
-LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
-
-RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
-
-LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c locking/share_mode_lock.c'''
-
-PRIVILEGES_SRC = '''lib/privileges.c'''
-
-PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
-
-PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
-                lib/util_wellknown.c lib/util_builtin.c passdb/pdb_compat.c
-                lib/util_unixsids.c passdb/lookup_sid.c
-                passdb/login_cache.c
-                passdb/account_pol.c ${PRIVILEGES_SRC}
-                lib/util_nscd.c lib/winbind_util.c
-                passdb/pdb_util.c passdb/pdb_interface.c
-                passdb/pdb_secrets.c
-                passdb/pdb_unixid.c'''
-#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
-
-GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
-
-PROFILE_SRC = '''profile/profile.c'''
-PROFILES_SRC = '''utils/profiles.c'''
-
-OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c'''
-
-NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
-
-FNAME_UTIL_SRC = '''lib/filename_util.c'''
-
-
-PLAINTEXT_AUTH_SRC = '''auth/pampass.c auth/pass_check.c'''
-
-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_sid2uid.c
-                   winbindd/wb_sid2gid.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'''
-
-BUILDOPT_SRC = '''smbd/build_options.c'''
-
-SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
-               smbd/utmp.c smbd/session.c
-               smbd/dfree.c smbd/dir.c smbd/password.c smbd/conn_msg.c
-               smbd/conn_idle.c
-               smbd/share_access.c smbd/fileio.c
-               smbd/ipc.c smbd/lanman.c smbd/negprot.c
-               smbd/message.c smbd/nttrans.c smbd/pipes.c
-               smbd/reply.c smbd/sesssetup.c smbd/trans2.c smbd/uid.c
-               smbd/dosmode.c smbd/filename.c smbd/open.c smbd/close.c
-               smbd/blocking.c smbd/sec_ctx.c smbd/srvstr.c
-               smbd/vfs.c smbd/perfcount.c smbd/statcache.c smbd/seal.c
-               smbd/posix_acls.c lib/sysacls.c
-               smbd/process.c smbd/service.c 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
-               smbd/quotas.c smbd/ntquotas.c smbd/msdfs.c
-               smbd/aio.c smbd/statvfs.c
-               smbd/dmapi.c smbd/signing.c
-               smbd/file_access.c
-               smbd/dnsregister.c smbd/globals.c
-               smbd/smb2_server.c
-               smbd/smb2_glue.c
-               smbd/smb2_negprot.c
-               smbd/smb2_sesssetup.c
-               smbd/smb2_tcon.c
-               smbd/smb2_create.c
-               smbd/smb2_close.c
-               smbd/smb2_flush.c
-               smbd/smb2_read.c
-               smbd/smb2_write.c
-               smbd/smb2_lock.c
-               smbd/smb2_ioctl.c
-               smbd/smb2_keepalive.c
-               smbd/smb2_find.c
-               smbd/smb2_notify.c
-               smbd/smb2_getinfo.c
-               smbd/smb2_setinfo.c
-               smbd/smb2_break.c
-               smbd/smbXsrv_version.c
-               smbd/smbXsrv_session.c
-               smbd/smbXsrv_tcon.c
-               smbd/smbXsrv_open.c
-               smbd/server_exit.c
-               smbd/durable.c
-               ${MANGLE_SRC}'''
-
-SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
-                ${OPLOCK_SRC} ${NOTIFY_SRC}
-                ${BUILDOPT_SRC}'''
-
-PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
-               printing/print_cups.c printing/print_generic.c
-               printing/lpq_parse.c printing/load.c printing/print_standard.c
-               printing/print_iprint.c printing/printer_list.c'''
-
-PRINTBASE_SRC = '''printing/notify.c printing/printing_db.c'''
-PRINTBACKEND_SRC = '''printing/printing.c
-                      printing/nt_printing.c
-                      printing/nt_printing_tdb.c
-                      printing/nt_printing_migrate_internal.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}'
-
-SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
-               web/swat.c web/neg_lang.c'''
-
-SWAT_SRC = '''${SWAT_SRC1}'''
-
-STATUS_SRC = '''utils/status.c utils/status_profile.c smbd/notify_internal.c'''
-
-SMBCONTROL_SRC = '''utils/smbcontrol.c'''
-
-SMBTREE_SRC = '''utils/smbtree.c'''
-
-TESTPARM_SRC = 'utils/testparm.c'
-
-SMBTA_UTIL_SRC = '''utils/smbta-util.c'''
-
-TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
-
-PASSWD_UTIL_SRC = 'utils/passwd_util.c'
-
-SMBPASSWD_SRC = '''utils/smbpasswd.c'''
-
-PDBEDIT_SRC = '''utils/pdbedit.c'''
-
-SMBGET_SRC = '''utils/smbget.c'''
-
-RPCCLIENT_SRC1 = '''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_SRC = '''${RPCCLIENT_SRC1}'''
-
-LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c
-                        libsmb/libsmb_thread_posix.c'''
-
-LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c'
-
-LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
-
-LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
-                    lib/netapi/cm.c
-                    lib/netapi/libnetapi.c
-                    lib/netapi/joindomain.c
-                    lib/netapi/serverinfo.c
-                    lib/netapi/getdc.c
-                    lib/netapi/user.c
-                    lib/netapi/group.c
-                    lib/netapi/localgroup.c
-                    lib/netapi/samr.c
-                    lib/netapi/sid.c
-                    lib/netapi/share.c
-                    lib/netapi/file.c
-                    lib/netapi/shutdown.c
-                    lib/netapi/netlogon.c'''
-
-LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}'''
-
-CLIENT_SRC = '''
-             client/client.c
-             client/clitar.c
-             client/dnsbrowse.c'''
-
 LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c'
 
 SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
@@ -505,7 +24,7 @@ LIBNET_SAMSYNC_SRC = '''libnet/libnet_samsync.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_rpc_join.c utils/net_time.c utils/net_lookup.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
@@ -559,6 +78,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
                 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}
@@ -625,7 +145,21 @@ bld.SETUP_BUILD_GROUPS()
 ######################## SUBSYSTEMS #################################
 
 bld.SAMBA3_LIBRARY('netapi',
-                    source=LIBNETAPI_SRC,
+                    source='''lib/netapi/netapi.c
+                    lib/netapi/cm.c
+                    lib/netapi/libnetapi.c
+                    lib/netapi/joindomain.c
+                    lib/netapi/serverinfo.c
+                    lib/netapi/getdc.c
+                    lib/netapi/user.c
+                    lib/netapi/group.c
+                    lib/netapi/localgroup.c
+                    lib/netapi/samr.c
+                    lib/netapi/sid.c
+                    lib/netapi/share.c
+                    lib/netapi/file.c
+                    lib/netapi/shutdown.c
+                    lib/netapi/netlogon.c''',
                     public_deps='''
                     talloc
                     util_cmdline
@@ -641,17 +175,15 @@ bld.SAMBA3_LIBRARY('netapi',
                     ''',
                     public_headers='../source3/lib/netapi/netapi.h',
                     pc_files='libnet/netapi.pc',
-                    vnum='0',
-                    vars=locals())
+                    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,
@@ -666,31 +198,42 @@ bld.SAMBA3_LIBRARY('gse',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('msrpc3',
-                   source='${LIBMSRPC_SRC}',
+                   source='''rpc_client/cli_pipe.c
+                   rpc_client/rpc_transport_np.c
+                   rpc_client/rpc_transport_sock.c
+                   rpc_client/rpc_transport_tstream.c
+                   librpc/rpc/dcerpc_helpers.c''',
                    deps='''ndr ndr-standard
                     RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH
                     LIBTSOCKET gse dcerpc-binding
-                    libsmb''',
-                   vars=locals(),
+                    libsmb
+                    ndr-table''',
                    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)
 
 bld.SAMBA3_SUBSYSTEM('GROUPDB',
-                    source=GROUPDB_SRC,
+                    source='groupdb/mapping.c groupdb/mapping_tdb.c',
                     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
@@ -718,24 +261,40 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_domain_info',
                      '!get_attr_list']
 private_pdb_match.append('!pdb_nds_*')
 private_pdb_match.append('!pdb_init_ldapsam')
+private_pdb_match.append('!pdb_ldapsam_init*')
 private_pdb_match = private_pdb_match + ldapsam_pdb_match
 
 private_pdb_match = private_pdb_match + map(lambda x: '!pdb_%s_init' % x, static_pdb_match)
 
 bld.SAMBA3_LIBRARY('pdb',
-                   source=PASSDB_SRC,
+                   source='''passdb/pdb_get_set.c
+                   passdb/passdb.c
+                   lib/util_wellknown.c
+                   lib/util_builtin.c
+                   passdb/pdb_compat.c
+                   lib/util_sid_passdb.c
+                   lib/util_unixsids.c
+                   passdb/lookup_sid.c
+                   passdb/login_cache.c
+                   passdb/account_pol.c
+                   lib/privileges.c
+                   lib/util_nscd.c
+                   lib/winbind_util.c
+                   passdb/pdb_util.c
+                   passdb/pdb_interface.c
+                   passdb/pdb_secrets.c
+                   passdb/pdb_unixid.c''',
                    deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping',
                    private_library=False,
                    pc_files=[],
                    public_headers_install=True,
                    public_headers='''
-                               include/passdb.h
-                               passdb/machine_sid.h
-                               passdb/lookup_sid.h''',
-                   abi_match=private_pdb_match + ['*'],
+                   include/passdb.h
+                   passdb/machine_sid.h
+                   passdb/lookup_sid.h''',
+                   abi_match=private_pdb_match,
                    abi_directory='passdb/ABI',
-                   vnum='0',
-                   vars=locals())
+                   vnum='0')
 
 bld.SAMBA3_LIBRARY('smbldaphelper',
                    source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',
@@ -745,12 +304,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',
@@ -763,7 +322,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',
@@ -776,18 +338,31 @@ 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,
-                    deps='samba-util',
-                    vars=locals())
+                    source='registry/reg_api_regf.c',
+                    deps='samba-util')
 
 bld.SAMBA3_LIBRARY('smbregistry',
-                   source=REG_BASE_SRC,
+                   source='''registry/reg_api.c
+                   registry/reg_dispatcher.c
+                   registry/reg_cachehook.c
+                   registry/reg_objects.c
+                   registry/reg_util_internal.c
+                   lib/util_nttoken.c
+                   registry/reg_backend_db.c
+                   registry/reg_parse_internal.c
+                   lib/cbuf.c
+                   lib/srprs.c
+                   registry/reg_init_basic.c''',
                    deps='''smbd_shim tdb-wrap3 NDR_SECURITY util_tdb talloc
                    replace util_reg samba-util samba-security
                    errors3 dbwrap samba3-util''',
@@ -795,19 +370,28 @@ bld.SAMBA3_LIBRARY('smbregistry',
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('REG_SMBCONF',
-                    source=REG_SMBCONF_SRC,
-                    deps='smbregistry',
-                    vars=locals())
+                    source='''registry/reg_backend_smbconf.c
+                    registry/reg_init_smbconf.c
+                    registry/reg_util_token.c
+                    registry/reg_api_util.c''',
+                    deps='smbregistry')
 
 bld.SAMBA3_SUBSYSTEM('REG_FULL',
-                    source=REG_FULL_SRC,
-                    deps='REG_SMBCONF tdb-wrap3',
-                    vars=locals())
+                    source='''registry/reg_backend_printing.c
+                    registry/reg_backend_shares.c
+                    registry/reg_backend_netlogon_params.c
+                    registry/reg_backend_prod_options.c
+                    registry/reg_backend_tcpip_params.c
+                    registry/reg_backend_hkpt_params.c
+                    registry/reg_backend_current_version.c
+                    registry/reg_backend_perflib.c
+                    registry/reg_init_full.c
+                    registry/reg_perfcount.c''',
+                    deps='REG_SMBCONF tdb-wrap3')
 
 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',
@@ -816,17 +400,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
@@ -839,8 +473,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''',
@@ -848,9 +482,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',
@@ -858,7 +492,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
@@ -870,7 +529,6 @@ bld.SAMBA3_LIBRARY('libsmb',
                    cli_smb_common
                    util_cmdline
                    tevent''',
-                   vars=locals(),
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('CLDAP',
@@ -882,15 +540,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',
@@ -900,30 +559,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,
@@ -951,60 +617,160 @@ bld.SAMBA3_LIBRARY('smbd_conn',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('smbd_base',
-                    source=SMBD_SRC_BASE,
-                    deps='''
-                    talloc
-                    tevent
-                    pdb
-                    libsmb
-                    msrpc3
-                    vfs
-                    vfs_default
-                    vfs_posixacl
-                    popt_samba3
-                    samba3core
-                    smbd_conn
-                    param_service
-                    AVAHI
-                    PRINTBASE
-                    PROFILE
-                    LOCKING
-                    LIBADS_SERVER
-                    LIBAFS
-                    LIBAFS_SETTOKEN
-                    RPC_SERVER
-                    NDR_SMBXSRV
-                   LIBASYS
-                    ccan-hash
-                    NDR_SMB_ACL
-                    netapi
-                    ''' + bld.env['dmapi_lib'],
-                    private_library=True,
-                    vars=locals())
+                   source='''
+                   smbd/server_reload.c
+                   smbd/files.c
+                   smbd/connection.c
+                   smbd/utmp.c
+                   smbd/session.c
+                   smbd/dfree.c
+                   smbd/dir.c
+                   smbd/password.c
+                   smbd/conn_msg.c
+                   smbd/conn_idle.c
+                   smbd/share_access.c
+                   smbd/fileio.c
+                   smbd/ipc.c
+                   smbd/lanman.c
+                   smbd/negprot.c
+                   smbd/message.c
+                   smbd/nttrans.c
+                   smbd/pipes.c
+                   smbd/reply.c
+                   smbd/sesssetup.c
+                   smbd/trans2.c
+                   smbd/uid.c
+                   smbd/dosmode.c
+                   smbd/filename.c
+                   smbd/open.c
+                   smbd/close.c
+                   smbd/blocking.c
+                   smbd/sec_ctx.c
+                   smbd/srvstr.c
+                   smbd/vfs.c
+                   smbd/perfcount.c
+                   smbd/statcache.c
+                   smbd/seal.c
+                   smbd/posix_acls.c
+                   lib/sysacls.c
+                   smbd/process.c
+                   smbd/service.c
+                   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
+                   smbd/quotas.c
+                   smbd/ntquotas.c
+                   smbd/msdfs.c
+                   smbd/aio.c smbd/statvfs.c
+                   smbd/dmapi.c
+                   smbd/signing.c
+                   smbd/file_access.c
+                   smbd/dnsregister.c smbd/globals.c
+                   smbd/smb2_server.c
+                   smbd/smb2_glue.c
+                   smbd/smb2_negprot.c
+                   smbd/smb2_sesssetup.c
+                   smbd/smb2_tcon.c
+                   smbd/smb2_create.c
+                   smbd/smb2_close.c
+                   smbd/smb2_flush.c
+                   smbd/smb2_read.c
+                   smbd/smb2_write.c
+                   smbd/smb2_lock.c
+                   smbd/smb2_ioctl.c
+                   smbd/smb2_ioctl_dfs.c
+                   smbd/smb2_ioctl_filesys.c
+                   smbd/smb2_ioctl_named_pipe.c
+                   smbd/smb2_ioctl_network_fs.c
+                   smbd/smb2_keepalive.c
+                   smbd/smb2_find.c
+                   smbd/smb2_notify.c
+                   smbd/smb2_getinfo.c
+                   smbd/smb2_setinfo.c
+                   smbd/smb2_break.c
+                   smbd/smbXsrv_version.c
+                   smbd/smbXsrv_session.c
+                   smbd/smbXsrv_tcon.c
+                   smbd/smbXsrv_open.c
+                   smbd/server_exit.c
+                   smbd/durable.c
+                   smbd/scavenger.c
+                   smbd/mangle.c
+                   smbd/mangle_hash.c
+                   smbd/mangle_hash2.c
+                   smbd/oplock.c
+                   smbd/oplock_irix.c
+                   smbd/oplock_linux.c
+                   smbd/notify.c
+                   smbd/notify_inotify.c
+                   smbd/notify_internal.c
+                   smbd/build_options.c''',
+                   deps='''
+                   talloc
+                   tevent
+                   pdb
+                   libsmb
+                   msrpc3
+                   vfs
+                   vfs_default
+                   vfs_posixacl
+                   popt_samba3
+                   samba3core
+                   smbd_conn
+                   param_service
+                   AVAHI
+                   PRINTBASE
+                   PROFILE
+                   LOCKING
+                   LIBADS_SERVER
+                   LIBAFS
+                   RPC_SERVER
+                   NDR_SMBXSRV
+                   LIBASYS
+                   ccan-hash
+                   NDR_SMB_ACL
+                   netapi
+                   NDR_IOCTL
+                   ''' + bld.env['dmapi_lib'],
+                   private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('LOCKING',
-                    source='${LOCKING_SRC}',
+                    source='''locking/locking.c
+                    locking/brlock.c
+                    locking/posix.c
+                    locking/share_mode_lock.c''',
                     deps='''
                     tdb_compat
                     talloc
                     NDR_OPEN_FILES
-                    FNAME_UTIL''',
-                    vars=locals())
+                    FNAME_UTIL''')
 
 bld.SAMBA3_SUBSYSTEM('PROFILE',
-                    source='${PROFILE_SRC}',
-                    deps='samba-util',
-                    vars=locals())
+                    source='profile/profile.c',
+                    deps='samba-util')
 
 bld.SAMBA3_SUBSYSTEM('PRINTBASE',
-                    source=PRINTBASE_SRC,
-                    deps='samba-util tdb_compat',
-                    vars=locals())
+                    source='''printing/notify.c printing/printing_db.c''',
+                    deps='samba-util tdb_compat')
 
 bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
-                    source=PRINTBACKEND_SRC,
-                    deps='PRINTBASE LIBADS_PRINTER tdb_compat printing_migrate',
-                    vars=locals())
+                    source='''printing/printing.c
+                    printing/nt_printing.c
+                    printing/nt_printing_tdb.c
+                    printing/nt_printing_migrate_internal.c
+                    printing/nt_printing_ads.c
+                    printing/queue_process.c''',
+                    deps='PRINTBASE LIBADS_PRINTER tdb_compat printing_migrate')
 
 bld.SAMBA3_LIBRARY('printing_migrate',
                     source='printing/nt_printing_migrate.c rpc_client/cli_winreg_spoolss.c printing/nt_printing_os2.c',
@@ -1013,19 +779,25 @@ bld.SAMBA3_LIBRARY('printing_migrate',
                     private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('PRINTING',
-                    source=PRINTING_SRC,
-                    deps='NDR_PRINTCAP tdb_compat cups',
-                    vars=locals())
+                    source='''printing/pcap.c
+                    printing/print_svid.c
+                    printing/print_aix.c
+                    printing/print_cups.c
+                    printing/print_generic.c
+                    printing/lpq_parse.c
+                    printing/load.c
+                    printing/print_standard.c
+                    printing/print_iprint.c
+                    printing/printer_list.c''',
+                    deps='NDR_PRINTCAP tdb_compat cups')
 
 bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
-                    source=PASSWD_UTIL_SRC,
-                    deps='samba-util',
-                    vars=locals())
+                    source='utils/passwd_util.c',
+                    deps='samba-util')
 
 bld.SAMBA3_SUBSYSTEM('FNAME_UTIL',
-                    source=FNAME_UTIL_SRC,
-                    deps='samba-util',
-                    vars=locals())
+                    source='lib/filename_util.c',
+                    deps='samba-util')
 
 bld.SAMBA3_SUBSYSTEM('LIBNET',
                     source=LIBNET_SRC,
@@ -1050,47 +822,51 @@ bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
-                    source=LIB_EVENTLOG_SRC,
-                    deps='NDR_EVENTLOG tdb_compat',
-                    vars=locals())
+                    source='lib/eventlog/eventlog.c',
+                    deps='NDR_EVENTLOG tdb_compat')
 
 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,
-                    deps='samba-util',
-                    vars=locals())
+                    source='''services/svc_spoolss.c
+                    services/svc_rcinit.c
+                    services/svc_winreg_glue.c
+                    services/svc_netlogon.c
+                    services/svc_winreg.c
+                    services/svc_wins.c''',
+                    deps='samba-util')
 
 bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH',
-                    source=PLAINTEXT_AUTH_SRC,
-                    deps='pam PAM_ERRORS',
-                    vars=locals())
+                    source='''auth/pampass.c auth/pass_check.c''',
+                    deps='pam PAM_ERRORS')
 
 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,
-                    deps='samba-util tdb_compat',
-                    vars=locals())
+                    source='libsmb/samlogon_cache.c',
+                    deps='samba-util tdb_compat')
 
 bld.SAMBA3_SUBSYSTEM('DCUTIL',
-                    source=DCUTIL_SRC,
-                    deps='ads msrpc3 libcli_lsa3',
-                    vars=locals())
+                    source='''libsmb/namequery_dc.c
+                    libsmb/trustdom_cache.c
+                    libsmb/dsgetdcname.c''',
+                    deps='ads msrpc3 libcli_lsa3')
 
 bld.SAMBA3_LIBRARY('trusts_util',
                    source='libsmb/trusts_util.c',
@@ -1124,21 +900,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)
 
@@ -1151,9 +928,8 @@ bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG_INTERNAL',
                     deps='LIBCLI_WINREG RPC_NCACN_NP')
 
 bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
-                    source=RPC_CLIENT_SCHANNEL_SRC,
-                    deps='samba-util krb5samba',
-                    vars=locals())
+                    source='rpc_client/cli_pipe_schannel.c',
+                    deps='samba-util krb5samba')
 
 bld.SAMBA3_SUBSYSTEM('INIT_LSA',
                     source='rpc_client/init_lsa.c',
@@ -1170,13 +946,23 @@ bld.SAMBA3_SUBSYSTEM('INIT_SAMR',
 ########################## BINARIES #################################
 
 bld.SAMBA3_BINARY('smbd/smbd',
-                 source='${SMBD_SRC_MAIN}',
+                 source='smbd/server.c',
                  deps='smbd_base EPMD LSASD',
-                 install_path='${SBINDIR}',
-                 vars=locals())
+                 install_path='${SBINDIR}')
 
 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
@@ -1184,11 +970,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
@@ -1210,34 +1085,30 @@ 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())
-
-bld.SAMBA3_BINARY('web/swat',
-                 source=SWAT_SRC,
-                 deps='''
-                 talloc
-                 tevent
-                 samba3core
-                 libsmb
-                 param
-                 pdb
-                 popt_samba3
-                 smbd_base
-                 LOCKING
-                 PLAINTEXT_AUTH
-                 PASSCHANGE
-                 PRINTBASE
-                 PRINTING
-                 ''',
-                 enabled=bld.env.build_swat,
-                 install_path='${SBINDIR}',
-                 vars=locals())
+                 install_path='${SBINDIR}')
 
 bld.SAMBA3_BINARY('rpcclient/rpcclient',
-                 source=RPCCLIENT_SRC,
+                 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''',
                  deps='''
                  talloc
                  popt_samba3
@@ -1264,12 +1135,13 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient',
                  RPC_NDR_NTSVCS
                  RPC_NDR_EVENTLOG
                  INIT_SAMR
-                RPC_NDR_FSRVP
-                 ''',
-                 vars=locals())
+                 RPC_NDR_FSRVP
+                 ''')
 
 bld.SAMBA3_BINARY('client/smbclient',
-                 source=CLIENT_SRC,
+                 source='''client/client.c
+                 client/clitar.c
+                 client/dnsbrowse.c''',
                  deps='''
                  talloc
                  popt_samba3
@@ -1287,7 +1159,7 @@ bld.SAMBA3_BINARY('net',
                  talloc
                  netapi
                  addns
-                 intl
+                 samba_intl
                  popt_samba3
                  pdb
                  libsmb
@@ -1323,13 +1195,12 @@ bld.SAMBA3_BINARY('net',
                  vars=locals())
 
 bld.SAMBA3_BINARY('profiles',
-                 source=PROFILES_SRC,
+                 source='utils/profiles.c',
                  deps='''
                  talloc
                  popt_samba3
                  param
-                 REGFIO''',
-                 vars=locals())
+                 REGFIO''')
 
 bld.SAMBA3_BINARY('smbspool',
                  source=CUPS_SRC,
@@ -1342,43 +1213,41 @@ bld.SAMBA3_BINARY('smbspool',
                  vars=locals())
 
 bld.SAMBA3_BINARY('testparm',
-                 source=TESTPARM_SRC,
+                 source='utils/testparm.c',
                  deps='''
                  talloc
                  param
-                 popt_samba3''',
-                 vars=locals())
+                 popt_samba3''')
 
 bld.SAMBA3_BINARY('smbta-util',
-                 source=SMBTA_UTIL_SRC,
+                 source='utils/smbta-util.c',
                  deps='''
                  talloc
                  secrets3
-                 param''',
-                 vars=locals())
+                 param''')
 
 bld.SAMBA3_BINARY('smbstatus',
-                 source=STATUS_SRC,
+                 source='''utils/status.c
+                 utils/status_profile.c
+                 smbd/notify_internal.c''',
                  deps='''
                  talloc
                  param
                  popt_samba3
                  smbd_base
                  LOCKING
-                 PROFILE''',
-                 vars=locals())
+                 PROFILE''')
 
 bld.SAMBA3_BINARY('smbcontrol',
-                 source=SMBCONTROL_SRC,
+                 source='utils/smbcontrol.c',
                  deps='''
                  talloc
                  param
                  popt_samba3
-                 PRINTBASE''',
-                 vars=locals())
+                 PRINTBASE''')
 
 bld.SAMBA3_BINARY('smbtree',
-                 source=SMBTREE_SRC,
+                 source='utils/smbtree.c',
                  deps='''
                  talloc
                  param
@@ -1386,36 +1255,32 @@ bld.SAMBA3_BINARY('smbtree',
                  msrpc3
                  popt_samba3
                  PROFILE
-                 RPC_NDR_SRVSVC''',
-                 vars=locals())
+                 RPC_NDR_SRVSVC''')
 
 bld.SAMBA3_BINARY('smbpasswd',
-                 source=SMBPASSWD_SRC,
+                 source='utils/smbpasswd.c',
                  deps='''
                  talloc
                  param
                  pdb
                  PASSWD_UTIL
-                 PASSCHANGE''',
-                 vars=locals())
+                 PASSCHANGE''')
 
 bld.SAMBA3_BINARY('pdbedit',
-                 source=PDBEDIT_SRC,
+                 source='utils/pdbedit.c',
                  deps='''
                  talloc
                  param
                  popt_samba3
                  pdb
-                 PASSWD_UTIL''',
-                 vars=locals())
+                 PASSWD_UTIL''')
 
 bld.SAMBA3_BINARY('smbget',
-                 source=SMBGET_SRC,
+                 source='utils/smbget.c',
                  deps='''
                  talloc
                  popt_samba3
-                 smbclient''',
-                 vars=locals())
+                 smbclient''')
 
 bld.SAMBA3_BINARY('nmblookup',
                  source=NMBLOOKUP_SRC,
@@ -1584,13 +1449,12 @@ bld.SAMBA3_BINARY('rpc_open_tcp',
                  vars=locals())
 
 bld.SAMBA3_BINARY('test_lp_load',
-                 source=TEST_LP_LOAD_SRC,
+                 source='param/test_lp_load.c',
                  deps='''
                  talloc
                  param
                  popt_samba3''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('dbwrap_tool',
                  source=DBWRAP_TOOL_SRC,
@@ -1635,9 +1499,14 @@ bld.SAMBA3_PYTHON('pylibsmb',
                   realname='samba/samba3/libsmb_samba_internal.so'
                   )
 
-swat_dir = os.path.join(bld.curdir, '../swat')
-swat_files = recursive_dirlist(swat_dir, swat_dir, '*')
-bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
+bld.SAMBA3_BINARY('samba-regedit',
+                  source="""utils/regedit.c utils/regedit_samba3.c
+                            utils/regedit_wrap.c utils/regedit_treeview.c
+                            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())
 
 ########################## INCLUDES #################################
 
@@ -1652,6 +1521,7 @@ bld.RECURSE('modules')
 bld.RECURSE('pam_smbpass')
 bld.RECURSE('passdb')
 bld.RECURSE('rpc_server')
+bld.RECURSE('script')
 bld.RECURSE('winbindd')
 bld.RECURSE('../examples/auth')
 bld.RECURSE('../examples/libsmbclient')
@@ -1663,4 +1533,3 @@ bld.RECURSE('lib/netapi/examples')
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()
 
-bld.SYMBOL_CHECK()