s3-waf: fix library names (we installed liblibsmbclient, etc.)
[idra/samba.git] / source3 / wscript_build
index 1a51b36bf9fe67915c41bdc440bc6014bb9f594f..4425133099e4aacbb97ae1c920cf315953e8e0ca 100644 (file)
@@ -29,16 +29,9 @@ 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
@@ -48,35 +41,15 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
              ../librpc/ndr/uuid.c
              librpc/ndr/util.c'''
 
-LIBCLI_SPOOLSS_SRC = '''
-                     ../librpc/gen_ndr/cli_spoolss.c
-                     ../librpc/gen_ndr/ndr_spoolss_c.c
-                     rpc_client/cli_spoolss.c
+LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
                      rpc_client/init_spoolss.c'''
 
-LIBCLI_EVENTLOG_SRC = '''
-                      ../librpc/gen_ndr/cli_eventlog.c
-                      ../librpc/gen_ndr/ndr_eventlog_c.c'''
-
-LIBCLI_NTSVCS_SRC = '''
-                    ../librpc/gen_ndr/cli_ntsvcs.c
-                    ../librpc/gen_ndr/ndr_ntsvcs_c.c'''
-
-LIBCLI_DRSUAPI_SRC = '''
-                     ../librpc/gen_ndr/cli_drsuapi.c
-                     ../librpc/gen_ndr/ndr_drsuapi_c.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'
 
-LIBCLI_EPMAPPER_SRC = '''
-                      ../librpc/gen_ndr/cli_epmapper.c
-                      ../librpc/gen_ndr/ndr_epmapper_c.c'''
-
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
 REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
@@ -173,12 +146,7 @@ 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
-             ../librpc/gen_ndr/ndr_nbt.c
-             ../librpc/gen_ndr/ndr_svcctl.c
-             ../librpc/ndr/ndr_svcctl.c'''
+LIBNBT_SRC = '''../libcli/netlogon.c'''
 
 LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
              libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
@@ -221,15 +189,12 @@ SCHANNEL_SRC = '''../libcli/auth/credentials.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/smb_seal.c libsmb/async_smb.c'''
 
 LIBMSRPC_SRC = '''
                ${SCHANNEL_SRC}
@@ -244,8 +209,7 @@ LIBMSRPC_SRC = '''
                ../librpc/rpc/binding.c
                ../librpc/rpc/dcerpc_util.c
                librpc/rpc/dcerpc_helpers.c
-               ../librpc/rpc/binding_handle.c
-               ${LIBCLI_EPMAPPER_SRC}'''
+               ../librpc/rpc/binding_handle.c'''
 
 #
 # registry-related objects
@@ -306,8 +270,7 @@ SERVICES_SRC = '''services/svc_spoolss.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'''
+NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c'''
 
 RPC_NCACN_NP = '''rpc_server/rpc_ncacn_np.c
                   rpc_server/rpc_handles.c'''
@@ -321,7 +284,7 @@ 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_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC}'''
+RPC_SERVER_SRC = '''${RPC_PIPE_SRC}'''
 
 RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
 
@@ -347,8 +310,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'''
 
@@ -451,13 +413,10 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    ../nsswitch/libwbclient/wb_reqtrans.c'''
 
 WINBINDD_SRC = '''${WINBINDD_SRC1}
-                  ${RPC_NCACN_NP} ${NPA_TSTREAM_SRC}
+                  ${RPC_NCACN_NP}
                   ${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
+                  ../librpc/gen_ndr/srv_lsa.c
+                  ../librpc/gen_ndr/srv_samr.c
                   rpc_server/srv_pipe_register.c'''
 
 MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
@@ -513,10 +472,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
 SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 ${RPC_SERVER_SRC}
                 ${OPLOCK_SRC} ${NOTIFY_SRC}
-                ${BUILDOPT_SRC}
-                ${LIBCLI_SPOOLSS_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
@@ -551,8 +507,7 @@ 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'''
+           ${PASSCHANGE_SRC}'''
 
 STATUS_SRC = '''utils/status.c utils/status_profile.c'''
 
@@ -568,8 +523,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 ${PASSCHANGE_SRC}'''
 
 PDBEDIT_SRC = '''utils/pdbedit.c'''
 
@@ -585,13 +539,7 @@ 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}
-                   ${LIBCLI_SPOOLSS_SRC}
-                   ${LIBCLI_EVENTLOG_SRC}
-                   ${LIBCLI_NTSVCS_SRC}
-                   ${LIBCLI_DRSUAPI_SRC}
-                   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}'
 
@@ -635,17 +583,14 @@ 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
@@ -685,10 +630,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
-              ${LIBCLI_SPOOLSS_SRC}
-              ${LIBCLI_DRSUAPI_SRC}
-              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'''
@@ -708,7 +649,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
                 torture/test_async_echo.c
                 torture/test_posix_append.c'''
 
-SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} ${TLDAP_SRC}
+SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
         ../nsswitch/libwbclient/wbc_async.c
         ../nsswitch/libwbclient/wb_reqtrans.c'''
 
@@ -761,8 +702,7 @@ POPT_SRC = '''../lib/popt/findme.c ../lib/popt/popt.c ../lib/popt/poptconfig.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
@@ -812,7 +752,7 @@ bld.RECURSE('../libcli/security')
 bld.SAMBA_SUBSYSTEM('WBCOMMON',
                     source=WBCOMMON_SRC)
 
