s4: Rename LIBSAMBA-* to libsamba-*
[samba.git] / source3 / wscript_build
index 805369e83aafb244e40747f4be584a4b932d663d..3abcd178e659960f03ceccd0679e39dd683e15e8 100644 (file)
@@ -62,15 +62,6 @@ LIBNDR_SCHANNEL_SRC = '''../librpc/gen_ndr/ndr_schannel.c
 LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c
                   ../librpc/ndr/ndr_spoolss_buf.c'''
 
-LIBNDR_NTPRINTING_SRC = '''../librpc/gen_ndr/ndr_ntprinting.c
-                           ../librpc/ndr/ndr_ntprinting.c'''
-
-LIBNDR_PREG_SRC = '''librpc/gen_ndr/ndr_preg.c
-                     librpc/ndr/ndr_preg.c'''
-
-LIBNDR_XATTR_SRC = '''../librpc/gen_ndr/ndr_xattr.c
-                  ../librpc/ndr/ndr_xattr.c'''
-
 LIBCLI_SPOOLSS_SRC = '''
                      ../librpc/gen_ndr/cli_spoolss.c
                      ../librpc/gen_ndr/ndr_spoolss_c.c
@@ -81,10 +72,6 @@ LIBCLI_EVENTLOG_SRC = '''
                       ../librpc/gen_ndr/cli_eventlog.c
                       ../librpc/gen_ndr/ndr_eventlog_c.c'''
 
-LIBCLI_WINREG_SRC = '''
-                    ../librpc/gen_ndr/cli_winreg.c
-                    ../librpc/gen_ndr/ndr_winreg_c.c'''
-
 LIBCLI_NTSVCS_SRC = '''
                     ../librpc/gen_ndr/cli_ntsvcs.c
                     ../librpc/gen_ndr/ndr_ntsvcs_c.c'''
@@ -97,10 +84,6 @@ LIBCLI_DFS_SRC = '''
                  ../librpc/gen_ndr/cli_dfs.c
                  ../librpc/gen_ndr/ndr_dfs_c.c'''
 
-LIBCLI_ECHO_SRC = '''
-                  ../librpc/gen_ndr/cli_echo.c
-                  ../librpc/gen_ndr/ndr_echo_c.c'''
-
 LIBCLI_INITSHUTDOWN_SRC = '''
                           ../librpc/gen_ndr/cli_initshutdown.c
                           ../librpc/gen_ndr/ndr_initshutdown_c.c'''
@@ -144,7 +127,6 @@ LIBCLI_EPMAPPER_SRC = '''
 LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
                  ${LIBNDR_GEN_SRC0}
                  ../librpc/gen_ndr/ndr_dfs.c
-                 ../librpc/gen_ndr/ndr_echo.c
                  ../librpc/gen_ndr/ndr_winreg.c
                  ../librpc/gen_ndr/ndr_initshutdown.c
                  ../librpc/gen_ndr/ndr_srvsvc.c
@@ -160,13 +142,7 @@ REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
 
 LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
 
-SOCKET_WRAPPER_SRC = '''${SOCKET_WRAPPER_SRCS}'''
-NSS_WRAPPER_SRC = '''${NSS_WRAPPER_SRCS}'''
-
-LIBSAMBAUTIL_SRC = '''
-                ${LIBREPLACE_SRC}
-                ${SOCKET_WRAPPER_SRC}
-                ${NSS_WRAPPER_SRC}'''
+LIBSAMBAUTIL_SRC = '''${LIBREPLACE_SRC}'''
 
 UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.c
                    ../lib/util/xfile.c ../lib/util/util_strlist.c
@@ -176,8 +152,10 @@ UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.c
                    ../lib/util/genrand.c ../lib/util/util_net.c
                    ../lib/util/become_daemon.c ../lib/util/system.c
                    ../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c
+                   ../lib/util/tevent_werror.c
                    ../lib/util/smb_threads.c ../lib/util/util_id.c
-                   ../lib/util/blocking.c ../lib/util/rfc1738.c '''
+                   ../lib/util/blocking.c ../lib/util/rfc1738.c
+                   ../lib/util/select.c'''
 
 LIBTEVENT_SRC0 = ''
 
@@ -185,14 +163,10 @@ PTHREADPOOL_SRC = ''
 
 LIBREPLACE_SRCS = ''
 
-SOCKET_WRAPPER_SRCS = ''
-
-NSS_WRAPPER_SRCS = ''
-
 ZLIB_SRCS = ''
 
 LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
-          lib/messages.c librpc/gen_ndr/ndr_messaging.c lib/messages_local.c
+          lib/messages.c lib/messages_local.c
           lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
           lib/interfaces.c lib/memcache.c
           lib/talloc_dict.c
@@ -205,7 +179,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
           lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
           lib/username.c
           ../libds/common/flag_mapping.c
-          lib/util_pw.c lib/access.c lib/smbrun.c
+          lib/access.c lib/smbrun.c
           lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC}
           lib/wins_srv.c
           lib/util_str.c lib/clobber.c lib/util_sid.c
@@ -213,7 +187,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
           lib/util.c lib/util_names.c
           lib/util_sock.c lib/sock_exec.c lib/util_sec.c
           lib/substitute.c lib/dbwrap_util.c
-          lib/ms_fnmatch.c lib/select.c lib/errmap_unix.c
+          lib/ms_fnmatch.c lib/errmap_unix.c
           lib/tallocmsg.c lib/dmallocmsg.c
           libsmb/clisigning.c libsmb/smb_signing.c
           lib/iconv.c lib/pam_errors.c intl/lang_tdb.c
@@ -221,44 +195,29 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
           lib/sessionid_tdb.c
           lib/module.c lib/events.c ${LIBTEVENT_SRC0}
           lib/server_contexts.c
-          lib/ldap_escape.c ${CHARSET_STATIC}
-          lib/secdesc.c lib/util_seaccess.c ../libcli/security/secace.c
-          ../libcli/security/sddl.c
-          ../libcli/security/secacl.c ${PTHREADPOOL_SRC}
+          lib/ldap_escape.c
+          lib/secdesc.c ${PTHREADPOOL_SRC}
           lib/fncall.c
           libads/krb5_errs.c lib/system_smbd.c lib/audit.c
-          lib/file_id.c lib/idmap_cache.c
-          ../libcli/security/dom_sid.c ../libcli/security/security_descriptor.c'''
+          lib/file_id.c lib/idmap_cache.c'''
 
 LIB_DUMMY_SRC = '''lib/dummysmbd.c lib/dummyroot.c'''
 LIB_NONSMBD_SRC = '''${LIB_DUMMY_SRC}'''
 
