diff options
| author | Günther Deschner <gd@samba.org> | 2010-10-08 13:17:21 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-10-20 16:21:12 +0200 |
| commit | 4a2e47b74a7dbf8604d6a3eff6235819d13fd83f (patch) | |
| tree | 9fd4ff19e8be9262d0c2a86589754b71da5e480b | |
| parent | 71ac92b67391d826b015fc4cffb104918d14594b (diff) | |
| download | samba-4a2e47b74a7dbf8604d6a3eff6235819d13fd83f.tar.gz samba-4a2e47b74a7dbf8604d6a3eff6235819d13fd83f.tar.bz2 samba-4a2e47b74a7dbf8604d6a3eff6235819d13fd83f.zip | |
s3-waf: move RPC_CLIENT_SCHANNEL into a subsystem.
Guenther
| -rw-r--r-- | source3/auth/wscript_build | 1 | ||||
| -rw-r--r-- | source3/wscript_build | 18 |
2 files changed, 12 insertions, 7 deletions
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build index 62a730ccd9..0fd28bc1f6 100644 --- a/source3/auth/wscript_build +++ b/source3/auth/wscript_build @@ -61,6 +61,7 @@ bld.SAMBA_MODULE('auth_server', bld.SAMBA_MODULE('auth_domain', subsystem='auth', source=AUTH_DOMAIN_SRC, + deps='RPC_CLIENT_SCHANNEL', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_DOMAIN'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_DOMAIN')) diff --git a/source3/wscript_build b/source3/wscript_build index 695a187f32..a558db0423 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -592,7 +592,6 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV} ${LIBCLI_LSA_SRC} ${LIBCLI_SAMR_SRC} ${LIBCLI_NETLOGON_SRC} - ${RPC_CLIENT_SCHANNEL_SRC} rpc_client/init_netlogon.c rpc_client/init_samr.c''' @@ -679,7 +678,6 @@ RPCCLIENT_SRC = '''${RPCCLIENT_SRC1} ${LIBCLI_LSA_SRC} ${LIBCLI_SAMR_SRC} ${LIBCLI_NETLOGON_SRC} - ${RPC_CLIENT_SCHANNEL_SRC} rpc_client/init_netlogon.c rpc_client/init_samr.c''' @@ -737,7 +735,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''' @@ -798,7 +795,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 @@ -945,7 +941,8 @@ 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 NDR_LIBNETAPI''', + LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI + RPC_CLIENT_SCHANNEL''', public_headers='lib/netapi/netapi.h', vars=locals()) @@ -1217,6 +1214,11 @@ 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 ################################# bld.SAMBA_BINARY('smbd/smbd', @@ -1258,7 +1260,8 @@ 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''', + LIBADS SMBREADLINE DCUTIL RPCCLI_WINREG RPCCLI_ECHO + RPC_CLIENT_SCHANNEL''', vars=locals()) bld.SAMBA_BINARY('smbclient', @@ -1274,7 +1277,8 @@ bld.SAMBA_BINARY('net', PARAM_WITHOUT_REG libwbclient 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 RPCCLI_WINREG + RPC_CLIENT_SCHANNEL''', vars=locals()) bld.SAMBA_BINARY('profiles', |