sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

s3-waf: split out LIBCLI_WINREG_INTERNAL as LIBCLI_WINREG was pulling in rpc server code in undesired places.

Browse Source 
Andreas, please check.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Jul  8 18:34:44 CEST 2011 on sn-devel-104
This commit is contained in:
Günther Deschner 2011-07-08 17:17:17 +02:00
parent 2a02f1c4af
commit f4add4fbf5
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/rpc_server/wscript_build
View File

@ -85,7 +85,7 @@ bld.SAMBA3_SUBSYSTEM('RPC_WKSSVC',
bld.SAMBA3_SUBSYSTEM('RPC_SVCCTL',
source=RPC_SVCCTL_SRC,
deps='SERVICES LIBCLI_WINREG',
deps='SERVICES LIBCLI_WINREG_INTERNAL',
vars=locals())
bld.SAMBA3_SUBSYSTEM('RPC_NTSVCS',
@ -110,12 +110,12 @@ bld.SAMBA3_SUBSYSTEM('RPC_SRVSVC',
bld.SAMBA3_SUBSYSTEM('RPC_SPOOLSS',
source=RPC_SPOOLSS_SRC,
deps='cups PRINTING PRINTBACKEND LIBCLI_WINREG RPC_NCACN_NP',
deps='cups PRINTING PRINTBACKEND LIBCLI_WINREG_INTERNAL RPC_NCACN_NP',
vars=locals())
bld.SAMBA3_SUBSYSTEM('RPC_EVENTLOG',
source=RPC_EVENTLOG_SRC,
deps='LIBEVENTLOG LIBCLI_WINREG',
deps='LIBEVENTLOG LIBCLI_WINREG_INTERNAL',
vars=locals())
bld.SAMBA3_SUBSYSTEM('RPC_RPCECHO',

11
source3/wscript_build
View File

@ -47,9 +47,6 @@ 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'''
@ -1082,8 +1079,12 @@ bld.SAMBA3_LIBRARY('LIBCLI_SPOOLSS',
private_library=True)
bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG',
source=LIBCLI_WINREG_SRC,
deps='RPC_NDR_WINREG RPC_NCACN_NP')
source='rpc_client/cli_winreg.c',
deps='RPC_NDR_WINREG')
bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG_INTERNAL',
source='rpc_client/cli_winreg_int.c',
deps='LIBCLI_WINREG RPC_NCACN_NP')
bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
source=RPC_CLIENT_SCHANNEL_SRC,