From 7e966397ec43e0a408f20e11403019fc94c272fc Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 24 Sep 2013 20:02:54 +0200 Subject: build: get rid of source variables and vars=locals() in source3/rpc_server/wscript_build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Adam Reviewed-by: Günther Deschner --- source3/rpc_server/wscript_build | 120 +++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 68 deletions(-) (limited to 'source3/rpc_server') diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build index bd96b92b25..cbc8debc55 100755 --- a/source3/rpc_server/wscript_build +++ b/source3/rpc_server/wscript_build @@ -1,33 +1,12 @@ #!/usr/bin/env python -RPC_LSARPC_SRC = '''lsa/srv_lsa_nt.c ../../librpc/gen_ndr/srv_lsa.c''' -RPC_NETLOGON_SRC = '''netlogon/srv_netlog_nt.c ../../librpc/gen_ndr/srv_netlogon.c''' -RPC_SAMR_SRC = '''samr/srv_samr_nt.c - samr/srv_samr_util.c - samr/srv_samr_chgpasswd.c - ../../librpc/gen_ndr/srv_samr.c''' -RPC_INITSHUTDOWN_SRC = '''initshutdown/srv_initshutdown_nt.c ../../librpc/gen_ndr/srv_initshutdown.c''' -RPC_WINREG_SRC = '''winreg/srv_winreg_nt.c ../../librpc/gen_ndr/srv_winreg.c''' -RPC_DSSETUP_SRC = '''dssetup/srv_dssetup_nt.c ../../librpc/gen_ndr/srv_dssetup.c''' -RPC_SRVSVC_SRC = '''srvsvc/srv_srvsvc_nt.c ../../librpc/gen_ndr/srv_srvsvc.c''' -RPC_WKSSVC_SRC = '''wkssvc/srv_wkssvc_nt.c ../../librpc/gen_ndr/srv_wkssvc.c''' -RPC_SVCCTL_SRC = '''svcctl/srv_svcctl_nt.c svcctl/srv_svcctl_reg.c ../../librpc/gen_ndr/srv_svcctl.c''' -RPC_NTSVCS_SRC = '''ntsvcs/srv_ntsvcs_nt.c ../../librpc/gen_ndr/srv_ntsvcs.c''' -RPC_NETDFS_SRC = '''dfs/srv_dfs_nt.c ../../librpc/gen_ndr/srv_dfs.c''' -RPC_SPOOLSS_SRC = '''spoolss/srv_spoolss_nt.c ../../librpc/gen_ndr/srv_spoolss.c - spoolss/srv_spoolss_util.c''' -RPC_EVENTLOG_SRC = '''eventlog/srv_eventlog_nt.c eventlog/srv_eventlog_reg.c ../../librpc/gen_ndr/srv_eventlog.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.SAMBA3_SUBSYSTEM('rpc', source='', - deps='RPC_PIPE_REGISTER', - vars=locals()) + deps='RPC_PIPE_REGISTER') bld.SAMBA3_SUBSYSTEM('RPC_CONFIG', source='rpc_config.c', - deps='talloc') + deps='talloc') bld.SAMBA3_SUBSYSTEM('RPC_NCACN_NP', source='rpc_ncacn_np.c rpc_handles.c rpc_contexts.c', @@ -62,79 +41,84 @@ bld.SAMBA3_SUBSYSTEM('SRV_ACCESS_CHECK', deps='samba-util') bld.SAMBA3_SUBSYSTEM('RPC_SAMR', - source=RPC_SAMR_SRC, - deps='PLAINTEXT_AUTH SRV_ACCESS_CHECK', - vars=locals()) + source='''samr/srv_samr_nt.c + samr/srv_samr_util.c + samr/srv_samr_chgpasswd.c + ../../librpc/gen_ndr/srv_samr.c''', + deps='PLAINTEXT_AUTH SRV_ACCESS_CHECK') bld.SAMBA3_SUBSYSTEM('RPC_LSARPC', - source=RPC_LSARPC_SRC, - deps='SRV_ACCESS_CHECK', - vars=locals()) + source='''lsa/srv_lsa_nt.c + ../../librpc/gen_ndr/srv_lsa.c''', + deps='SRV_ACCESS_CHECK') bld.SAMBA3_SUBSYSTEM('RPC_WINREG', - source=RPC_WINREG_SRC, - deps='REG_FULL REGFIO REG_API_REGF NDR_PERFCOUNT', - vars=locals()) + source='''winreg/srv_winreg_nt.c + ../../librpc/gen_ndr/srv_winreg.c''', + deps='REG_FULL REGFIO REG_API_REGF NDR_PERFCOUNT') bld.SAMBA3_SUBSYSTEM('RPC_INITSHUTDOWN', - source=RPC_INITSHUTDOWN_SRC, - deps='samba-util', - vars=locals()) + source='''initshutdown/srv_initshutdown_nt.c + ../../librpc/gen_ndr/srv_initshutdown.c''', + deps='samba-util') bld.SAMBA3_SUBSYSTEM('RPC_DSSETUP', - source=RPC_DSSETUP_SRC, - deps='samba-util', - vars=locals()) + source='''dssetup/srv_dssetup_nt.c + ../../librpc/gen_ndr/srv_dssetup.c''', + deps='samba-util') bld.SAMBA3_SUBSYSTEM('RPC_WKSSVC', - source=RPC_WKSSVC_SRC, - deps='LIBNET', - vars=locals()) + source='''wkssvc/srv_wkssvc_nt.c + ../../librpc/gen_ndr/srv_wkssvc.c''', + deps='LIBNET') bld.SAMBA3_SUBSYSTEM('RPC_SVCCTL', - source=RPC_SVCCTL_SRC, - deps='SERVICES LIBCLI_WINREG_INTERNAL', - vars=locals()) + source='''svcctl/srv_svcctl_nt.c + svcctl/srv_svcctl_reg.c + ../../librpc/gen_ndr/srv_svcctl.c''', + deps='SERVICES LIBCLI_WINREG_INTERNAL') bld.SAMBA3_SUBSYSTEM('RPC_NTSVCS', - source=RPC_NTSVCS_SRC, - deps='samba-util', - vars=locals()) + source='''ntsvcs/srv_ntsvcs_nt.c + ../../librpc/gen_ndr/srv_ntsvcs.c''', + deps='samba-util') bld.SAMBA3_SUBSYSTEM('RPC_NETLOGON', - source=RPC_NETLOGON_SRC, - deps='RPC_NCACN_NP', - vars=locals()) + source='''netlogon/srv_netlog_nt.c + ../../librpc/gen_ndr/srv_netlogon.c''', + deps='RPC_NCACN_NP') bld.SAMBA3_SUBSYSTEM('RPC_NETDFS', - source=RPC_NETDFS_SRC, - deps='samba-util', - vars=locals()) + source='''dfs/srv_dfs_nt.c + ../../librpc/gen_ndr/srv_dfs.c''', + deps='samba-util') bld.SAMBA3_SUBSYSTEM('RPC_SRVSVC', - source=RPC_SRVSVC_SRC, - deps='samba-util tdb', - vars=locals()) + source='''srvsvc/srv_srvsvc_nt.c + ../../librpc/gen_ndr/srv_srvsvc.c''', + deps='samba-util tdb') bld.SAMBA3_SUBSYSTEM('RPC_SPOOLSS', - source=RPC_SPOOLSS_SRC, - deps='PRINTING PRINTBACKEND LIBCLI_WINREG_INTERNAL RPC_NCACN_NP', - vars=locals()) + source='''spoolss/srv_spoolss_nt.c + ../../librpc/gen_ndr/srv_spoolss.c + spoolss/srv_spoolss_util.c''', + deps='PRINTING PRINTBACKEND LIBCLI_WINREG_INTERNAL RPC_NCACN_NP') bld.SAMBA3_SUBSYSTEM('RPC_EVENTLOG', - source=RPC_EVENTLOG_SRC, - deps='LIBEVENTLOG LIBCLI_WINREG_INTERNAL', - vars=locals()) + source='''eventlog/srv_eventlog_nt.c + eventlog/srv_eventlog_reg.c + ../../librpc/gen_ndr/srv_eventlog.c''', + deps='LIBEVENTLOG LIBCLI_WINREG_INTERNAL') bld.SAMBA3_SUBSYSTEM('RPC_RPCECHO', - source=RPC_RPCECHO_SRC, - deps='samba-util', - vars=locals()) + source='''echo/srv_echo_nt.c + ../../librpc/gen_ndr/srv_echo.c''', + deps='samba-util') bld.SAMBA3_SUBSYSTEM('RPC_EPMAPPER', - source=RPC_EPMAPPER_SRC, - deps='samba-util', - vars=locals()) + source='''epmapper/srv_epmapper.c + ../../librpc/gen_ndr/srv_epmapper.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', -- cgit