diff options
| author | Günther Deschner <gd@samba.org> | 2011-07-08 17:17:17 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-07-26 21:53:22 +0200 |
| commit | cc23bb6b7674f89e8e87048a97bb2d81e989247c (patch) | |
| tree | a12c72fddd8d7e40cb185cb3e78661d62ce81b4d | |
| parent | a395d86d83d86e52b29fd0e10f5fc2f29e2d6ac6 (diff) | |
| download | samba-cc23bb6b7674f89e8e87048a97bb2d81e989247c.tar.gz samba-cc23bb6b7674f89e8e87048a97bb2d81e989247c.tar.xz samba-cc23bb6b7674f89e8e87048a97bb2d81e989247c.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
(cherry picked from commit f4add4fbf545313f5d24e0d9e5c9eb0f8fac630a)
Conflicts:
source3/rpc_server/wscript_build
source3/wscript_build
The last 21 patches address bug #8214 (printer driver upgrade fails, causing
smbd to exit on startup).
(cherry picked from commit 9a555e0271c333d1e33a9f2df435166aa8c6dfde)
| -rw-r--r-- | source3/rpc_server/wscript_build | 6 | ||||
| -rwxr-xr-x | source3/wscript_build | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build index 346d770385e..65f1c1719f2 100644 --- a/source3/rpc_server/wscript_build +++ b/source3/rpc_server/wscript_build @@ -77,7 +77,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', @@ -98,12 +98,12 @@ bld.SAMBA3_SUBSYSTEM('RPC_SRVSVC', bld.SAMBA3_SUBSYSTEM('RPC_SPOOLSS', source=RPC_SPOOLSS_SRC, - deps='cups PRINTING PRINTBACKEND LIBCLI_WINREG', + deps='cups PRINTING PRINTBACKEND LIBCLI_WINREG_INTERNAL', 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 4d47acb8e61..40935d1ebdb 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -50,9 +50,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''' @@ -1002,9 +999,13 @@ bld.SAMBA3_LIBRARY('LIBCLI_SPOOLSS', private_library=True) bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG', - source=LIBCLI_WINREG_SRC, + 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, vars=locals()) |