lib/compression: add shared wscript_build.
[sfrench/samba-autobuild/.git] / source3 / wscript_build
index 8c1d6834354db5261686807093e862d848846d89..fde1d175a654faf042fee4ef745a7eaa625f8467 100644 (file)
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
 from samba_utils import *
+import samba_version
 
-TDB_LIB_SRC = '''lib/util_tdb.c ../lib/util/util_tdb.c
+TDB_LIB_SRC = '''
           lib/dbwrap.c lib/dbwrap_tdb.c
           lib/dbwrap_ctdb.c
           lib/g_lock.c
@@ -29,34 +30,23 @@ SERVER_MUTEX_SRC = 'lib/server_mutex.c'
 
 PASSCHANGE_SRC = '''libsmb/passchange.c'''
 
-LIBNDR_DRSUAPI_SRC = '''../librpc/ndr/ndr_drsuapi.c
-                     ../librpc/ndr/ndr_compression.c
-                     ../librpc/gen_ndr/ndr_drsuapi.c
-                     ../librpc/ndr/ndr_drsblobs.c
-                     ../librpc/gen_ndr/ndr_drsblobs.c'''
-
 COMPRESSION_SRC = '../lib/compression/mszip.c'
 
-DRSUAPI_SRC = '''${LIBNDR_DRSUAPI_SRC}
-              ${COMPRESSION_SRC}'''
+DRSUAPI_SRC = '''${COMPRESSION_SRC}'''
 
-LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
-             ../librpc/ndr/ndr.c
-             ../librpc/ndr/ndr_misc.c
-             ../librpc/gen_ndr/ndr_misc.c
-             ../librpc/ndr/ndr_string.c
-             ../librpc/ndr/uuid.c
-             librpc/ndr/util.c'''
+LIBNDR_SRC = '''librpc/ndr/util.c'''
 
 LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
                      rpc_client/init_spoolss.c'''
 
-LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c
-                 rpc_client/init_lsa.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'
+LIBRPCCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c rpc_client/util_netlogon.c'
+
+LIBCLI_WINREG_SRC = '''rpc_client/cli_winreg.c
+                       rpc_client/cli_winreg_int.c'''
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
@@ -85,16 +75,17 @@ PTHREADPOOL_SRC = ''
 
 LIBREPLACE_SRCS = ''
 
-LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
+LIB_SRC = '''${LIBSAMBAUTIL_SRC}
           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
           lib/util_sconn.c
           lib/serverid.c
-          lib/util_transfer_file.c ../lib/async_req/async_sock.c
+          lib/util_transfer_file.c
+          lib/addrchange.c
           ${TDB_LIB_SRC}
-          ${VERSION_SRC} lib/charcnv.c lib/debug.c lib/fault.c
+          lib/debug.c lib/fault.c
           lib/interface.c lib/pidfile.c
           lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
           lib/username.c
@@ -102,15 +93,15 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
           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
-          lib/util_unistr.c lib/util_file.c
+          lib/clobber.c lib/util_sid.c
+          lib/util_file.c
           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/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
+          intl/lang_tdb.c
           lib/conn_tdb.c lib/adt_tree.c lib/gencache.c
           lib/sessionid_tdb.c
           lib/module.c lib/events.c ${LIBTEVENT_SRC0}
@@ -154,27 +145,17 @@ LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
 SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
                  passdb/machine_sid.c'''
 
-LIBNBT_SRC = '''../libcli/nbt/nbtname.c
-             ../libcli/netlogon.c
-             ../libcli/ndr_netlogon.c'''
-
 LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
              libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
              libads/dns.c libads/sitename_cache.c'''
 
-NTERR_SRC = '''libsmb/nterr.c libsmb/smberr.c'''
-DOSERR_SRC = '../libcli/util/doserr.c'
+NTERR_SRC = '''libsmb/smberr.c'''
 ERRORMAP_SRC = 'libsmb/errormap.c'
 DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
 
-LIBSMB_ERR_SRC0 = '''${NTERR_SRC} ${DOSERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SRC}'''
-
-LIBSMB_ERR_SRC1 = '''../libcli/auth/smbdes.c ../libcli/auth/smbencrypt.c ../libcli/auth/msrpc_parse.c ../libcli/auth/session.c'''
-
-LIBSMB_ERR_SRC = '${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1}'
+LIBSMB_ERR_SRC = '''${NTERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SRC}'''
 
 LIBSMB_SRC0 = '''
-               ../libcli/auth/ntlm_check.c
                libsmb/ntlmssp.c
                libsmb/ntlmssp_wrap.c
                ../libcli/auth/ntlmssp.c
@@ -184,30 +165,24 @@ LIBSMB_SRC0 = '''
 
 LIBSAMBA_SRC = '${LIBSMB_SRC0}'
 
-LIBCLI_LDAP_MESSAGE_SRC = '''../libcli/ldap/ldap_message.c'''
-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'''
 
 TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
 
-SCHANNEL_SRC = '''../libcli/auth/credentials.c
-               ../libcli/auth/schannel_sign.c
-               ../libcli/auth/schannel_state_tdb.c'''
+SCHANNEL_SRC = '''../libcli/auth/schannel_sign.c'''
 
 LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/clikrb5.c libsmb/clispnego.c
-             ../libcli/auth/spnego_parse.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/smb_seal.c libsmb/async_smb.c
-             ${LIBNBT_SRC}
-             ${DRSUAPI_SRC}'''
+             libsmb/cli_np_tstream.c
+             libsmb/smbsock_connect.c'''
 
 LIBMSRPC_SRC = '''
                ${SCHANNEL_SRC}
@@ -267,8 +242,6 @@ REG_SMBCONF_SRC = '''
                   registry/reg_util_token.c
                   registry/reg_api_util.c'''
 
-REG_EVENTLOG_SRC = '''registry/reg_eventlog.c'''
-
 REG_FULL_SRC = '''
                ${REG_BACKENDS_EXTRA_SRC}
                ${REG_INIT_FULL_SRC}