-READLINE_SRC = '''lib/readline.c'''
-
 POPT_LIB_SRC = '''lib/popt_common.c'''
 
 PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/util.c param/loadparm_server_role.c
                            lib/sharesec.c lib/ldap_debug_handler.c'''
-PARAM_REG_ADD_SRC = '''${REG_SMBCONF_SRC} ${LIBSMBCONF_SRC} ${PRIVILEGES_BASIC_SRC}'''
-PARAM_SRC = '''${PARAM_REG_ADD_SRC}'''
 
 KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
 
 LIBADDNS_SRC0 = '''libaddns/dnsrecord.c libaddns/dnsutils.c  libaddns/dnssock.c
                libaddns/dnsgss.c libaddns/dnsmarshall.c'''
-LIBADDNS_SRC = '''${LIBADDNS_SRC0} ${SOCKET_WRAPPER_SRC}'''
-
-GPEXT_STATIC = ''
-GPEXT_REGISTRY_SRC = 'libgpo/gpext/registry.c'
-GPEXT_SCRIPTS_SRC = 'libgpo/gpext/scripts.c'
-GPEXT_SECURITY_SRC = 'libgpo/gpext/security.c'
-
-GPEXT_SRC = '''../libgpo/gpext/gpext.c ${GPEXT_STATIC}'''
+LIBADDNS_SRC = '''${LIBADDNS_SRC0}'''
 
 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
-              ${GPEXT_SRC}'''
+              libgpo/gpo_reg.c'''
 LIBGPO_SRC = '''${LIBGPO_SRC0}'''
 
 LIBADS_SRC = '''libads/ldap.c
@@ -270,14 +229,12 @@ LIBADS_SRC = '''libads/ldap.c
              libads/disp_sec.c libads/ldap_utils.c
              libads/ldap_schema.c libads/util.c libads/ndr.c'''
 
-LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c
-                    ../librpc/ndr/ndr_krb5pac.c
-                    ../librpc/gen_ndr/ndr_krb5pac.c'''
+LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c'''
 
 LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
 
 SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
-                 passdb/machine_sid.c librpc/gen_ndr/ndr_secrets.c'''
+                 passdb/machine_sid.c'''
 
 LIBNBT_SRC = '''../libcli/nbt/nbtname.c
              ../libcli/netlogon.c
@@ -318,8 +275,7 @@ LIBCLI_LDAP_NDR_SRC = '''../libcli/ldap/ldap_ndr.c lib/ldb_compat.c'''
 
 CLDAP_SRC = '''libads/cldap.c
         ../libcli/cldap/cldap.c
-        ../lib/util/idtree.c
-        ${LIBCLI_LDAP_MESSAGE_SRC} ${LIBCLI_LDAP_NDR_SRC}'''
+        ../lib/util/idtree.c'''
 
 TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
 
@@ -339,7 +295,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/smb_seal.c libsmb/async_smb.c
              ${LIBNMB_SRC}
              ${LIBNBT_SRC}
-             ${CLDAP_SRC}
              ${DRSUAPI_SRC}'''
 
 LIBMSRPC_SRC = '''
@@ -395,70 +350,31 @@ REG_BASE_SRC = '''registry/reg_api.c
                ${REG_BACKENDS_BASE_SRC}
                ${REG_INIT_BASIC_SRC}'''
 
-REG_SMBCONF_SRC = '''${REG_BASE_SRC}
+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_SMBCONF_SRC}
+REG_FULL_SRC = '''
                ${REG_BACKENDS_EXTRA_SRC}
                ${REG_INIT_FULL_SRC}
                registry/reg_eventlog.c
-               registry/reg_perfcount.c
-               librpc/gen_ndr/ndr_perfcount.c'''
-
-LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
-
-RPC_STATIC = ''
-
-RPC_LSARPC_SRC = '''rpc_server/srv_lsa_nt.c
-                    ../librpc/gen_ndr/srv_lsa.c'''
-
-RPC_NETLOGON_SRC = '''rpc_server/srv_netlog_nt.c
-                      ../librpc/gen_ndr/srv_netlogon.c'''
-
-RPC_SAMR_SRC = '''rpc_server/srv_samr_nt.c
-               rpc_server/srv_samr_util.c
-               rpc_server/srv_samr_chgpasswd.c
-               ../librpc/gen_ndr/srv_samr.c'''
-
-RPC_INITSHUTDOWN_SRC = ''' ../librpc/gen_ndr/srv_initshutdown.c rpc_server/srv_initshutdown_nt.c'''
-
-RPC_WINREG_SRC = '''rpc_server/srv_winreg_nt.c
-                    ../librpc/gen_ndr/srv_winreg.c'''
-
-RPC_DSSETUP_SRC = ''' rpc_server/srv_dssetup_nt.c ../librpc/gen_ndr/srv_dssetup.c'''
-
-RPC_SRVSVC_SRC = '''rpc_server/srv_srvsvc_nt.c
-                    ../librpc/gen_ndr/srv_srvsvc.c'''
+               registry/reg_perfcount.c'''
 
-RPC_WKSSVC_SRC = '''../librpc/gen_ndr/srv_wkssvc.c
-                    rpc_server/srv_wkssvc_nt.c'''
-
-RPC_SVCCTL_SRC = ''' rpc_server/srv_svcctl_nt.c
-                  ../librpc/gen_ndr/srv_svcctl.c
-                  services/svc_spoolss.c services/svc_rcinit.c services/services_db.c
-                  services/svc_netlogon.c services/svc_winreg.c
+SERVICES_SRC = '''services/svc_spoolss.c
+                  services/svc_rcinit.c
+                  services/services_db.c
+                  services/svc_netlogon.c
+                  services/svc_winreg.c
                   services/svc_wins.c'''
 
-RPC_NTSVCS_SRC = '''rpc_server/srv_ntsvcs_nt.c
-                 ../librpc/gen_ndr/srv_ntsvcs.c'''
-
-RPC_NETDFS_SRC = '''../librpc/gen_ndr/srv_dfs.c
-                    rpc_server/srv_dfs_nt.c'''
-
-RPC_SPOOLSS_SRC = '''rpc_server/srv_spoolss_nt.c
-                     rpc_server/srv_spoolss_util.c
-                  ../librpc/gen_ndr/srv_spoolss.c'''
-
-RPC_EVENTLOG_SRC = '''rpc_server/srv_eventlog_nt.c
-                   ../librpc/gen_ndr/srv_eventlog.c'''
+LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
 
 NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c
                      ../librpc/gen_ndr/ndr_named_pipe_auth.c'''
 
-RPC_NCACN_NP = '''rpc_server/srv_pipe_register.c rpc_server/rpc_ncacn_np.c
+RPC_NCACN_NP = '''rpc_server/rpc_ncacn_np.c
                   rpc_server/rpc_handles.c'''
 
 RPC_SERVICE = '''rpc_server/rpc_server.c'''
@@ -470,46 +386,28 @@ RPC_CRYPTO = '''rpc_server/dcesrv_ntlmssp.c
 RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c
                ${RPC_NCACN_NP} ${RPC_SERVICE} ${RPC_CRYPTO}'''
 
-RPC_RPCECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
-
-RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC} ${RPC_STATIC}'''
+RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC}'''
 
 RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
 
 LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c'''
 
-PRIVILEGES_BASIC_SRC = '''../libcli/security/privileges.c'''
-
 PRIVILEGES_SRC = '''lib/privileges.c'''
 
 PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
 
