diff options
| author | Günther Deschner <gd@samba.org> | 2010-12-15 00:33:21 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-12-15 10:56:18 +0100 |
| commit | 5130e4a6226115817cb18be265c47f5290d1aedc (patch) | |
| tree | 2ab5f410d6dc21d86a44d2c77e2ef7647d60b2c4 | |
| parent | ea510ae16cc7103bb001469b644415b2867ff347 (diff) | |
| download | samba-5130e4a6226115817cb18be265c47f5290d1aedc.tar.gz samba-5130e4a6226115817cb18be265c47f5290d1aedc.tar.bz2 samba-5130e4a6226115817cb18be265c47f5290d1aedc.zip | |
s3-waf: rework rpc_server handling a bit.
Guenther
| -rw-r--r-- | source3/rpc_server/wscript_build | 19 | ||||
| -rw-r--r-- | source3/wscript_build | 23 |
2 files changed, 21 insertions, 21 deletions
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build index c56a23476a..145e00e93a 100644 --- a/source3/rpc_server/wscript_build +++ b/source3/rpc_server/wscript_build @@ -19,7 +19,8 @@ RPC_EVENTLOG_SRC = '''srv_eventlog_nt.c ../../librpc/gen_ndr/srv_eventlog.c''' RPC_RPCECHO_SRC = '''srv_echo_nt.c ../../librpc/gen_ndr/srv_echo.c''' bld.SAMBA_SUBSYSTEM('rpc', - source='srv_pipe_register.c', + source='', + deps='RPC_PIPE_REGISTER', vars=locals()) bld.SAMBA_SUBSYSTEM('RPC_SAMR', @@ -31,6 +32,22 @@ bld.SAMBA_SUBSYSTEM('RPC_LSARPC', source=RPC_LSARPC_SRC, vars=locals()) +bld.SAMBA_SUBSYSTEM('RPC_NCACN_NP', + source='rpc_ncacn_np.c rpc_handles.c') + +bld.SAMBA_SUBSYSTEM('RPC_SERVICE', + source='rpc_server.c') + +bld.SAMBA_SUBSYSTEM('RPC_CRYPTO', + source='dcesrv_ntlmssp.c dcesrv_gssapi.c dcesrv_spnego.c') + +bld.SAMBA_SUBSYSTEM('RPC_PIPE_REGISTER', + source='srv_pipe_register.c') + +bld.SAMBA_SUBSYSTEM('RPC_SERVER', + source='srv_pipe_hnd.c srv_pipe.c', + deps='RPC_NCACN_NP RPC_SERVICE RPC_CRYPTO') + bld.SAMBA_MODULE('rpc_lsarpc', subsystem='rpc', source='../../librpc/gen_ndr/srv_lsa.c', diff --git a/source3/wscript_build b/source3/wscript_build index 482cb023ef..e151ba67cc 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -260,20 +260,6 @@ SERVICES_SRC = '''services/svc_spoolss.c LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.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}''' - RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c''' LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c''' @@ -401,11 +387,9 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c ../nsswitch/libwbclient/wb_reqtrans.c''' WINBINDD_SRC = '''${WINBINDD_SRC1} - ${RPC_NCACN_NP} ${TDB_VALIDATE_SRC} ../librpc/gen_ndr/srv_lsa.c - ../librpc/gen_ndr/srv_samr.c - rpc_server/srv_pipe_register.c''' + ../librpc/gen_ndr/srv_samr.c''' MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c''' @@ -457,7 +441,6 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c ${MANGLE_SRC}''' SMBD_SRC_BASE = '''${SMBD_SRC_SRV} - ${RPC_SERVER_SRC} ${OPLOCK_SRC} ${NOTIFY_SRC} ${BUILDOPT_SRC}''' @@ -967,7 +950,7 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE', LIBSMBCONF REG_FULL FNAME_UTIL LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS RPCCLI_SRVSVC NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON INIT_SAMR - LIBCLI_SMB_COMMON + LIBCLI_SMB_COMMON RPC_SERVER ''', vars=locals()) @@ -1228,7 +1211,7 @@ bld.SAMBA_BINARY('winbindd/winbindd', TOKEN_UTIL LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON RPCCLI_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON - RPC_SAMR RPC_LSARPC + RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC ''', enabled=bld.env.build_winbind, install_path='${SBINDIR}', |