summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-08-26 00:13:00 +0200
committerGünther Deschner <gd@samba.org>2010-08-26 00:17:10 +0200
commit6a795dd14674bfa2f6fe5206a9237f867c48e875 (patch)
tree6ec2fcf269ae3f59402cbfa04c80ae2be04d3890
parentd6949f58fa82196fc67a87e6bf47a5c05698a734 (diff)
downloadsamba-6a795dd14674bfa2f6fe5206a9237f867c48e875.tar.gz
samba-6a795dd14674bfa2f6fe5206a9237f867c48e875.tar.bz2
samba-6a795dd14674bfa2f6fe5206a9237f867c48e875.zip
s3-waf: further rationalise LIBMSRPC_SRC and remove RPC_CLIENT_SRC.
Guenther
-rw-r--r--source3/wscript_build22
1 files changed, 10 insertions, 12 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 475d4003a5..90d1bb3a5f 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -351,14 +351,19 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
LIBMSRPC_SRC = '''
${SCHANNEL_SRC}
- ${RPC_CLIENT_SRC}
- ../librpc/rpc/binding.c'''
+ rpc_client/cli_pipe.c
+ librpc/rpc/rpc_common.c
+ librpc/rpc/dcerpc_gssapi.c
+ librpc/rpc/dcerpc_spnego.c
+ rpc_client/rpc_transport_np.c
+ rpc_client/rpc_transport_sock.c
+ ../librpc/rpc/binding.c
+ ../librpc/rpc/dcerpc_util.c
+ librpc/rpc/dcerpc_helpers.c
+ ../librpc/rpc/binding_handle.c'''
LIBMSRPC_GEN_SRC = '''
${LIBCLI_EPMAPPER_SRC}
- ../librpc/rpc/dcerpc_util.c
- librpc/rpc/dcerpc_helpers.c
- ../librpc/rpc/binding_handle.c
${LIBNDR_GEN_SRC}'''
#
@@ -467,13 +472,6 @@ RPC_ECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
#TODO: RPC_SERVER_SRC used to include RPC_STATIC modules
RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC}'''
-RPC_CLIENT_SRC = '''rpc_client/cli_pipe.c
- librpc/rpc/rpc_common.c
- librpc/rpc/dcerpc_gssapi.c
- librpc/rpc/dcerpc_spnego.c
- rpc_client/rpc_transport_np.c
- rpc_client/rpc_transport_sock.c'''
-
RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c'''