-PDB_STATIC =        ''
-PDB_TDBSAM_SRC =    'passdb/pdb_tdb.c'
-PDB_LDAP_SRC =      'passdb/pdb_ldap.c passdb/pdb_nds.c'
-PDB_ADS_SRC =       'passdb/pdb_ads.c'
-PDB_SMBPASSWD_SRC = 'passdb/pdb_smbpasswd.c'
-PDB_WBC_SAM_SRC =   'passdb/pdb_wbc_sam.c'
-
-PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c passdb/pdb_interface.c
+PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
                 passdb/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c
                 passdb/util_unixsids.c passdb/lookup_sid.c
-                passdb/login_cache.c ${PDB_STATIC}
+                passdb/login_cache.c
                 passdb/account_pol.c ${PRIVILEGES_SRC}
                 lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}'''
 #FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
 
-CHARSET_STATIC = ''
-CHARSET_WEIRD_SRC = 'modules/weird.c'
-CHARSET_CP850_SRC = 'modules/CP850.c'
-CHARSET_CP437_SRC = 'modules/CP437.c'
-CHARSET_MACOSXFS_SRC = 'modules/charset_macosxfs.c'
-
 GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
 
 PROFILE_SRC = '''profile/profile.c'''
-PROFILES_SRC = '''utils/profiles.c
-               ${REGFIO_SRC}'''
+PROFILES_SRC = '''utils/profiles.c'''
 
 OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
              smbd/oplock_onefs.c'''
@@ -519,55 +417,6 @@ NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c
 
 FNAME_UTIL_SRC = '''smbd/filename_util.c'''
 
-VFS_STATIC = ''
-VFS_DEFAULT_SRC = '''modules/vfs_default.c'''
-VFS_AUDIT_SRC = '''modules/vfs_audit.c'''
-VFS_EXTD_AUDIT_SRC = '''modules/vfs_extd_audit.c'''
-VFS_FULL_AUDIT_SRC = '''modules/vfs_full_audit.c'''
-VFS_FAKE_PERMS_SRC = '''modules/vfs_fake_perms.c'''
-VFS_RECYCLE_SRC = '''modules/vfs_recycle.c'''
-VFS_NETATALK_SRC = '''modules/vfs_netatalk.c'''
-VFS_DEFAULT_QUOTA_SRC = '''modules/vfs_default_quota.c'''
-VFS_READONLY_SRC = '''modules/vfs_readonly.c modules/getdate.c'''
-VFS_CAP_SRC = '''modules/vfs_cap.c'''
-VFS_EXPAND_MSDFS_SRC = '''modules/vfs_expand_msdfs.c'''
-VFS_SHADOW_COPY_SRC = '''modules/vfs_shadow_copy.c'''
-VFS_SHADOW_COPY2_SRC = '''modules/vfs_shadow_copy2.c'''
-VFS_AFSACL_SRC = '''modules/vfs_afsacl.c'''
-VFS_XATTR_TDB_SRC = '''modules/vfs_xattr_tdb.c'''
-VFS_POSIXACL_SRC = '''modules/vfs_posixacl.c'''
-VFS_AIXACL_SRC = '''modules/vfs_aixacl.c modules/vfs_aixacl_util.c'''
-VFS_AIXACL2_SRC = '''modules/vfs_aixacl2.c modules/vfs_aixacl_util.c modules/nfs4_acls.c'''
-VFS_SOLARISACL_SRC = '''modules/vfs_solarisacl.c'''
-VFS_ZFSACL_SRC = '''modules/vfs_zfsacl.c modules/nfs4_acls.c'''
-VFS_HPUXACL_SRC = '''modules/vfs_hpuxacl.c'''
-VFS_IRIXACL_SRC = '''modules/vfs_irixacl.c'''
-VFS_TRU64ACL_SRC = '''modules/vfs_tru64acl.c'''
-VFS_CATIA_SRC = 'modules/vfs_catia.c'
-VFS_STREAMS_XATTR_SRC = 'modules/vfs_streams_xattr.c'
-VFS_STREAMS_DEPOT_SRC = 'modules/vfs_streams_depot.c'
-VFS_CACHEPRIME_SRC = 'modules/vfs_cacheprime.c'
-VFS_PREALLOC_SRC = 'modules/vfs_prealloc.c'
-VFS_COMMIT_SRC = 'modules/vfs_commit.c'
-VFS_GPFS_SRC = 'modules/vfs_gpfs.c modules/gpfs.c modules/nfs4_acls.c'
-VFS_NOTIFY_FAM_SRC = 'modules/vfs_notify_fam.c'
-VFS_READAHEAD_SRC = 'modules/vfs_readahead.c'
-VFS_TSMSM_SRC = 'modules/vfs_tsmsm.c'
-VFS_FILEID_SRC = 'modules/vfs_fileid.c'
-VFS_AIO_FORK_SRC = 'modules/vfs_aio_fork.c'
-VFS_PREOPEN_SRC = 'modules/vfs_preopen.c'
-VFS_SYNCOPS_SRC = 'modules/vfs_syncops.c'
-VFS_ACL_XATTR_SRC = 'modules/vfs_acl_xattr.c'
-VFS_ACL_TDB_SRC = 'modules/vfs_acl_tdb.c'
-VFS_SMB_TRAFFIC_ANALYZER_SRC = 'modules/vfs_smb_traffic_analyzer.c'
-VFS_ONEFS_SRC = '''modules/vfs_onefs.c modules/onefs_acl.c modules/onefs_system.c
-                modules/onefs_open.c modules/onefs_streams.c modules/onefs_dir.c
-                modules/onefs_cbrl.c modules/onefs_notify.c modules/onefs_config.c'''
-VFS_ONEFS_SHADOW_COPY_SRC = 'modules/vfs_onefs_shadow_copy.c modules/onefs_shadow_copy.c'
-VFS_DIRSORT_SRC = 'modules/vfs_dirsort.c'
-VFS_SCANNEDONLY_SRC = 'modules/vfs_scannedonly.c'
-VFS_CROSSRENAME_SRC = 'modules/vfs_crossrename.c'
-VFS_LINUX_XFS_SGID_SRC = 'modules/vfs_linux_xfs_sgid.c'
 
 PLAINTEXT_AUTH_SRC = '''auth/pampass.c auth/pass_check.c'''
 
