summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2013-10-23 10:24:13 +0200
committerStefan Metzmacher <metze@samba.org>2013-10-29 15:45:39 +0100
commit710ddf82ed88002493171f36fbbeebfff0a181fb (patch)
treec76db96370936d4f59958f5c669ad147b05363d4
parentdf4c2df53b7fa94149fb9fd0c48f651fef342274 (diff)
downloadsamba-710ddf82ed88002493171f36fbbeebfff0a181fb.tar.gz
s3-waf: Seperate rpc_server and rpc_service.
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rwxr-xr-xsource3/rpc_server/wscript_build42
-rwxr-xr-xsource3/wscript_build2
2 files changed, 34 insertions, 10 deletions
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index d7c2c04ef3e..3ed6d37f269 100755
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -13,7 +13,7 @@ bld.SAMBA3_SUBSYSTEM('RPC_NCACN_NP',
source='rpc_ncacn_np.c rpc_handles.c rpc_contexts.c',
deps='RPC_CONFIG auth auth_sam_reply RPC_PIPE_REGISTER npa_tstream')
-bld.SAMBA3_SUBSYSTEM('RPC_SERVICE',
+bld.SAMBA3_SUBSYSTEM('RPC_SERVER_LOOP',
source='rpc_server.c',
deps='samba-util')
@@ -29,6 +29,16 @@ bld.SAMBA3_SUBSYSTEM('SRV_ACCESS_CHECK',
source='srv_access_check.c',
deps='samba-util')
+bld.SAMBA3_SUBSYSTEM('RPC_SERVER',
+ source='srv_pipe_hnd.c srv_pipe.c rpc_sock_helper.c',
+ deps='''
+ RPC_CONFIG
+ RPC_NCACN_NP
+ RPC_SERVER_LOOP
+ RPC_CRYPTO
+ NDR_NAMED_PIPE_AUTH
+ ''')
+
### RPC_SERVICES
bld.SAMBA3_SUBSYSTEM('RPC_DSSETUP',
source='''dssetup/srv_dssetup_nt.c
@@ -115,14 +125,28 @@ bld.SAMBA3_SUBSYSTEM('RPC_SERVER_REGISTER',
source='rpc_ep_register.c ../librpc/rpc/dcerpc_ep.c',
deps='samba-util')
-bld.SAMBA3_SUBSYSTEM('RPC_SERVER',
- source='srv_pipe_hnd.c srv_pipe.c rpc_sock_helper.c rpc_service_setup.c',
- deps='''RPC_CONFIG RPC_NCACN_NP RPC_SERVICE RPC_CRYPTO
- RPC_SAMR RPC_LSARPC RPC_WINREG RPC_INITSHUTDOWN
- RPC_DSSETUP RPC_WKSSVC RPC_SVCCTL RPC_NTSVCS
- RPC_NETLOGON RPC_NETDFS RPC_SRVSVC RPC_SPOOLSS
- RPC_EVENTLOG RPC_RPCECHO RPC_SERVER RPC_EPMAPPER
- RPC_SERVER_REGISTER NDR_NAMED_PIPE_AUTH''')
+bld.SAMBA3_SUBSYSTEM('RPC_SERVICE',
+ source='rpc_service_setup.c',
+ deps='''
+ RPC_SERVER
+ RPC_SERVER_REGISTER
+ RPC_SAMR
+ RPC_LSARPC
+ RPC_WINREG
+ RPC_INITSHUTDOWN
+ RPC_DSSETUP
+ RPC_WKSSVC
+ RPC_SVCCTL
+ RPC_NTSVCS
+ RPC_NETLOGON
+ RPC_NETDFS
+ RPC_SRVSVC
+ RPC_SPOOLSS
+ RPC_EVENTLOG
+ RPC_RPCECHO
+ RPC_SERVER
+ RPC_EPMAPPER
+ ''')
# RPC_DAEMONS
bld.SAMBA3_SUBSYSTEM('EPMD',
diff --git a/source3/wscript_build b/source3/wscript_build
index 4803e9b13e3..9f5be8ee36a 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -588,7 +588,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
LOCKING
LIBADS_SERVER
LIBAFS
- RPC_SERVER
+ RPC_SERVICE
NDR_SMBXSRV
LIBASYS
ccan-hash