s3-waf: convert RPCCLI_SVCCTL into a subsystem.

Guenther

diff --git a/source3/wscript_build b/source3/wscript_build
index fcd8dee0a53b051ac0a9c397be8d8902599af037..a991f94c2b3616b445692e49b553b18ce3ff77fb 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -78,10 +78,6 @@ LIBCLI_DSSETUP_SRC = '''
                      ../librpc/gen_ndr/cli_dssetup.c
                      ../librpc/gen_ndr/ndr_dssetup_c.c'''
 
-LIBCLI_SVCCTL_SRC = '''
-                    ../librpc/gen_ndr/cli_svcctl.c
-                    ../librpc/gen_ndr/ndr_svcctl_c.c'''
-
 LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c
                  rpc_client/init_lsa.c'''
 
@@ -709,7 +705,6 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               ${LIBCLI_DRSUAPI_SRC}
               ${LIBCLI_INITSHUTDOWN_SRC}
               ${LIBCLI_DSSETUP_SRC}
-              ${LIBCLI_SVCCTL_SRC}
               rpc_client/init_netlogon.c
               rpc_client/init_samr.c
               registry/reg_parse.c registry/reg_format.c
@@ -1186,6 +1181,10 @@ bld.SAMBA_SUBSYSTEM('RPCCLI_WKSSVC',
        source='../librpc/gen_ndr/cli_wkssvc.c',
        public_deps='RPC_NDR_WKSSVC')
 
+bld.SAMBA_SUBSYSTEM('RPCCLI_SVCCTL',
+       source='../librpc/gen_ndr/cli_svcctl.c',
+       public_deps='RPC_NDR_SVCCTL')
+
 bld.SAMBA_SUBSYSTEM('LIBCLI_SAMR',
                     source=LIBCLI_SAMR_SRC,
                     deps='RPCCLI_SAMR')
@@ -1270,7 +1269,7 @@ bld.SAMBA_BINARY('net',
                  REGFIO NDR_NTPRINTING RPCCLI_WINREG
                  RPC_CLIENT_SCHANNEL TOKEN_UTIL
                  LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
-                 RPCCLI_SRVSVC RPCCLI_WKSSVC
+                 RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL
                 ''',
                  vars=locals())