-bld.SAMBA_LIBRARY('libwbclient',
+bld.SAMBA_LIBRARY('wbclient',
                     source='''../nsswitch/libwbclient/wbc_guid.c
                               ../nsswitch/libwbclient/wbc_idmap.c
                               ../nsswitch/libwbclient/wbclient.c
@@ -824,21 +764,22 @@ bld.SAMBA_LIBRARY('libwbclient',
                     private_library=True,
                     public_deps='talloc WBCOMMON')
 
-bld.SAMBA_LIBRARY('libnetapi',
+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''',
+                    RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_INITSHUTDOWN
+                    INIT_NETLOGON INIT_SAMR''',
                     public_headers='lib/netapi/netapi.h',
                     private_library=True,
                     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
+                    public_deps='''talloc tdb wbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB
                     LIBMSRPC_GEN LIBMSRPC LIBCLI_LSA RPCCLI_SRVSVC''',
                     public_headers='include/libsmbclient.h',
                     private_library=True,
@@ -853,7 +794,8 @@ bld.SAMBA_LIBRARY('smbsharemodes',
 
 bld.SAMBA_SUBSYSTEM('LIBMSRPC',
                     source='${LIBMSRPC_SRC}',
-                    deps='ndr NDR_SECURITY NDR_DCERPC NDR_SCHANNEL',
+                    deps='''ndr NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
+                    RPCCLI_EPMAPPER''',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
@@ -964,7 +906,12 @@ bld.SAMBA_SUBSYSTEM('LIBSAMBA',
 
 bld.SAMBA_SUBSYSTEM('LIBSMB',
                     source=LIBSMB_SRC,
-                    deps='LIBSAMBA z LZXPRESS CLDAP LIBNMB',
+                    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',
@@ -1012,14 +959,14 @@ bld.SAMBA_SUBSYSTEM('LIBSMBCONF',
 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
+                    PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO
                     LIBSMBCONF REG_FULL FNAME_UTIL
-                    LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
-                    RPCCLI_SRVSVC
+                    LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
+                    RPCCLI_SRVSVC NPA_TSTREAM INIT_NETLOGON INIT_SAMR
                     ''',
                     vars=locals())
 
@@ -1077,18 +1024,28 @@ bld.SAMBA_SUBSYSTEM('LIBNMB',
                     source=LIBNMB_SRC,
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('LIBNBT',
+                    source=LIBNBT_SRC,
+                    deps='NDR_SVCCTL NDR_NBT NDR_NBT_BUF 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',
                     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())
@@ -1179,22 +1136,58 @@ 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')
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_LSA',
                     source=LIBCLI_LSA_SRC,
-                    deps='RPCCLI_LSA')
+                    deps='RPCCLI_LSA INIT_LSA')
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON',
                     source=LIBCLI_NETLOGON_SRC,
                     deps='RPCCLI_NETLOGON')
 
+bld.SAMBA_SUBSYSTEM('LIBCLI_SPOOLSS',
+                    source=LIBCLI_SPOOLSS_SRC,
+                    deps='RPCCLI_SPOOLSS')
+
 bld.SAMBA_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
        source=RPC_CLIENT_SCHANNEL_SRC,
        vars=locals())
 
+bld.SAMBA_SUBSYSTEM('NPA_TSTREAM',
+                    source=NPA_TSTREAM_SRC,
+                    deps='NDR_NAMED_PIPE_AUTH')
+
+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 #################################
 
@@ -1206,7 +1199,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}',
@@ -1215,13 +1208,14 @@ 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
                  LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
                  TOKEN_UTIL
                  LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
-                 RPCCLI_DSSETUP
+                 RPCCLI_DSSETUP NPA_TSTREAM INIT_NETLOGON
+                 RPC_SAMR RPC_LSARPC
                  ''',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}',
@@ -1229,10 +1223,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''',
                  enabled=bld.env.build_swat,
                  install_path='${SBINDIR}',
                  vars=locals())
@@ -1240,32 +1234,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
+                 PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC
                  LIBADS SMBREADLINE DCUTIL RPCCLI_WINREG RPCCLI_ECHO
                  RPC_CLIENT_SCHANNEL
-                 LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
+                 LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
                  RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_DSSETUP RPCCLI_DFS
+                 RPCCLI_DRSUAPI RPCCLI_NTSVCS RPCCLI_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 RPCCLI_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
                  RPC_CLIENT_SCHANNEL TOKEN_UTIL
-                 LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
+                 LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
                  RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL RPCCLI_DSSETUP
-                 RPCCLI_INITSHUTDOWN
+                 RPCCLI_INITSHUTDOWN RPCCLI_DRSUAPI INIT_NETLOGON INIT_SAMR
                 ''',
                  vars=locals())
 
@@ -1276,14 +1272,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())
 
@@ -1306,28 +1302,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''',
                  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''',
                  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',
@@ -1337,18 +1333,18 @@ bld.SAMBA_BINARY('nmblookup',
 
 bld.SAMBA_BINARY('smbtorture',
                  source=SMBTORTURE_SRC,
-                 deps='''talloc tdb tevent cap resolv libwbclient PARAM LIBSMB KRBCLIENT
+                 deps='''talloc tdb tevent cap resolv wbclient PARAM LIBSMB KRBCLIENT TLDAP
                  LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPCCLI_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())
 
@@ -1359,14 +1355,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())
@@ -1374,17 +1370,17 @@ 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 REG_EVENTLOG''',
                  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())
 
@@ -1395,7 +1391,7 @@ bld.SAMBA_BINARY('nsstest',
 
 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())
 
@@ -1416,7 +1412,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())
 
@@ -1427,7 +1423,7 @@ 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())
 
@@ -1437,17 +1433,17 @@ bld.SAMBA_BINARY('versiontest',
 
 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''',
+                 NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE''',
                  vars=locals())
 
 bld.SAMBA_BINARY('timelimit',
@@ -1456,13 +1452,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',
@@ -1478,7 +1474,7 @@ 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())