s3-waf: convert RPCCLI_DRSUAPI into a subsystem.

Guenther

diff --git a/source3/wscript_build b/source3/wscript_build
index 1a51b36bf9fe67915c41bdc440bc6014bb9f594f..f4220e4ecc59afa97e8101e7e2fe6e93e704f2bb 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -62,10 +62,6 @@ LIBCLI_NTSVCS_SRC = '''
                     ../librpc/gen_ndr/cli_ntsvcs.c
                     ../librpc/gen_ndr/ndr_ntsvcs_c.c'''
 
-LIBCLI_DRSUAPI_SRC = '''
-                     ../librpc/gen_ndr/cli_drsuapi.c
-                     ../librpc/gen_ndr/ndr_drsuapi_c.c'''
-
 LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c
                  rpc_client/init_lsa.c'''
 
@@ -589,7 +585,6 @@ RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
                    ${LIBCLI_SPOOLSS_SRC}
                    ${LIBCLI_EVENTLOG_SRC}
                    ${LIBCLI_NTSVCS_SRC}
-                   ${LIBCLI_DRSUAPI_SRC}
                    rpc_client/init_netlogon.c
                    rpc_client/init_samr.c'''
 
@@ -686,7 +681,6 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               utils/net_eventlog.c
               utils/net_printing.c
               ${LIBCLI_SPOOLSS_SRC}
-              ${LIBCLI_DRSUAPI_SRC}
               rpc_client/init_netlogon.c
               rpc_client/init_samr.c
               registry/reg_parse.c registry/reg_format.c
@@ -1179,6 +1173,10 @@ bld.SAMBA_SUBSYSTEM('RPCCLI_DFS',
        source='../librpc/gen_ndr/cli_dfs.c',
        public_deps='RPC_NDR_DFS')
 
+bld.SAMBA_SUBSYSTEM('RPCCLI_DRSUAPI',
+       source='../librpc/gen_ndr/cli_drsuapi.c',
+       public_deps='RPC_NDR_DRSUAPI')
+
 bld.SAMBA_SUBSYSTEM('LIBCLI_SAMR',
                     source=LIBCLI_SAMR_SRC,
                     deps='RPCCLI_SAMR')
@@ -1245,6 +1243,7 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
                  RPC_CLIENT_SCHANNEL
                  LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
                  RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_DSSETUP RPCCLI_DFS
+                 RPCCLI_DRSUAPI
                  ''',
                  vars=locals())
 
@@ -1265,7 +1264,7 @@ bld.SAMBA_BINARY('net',
                  RPC_CLIENT_SCHANNEL TOKEN_UTIL
                  LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
                  RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL RPCCLI_DSSETUP
-                 RPCCLI_INITSHUTDOWN
+                 RPCCLI_INITSHUTDOWN RPCCLI_DRSUAPI
                 ''',
                  vars=locals())