sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3-waf: fix the build after winreg and rpc services changes.

Browse Source 
Andreas, please check.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Feb  7 13:18:41 CET 2011 on sn-devel-104
This commit is contained in:
Günther Deschner 2011-02-03 12:25:24 +01:00
parent a3ee831f2d
commit 7637e1df8e
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/rpc_server/wscript_build
View File

@ -11,12 +11,12 @@ RPC_WINREG_SRC = '''srv_winreg_nt.c ../../librpc/gen_ndr/srv_winreg.c'''
RPC_DSSETUP_SRC = '''srv_dssetup_nt.c ../../librpc/gen_ndr/srv_dssetup.c'''
RPC_SRVSVC_SRC = '''srv_srvsvc_nt.c ../../librpc/gen_ndr/srv_srvsvc.c'''
RPC_WKSSVC_SRC = '''srv_wkssvc_nt.c ../../librpc/gen_ndr/srv_wkssvc.c'''
RPC_SVCCTL_SRC = '''srv_svcctl_nt.c ../../librpc/gen_ndr/srv_svcctl.c'''
RPC_SVCCTL_SRC = '''srv_svcctl_nt.c srv_svcctl_reg.c ../../librpc/gen_ndr/srv_svcctl.c'''
RPC_NTSVCS_SRC = '''srv_ntsvcs_nt.c ../../librpc/gen_ndr/srv_ntsvcs.c'''
RPC_NETDFS_SRC = '''srv_dfs_nt.c ../../librpc/gen_ndr/srv_dfs.c'''
RPC_SPOOLSS_SRC = '''srv_spoolss_nt.c ../../librpc/gen_ndr/srv_spoolss.c
srv_spoolss_util.c'''
RPC_EVENTLOG_SRC = '''srv_eventlog_nt.c ../../librpc/gen_ndr/srv_eventlog.c'''
RPC_EVENTLOG_SRC = '''srv_eventlog_nt.c srv_eventlog_reg.c ../../librpc/gen_ndr/srv_eventlog.c'''
RPC_RPCECHO_SRC = '''srv_echo_nt.c ../../librpc/gen_ndr/srv_echo.c'''
RPC_EPMAPPER_SRC = '''srv_epmapper.c ../../librpc/gen_ndr/srv_epmapper.c'''
@ -69,7 +69,7 @@ bld.SAMBA_SUBSYSTEM('RPC_WKSSVC',
bld.SAMBA_SUBSYSTEM('RPC_SVCCTL',
source=RPC_SVCCTL_SRC,
deps='SERVICES',
deps='SERVICES LIBCLI_WINREG',
vars=locals())
bld.SAMBA_SUBSYSTEM('RPC_NTSVCS',
@ -90,12 +90,12 @@ bld.SAMBA_SUBSYSTEM('RPC_SRVSVC',
bld.SAMBA_SUBSYSTEM('RPC_SPOOLSS',
source=RPC_SPOOLSS_SRC,
deps='cups PRINTING PRINTBACKEND RPC_NDR_WINREG',
deps='cups PRINTING PRINTBACKEND LIBCLI_WINREG',
vars=locals())
bld.SAMBA_SUBSYSTEM('RPC_EVENTLOG',
source=RPC_EVENTLOG_SRC,
deps='LIBEVENTLOG',
deps='LIBEVENTLOG LIBCLI_WINREG',
vars=locals())
bld.SAMBA_SUBSYSTEM('RPC_RPCECHO',

19
source3/wscript_build
View File

@ -45,6 +45,9 @@ LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
LIBRPCCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c rpc_client/util_netlogon.c'
LIBCLI_WINREG_SRC = '''rpc_client/cli_winreg.c
rpc_client/cli_winreg_int.c'''
# this includes only the low level parse code, not stuff
# that requires knowledge of security contexts
REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
@ -239,8 +242,6 @@ REG_SMBCONF_SRC = '''
registry/reg_util_token.c
registry/reg_api_util.c'''
REG_EVENTLOG_SRC = '''registry/reg_eventlog.c'''
REG_FULL_SRC = '''
${REG_BACKENDS_EXTRA_SRC}
${REG_INIT_FULL_SRC}
@ -248,7 +249,7 @@ REG_FULL_SRC = '''
SERVICES_SRC = '''services/svc_spoolss.c
services/svc_rcinit.c
services/services_db.c
services/svc_winreg_glue.c
services/svc_netlogon.c
services/svc_winreg.c
services/svc_wins.c'''
@ -824,11 +825,7 @@ bld.SAMBA_SUBSYSTEM('REG_SMBCONF',
bld.SAMBA_SUBSYSTEM('REG_FULL',
source=REG_FULL_SRC,
deps='REG_SMBCONF REG_EVENTLOG',
vars=locals())
bld.SAMBA_SUBSYSTEM('REG_EVENTLOG',
source=REG_EVENTLOG_SRC,
deps='REG_SMBCONF',
vars=locals())
bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
@ -1092,6 +1089,10 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SPOOLSS',
source=LIBCLI_SPOOLSS_SRC,
deps='RPC_NDR_SPOOLSS')
bld.SAMBA_SUBSYSTEM('LIBCLI_WINREG',
source=LIBCLI_WINREG_SRC,
deps='RPC_NDR_WINREG')
bld.SAMBA_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
source=RPC_CLIENT_SCHANNEL_SRC,
vars=locals())
@ -1286,7 +1287,7 @@ bld.SAMBA_BINARY('smbcquotas',
bld.SAMBA_BINARY('eventlogadm',
source=EVTLOGADM_SRC,
deps='''talloc tevent cap POPT_SAMBA LIBS PARAM
LIB_NONSMBD LIBSMB_ERR PASSDB wbclient LIBEVENTLOG REG_EVENTLOG''',
LIB_NONSMBD LIBSMB_ERR PASSDB wbclient LIBEVENTLOG''',
vars=locals())
bld.SAMBA_BINARY('sharesec',