@@ -276,30 +249,13 @@ REG_FULL_SRC = '''
 
 SERVICES_SRC = '''services/svc_spoolss.c
                   services/svc_rcinit.c
-                  services/services_db.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'''
 
-NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c
-                     ../librpc/gen_ndr/ndr_named_pipe_auth.c'''
-
-RPC_NCACN_NP = '''rpc_server/rpc_ncacn_np.c
-                  rpc_server/rpc_handles.c'''
-
-RPC_SERVICE = '''rpc_server/rpc_server.c'''
-
-RPC_CRYPTO = '''rpc_server/dcesrv_ntlmssp.c
-                rpc_server/dcesrv_gssapi.c
-                rpc_server/dcesrv_spnego.c'''
-
-RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c
-               ${RPC_NCACN_NP} ${RPC_SERVICE} ${RPC_CRYPTO}'''
-
-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'''
@@ -324,8 +280,7 @@ PROFILES_SRC = '''utils/profiles.c'''
 OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
              smbd/oplock_onefs.c'''
 
-NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c
-                librpc/gen_ndr/ndr_notify.c'''
+NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
 
 FNAME_UTIL_SRC = '''smbd/filename_util.c'''
 
@@ -425,17 +380,10 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    auth/server_info_sam.c
                    auth/user_info.c
                    auth/user_util.c
-                   ../nsswitch/libwbclient/wb_reqtrans.c'''
+                   lib/wb_reqtrans.c'''
 
 WINBINDD_SRC = '''${WINBINDD_SRC1}
-                  ${RPC_NCACN_NP} ${NPA_TSTREAM_SRC}
-                  ${TDB_VALIDATE_SRC}
-                  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'''
+                  ${TDB_VALIDATE_SRC}'''
 
 MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
 
@@ -484,15 +432,11 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
                smbd/smb2_getinfo.c
                smbd/smb2_setinfo.c
                smbd/smb2_break.c
-               ../libcli/smb/smb2_create_blob.c
                ${MANGLE_SRC}'''
 
 SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
-                ${RPC_SERVER_SRC}
                 ${OPLOCK_SRC} ${NOTIFY_SRC}
-                ${BUILDOPT_SRC}
-                rpc_client/init_netlogon.c
-                rpc_client/init_samr.c'''
+                ${BUILDOPT_SRC}'''
 
 PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
                printing/print_cups.c printing/print_generic.c
@@ -526,9 +470,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}
-           ${PASSCHANGE_SRC}
-           rpc_client/init_lsa.c'''
+SWAT_SRC = '''${SWAT_SRC1}'''
 
 STATUS_SRC = '''utils/status.c utils/status_profile.c'''
 
@@ -544,8 +486,7 @@ TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
 
 PASSWD_UTIL_SRC = 'utils/passwd_util.c'
 
-SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSCHANGE_SRC}
-                rpc_client/init_lsa.c'''
+SMBPASSWD_SRC = '''utils/smbpasswd.c'''
 
 PDBEDIT_SRC = '''utils/pdbedit.c'''
 
@@ -561,11 +502,9 @@ RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
                     rpcclient/cmd_drsuapi.c rpcclient/cmd_eventlog.c
                     rpcclient/cmd_winreg.c'''
 
-RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
-                   rpc_client/init_netlogon.c
-                   rpc_client/init_samr.c'''
+RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}'''
 
-PAM_WINBIND_SRC = '../nsswitch/pam_winbind.c ${WBCOMMON_SRC} ${LIBREPLACE_SRC}'
+PAM_WINBIND_SRC = '../nsswitch/pam_winbind.c'
 
 LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c
                         libsmb/libsmb_thread_posix.c'''
@@ -607,21 +546,16 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
                     lib/netapi/shutdown.c
                     lib/netapi/netlogon.c'''
 
-LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}
-                   rpc_client/init_netlogon.c
-                   rpc_client/init_samr.c'''
+LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}'''
 
 # FIXME:  bigballofmud
 
 CLIENT_SRC1 = '''client/client.c client/clitar.c
                  client/dnsbrowse.c'''
 
-CLIENT_SRC = '''${CLIENT_SRC1}
-                rpc_client/init_lsa.c'''
+CLIENT_SRC = '''${CLIENT_SRC1}'''
 
-LIBSMBCONF_SRC = '''../lib/smbconf/smbconf.c ../lib/smbconf/smbconf_util.c
-                    ../lib/smbconf/smbconf_txt.c lib/smbconf/smbconf_reg.c
-                    lib/smbconf/smbconf_init.c'''
+LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c'
 
 SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
 
@@ -631,15 +565,14 @@ LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c'
 
 
 LIBNET_DSSYNC_SRC = '''libnet/libnet_dssync.c
-                       libnet/libnet_dssync_keytab.c
-                       ../libcli/drsuapi/repl_decrypt.c'''
+                       libnet/libnet_dssync_passdb.c
+                       libnet/libnet_dssync_keytab.c'''
 
 LIBNET_SAMSYNC_SRC = '''libnet/libnet_samsync.c
                         libnet/libnet_samsync_ldif.c
                         libnet/libnet_samsync_passdb.c
                         libnet/libnet_samsync_display.c
-                        libnet/libnet_samsync_keytab.c
-                        ../libcli/samsync/decrypt.c'''
+                        libnet/libnet_samsync_keytab.c'''
 
 NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               utils/net_rap.c utils/net_rpc.c utils/net_rpc_samsync.c
@@ -657,8 +590,6 @@ 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
-              rpc_client/init_netlogon.c
-              rpc_client/init_samr.c
               registry/reg_parse.c registry/reg_format.c
               registry/reg_parse_internal.c registry/reg_import.c
               lib/cbuf.c lib/srprs.c'''
