diff options
| -rwxr-xr-x | source3/wscript_build | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index 0cce7dec7b..532a23a40d 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -653,7 +653,7 @@ if not bld.env.toplevel_build: bld.SAMBA3_LIBRARY('netapi', source=LIBNETAPI_SRC, - public_deps='''talloc tdb_compat cap wbclient smbd_shim LIBSMB KRBCLIENT + public_deps='''talloc tdb_compat cap wbclient smbd_shim libsmb KRBCLIENT passdb SMBLDAP param samba-util LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI RPC_CLIENT_SCHANNEL smbconf REG_SMBCONF TOKEN_UTIL @@ -666,7 +666,7 @@ bld.SAMBA3_LIBRARY('netapi', bld.SAMBA3_LIBRARY('libsmb/smbclient', source=LIBSMBCLIENT_SRC, - public_deps='''talloc tdb_compat wbclient cap param smbd_shim LIBSMB KRBCLIENT passdb SMBLDAP + public_deps='''talloc tdb_compat wbclient cap param smbd_shim libsmb KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 LIBCLI_LSA3 RPC_NDR_SRVSVC popt_samba3''', public_headers='include/libsmbclient.h', vnum='0', @@ -682,7 +682,7 @@ bld.SAMBA3_LIBRARY('smbsharemodes', bld.SAMBA3_LIBRARY('nss_wins', source=WINBIND_WINS_NSS_SRC, - deps='''winbind-client param LIBSMB smbd_shim LIBTSOCKET KRBCLIENT + deps='''winbind-client param libsmb smbd_shim LIBTSOCKET KRBCLIENT cap wbclient''', realname='libnss_wins.so.2', vnum='2') @@ -692,7 +692,7 @@ bld.SAMBA3_LIBRARY('msrpc3', deps='''ndr ndr-standard RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH LIBTSOCKET KRB5_WRAP rpccommon - LIBSMB''', + libsmb''', vars=locals(), private_library=True) @@ -807,7 +807,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP', deps='LIBSMB_ERR NDR_NTLMSSP NTLMSSP_COMMON', vars=locals()) -bld.SAMBA3_LIBRARY('LIBSMB', +bld.SAMBA3_LIBRARY('libsmb', source=LIBSMB_SRC, deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON util_cmdline', vars=locals(), @@ -836,7 +836,7 @@ bld.SAMBA3_SUBSYSTEM('SMBLDAP', bld.SAMBA3_LIBRARY('ads', source=LIBADS_SRC, - deps='cli-ldap-common KRB5_WRAP ldap lber KRBCLIENT param LIBNTLMSSP LIBNMB LIBSMB DCUTIL', + deps='cli-ldap-common KRB5_WRAP ldap lber KRBCLIENT param LIBNTLMSSP LIBNMB libsmb DCUTIL', private_library=True, vars=locals()) @@ -876,7 +876,7 @@ bld.SAMBA3_LIBRARY('smbd_base', source=SMBD_SRC_BASE, deps='''tdb_compat tevent dl krb5 ldap gssapi gssapi_krb5 samba-util wbclient crypt nsl cups cap z passdb - param samba3core LIBSMB popt_samba3 KRBCLIENT AVAHI + param samba3core libsmb popt_samba3 KRBCLIENT AVAHI LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER LIBADS_PRINTER vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO @@ -1097,7 +1097,7 @@ bld.SAMBA3_BINARY('smbd/smbd', bld.SAMBA3_BINARY('nmbd/nmbd', source=NMBD_SRC, deps='''talloc tdb_compat tevent z cap wbclient dl - passdb param ldap smbd_shim LIBSMB + passdb param ldap smbd_shim libsmb popt_samba3 KRBCLIENT NDR_SAMR NDR_LSA PROFILE''', install_path='${SBINDIR}', vars=locals()) @@ -1105,7 +1105,7 @@ bld.SAMBA3_BINARY('nmbd/nmbd', bld.SAMBA3_BINARY('winbindd/winbindd', source=WINBINDD_SRC, deps='''talloc tdb_compat tevent cap dl z - wbclient passdb ldap param smbd_shim LIBSMB + wbclient passdb ldap param smbd_shim libsmb popt_samba3 KRBCLIENT LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER SRV_NDR_WBINT RPC_NDR_WBINT NDR_WBINT LIBAFS LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info @@ -1121,7 +1121,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd', bld.SAMBA3_BINARY('web/swat', source=SWAT_SRC, - deps='''talloc tevent cap samba3core LIBSMB wbclient param + deps='''talloc tevent cap samba3core libsmb wbclient param smbd_shim passdb popt_samba3 KRBCLIENT cups LIBMSRPC_GEN msrpc3 LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING FNAME_UTIL LIBCLI_SAMR INIT_LSA PASSCHANGE''', @@ -1131,7 +1131,7 @@ bld.SAMBA3_BINARY('web/swat', bld.SAMBA3_BINARY('rpcclient/rpcclient', source=RPCCLIENT_SRC, - deps='''talloc tdb_compat cap popt_samba3 passdb LIBSMB smbd_shim + deps='''talloc tdb_compat cap popt_samba3 passdb libsmb smbd_shim param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 ads SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO RPC_CLIENT_SCHANNEL @@ -1144,7 +1144,7 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient', bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, source=CLIENT_SRC, - deps='''talloc tdb_compat cap popt_samba3 passdb LIBSMB smbd_shim + deps='''talloc tdb_compat cap popt_samba3 passdb libsmb smbd_shim param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA LIBCLI_SMB_COMMON''', @@ -1152,7 +1152,7 @@ bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, bld.SAMBA3_BINARY('net', source=NET_SRC, - deps='''talloc tdb_compat netapi addns cap intl popt_samba3 passdb LIBSMB smbd_shim + deps='''talloc tdb_compat netapi addns cap intl popt_samba3 passdb libsmb smbd_shim param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 LIBGPO ads LIBADS_SERVER LIBADS_PRINTER LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL @@ -1171,7 +1171,7 @@ bld.SAMBA3_BINARY('profiles', bld.SAMBA3_BINARY('smbspool', source=CUPS_SRC, - deps='''talloc tdb_compat tevent cap wbclient popt_samba3 param LIBSMB smbd_shim samba3core + deps='''talloc tdb_compat tevent cap wbclient popt_samba3 param libsmb smbd_shim samba3core KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) @@ -1202,14 +1202,14 @@ bld.SAMBA3_BINARY('smbcontrol', bld.SAMBA3_BINARY('smbtree', source=SMBTREE_SRC, deps='''talloc tdb_compat tevent cap wbclient param smbd_shim - LIBSMB LIBSMB_ERR popt_samba3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PROFILE + libsmb LIBSMB_ERR popt_samba3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PROFILE RPC_NDR_SRVSVC''', vars=locals()) bld.SAMBA3_BINARY('smbpasswd', source=SMBPASSWD_SRC, deps='''talloc tdb_compat tevent cap wbclient param smbd_shim - LIBSMB LIBSMB_ERR popt_samba3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PASSWD_UTIL + libsmb LIBSMB_ERR popt_samba3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PASSWD_UTIL LIBCLI_SAMR INIT_LSA PASSCHANGE''', vars=locals()) @@ -1232,7 +1232,7 @@ bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3, bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3, source=SMBTORTURE_SRC, - deps='''talloc tdb_compat tevent cap wbclient param LIBSMB KRBCLIENT TLDAP + deps='''talloc tdb_compat tevent cap wbclient param libsmb KRBCLIENT TLDAP smbd_shim popt_samba3 asn1util LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''', vars=locals()) @@ -1248,7 +1248,7 @@ bld.SAMBA3_BINARY('replacetort', bld.SAMBA3_BINARY('masktest' + bld.env.suffix3, source=MASKTEST_SRC, - deps='''talloc tdb_compat cap wbclient param smbd_shim LIBSMB KRBCLIENT + deps='''talloc tdb_compat cap wbclient param smbd_shim libsmb KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) @@ -1259,14 +1259,14 @@ bld.SAMBA3_BINARY('msgtest', bld.SAMBA3_BINARY('smbcacls', source=SMBCACLS_SRC, - deps='''talloc tdb_compat cap wbclient param LIBSMB KRBCLIENT + deps='''talloc tdb_compat cap wbclient param libsmb KRBCLIENT smbd_shim passdb popt_samba3 SMBLDAP LIBMSRPC_GEN msrpc3 LIBCLI_LSA3''', vars=locals()) bld.SAMBA3_BINARY('smbcquotas', source=SMBCQUOTAS_SRC, - deps='''talloc tdb_compat cap wbclient param smbd_shim LIBSMB KRBCLIENT + deps='''talloc tdb_compat cap wbclient param smbd_shim libsmb KRBCLIENT popt_samba3 passdb SMBLDAP LIBMSRPC_GEN msrpc3 LIBCLI_LSA3''', vars=locals()) @@ -1284,13 +1284,13 @@ bld.SAMBA3_BINARY('sharesec', bld.SAMBA3_BINARY('locktest' + bld.env.suffix3, source=LOCKTEST_SRC, - deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT LIBSMB smbd_shim + deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT libsmb smbd_shim asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''', vars=locals()) bld.SAMBA3_BINARY('pdbtest', source=PDBTEST_SRC, - deps='''talloc tdb_compat cap wbclient param LIBSMB KRBCLIENT smbd_shim passdb + deps='''talloc tdb_compat cap wbclient param libsmb KRBCLIENT smbd_shim passdb SMBLDAP popt_samba3 NDR_SAMR NDR_LSA''', vars=locals()) @@ -1311,7 +1311,7 @@ bld.SAMBA3_BINARY('log2pcap', bld.SAMBA3_BINARY('locktest2', source=LOCKTEST2_SRC, - deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT LIBSMB smbd_shim + deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT libsmb smbd_shim asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''', vars=locals()) @@ -1322,7 +1322,7 @@ bld.SAMBA3_BINARY('debug2html', bld.SAMBA3_BINARY('smbfilter', source=SMBFILTER_SRC, - deps='''talloc tevent cap wbclient param LIBSMB smbd_shim KRBCLIENT asn1util LIBTSOCKET + deps='''talloc tevent cap wbclient param libsmb smbd_shim KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) @@ -1352,7 +1352,7 @@ bld.SAMBA3_BINARY('timelimit', bld.SAMBA3_BINARY('rpc_open_tcp', source=RPC_OPEN_TCP_SRC, - deps='''talloc tdb_compat tevent cap wbclient KRBCLIENT param samba3core LIBSMB smbd_shim + deps='''talloc tdb_compat tevent cap wbclient KRBCLIENT param samba3core libsmb smbd_shim LIBSMB_ERR asn1util LIBTSOCKET LIBMSRPC_GEN msrpc3''', vars=locals()) |