From 710ddf82ed88002493171f36fbbeebfff0a181fb Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 23 Oct 2013 10:24:13 +0200
Subject: [PATCH] s3-waf: Seperate rpc_server and rpc_service.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---
 source3/rpc_server/wscript_build | 42 +++++++++++++++++++++++++-------
 source3/wscript_build            |  2 +-
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index d7c2c04ef3e9..3ed6d37f2694 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 4803e9b13e3c..9f5be8ee36a7 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
-- 
2.34.1