@@ -676,11 +607,13 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
                 torture/denytest.c torture/mangle_test.c
                 torture/nbench.c
                 torture/test_async_echo.c
-                torture/test_posix_append.c'''
+                torture/test_addrchange.c
+                torture/test_posix_append.c
+                torture/test_smbsock_any_connect.c'''
 
-SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} ${TLDAP_SRC}
-        ../nsswitch/libwbclient/wbc_async.c
-        ../nsswitch/libwbclient/wb_reqtrans.c'''
+SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
+        torture/wbc_async.c
+        lib/wb_reqtrans.c'''
 
 MASKTEST_SRC = '''torture/masktest.c'''
 
@@ -715,29 +648,17 @@ DEBUG2HTML_SRC = '''utils/debug2html.c utils/debugparse.c'''
 
 SMBFILTER_SRC = '''utils/smbfilter.c'''
 
-WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c ${PARAM_SRC}
-        ${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC}'''
+WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c'''
 
 WBINFO_SRC = '''../nsswitch/wbinfo.c'''
 
-WINBIND_NSS_SRC = '''${WBCOMMON_SRC} ${LIBREPLACE_SRC}'''
-
-WINBIND_KRB5_LOCATOR_SRC1 = '../nsswitch/winbind_krb5_locator.c'
-WINBIND_KRB5_LOCATOR_SRC = '''${WINBIND_KRB5_LOCATOR_SRC1} ${LIBREPLACE_SRC}'''
-
-POPT_SRC = '''../lib/popt/findme.c ../lib/popt/popt.c ../lib/popt/poptconfig.c \
-          ../lib/popt/popthelp.c ../lib/popt/poptparse.c'''
-
 NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
 
 NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
-                ../libcli/auth/spnego_parse.c libsmb/clikrb5.c libads/kerberos.c
-                libsmb/samlogon_cache.c'''
+                libsmb/clikrb5.c libads/kerberos.c'''
 
 
-VLP_SRC = '''printing/tests/vlp.c
-          ../lib/util/util_tdb.c
-          ${LIBSAMBAUTIL_SRC}'''
+VLP_SRC = '''printing/tests/vlp.c'''
 
 RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
 
@@ -765,66 +686,79 @@ t.env.BUILDDIR = bld.path.abspath()
 
 bld.SETUP_BUILD_GROUPS()
 
+samba_version.load_version(bld.env)
+
 bld.SAMBA_MKVERSION('include/version.h')
 
 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')
-
 ######################## SUBSYSTEMS #################################
 
-bld.SAMBA_SUBSYSTEM('WBCOMMON',
-                    source=WBCOMMON_SRC)
-
-bld.SAMBA_LIBRARY('libwbclient',
-                    source='''../nsswitch/libwbclient/wbc_guid.c
-                              ../nsswitch/libwbclient/wbc_idmap.c
-                              ../nsswitch/libwbclient/wbclient.c
-                              ../nsswitch/libwbclient/wbc_pam.c
-                              ../nsswitch/libwbclient/wbc_pwd.c
-                              ../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',
+bld.SAMBA_SUBSYSTEM('winbind-client',
+                    source=WBCOMMON_SRC,
+                    deps='replace',
+                    cflags='-DSOCKET_WRAPPER_DISABLE=1 -DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR)
+
+bld.SAMBA_LIBRARY('netapi',
                     source=LIBNETAPI_SRC,
-                    public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT
+                    public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT
                     PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
                     LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI
-                    RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF TOKEN_UTIL
-                    LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
-                    RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_INITSHUTDOWN''',
+                    RPC_CLIENT_SCHANNEL LIB_SMBCONF REG_SMBCONF TOKEN_UTIL
+                    LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON
+                    RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_INITSHUTDOWN
+                    INIT_NETLOGON INIT_SAMR''',
                     public_headers='lib/netapi/netapi.h',
-                    private_library=True,
+                    vnum='0',
                     vars=locals())
 
-bld.SAMBA_LIBRARY('libsmbclient',
+bld.SAMBA_LIBRARY('smbclient',
                     source=LIBSMBCLIENT_SRC,
-                    public_deps='''talloc tdb libwbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB
-                    LIBMSRPC_GEN LIBMSRPC LIBCLI_LSA RPCCLI_SRVSVC''',
+                    public_deps='''talloc tdb wbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB
+                    LIBMSRPC_GEN LIBMSRPC LIBCLI_LSA RPC_NDR_SRVSVC''',
                     public_headers='include/libsmbclient.h',
-                    private_library=True,
+                    vnum='0',
                     vars=locals())
 
 bld.SAMBA_LIBRARY('smbsharemodes',
                     source=LIBSMBSHAREMODES_SRC,
                     public_deps='''talloc tdb''',
                     public_headers='include/smb_share_modes.h',
-                    private_library=True,
+                    vnum='0',
                     vars=locals())
 
+bld.SAMBA_LIBRARY('nss_winbind',
+                  source='../nsswitch/winbind_nss_linux.c',
+                  deps='winbind-client',
+                  realname='libnss_winbind.so.2',
+                  vnum='2')
+
+bld.SAMBA_LIBRARY('nss_wins',
+                  source=WINBIND_WINS_NSS_SRC,
+                  deps='''winbind-client PARAM LIBSMB LIB_NONSMBD LIBTSOCKET KRBCLIENT
+                  cap wbclient''',
+                  realname='libnss_wins.so.2',
+                  vnum='2')
+
+if bld.CONFIG_SET('WITH_PAM_MODULES'):
+        bld.SAMBA_LIBRARY('pamwinbind',
+                          source=PAM_WINBIND_SRC,
+                          deps='intl talloc wbclient winbind-client LIBINIPARSER pam',
+                          cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
+                          realname='pam_winbind.so')
+
+if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
+        bld.SAMBA_LIBRARY('winbind_krb5_locator',
+                          source='../nsswitch/winbind_krb5_locator.c',
+                          deps='wbclient krb5',
+                          realname='winbind_krb5_locator.so')
+
 bld.SAMBA_SUBSYSTEM('LIBMSRPC',
                     source='${LIBMSRPC_SRC}',
-                    deps='''ndr NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
-                    RPCCLI_EPMAPPER''',
+                    deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
+                    RPC_NDR_EPMAPPER COMMON_SCHANNELDB LIBCLI_AUTH''',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
@@ -842,12 +776,6 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
                     deps='talloc',
                     local_include=False)
 
-bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE',
-                    source=LIBCLI_LDAP_MESSAGE_SRC)
-
-bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR',
-                    source=LIBCLI_LDAP_NDR_SRC)
-
 bld.SAMBA_SUBSYSTEM('AVAHI',
                     source=AVAHI_SRC,
                     deps='avahi-common avahi-client',
@@ -875,7 +803,7 @@ bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
 
 bld.SAMBA_SUBSYSTEM('PARAM',
                     source='',
-                    deps='PARAM_WITHOUT_REG DYNCONFIG LIBSMBCONF',
+                    deps='PARAM_WITHOUT_REG DYNCONFIG LIB_SMBCONF',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('REGFIO',
@@ -897,11 +825,7 @@ bld.SAMBA_SUBSYSTEM('REG_SMBCONF',
 
 bld.SAMBA_SUBSYSTEM('REG_FULL',
                     source=REG_FULL_SRC,
-                    deps='REG_SMBCONF REG_EVENTLOG',
-                    vars=locals())
-
-bld.SAMBA_SUBSYSTEM('REG_EVENTLOG',
-                    source=REG_EVENTLOG_SRC,
+                    deps='REG_SMBCONF',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
@@ -915,7 +839,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA_SUBSYSTEM('LIBS',
                     source=LIB_SRC,
-                    deps='iconv LIBCRYPTO ndr security NDR_SECURITY charset NDR_MESSAGING',
+                    deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET UTIL_TDB SAMBA_VERSION',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -925,17 +849,22 @@ bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
 
 bld.SAMBA_SUBSYSTEM('LIBSMB_ERR',
                     source=LIBSMB_ERR_SRC,
-                    deps='SECRETS ldap lber',
+                    deps='errors SECRETS ldap lber MSRPC_PARSE LIBCLI_AUTH',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBSAMBA',
                     source=LIBSAMBA_SRC,
-                    deps='LIBSMB_ERR NDR_NTLMSSP',
+                    deps='LIBSMB_ERR NDR_NTLMSSP ntlm_check',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBSMB',
                     source=LIBSMB_SRC,
-                    deps='LIBSAMBA z LZXPRESS CLDAP LIBNMB NDR_SVCCTL NDR_NBT',
+                    deps='LIBSAMBA CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBDRSUAPI',
+                    source=DRSUAPI_SRC,
+                    deps='z LZXPRESS NDR_DRSUAPI NDR_DRSBLOBS',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('CLDAP',
@@ -975,22 +904,23 @@ bld.SAMBA_SUBSYSTEM('LIBAFS_SETTOKEN',
                     source=AFS_SETTOKEN_SRC,
                     vars=locals())
 
-bld.SAMBA_SUBSYSTEM('LIBSMBCONF',
-                    source=LIBSMBCONF_SRC,
-                    deps='REG_BASE REG_SMBCONF',
+bld.SAMBA_SUBSYSTEM('LIB_SMBCONF',
+                    source=LIB_SMBCONF_SRC,
+                    deps='LIBSMBCONF REG_BASE REG_SMBCONF',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('SMBD_BASE',
                     source=SMBD_SRC_BASE,
                     deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
-                    DYNCONFIG libwbclient crypt nsl cups cap resolv z PASSDB
+                    DYNCONFIG wbclient crypt nsl cups cap resolv z PASSDB
                     PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
                     LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
                     vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
-                    PRINTING PRINTBACKEND NDR_XATTR REGFIO
-                    LIBSMBCONF REG_FULL FNAME_UTIL
-                    LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
-                    RPCCLI_SRVSVC
+                    PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO
+                    LIB_SMBCONF REG_FULL FNAME_UTIL
+                    LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+                    RPC_NDR_SRVSVC NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON INIT_SAMR
+                    LIBCLI_SMB_COMMON RPC_SERVER
                     ''',
                     vars=locals())
 
@@ -1024,6 +954,12 @@ bld.SAMBA_SUBSYSTEM('FNAME_UTIL',
                     source=FNAME_UTIL_SRC,
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('UTIL_TDB',
+       source='../lib/util/util_tdb.c',
+       local_include=False,
+       public_deps='tdb talloc'
+       )
+
 bld.SAMBA_SUBSYSTEM('LIBNET',
                     source=LIBNET_SRC,
                     deps='NDR_LIBNET_JOIN',
@@ -1031,12 +967,12 @@ bld.SAMBA_SUBSYSTEM('LIBNET',
 
 bld.SAMBA_SUBSYSTEM('LIBNET_DSSYNC',
                     source=LIBNET_DSSYNC_SRC,
-                    deps='LIBNET',
+                    deps='LIBNET LIBCLI_DRSUAPI',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBNET_SAMSYNC',
                     source=LIBNET_SAMSYNC_SRC,
-                    deps='LIBNET',
+                    deps='LIBNET LIBCLI_SAMSYNC',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBEVENTLOG',
@@ -1048,26 +984,58 @@ bld.SAMBA_SUBSYSTEM('LIBNMB',
                     source=LIBNMB_SRC,
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('LIBNBT',
+                    source='',
+                    deps='NDR_SVCCTL NDR_NBT NDR_NBT_BUF LIBCLI_NETLOGON LIBCLI_NDR_NETLOGON',
+                    vars=locals())
+
 bld.SAMBA_SUBSYSTEM('SERVICES',
                     source=SERVICES_SRC,
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('PLAINTEXT_AUTH',
                     source=PLAINTEXT_AUTH_SRC,
+                    deps='pam PAM_ERRORS',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('PASSCHANGE',
+                    source=PASSCHANGE_SRC,
+                    deps='LIBCLI_SAMR',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('SAMBA_VERSION',
+                    source=VERSION_SRC,
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('SLCACHE',
                     source=SLCACHE_SRC,
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('SPNEGO_PARSE',
+                    source='../libcli/auth/spnego_parse.c',
+                    vars=locals())
+
 bld.SAMBA_SUBSYSTEM('DCUTIL',
                     source=DCUTIL_SRC,
                     vars=locals())
 
-bld.SAMBA_SUBSYSTEM('ndr',
+bld.SAMBA_SUBSYSTEM('ndr-util',
                     source=LIBNDR_SRC,
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('tdb-wrap',
+                    source='lib/util_tdb.c',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('CHARSET',
+                    source='''lib/util_str.c lib/util_unistr.c lib/charcnv.c lib/iconv.c''',
+                    public_deps='iconv',
+                    deps='DYNCONFIG')
+
+bld.SAMBA_SUBSYSTEM('samba-util',
+                    source=UTIL_SRC,
+                    deps='talloc CHARSET LIBCRYPTO',
+                    vars=locals())
 #FIXME
 bld.SAMBA_SUBSYSTEM('ndr-standard',
                     source='',
@@ -1081,9 +1049,8 @@ bld.SAMBA_SUBSYSTEM('ndr-standard',
 #FIXME
 bld.SAMBA_SUBSYSTEM('dcerpc', '')
 
-bld.SAMBA_SUBSYSTEM('LZXPRESS',
-                   deps='replace',
-                   source='../lib/compression/lzxpress.c')
+bld.SAMBA_SUBSYSTEM('ldb',
+                    source='lib/ldb_compat.c')
 
 bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
                     source='''../librpc/gen_ndr/ndr_security.c ../librpc/ndr/ndr_sec_helper.c''',
@@ -1102,94 +1069,38 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
        deps='talloc',
        autoproto='nbtname.h')
 
-bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON',
-       source='../libcli/ndr_netlogon.c',
-       public_deps='ndr 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('RPCCLI_SAMR',
-       source='../librpc/gen_ndr/cli_samr.c',
-       public_deps='RPC_NDR_SAMR')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_LSA',
-       source='../librpc/gen_ndr/cli_lsa.c',
-       public_deps='RPC_NDR_LSA')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_NETLOGON',
-       source='../librpc/gen_ndr/cli_netlogon.c',
-       public_deps='RPC_NDR_NETLOGON')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_SRVSVC',
-       source='../librpc/gen_ndr/cli_srvsvc.c',
-       public_deps='RPC_NDR_SRVSVC')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_INITSHUTDOWN',
-       source='../librpc/gen_ndr/cli_initshutdown.c',
-       public_deps='RPC_NDR_INITSHUTDOWN')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_WKSSVC',
-       source='../librpc/gen_ndr/cli_wkssvc.c',
-       public_deps='RPC_NDR_WKSSVC')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_SVCCTL',
-       source='../librpc/gen_ndr/cli_svcctl.c',
-       public_deps='RPC_NDR_SVCCTL')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_DSSETUP',
-       source='../librpc/gen_ndr/cli_dssetup.c',
-       public_deps='RPC_NDR_DSSETUP')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_DFS',
-       source='../librpc/gen_ndr/cli_dfs.c',
-       public_deps='RPC_NDR_DFS')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_DRSUAPI',
-       source='../librpc/gen_ndr/cli_drsuapi.c',
-       public_deps='RPC_NDR_DRSUAPI')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_NTSVCS',
-       source='../librpc/gen_ndr/cli_ntsvcs.c',
-       public_deps='RPC_NDR_NTSVCS')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_EVENTLOG',
-       source='../librpc/gen_ndr/cli_eventlog.c',
-       public_deps='RPC_NDR_EVENTLOG')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_EPMAPPER',
-       source='../librpc/gen_ndr/cli_epmapper.c',
-       public_deps='RPC_NDR_EPMAPPER')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_SPOOLSS',
-       source='../librpc/gen_ndr/cli_spoolss.c',
-       public_deps='RPC_NDR_SPOOLSS')
-
 bld.SAMBA_SUBSYSTEM('LIBCLI_SAMR',
                     source=LIBCLI_SAMR_SRC,
-                    deps='RPCCLI_SAMR')
+                    deps='RPC_NDR_SAMR')
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_LSA',
                     source=LIBCLI_LSA_SRC,
-                    deps='RPCCLI_LSA')
+                    deps='RPC_NDR_LSA INIT_LSA')
 
-bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON',
-                    source=LIBCLI_NETLOGON_SRC,
-                    deps='RPCCLI_NETLOGON')
+bld.SAMBA_SUBSYSTEM('LIBRPCCLI_NETLOGON',
+                    source=LIBRPCCLI_NETLOGON_SRC,
+                    deps='RPC_NDR_NETLOGON')
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_SPOOLSS',
                     source=LIBCLI_SPOOLSS_SRC,
-                    deps='RPCCLI_SPOOLSS')
+                    deps='RPC_NDR_SPOOLSS')
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_WINREG',
+                    source=LIBCLI_WINREG_SRC,
+                    deps='RPC_NDR_WINREG')
 
 bld.SAMBA_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
        source=RPC_CLIENT_SCHANNEL_SRC,
        vars=locals())
 
+bld.SAMBA_SUBSYSTEM('INIT_LSA',
+                    source='rpc_client/init_lsa.c')
+
+bld.SAMBA_SUBSYSTEM('INIT_NETLOGON',
+                    source='rpc_client/init_netlogon.c')
+
+bld.SAMBA_SUBSYSTEM('INIT_SAMR',
+                    source='rpc_client/init_samr.c')
 
 ########################## BINARIES #################################
 
@@ -1201,7 +1112,7 @@ bld.SAMBA_BINARY('smbd/smbd',
 
 bld.SAMBA_BINARY('nmbd/nmbd',
                  source=NMBD_SRC,
-                 deps='''talloc tdb tevent z cap resolv libwbclient dl
+                 deps='''talloc tdb tevent z cap resolv wbclient dl
                  PASSDB PARAM ldap LIB_NONSMBD LIBSMB
                  POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSA''',
                  install_path='${SBINDIR}',
@@ -1210,13 +1121,15 @@ bld.SAMBA_BINARY('nmbd/nmbd',
 bld.SAMBA_BINARY('winbindd/winbindd',
                  source=WINBINDD_SRC,
                  deps='''talloc tdb tevent cap dl z
-                 libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
+                 wbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
                  POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
-                 SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
+                 SRV_NDR_WBINT RPC_NDR_WBINT LIBAFS
                  LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
                  TOKEN_UTIL
-                 LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
-                 RPCCLI_DSSETUP
+                 LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON
+                 RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
+                 RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
+                 PAM_ERRORS
                  ''',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}',
@@ -1224,10 +1137,10 @@ bld.SAMBA_BINARY('winbindd/winbindd',
 
 bld.SAMBA_BINARY('web/swat',
                  source=SWAT_SRC,
-                 deps='''talloc tevent cap LIBS LIBSMB libwbclient PARAM
+                 deps='''talloc tevent cap LIBS LIBSMB wbclient PARAM
                  LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups
                  LIBMSRPC_GEN LIBMSRPC LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING FNAME_UTIL
-                 LIBCLI_SAMR''',
+                 LIBCLI_SAMR INIT_LSA PASSCHANGE''',
                  enabled=bld.env.build_swat,
                  install_path='${SBINDIR}',
                  vars=locals())
@@ -1235,33 +1148,34 @@ bld.SAMBA_BINARY('web/swat',
 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 SMBREADLINE DCUTIL RPCCLI_WINREG RPCCLI_ECHO
+                 PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC
+                 LIBADS SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO
                  RPC_CLIENT_SCHANNEL
-                 LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
-                 RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_DSSETUP RPCCLI_DFS
-                 RPCCLI_DRSUAPI RPCCLI_NTSVCS RPCCLI_EVENTLOG
+                 LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+                 RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_DSSETUP RPC_NDR_DFS
+                 RPC_NDR_DRSUAPI RPC_NDR_NTSVCS RPC_NDR_EVENTLOG INIT_NETLOGON
+                 INIT_SAMR
                  ''',
                  vars=locals())
 
-bld.SAMBA_BINARY('smbclient',
+bld.SAMBA_BINARY('client/smbclient',
                  source=CLIENT_SRC,
                  deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
-                 PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN
-                 LIBMSRPC SMBREADLINE libsmbclient RPCCLI_SRVSVC''',
+                 PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN
+                 LIBMSRPC SMBREADLINE smbclient RPC_NDR_SRVSVC INIT_LSA''',
                  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
+                 deps='''talloc tdb netapi addns cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
+                 PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBGPO LIBADS LIBADS_SERVER LIBADS_PRINTER
                  LOCALE_DIR LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
                  LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
-                 REGFIO NDR_NTPRINTING RPCCLI_WINREG
+                 REGFIO NDR_NTPRINTING RPC_NDR_WINREG
                  RPC_CLIENT_SCHANNEL TOKEN_UTIL
-                 LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
-                 RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL RPCCLI_DSSETUP
-                 RPCCLI_INITSHUTDOWN RPCCLI_DRSUAPI
+                 LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+                 RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_SVCCTL RPC_NDR_DSSETUP
+                 RPC_NDR_INITSHUTDOWN RPC_NDR_DRSUAPI INIT_NETLOGON INIT_SAMR
                 ''',
                  vars=locals())
 
@@ -1272,14 +1186,14 @@ bld.SAMBA_BINARY('profiles',
 
 bld.SAMBA_BINARY('smbspool',
                  source=CUPS_SRC,
-                 deps='''talloc tdb tevent resolv cap libwbclient POPT_SAMBA PARAM LIBSMB LIB_NONSMBD LIBS
+                 deps='''talloc tdb tevent resolv cap wbclient POPT_SAMBA PARAM LIBSMB LIB_NONSMBD LIBS
                  KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
                  vars=locals())
 
 bld.SAMBA_BINARY('testparm',
                  source=TESTPARM_SRC,
                  deps='''talloc tevent ldap cap 
-                 libwbclient ASN1_UTIL LIBTSOCKET PASSDB PARAM LIB_NONSMBD
+                 wbclient ASN1_UTIL LIBTSOCKET PASSDB PARAM LIB_NONSMBD
                  LIBSMB_ERR POPT_SAMBA''',
                  vars=locals())
 
@@ -1302,28 +1216,28 @@ bld.SAMBA_BINARY('smbcontrol',
 
 bld.SAMBA_BINARY('smbtree',
                  source=SMBTREE_SRC,
-                 deps='''talloc tdb tevent cap resolv libwbclient PARAM LIB_NONSMBD
+                 deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD
                  LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PROFILE
-                 RPCCLI_SRVSVC''',
+                 RPC_NDR_SRVSVC''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbpasswd',
                  source=SMBPASSWD_SRC,
-                 deps='''talloc tdb tevent cap resolv libwbclient PARAM LIB_NONSMBD
+                 deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD
                  LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PASSWD_UTIL
-                 LIBCLI_SAMR''',
+                 LIBCLI_SAMR INIT_LSA PASSCHANGE''',
                  vars=locals())
 
 bld.SAMBA_BINARY('pdbedit',
                  source=PDBEDIT_SRC,
-                 deps='''talloc tdb tevent cap resolv libwbclient PARAM LIB_NONSMBD
+                 deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD
                  LIBSAMBA LIBSMB_ERR POPT_SAMBA PASSDB SMBLDAP GROUPDB
                  PASSWD_UTIL LIBCLI_LDAP_NDR''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbget',
                  source=SMBGET_SRC,
-                 deps='''talloc tdb libsmbclient POPT_SAMBA''',
+                 deps='''talloc tdb smbclient POPT_SAMBA''',
                  vars=locals())
 
 bld.SAMBA_BINARY('nmblookup',
@@ -1333,18 +1247,18 @@ 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_LSA LIBMSRPC LIBMSRPC_GEN RPCCLI_ECHO''',
+                 deps='''talloc tdb tevent cap resolv wbclient PARAM LIBSMB KRBCLIENT TLDAP
+                 LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPC_NDR_ECHO''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbconftort',
                  source=SMBCONFTORT_SRC,
-                 deps='''talloc tdb tevent cap resolv libwbclient PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA''',
+                 deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA''',
                  vars=locals())
 
 bld.SAMBA_BINARY('masktest',
                  source=MASKTEST_SRC,
-                 deps='''talloc tdb cap resolv libwbclient PARAM LIB_NONSMBD LIBSMB KRBCLIENT
+                 deps='''talloc tdb cap resolv wbclient PARAM LIB_NONSMBD LIBSMB KRBCLIENT
                  ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
                  vars=locals())
 
@@ -1355,14 +1269,14 @@ bld.SAMBA_BINARY('msgtest',
 
 bld.SAMBA_BINARY('smbcacls',
                  source=SMBCACLS_SRC,
-                 deps='''talloc tdb cap resolv libwbclient PARAM LIBSMB KRBCLIENT
+                 deps='''talloc tdb cap resolv wbclient PARAM LIBSMB KRBCLIENT
                  LIB_NONSMBD PASSDB GROUPDB POPT_SAMBA SMBLDAP LIBMSRPC_GEN
                  LIBMSRPC LIBCLI_LSA''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbcquotas',
                  source=SMBCQUOTAS_SRC,
-                 deps='''talloc tdb cap resolv libwbclient PARAM LIB_NONSMBD LIBSMB KRBCLIENT
+                 deps='''talloc tdb cap resolv wbclient PARAM LIB_NONSMBD LIBSMB KRBCLIENT
                  POPT_SAMBA PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC
                  LIBCLI_LSA''',
                  vars=locals())
@@ -1370,28 +1284,28 @@ bld.SAMBA_BINARY('smbcquotas',
 bld.SAMBA_BINARY('eventlogadm',
                  source=EVTLOGADM_SRC,
                  deps='''talloc tevent cap POPT_SAMBA LIBS PARAM
-                 LIB_NONSMBD LIBSMB_ERR PASSDB libwbclient LIBEVENTLOG REG_EVENTLOG''',
+                 LIB_NONSMBD LIBSMB_ERR PASSDB wbclient LIBEVENTLOG''',
                  vars=locals())
 
 bld.SAMBA_BINARY('sharesec',
                  source=SHARESEC_SRC,
-                 deps='''talloc tdb tevent cap resolv libwbclient PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA''',
+                 deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA''',
                  vars=locals())
 
 bld.SAMBA_BINARY('locktest',
                  source=LOCKTEST_SRC,
-                 deps='''talloc tdb tevent cap resolv libwbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
+                 deps='''talloc tdb tevent cap resolv wbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
                  ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
                  vars=locals())
 
 bld.SAMBA_BINARY('nsstest',
                  source=NSSTEST_SRC,
-                 deps='',
+                 deps='dl',
                  vars=locals())
 
 bld.SAMBA_BINARY('pdbtest',
                  source=PDBTEST_SRC,
-                 deps='''talloc tdb cap resolv libwbclient PARAM LIBSMB KRBCLIENT LIB_NONSMBD PASSDB GROUPDB
+                 deps='''talloc tdb cap resolv wbclient PARAM LIBSMB KRBCLIENT LIB_NONSMBD PASSDB GROUPDB
                  SMBLDAP POPT_SAMBA NDR_SAMR NDR_LSA''',
                  vars=locals())
 
@@ -1412,7 +1326,7 @@ bld.SAMBA_BINARY('log2pcap',
 
 bld.SAMBA_BINARY('locktest2',
                  source=LOCKTEST2_SRC,
-                 deps='''talloc tdb tevent cap resolv libwbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
+                 deps='''talloc tdb tevent cap resolv wbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
                  ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
                  vars=locals())
 
@@ -1423,27 +1337,28 @@ bld.SAMBA_BINARY('debug2html',
 
 bld.SAMBA_BINARY('smbfilter',
                  source=SMBFILTER_SRC,
-                 deps='''talloc tevent cap resolv libwbclient PARAM LIBSMB LIB_NONSMBD KRBCLIENT ASN1_UTIL LIBTSOCKET
+                 deps='''talloc tevent cap resolv wbclient PARAM LIBSMB LIB_NONSMBD KRBCLIENT ASN1_UTIL LIBTSOCKET
                  NDR_SAMR NDR_LSA''',
                  vars=locals())
 
 bld.SAMBA_BINARY('versiontest',
-                 source='lib/version_test.c ${VERSION_SRC}',
+                 source='lib/version_test.c',
+                 deps='SAMBA_VERSION',
                  vars=locals())
 
 bld.SAMBA_BINARY('wbinfo',
                  source=WBINFO_SRC,
-                 deps='''talloc libwbclient tevent cap
+                 deps='''talloc wbclient tevent cap
                  ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
                  LIBSAMBA POPT_SAMBA LIBAFS_SETTOKEN''',
                  vars=locals())
 
 bld.SAMBA_BINARY('ntlm_auth',
                  source=NTLM_AUTH_SRC,
-                 deps='''tdb talloc cap resolv krb5 k5crypto com_err libwbclient PARAM LIB_NONSMBD
+                 deps='''tdb talloc cap resolv krb5 k5crypto com_err wbclient PARAM LIB_NONSMBD
                  LIBS LIBSAMBA POPT_SAMBA ASN1_UTIL LIBTSOCKET
-                 PASSDB GROUPDB SMBLDAP WBCOMMON LIBINIPARSER LIBADS_SERVER
-                 NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB''',
+                 PASSDB GROUPDB SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
+                 NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE''',
                  vars=locals())
 
 bld.SAMBA_BINARY('timelimit',
@@ -1452,13 +1367,13 @@ bld.SAMBA_BINARY('timelimit',
 
 bld.SAMBA_BINARY('rpc_open_tcp',
                  source=RPC_OPEN_TCP_SRC,
-                 deps='''talloc tdb tevent resolv cap libwbclient KRBCLIENT PARAM LIBS LIBSMB LIB_NONSMBD
+                 deps='''talloc tdb tevent resolv cap wbclient KRBCLIENT PARAM LIBS LIBSMB LIB_NONSMBD
                  LIBSMB_ERR ASN1_UTIL LIBTSOCKET LIBMSRPC_GEN LIBMSRPC''',
                  vars=locals())
 
 bld.SAMBA_BINARY('test_lp_load',
                  source=TEST_LP_LOAD_SRC,
-                 deps='''talloc tdb tevent cap libwbclient PARAM LIB_NONSMBD POPT_SAMBA LIBSAMBA''',
+                 deps='''talloc tdb tevent cap wbclient PARAM LIB_NONSMBD POPT_SAMBA LIBSAMBA''',
                  vars=locals())
 
 bld.SAMBA_BINARY('dbwrap_tool',
@@ -1474,13 +1389,13 @@ bld.SAMBA_BINARY('dbwrap_torture',
 
 bld.SAMBA_BINARY('split_tokens',
                  source=SPLIT_TOKENS_SRC,
-                 deps='''talloc tdb tevent cap libwbclient PARAM LIB_NONSMBD POPT_SAMBA
+                 deps='''talloc tdb tevent cap wbclient PARAM LIB_NONSMBD POPT_SAMBA
                  LIBSAMBA''',
                  vars=locals())
 
 bld.SAMBA_BINARY('vlp',
                  source=VLP_SRC,
-                 deps='''talloc tdb PARAM_UTIL''',
+                 deps='''talloc tdb PARAM_UTIL UTIL_TDB''',
                  vars=locals())
 
 swat_files=recursive_dirlist('../swat', '../swat', '*')
@@ -1488,24 +1403,39 @@ bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
 
 ########################## INCLUDES #################################
 
+bld.RECURSE('../lib/addns')
+bld.RECURSE('../lib/async_req')
+bld.RECURSE('../libcli/auth')
+bld.RECURSE('../libcli/drsuapi')
+bld.RECURSE('../libcli/ldap')
+bld.RECURSE('../libcli/named_pipe_auth')
+bld.RECURSE('../libcli/netlogon')
+bld.RECURSE('../libcli/samsync')
+bld.RECURSE('../libcli/security')
+bld.RECURSE('../libcli/smb')
+bld.RECURSE('../libcli/smbreadline')
+bld.RECURSE('../lib/crypto')
+bld.RECURSE('../lib/iniparser/src')
+bld.RECURSE('../lib/nss_wrapper')
+bld.RECURSE('../lib/popt')
+bld.RECURSE('../librpc')
+bld.RECURSE('../lib/smbconf')
 bld.RECURSE('../lib/socket_wrapper')
 bld.RECURSE('../lib/talloc')
 bld.RECURSE('../lib/tdb')
-bld.RECURSE('../lib/nss_wrapper')
 bld.RECURSE('../lib/tevent')
-bld.RECURSE('../lib/popt')
-bld.RECURSE('../lib/zlib')
 bld.RECURSE('../lib/tsocket')
-bld.RECURSE('../lib/iniparser/src')
-bld.RECURSE('../lib/crypto')
-bld.RECURSE('modules')
+bld.RECURSE('../lib/zlib')
+bld.RECURSE('../nsswitch/libwbclient')
 bld.RECURSE('auth')
-bld.RECURSE('passdb')
-bld.RECURSE('winbindd')
 bld.RECURSE('libgpo/gpext')
+bld.RECURSE('librpc')
+bld.RECURSE('librpc/idl')
+bld.RECURSE('modules')
 bld.RECURSE('pam_smbpass')
+bld.RECURSE('passdb')
 bld.RECURSE('rpc_server')
-bld.RECURSE('libaddns')
+bld.RECURSE('winbindd')
 
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()