@@ -575,56 +424,6 @@ SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
 
 DCUTIL_SRC  = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/trusts_util.c libsmb/dsgetdcname.c'''
 
-AUTH_BUILTIN_SRC = 'auth/auth_builtin.c'
-AUTH_DOMAIN_SRC = 'auth/auth_domain.c'
-AUTH_SAM_SRC = 'auth/auth_sam.c auth/check_samsec.c'
-AUTH_SERVER_SRC = 'auth/auth_server.c'
-AUTH_UNIX_SRC = 'auth/auth_unix.c'
-AUTH_WINBIND_SRC = 'auth/auth_winbind.c'
-AUTH_WBC_SRC = 'auth/auth_wbc.c'
-AUTH_SCRIPT_SRC = 'auth/auth_script.c'
-AUTH_NETLOGOND_SRC = 'auth/auth_netlogond.c'
-
-AUTH_STATIC = ''
-AUTH_SRC = '''${AUTH_STATIC} auth/auth.c auth/auth_util.c auth/token_util.c
-           auth/server_info.c
-           auth/server_info_sam.c
-           auth/user_info.c
-           auth/user_util.c
-           auth/user_krb5.c
-           auth/auth_compat.c auth/auth_ntlmssp.c
-           ${PLAINTEXT_AUTH_SRC} ${SLCACHE_SRC} ${DCUTIL_SRC}'''
-
-#FIXME: set IDMAP_STATIC during configuration
-IDMAP_STATIC=''
-IDMAP_RW_SRC = 'winbindd/idmap_rw.c'
-IDMAP_SRC = 'winbindd/idmap.c winbindd/idmap_util.c ${IDMAP_RW_SRC} ${IDMAP_STATIC}'
-
-#FIXME: set NSS_INFO_STATIC during configuration
-NSS_INFO_STATIC = ''
-NSS_INFO_TEMPLATE_SRC = 'winbindd/nss_info_template.c'
-NSS_INFO_SRC = 'winbindd/nss_info.c'
-
-IDMAP_AD_SRC = '''winbindd/idmap_ad.c'''
-IDMAP_RID_SRC = '''winbindd/idmap_rid.c'''
-IDMAP_PASSDB_SRC = '''winbindd/idmap_passdb.c'''
-IDMAP_LDAP_SRC = '''winbindd/idmap_ldap.c'''
-IDMAP_TDB2_SRC = '''winbindd/idmap_tdb2.c'''
-
-IDMAP_HASH_SRC = '''winbindd/idmap_hash/idmap_hash.c
-                    winbindd/idmap_hash/mapfile.c'''
-
-IDMAP_ADEX_SRC = '''winbindd/idmap_adex/idmap_adex.c
-                    winbindd/idmap_adex/cell_util.c
-                    winbindd/idmap_adex/likewise_cell.c
-                    winbindd/idmap_adex/provider_unified.c
-                    winbindd/idmap_adex/gc_util.c
-                    winbindd/idmap_adex/domain_util.c'''
-
-PERFCOUNT_STATIC = ''
-PERFCOUNT_ONEFS_SRC = 'modules/perfcount_onefs.c'
-PERFCOUNT_TEST_SRC = 'modules/perfcount_test.c'
-
 WINBINDD_SRC1 = '''winbindd/winbindd.c
                    winbindd/winbindd_group.c
                    winbindd/winbindd_util.c
@@ -715,18 +514,21 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    auth/server_info_sam.c
                    auth/user_info.c
                    auth/user_util.c
-                   rpc_server/srv_samr_chgpasswd.c
                    ../nsswitch/libwbclient/wb_reqtrans.c'''
 
 WINBINDD_SRC = '''${WINBINDD_SRC1}
-                  ${IDMAP_SRC} ${NSS_INFO_SRC}
-                  ${RPC_NCACN_NP} ${NPA_TSTREAM_SRC} ${RPC_SAMR_SRC} ${RPC_LSARPC_SRC}
+                  ${RPC_NCACN_NP} ${NPA_TSTREAM_SRC}
                   ${TDB_VALIDATE_SRC}
                   ${LIBCLI_DSSETUP_SRC}
                   ${LIBCLI_LSA_SRC}
                   ${LIBCLI_SAMR_SRC}
                   ${LIBCLI_NETLOGON_SRC}
-                  rpc_client/init_netlogon.c'''
+                  rpc_client/init_netlogon.c
+                  rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c
+                  rpc_server/srv_samr_nt.c ../librpc/gen_ndr/srv_samr.c
+                  rpc_server/srv_samr_util.c
+                  rpc_server/srv_samr_chgpasswd.c
+                  rpc_server/srv_pipe_register.c'''
 
 MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
 
@@ -780,25 +582,15 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
 
 SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 ${RPC_SERVER_SRC}
-                ${PRINTING_SRC}
-                ${PRINTBACKEND_SRC}
                 ${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
-                ${REG_FULL_SRC}
                 ${BUILDOPT_SRC}
-                ${LIBSMBCONF_SRC}
                 ${LIBCLI_SPOOLSS_SRC}
-                ${LIBCLI_WINREG_SRC}
                 ${LIBCLI_SRVSVC_SRC}
                 ${LIBCLI_LSA_SRC}
                 ${LIBCLI_SAMR_SRC}
                 ${LIBCLI_NETLOGON_SRC}
-                ${RPC_CLIENT_SCHANNEL_SRC}
                 rpc_client/init_netlogon.c
-                rpc_client/init_samr.c
-                ${PRIVILEGES_BASIC_SRC}
-                ${REGFIO_SRC}
-                ${REG_API_REGF_SRC}
-                ${LIBNDR_XATTR_SRC}'''
+                rpc_client/init_samr.c'''
 
 PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
                printing/print_cups.c printing/print_generic.c
@@ -810,9 +602,7 @@ PRINTBACKEND_SRC = '''printing/printing.c
                       printing/nt_printing.c
                       printing/nt_printing_tdb.c
                       printing/nt_printing_migrate.c
-                      printing/nt_printing_ads.c
-                      ${LIBNDR_NTPRINTING_SRC}
-                      ${PRINTBASE_SRC}'''
+                      printing/nt_printing_ads.c'''
 
 SMBD_SRC = '''${SMBD_SRC_BASE} ${SMBD_SRC_MAIN}'''
 
@@ -834,7 +624,7 @@ 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} ${PRINTING_SRC} ${PRINTBASE_SRC}
+SWAT_SRC = '''${SWAT_SRC1}
            ${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}
            ${LIBCLI_SAMR_SRC}
            rpc_client/init_lsa.c'''
@@ -842,7 +632,7 @@ SWAT_SRC = '''${SWAT_SRC1} ${PRINTING_SRC} ${PRINTBASE_SRC}
 STATUS_SRC = '''utils/status.c utils/status_profile.c
              ${FNAME_UTIL_SRC}'''
 
-SMBCONTROL_SRC = '''utils/smbcontrol.c ${PRINTBASE_SRC}'''
+SMBCONTROL_SRC = '''utils/smbcontrol.c'''
 
 SMBTREE_SRC = '''utils/smbtree.c
              ${LIBCLI_SRVSVC_SRC}'''
@@ -859,13 +649,10 @@ SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSCHANGE_SRC}
                 ${LIBCLI_SAMR_SRC}
                 rpc_client/init_lsa.c'''
 
-PDBEDIT_SRC = '''utils/pdbedit.c
-                ${LIBCLI_LDAP_NDR_SRC}'''
+PDBEDIT_SRC = '''utils/pdbedit.c'''
 
 SMBGET_SRC = '''utils/smbget.c'''
 
-DISPLAY_SEC_SRC= '../libcli/security/display_sec.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
@@ -882,15 +669,12 @@ RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
                    ${LIBCLI_NTSVCS_SRC}
                    ${LIBCLI_DRSUAPI_SRC}
                    ${LIBCLI_DFS_SRC}
-                   ${LIBCLI_ECHO_SRC}
                    ${LIBCLI_DSSETUP_SRC}
                    ${LIBCLI_WKSSVC_SRC}
                    ${LIBCLI_SRVSVC_SRC}
                    ${LIBCLI_LSA_SRC}
                    ${LIBCLI_SAMR_SRC}
-                   ${LIBCLI_WINREG_SRC}
                    ${LIBCLI_NETLOGON_SRC}
-                   ${RPC_CLIENT_SCHANNEL_SRC}
                    rpc_client/init_netlogon.c
                    rpc_client/init_samr.c'''
 
