From c8b2b109760b366bee6dcf7c6c306936d271f508 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 9 Feb 2011 15:56:20 +1100 Subject: s3-waf: use SAMBA3_*() build rules in source3/build this brings the s3 waf build much closer to the proposed s3build top level build, using the same bld.SAMBA3_*() rules There are a few renames of subsystems in here, with a 3 suffix where it would create a conflict. Pair-Programmed-With: Andrew Bartlett --- source3/rpc_server/wscript_build | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'source3/rpc_server/wscript_build') diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build index 2eb5b3af0a..96801b5d83 100644 --- a/source3/rpc_server/wscript_build +++ b/source3/rpc_server/wscript_build @@ -20,94 +20,94 @@ RPC_EVENTLOG_SRC = '''eventlog/srv_eventlog_nt.c eventlog/srv_eventlog_reg.c ../ RPC_RPCECHO_SRC = '''echo/srv_echo_nt.c ../../librpc/gen_ndr/srv_echo.c''' RPC_EPMAPPER_SRC = '''epmapper/srv_epmapper.c ../../librpc/gen_ndr/srv_epmapper.c''' -bld.SAMBA_SUBSYSTEM('rpc', +bld.SAMBA3_SUBSYSTEM('rpc', source='', deps='RPC_PIPE_REGISTER', vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_NCACN_NP', +bld.SAMBA3_SUBSYSTEM('RPC_NCACN_NP', source='rpc_ncacn_np.c rpc_handles.c', deps='auth_sam_reply') -bld.SAMBA_SUBSYSTEM('RPC_SERVICE', +bld.SAMBA3_SUBSYSTEM('RPC_SERVICE', source='rpc_server.c') -bld.SAMBA_SUBSYSTEM('RPC_CRYPTO', +bld.SAMBA3_SUBSYSTEM('RPC_CRYPTO', source='dcesrv_ntlmssp.c dcesrv_gssapi.c dcesrv_spnego.c') -bld.SAMBA_SUBSYSTEM('RPC_PIPE_REGISTER', +bld.SAMBA3_SUBSYSTEM('RPC_PIPE_REGISTER', source='srv_pipe_register.c') -bld.SAMBA_SUBSYSTEM('RPC_SERVER_REGISTER', +bld.SAMBA3_SUBSYSTEM('RPC_SERVER_REGISTER', source='srv_rpc_register.c ../librpc/rpc/dcerpc_ep.c') -bld.SAMBA_SUBSYSTEM('RPC_SAMR', +bld.SAMBA3_SUBSYSTEM('RPC_SAMR', source=RPC_SAMR_SRC, deps='PLAINTEXT_AUTH', vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_LSARPC', +bld.SAMBA3_SUBSYSTEM('RPC_LSARPC', source=RPC_LSARPC_SRC, vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_WINREG', +bld.SAMBA3_SUBSYSTEM('RPC_WINREG', source=RPC_WINREG_SRC, deps='REGFIO REG_API_REGF NDR_PERFCOUNT', vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_INITSHUTDOWN', +bld.SAMBA3_SUBSYSTEM('RPC_INITSHUTDOWN', source=RPC_INITSHUTDOWN_SRC, vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_DSSETUP', +bld.SAMBA3_SUBSYSTEM('RPC_DSSETUP', source=RPC_DSSETUP_SRC, vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_WKSSVC', +bld.SAMBA3_SUBSYSTEM('RPC_WKSSVC', source=RPC_WKSSVC_SRC, deps='LIBNET', vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_SVCCTL', +bld.SAMBA3_SUBSYSTEM('RPC_SVCCTL', source=RPC_SVCCTL_SRC, deps='SERVICES LIBCLI_WINREG', vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_NTSVCS', +bld.SAMBA3_SUBSYSTEM('RPC_NTSVCS', source=RPC_NTSVCS_SRC, vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_NETLOGON', +bld.SAMBA3_SUBSYSTEM('RPC_NETLOGON', source=RPC_NETLOGON_SRC, vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_NETDFS', +bld.SAMBA3_SUBSYSTEM('RPC_NETDFS', source=RPC_NETDFS_SRC, vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_SRVSVC', +bld.SAMBA3_SUBSYSTEM('RPC_SRVSVC', source=RPC_SRVSVC_SRC, vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_SPOOLSS', +bld.SAMBA3_SUBSYSTEM('RPC_SPOOLSS', source=RPC_SPOOLSS_SRC, deps='cups PRINTING PRINTBACKEND LIBCLI_WINREG', vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_EVENTLOG', +bld.SAMBA3_SUBSYSTEM('RPC_EVENTLOG', source=RPC_EVENTLOG_SRC, deps='LIBEVENTLOG LIBCLI_WINREG', vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_RPCECHO', +bld.SAMBA3_SUBSYSTEM('RPC_RPCECHO', source=RPC_RPCECHO_SRC, vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_EPMAPPER', +bld.SAMBA3_SUBSYSTEM('RPC_EPMAPPER', source=RPC_EPMAPPER_SRC, vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_SERVER', +bld.SAMBA3_SUBSYSTEM('RPC_SERVER', source='srv_pipe_hnd.c srv_pipe.c', deps='''RPC_NCACN_NP RPC_SERVICE RPC_CRYPTO RPC_SAMR RPC_LSARPC RPC_WINREG RPC_INITSHUTDOWN -- cgit