diff options
| author | Günther Deschner <gd@samba.org> | 2011-07-08 17:17:17 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-07-08 18:34:43 +0200 |
| commit | f4add4fbf545313f5d24e0d9e5c9eb0f8fac630a (patch) | |
| tree | 484028689fc10472de8437f04de5725c7faa6b63 | |
| parent | 2a02f1c4af00915c750e4b71c0beafe9fb765815 (diff) | |
| download | samba-f4add4fbf545313f5d24e0d9e5c9eb0f8fac630a.tar.gz samba-f4add4fbf545313f5d24e0d9e5c9eb0f8fac630a.tar.bz2 samba-f4add4fbf545313f5d24e0d9e5c9eb0f8fac630a.zip | |
s3-waf: split out LIBCLI_WINREG_INTERNAL as LIBCLI_WINREG was pulling in rpc server code in undesired places.
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
| -rw-r--r-- | source3/rpc_server/wscript_build | 6 | ||||
| -rwxr-xr-x | source3/wscript_build | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build index c3cf2f9327..db04832550 100644 --- a/source3/rpc_server/wscript_build +++ b/source3/rpc_server/wscript_build @@ -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', diff --git a/source3/wscript_build b/source3/wscript_build index 35b0b1d521..31552a07ba 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -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, |