@@ -924,7 +708,6 @@ LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
 
 LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
                     lib/netapi/cm.c
-                    librpc/gen_ndr/ndr_libnetapi.c
                     lib/netapi/libnetapi.c
                     lib/netapi/joindomain.c
                     lib/netapi/serverinfo.c
@@ -940,9 +723,6 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
                     lib/netapi/netlogon.c'''
 
 LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}
-                   ${LIBSMBCONF_SRC}
-                   ${REG_SMBCONF_SRC}
-                   ${PRIVILEGES_BASIC_SRC}
                    auth/token_util.c
                    ${LIBCLI_INITSHUTDOWN_SRC}
                    ${LIBCLI_WKSSVC_SRC}
@@ -950,7 +730,6 @@ LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}
                    ${LIBCLI_LSA_SRC}
                    ${LIBCLI_SAMR_SRC}
                    ${LIBCLI_NETLOGON_SRC}
-                   ${RPC_CLIENT_SCHANNEL_SRC}
                    rpc_client/init_netlogon.c
                    rpc_client/init_samr.c'''
 
@@ -1001,10 +780,7 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               utils/net_serverid.c
               utils/net_eventlog.c
               utils/net_printing.c
-              ${LIBNDR_NTPRINTING_SRC}
-              ${LIBNDR_PREG_SRC}
               ${LIBCLI_SPOOLSS_SRC}
-              ${LIBCLI_WINREG_SRC}
               ${LIBCLI_DRSUAPI_SRC}
               ${LIBCLI_INITSHUTDOWN_SRC}
               ${LIBCLI_DSSETUP_SRC}
@@ -1014,7 +790,6 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               ${LIBCLI_LSA_SRC}
               ${LIBCLI_SAMR_SRC}
               ${LIBCLI_NETLOGON_SRC}
-              ${RPC_CLIENT_SCHANNEL_SRC}
               rpc_client/init_netlogon.c
               rpc_client/init_samr.c
               registry/reg_parse.c registry/reg_format.c
@@ -1024,8 +799,7 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
 NET_SRC2 = 'utils/net_registry_util.c utils/net_help_common.c'
 
 NET_SRC = '''${NET_SRC1}
-             ${NET_SRC2}
-             ${REGFIO_SRC}'''
+             ${NET_SRC2}'''
 
 CUPS_SRC = '''client/smbspool.c'''
 
@@ -1034,6 +808,7 @@ NMBLOOKUP_SRC = '''utils/nmblookup.c ${LIBNMB_SRC}'''
 SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/utable.c
                 torture/denytest.c torture/mangle_test.c
                 torture/nbench.c
+                torture/test_async_echo.c
                 torture/test_posix_append.c'''
 
 SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} ${TLDAP_SRC}
@@ -1046,7 +821,7 @@ MSGTEST_SRC = '''torture/msgtest.c'''
 
 LOCKTEST_SRC = '''torture/locktest.c ${FNAME_UTIL_SRC}'''
 
-NSSTEST_SRC = '''torture/nsstest.c ${LIBSAMBAUTIL_SRC}'''
+NSSTEST_SRC = '''../nsswitch/nsstest.c ${LIBSAMBAUTIL_SRC}'''
 
 PDBTEST_SRC = '''torture/pdbtest.c'''
 
@@ -1079,12 +854,6 @@ SMBFILTER_SRC = '''utils/smbfilter.c'''
 WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c ${PARAM_SRC}
         ${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC} ${LIBNMB_SRC}'''
 
-PAM_SMBPASS_SRC_0 = '''pam_smbpass/pam_smb_auth.c pam_smbpass/pam_smb_passwd.c
-                pam_smbpass/pam_smb_acct.c pam_smbpass/support.c ../lib/util/asn1.c'''
-PAM_SMBPASS_SRC = '''${PAM_SMBPASS_SRC_0} ${PARAM_SRC} ${LIB_NONSMBD_SRC} ${PASSDB_SRC} ${GROUPDB_SRC} \
-                ${SMBLDAP_SRC} ${LIBSAMBA_SRC} \
-                ${LIBTSOCKET_SRC}'''
-
 WBINFO_SRC = '''../nsswitch/wbinfo.c'''
 
 WINBIND_NSS_SRC = '''${WBCOMMON_SRC} ${LIBREPLACE_SRC}'''
@@ -1101,7 +870,6 @@ NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
                 ../libcli/auth/spnego_parse.c libsmb/clikrb5.c libads/kerberos.c
                 libsmb/samlogon_cache.c
                 ${LIBNMB_SRC}
-                ${LIBCLI_LDAP_NDR_SRC}
                 ${LIBNDR_NETLOGON_SRC}'''
 
 
@@ -1121,7 +889,7 @@ SPLIT_TOKENS_SRC = 'utils/split_tokens.c'
 LIBS='ICONV'
 
 bld.SAMBA_GENERATOR('build_options',
-                    source='include/config.h script/mkbuildoptions.awk',
+                    source='include/config.h script/mkbuildoptions-waf.awk',
                     target='smbd/build_options.c',
                     rule='${AWK} -f ${SRC[1].abspath(env)} > ${TGT} < ${SRC[0].abspath(env)}')
 
@@ -1137,36 +905,17 @@ t.env.BUILDDIR = bld.path.abspath()
 bld.SETUP_BUILD_GROUPS()
 
 bld.RECURSE('../lib/replace')
+bld.RECURSE('../libcli/smbreadline')
 print "SBINDIR=%s" % bld.env.SBINDIR
 bld.RECURSE('build')
 
 bld.RECURSE('../librpc')
 bld.RECURSE('librpc/idl')
 bld.RECURSE('librpc')
+bld.RECURSE('../libcli/security')
 
 bld.SAMBA_MKVERSION('include/version.h')
 
-for prefix in bld.env.MODULE_PREFIXES:
-
-    if prefix == 'auth': continue
-    if prefix == 'pdb': continue
-    if prefix == 'idmap': continue
-    if prefix == 'charset': continue
-
-    static_key = "%s_STATIC" % prefix.upper()
-    shared_key = "%s_SHARED" % prefix.upper()
-
-    for module in bld.env[static_key]:
-        bld.SAMBA_SUBSYSTEM(module,
-                            source="${%s_SRC}" % module,
-                            vars=locals())
-
-    # Set up subsystems for the shared modules
-    for module in bld.env[shared_key]:
-        bld.SAMBA_MODULE(module,
-                            source="${%s_SRC}" % module,
-                            vars=locals())
-
 ######################## SUBSYSTEMS #################################
 
 bld.SAMBA_SUBSYSTEM('WBCOMMON',
@@ -1181,14 +930,17 @@ bld.SAMBA_LIBRARY('libwbclient',
                               ../nsswitch/libwbclient/wbc_sid.c
                               ../nsswitch/libwbclient/wbc_util.c''',
                     public_headers='../nsswitch/libwbclient/wbclient.h',
+                    private_library=True,
                     public_deps='talloc WBCOMMON')
 
 bld.SAMBA_LIBRARY('libnetapi',
                     source=LIBNETAPI_SRC,
                     public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT
                     PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
-                    LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL''',
+                    LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI
+                    RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF''',
                     public_headers='lib/netapi/netapi.h',
+                    private_library=True,
                     vars=locals())
 
 bld.SAMBA_LIBRARY('libsmbclient',
@@ -1196,18 +948,20 @@ bld.SAMBA_LIBRARY('libsmbclient',
                     public_deps='''talloc tdb libwbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB
                     LIBMSRPC_GEN LIBMSRPC''',
                     public_headers='include/libsmbclient.h',
+                    private_library=True,
                     vars=locals())
 
 bld.SAMBA_LIBRARY('libsmbsharemodes',
                     source=LIBSMBSHAREMODES_SRC,
                     public_deps='''talloc tdb''',
                     public_headers='include/smb_share_modes.h',
+                    private_library=True,
                     vars=locals())
 
 bld.SAMBA_LIBRARY('libaddns',
                     source=LIBADDNS_SRC,
-                    deps='SOCKET_WRAPPER',
                     public_deps='talloc krb5 k5crypto com_err gssapi gssapi_krb5',
+                    private_library=True,
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBMSRPC',
@@ -1217,11 +971,13 @@ bld.SAMBA_SUBSYSTEM('LIBMSRPC',
 
 bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
                     source='${LIBNDR_GEN_SRC}',
-                    deps='LIBNDR NDR_SECURITY NDR_DCERPC NDR_EVENTLOG NDR_LSA',
+                    deps='''LIBNDR NDR_SECURITY NDR_DCERPC NDR_EVENTLOG NDR_LSA
+                    NDR_ECHO''',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBGPO',
                     source='${LIBGPO_SRC}',
+                    deps='gpext',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
@@ -1229,195 +985,11 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
                     deps='talloc',
                     local_include=False)
 
-bld.SAMBA_SUBSYSTEM('AUTH',
-                    source=AUTH_SRC,
-                    deps='''AUTH_SAM AUTH_UNIX AUTH_WINBIND AUTH_WBC
-                            AUTH_SERVER AUTH_DOMAIN AUTH_BUILTIN
-                            AUTH_NETLOGOND''',
-                    vars=locals())
+bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE',
+                    source=LIBCLI_LDAP_MESSAGE_SRC)
 
-bld.SAMBA_MODULE('AUTH_SAM',
-                 subsystem='AUTH',
-                 source=AUTH_SAM_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('AUTH_UNIX',
-                 subsystem='AUTH',
-                 source=AUTH_UNIX_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('AUTH_WINBIND',
-                 subsystem='AUTH',
-                 source=AUTH_WINBIND_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('AUTH_WBC',
-                 subsystem='AUTH',
-                 source=AUTH_WBC_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('AUTH_SERVER',
-                 subsystem='AUTH',
-                 source=AUTH_SERVER_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('AUTH_DOMAIN',
-                 subsystem='AUTH',
-                 source=AUTH_DOMAIN_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('AUTH_BUILTIN',
-                 subsystem='AUTH',
-                 source=AUTH_BUILTIN_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('AUTH_NETLOGOND',
-                 subsystem='AUTH',
-                 source=AUTH_NETLOGOND_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_SUBSYSTEM('PDB',
-                    source='',
-                    deps='''PDB_TDBSAM PDB_LDAP PDB_ADS PDB_SMBPASSWD PDB_WBC_SAM''',
-                    vars=locals())
-
-bld.SAMBA_MODULE('PDB_TDBSAM',
-                 subsystem='PDB',
-                 source=PDB_TDBSAM_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('PDB_LDAP',
-                 subsystem='PDB',
-                 source=PDB_LDAP_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('PDB_ADS',
-                 subsystem='PDB',
-                 source=PDB_ADS_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=False) #fixme
-
-bld.SAMBA_MODULE('PDB_SMBPASSWD',
-                 subsystem='PDB',
-                 source=PDB_SMBPASSWD_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('PDB_WBC_SAM',
-                 subsystem='PDB',
-                 source=PDB_WBC_SAM_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_SUBSYSTEM('IDMAP',
-                    source=IDMAP_SRC,
-                    deps='''IDMAP_AD IDMAP_RID IDMAP_PASSDB IDMAP_LDAP IDMAP_TDB2 IDMAP_HASH IDMAP_ADEX''',
-                    vars=locals())
-
-bld.SAMBA_MODULE('IDMAP_AD',
-                 subsystem='IDMAP',
-                 source=IDMAP_AD_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('IDMAP_RID',
-                 subsystem='IDMAP',
-                 source=IDMAP_RID_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('IDMAP_PASSDB',
-                 subsystem='IDMAP',
-                 source=IDMAP_PASSDB_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('IDMAP_LDAP',
-                 subsystem='IDMAP',
-                 source=IDMAP_LDAP_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('IDMAP_TDB2',
-                 subsystem='IDMAP',
-                 source=IDMAP_TDB2_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('IDMAP_HASH',
-                 subsystem='IDMAP',
-                 source=IDMAP_HASH_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('IDMAP_ADEX',
-                 subsystem='IDMAP',
-                 source=IDMAP_ADEX_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_SUBSYSTEM('CHARSET',
-                    source='',
-                    deps='''CHARSET_WEIRD CHARSET_CP850 CHARSET_CP437 CHARSET_MACOSXFS''',
-                    vars=locals())
-
-bld.SAMBA_MODULE('CHARSET_WEIRD',
-                 subsystem='CHARSET',
-                 source=CHARSET_WEIRD_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('CHARSET_CP850',
-                 subsystem='CHARSET',
-                 source=CHARSET_CP850_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('CHARSET_CP437',
-                 subsystem='CHARSET',
-                 source=CHARSET_CP437_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('CHARSET_MACOSXFS',
-                 subsystem='CHARSET',
-                 source=CHARSET_MACOSXFS_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=False) #fixme
+bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR',
+                    source=LIBCLI_LDAP_NDR_SRC)
 
 bld.SAMBA_SUBSYSTEM('AVAHI',
                     source=AVAHI_SRC,
@@ -1433,16 +1005,37 @@ bld.SAMBA_SUBSYSTEM('TLDAP',
 
 bld.SAMBA_SUBSYSTEM('PASSDB',
                     source=PASSDB_SRC,
-                    deps='''GROUPDB TLDAP SECRETS SMBLDAP PDB_SMBPASSWD
-                            PDB_TDBSAM PDB_WBC_SAM PDB_LDAP''',
+                    deps='''GROUPDB TLDAP SECRETS SMBLDAP pdb''',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
                     source=PARAM_WITHOUT_REG_SRC)
 
 bld.SAMBA_SUBSYSTEM('PARAM',
-                    source=PARAM_SRC,
-                    deps='PARAM_WITHOUT_REG DYNCONFIG',
+                    source='',
+                    deps='PARAM_WITHOUT_REG DYNCONFIG LIBSMBCONF',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('REGFIO',
+                    source=REGFIO_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('REG_API_REGF',
+                    source=REG_API_REGF_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('REG_BASE',
+                    source=REG_BASE_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('REG_SMBCONF',
+                    source=REG_SMBCONF_SRC,
+                    deps='REG_BASE',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('REG_FULL',
+                    source=REG_FULL_SRC,
+                    deps='REG_SMBCONF',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
@@ -1456,7 +1049,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA_SUBSYSTEM('LIBS',
                     source=LIB_SRC,
-                    deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY',
+                    deps='iconv LIBCRYPTO LIBNDR libsecurity NDR_SECURITY charset NDR_MESSAGING',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -1476,11 +1069,17 @@ bld.SAMBA_SUBSYSTEM('LIBSAMBA',
 
 bld.SAMBA_SUBSYSTEM('LIBSMB',
                     source=LIBSMB_SRC,
-                    deps='LIBSAMBA ZLIB',
+                    deps='LIBSAMBA ZLIB CLDAP',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('CLDAP',
+                    source=CLDAP_SRC,
+                    deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('SECRETS',
                     source=SECRETS_SRC,
+                    deps='NDR_SECRETS',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('SMBLDAP',
@@ -1490,10 +1089,12 @@ bld.SAMBA_SUBSYSTEM('SMBLDAP',
 
 bld.SAMBA_SUBSYSTEM('LIBADS',
                     source=LIBADS_SRC,
+                    deps='LIBCLI_LDAP_NDR',
                    vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBADS_SERVER',
                     source=LIBADS_SERVER_SRC,
+                    deps='NDR_KRB5PAC',
                    vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBADS_PRINTER',
@@ -1508,22 +1109,23 @@ bld.SAMBA_SUBSYSTEM('LIBAFS_SETTOKEN',
                     source=AFS_SETTOKEN_SRC,
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('LIBSMBCONF',
+                    source=LIBSMBCONF_SRC,
+                    deps='REG_BASE REG_SMBCONF',
+                    vars=locals())
+
 bld.SAMBA_SUBSYSTEM('SMBD_BASE',
                     source=SMBD_SRC_BASE,
                     deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
-                    NSS_WRAPPER DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB
+                    DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB
                     PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
                     LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
-                    VFS_DEFAULT RPC_MODULES AUTH LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET LIBEVENTLOG''',
+                    vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
+                    PRINTING PRINTBACKEND NDR_XATTR REGFIO
+                    LIBSMBCONF REG_FULL
+                    ''',
                     vars=locals())
 
-bld.SAMBA_SUBSYSTEM('RPC_MODULES',
-                    source='',
-                    deps='''RPC_LSARPC RPC_SAMR RPC_WINREG RPC_INITSHUTDOWN
-                            RPC_DSSETUP RPC_WKSSVC RPC_SVCCTL RPC_NTSVCS
-                            RPC_NETLOGON RPC_NETDFS RPC_SRVSVC RPC_SPOOLSS
-                            RPC_EVENTLOG RPC_RPCECHO''')
-
 bld.SAMBA_SUBSYSTEM('LOCKING',
                     source='${LOCKING_SRC}',
                     deps='''tdb talloc''',
@@ -1533,16 +1135,21 @@ bld.SAMBA_SUBSYSTEM('PROFILE',
                     source='${PROFILE_SRC}',
                     vars=locals())
 
-bld.SAMBA_SUBSYSTEM('READLINE',
-                    source=READLINE_SRC,
+bld.SAMBA_SUBSYSTEM('PRINTBASE',
+                    source=PRINTBASE_SRC,
                     vars=locals())
 
-bld.SAMBA_SUBSYSTEM('PASSWD_UTIL',
-                    source=PASSWD_UTIL_SRC,
+bld.SAMBA_SUBSYSTEM('PRINTBACKEND',
+                    source=PRINTBACKEND_SRC,
+                    deps='PRINTBASE NDR_NTPRINTING LIBADS_PRINTER',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('PRINTING',
+                    source=PRINTING_SRC,
                     vars=locals())
 
-bld.SAMBA_SUBSYSTEM('DISPLAY_SEC',
-                    source=DISPLAY_SEC_SRC,
+bld.SAMBA_SUBSYSTEM('PASSWD_UTIL',
+                    source=PASSWD_UTIL_SRC,
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBNET',
@@ -1565,6 +1172,10 @@ bld.SAMBA_SUBSYSTEM('LIBEVENTLOG',
                     deps='NDR_EVENTLOG',
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('SERVICES',
+                    source=SERVICES_SRC,
+                    vars=locals())
+
 bld.SAMBA_SUBSYSTEM('PLAINTEXT_AUTH',
                     source=PLAINTEXT_AUTH_SRC,
                     vars=locals())
@@ -1583,7 +1194,7 @@ bld.SAMBA_SUBSYSTEM('LIBNDR',
 
 #FIXME
 bld.SAMBA_SUBSYSTEM('NDR_STANDARD',
-                    source=LIBNDR_SRC,
+                    source='',
                     vars=locals())
 
 #FIXME
@@ -1602,21 +1213,30 @@ bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
                     source='../librpc/gen_ndr/ndr_dcerpc.c',
                     vars=locals())
 
-bld.SAMBA_SUBSYSTEM('NDR_SRVSVC',
-                    source='../librpc/gen_ndr/ndr_srvsvc.c',
-                    vars=locals())
-
-bld.SAMBA_SUBSYSTEM('LIBSAMBA-ERRORS',
-                   source='../libcli/util/doserr.c libsmb/nterr.c')
+bld.SAMBA_SUBSYSTEM('libsamba-errors',
+       source='../libcli/util/doserr.c libsmb/nterr.c')
 
 bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
-                   source='../libcli/nbt/nbtname.c',
-                   deps='talloc',
-                   autoproto='nbtname.h')
+       source='../libcli/nbt/nbtname.c',
+       deps='talloc',
+       autoproto='nbtname.h')
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON',
-                   source='../libcli/ndr_netlogon.c',
-                   public_deps='LIBNDR NDR_SECURITY')
+       source='../libcli/ndr_netlogon.c',
+       public_deps='LIBNDR NDR_SECURITY')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_WINREG',
+       source='../librpc/gen_ndr/cli_winreg.c',
+       public_deps='RPC_NDR_WINREG')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_ECHO',
+       source='../librpc/gen_ndr/cli_echo.c',
+       public_deps='RPC_NDR_ECHO')
+
+bld.SAMBA_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
+       source=RPC_CLIENT_SCHANNEL_SRC,
+       vars=locals())
+
 
 ########################## BINARIES #################################
 
@@ -1629,18 +1249,18 @@ bld.SAMBA_BINARY('smbd/smbd',
 bld.SAMBA_BINARY('nmbd/nmbd',
                  source=NMBD_SRC,
                  deps='''talloc tdb tevent ZLIB cap resolv libwbclient dl
-                 NSS_WRAPPER PASSDB PARAM ldap LIB_NONSMBD LIBSMB
+                 PASSDB PARAM ldap LIB_NONSMBD LIBSMB
                  POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSA''',
                  install_path='${SBINDIR}',
                  vars=locals())
 
 bld.SAMBA_BINARY('winbindd/winbindd',
                  source=WINBINDD_SRC,
-                 deps='''talloc tdb tevent cap dl ZLIB NSS_WRAPPER
+                 deps='''talloc tdb tevent cap dl ZLIB 
                  libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
                  POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
-                 NSS_INFO_TEMPLATE SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
-                 LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL
+                 SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
+                 LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
                  ''',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}',
@@ -1650,7 +1270,7 @@ bld.SAMBA_BINARY('web/swat',
                  source=SWAT_SRC,
                  deps='''talloc tevent cap LIBS LIBSMB libwbclient PARAM
                  LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups
-                 LIBMSRPC_GEN LIBMSRPC LOCKING PLAINTEXT_AUTH''',
+                 LIBMSRPC_GEN LIBMSRPC LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING''',
                  enabled=bld.env.build_swat,
                  install_path='${SBINDIR}',
                  vars=locals())
@@ -1659,27 +1279,30 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
                  source=RPCCLIENT_SRC,
                  deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
                  PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC
-                 LIBADS READLINE DISPLAY_SEC DCUTIL''',
+                 LIBADS SMBREADLINE DCUTIL RPCCLI_WINREG RPCCLI_ECHO
+                 RPC_CLIENT_SCHANNEL''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbclient',
                  source=CLIENT_SRC,
                  deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
                  PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN
-                 LIBMSRPC READLINE DISPLAY_SEC''',
+                 LIBMSRPC SMBREADLINE''',
                  vars=locals())
 
 bld.SAMBA_BINARY('net',
                  source=NET_SRC,
                  deps='''talloc tdb libnetapi libaddns cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
                  PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBGPO LIBADS LIBADS_SERVER LIBADS_PRINTER
-                 LOCALE_DIR LIBAFS LIBAFS_SETTOKEN READLINE PASSWD_UTIL LIBNET
-                 LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DISPLAY_SEC DCUTIL''',
+                 LOCALE_DIR LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
+                 LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
+                 REGFIO NDR_NTPRINTING RPCCLI_WINREG
+                 RPC_CLIENT_SCHANNEL''',
                  vars=locals())
 
 bld.SAMBA_BINARY('profiles',
                  source=PROFILES_SRC,
-                 deps='''talloc tdb cap tevent POPT_SAMBA PARAM LIBS LIBSMB_ERR LIB_NONSMBD''',
+                 deps='''talloc tdb cap tevent POPT_SAMBA PARAM LIBS LIBSMB_ERR LIB_NONSMBD REGFIO''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbspool',
@@ -1690,7 +1313,7 @@ bld.SAMBA_BINARY('smbspool',
 
 bld.SAMBA_BINARY('testparm',
                  source=TESTPARM_SRC,
-                 deps='''talloc tevent ldap cap NSS_WRAPPER
+                 deps='''talloc tevent ldap cap 
                  libwbclient ASN1_UTIL LIBTSOCKET PASSDB PARAM LIB_NONSMBD
                  LIBSMB_ERR POPT_SAMBA''',
                  vars=locals())
@@ -1709,7 +1332,7 @@ bld.SAMBA_BINARY('smbstatus',
 
 bld.SAMBA_BINARY('smbcontrol',
                  source=SMBCONTROL_SRC,
-                 deps='''talloc tdb tevent cap PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA''',
+                 deps='''talloc tdb tevent cap PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA PRINTBASE''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbtree',
@@ -1728,7 +1351,7 @@ bld.SAMBA_BINARY('pdbedit',
                  source=PDBEDIT_SRC,
                  deps='''talloc tdb tevent cap resolv libwbclient PARAM LIB_NONSMBD
                  LIBSAMBA LIBSMB_ERR POPT_SAMBA PASSDB SMBLDAP GROUPDB
-                 PASSWD_UTIL''',
+                 PASSWD_UTIL LIBCLI_LDAP_NDR''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbget',
@@ -1744,7 +1367,7 @@ bld.SAMBA_BINARY('nmblookup',
 bld.SAMBA_BINARY('smbtorture',
                  source=SMBTORTURE_SRC,
                  deps='''talloc tdb tevent cap resolv libwbclient PARAM LIBSMB KRBCLIENT
-                 LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
+                 LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPCCLI_ECHO''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbconftort',
@@ -1795,7 +1418,7 @@ bld.SAMBA_BINARY('locktest',
 
 bld.SAMBA_BINARY('nsstest',
                  source=NSSTEST_SRC,
-                 deps='NSS_WRAPPER',
+                 deps='',
                  vars=locals())
 
 bld.SAMBA_BINARY('pdbtest',
@@ -1806,7 +1429,7 @@ bld.SAMBA_BINARY('pdbtest',
 
 bld.SAMBA_BINARY('vfstest',
                  source=VFSTEST_SRC,
-                 deps='''SMBD_BASE READLINE''',
+                 deps='''SMBD_BASE SMBREADLINE''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbiconv',
@@ -1843,7 +1466,7 @@ bld.SAMBA_BINARY('versiontest',
 bld.SAMBA_BINARY('wbinfo',
                  source=WBINFO_SRC,
                  deps='''talloc libwbclient tevent cap
-                 NSS_WRAPPER ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
+                 ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
                  LIBSAMBA POPT_SAMBA LIBAFS_SETTOKEN''',
                  vars=locals())
 
@@ -1852,7 +1475,7 @@ bld.SAMBA_BINARY('ntlm_auth',
                  deps='''tdb talloc cap resolv krb5 k5crypto com_err libwbclient PARAM LIB_NONSMBD
                  LIBS LIBSAMBA POPT_SAMBA ASN1_UTIL LIBTSOCKET
                  PASSDB GROUPDB SMBLDAP WBCOMMON LIBINIPARSER LIBADS_SERVER
-                 NDR_SAMR NDR_LSA''',
+                 NDR_SAMR NDR_LSA LIBCLI_LDAP_NDR''',
                  vars=locals())
 
 bld.SAMBA_BINARY('timelimit',
@@ -1887,6 +1510,11 @@ bld.SAMBA_BINARY('split_tokens',
                  LIBSAMBA''',
                  vars=locals())
 
+bld.SAMBA_BINARY('vlp',
+                 source=VLP_SRC,
+                 deps='''talloc tdb''',
+                 vars=locals())
+
 swat_files=recursive_dirlist('../swat', '../swat', '*')
 bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
 
@@ -1902,6 +1530,13 @@ bld.RECURSE('../lib/zlib')
 bld.RECURSE('../lib/tsocket')
 bld.RECURSE('../lib/iniparser/src')
 bld.RECURSE('../lib/crypto')
+bld.RECURSE('modules')
+bld.RECURSE('auth')
+bld.RECURSE('passdb')
+bld.RECURSE('winbindd')
+bld.RECURSE('libgpo/gpext')
+bld.RECURSE('pam_smbpass')
+bld.RECURSE('rpc_server')
 
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()