s3-waf: convert INIT_SAMR into a subsystem.

Guenther

diff --git a/source3/wscript_build b/source3/wscript_build
index ee8148e2d87795b3033284bd24a20d17b93f4a68..eb0d69ff76a38d8b23bac6806be274f95a2d0732 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -474,8 +474,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
 SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 ${RPC_SERVER_SRC}
                 ${OPLOCK_SRC} ${NOTIFY_SRC}
-                ${BUILDOPT_SRC}
-                rpc_client/init_samr.c'''
+                ${BUILDOPT_SRC}'''
 
 PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
                printing/print_cups.c printing/print_generic.c
@@ -542,8 +541,7 @@ RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
                     rpcclient/cmd_drsuapi.c rpcclient/cmd_eventlog.c
                     rpcclient/cmd_winreg.c'''
 
-RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
-                   rpc_client/init_samr.c'''
+RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}'''
 
 PAM_WINBIND_SRC = '../nsswitch/pam_winbind.c ${WBCOMMON_SRC} ${LIBREPLACE_SRC}'
 
@@ -587,8 +585,7 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
                     lib/netapi/shutdown.c
                     lib/netapi/netlogon.c'''
 
-LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}
-                   rpc_client/init_samr.c'''
+LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}'''
 
 # FIXME:  bigballofmud
 
@@ -635,7 +632,6 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               utils/net_serverid.c
               utils/net_eventlog.c
               utils/net_printing.c
-              rpc_client/init_samr.c
               registry/reg_parse.c registry/reg_format.c
               registry/reg_parse_internal.c registry/reg_import.c
               lib/cbuf.c lib/srprs.c'''
@@ -778,7 +774,7 @@ bld.SAMBA_LIBRARY('libnetapi',
                     RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF TOKEN_UTIL
                     LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
                     RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_INITSHUTDOWN
-                    INIT_NETLOGON''',
+                    INIT_NETLOGON INIT_SAMR''',
                     public_headers='lib/netapi/netapi.h',
                     private_library=True,
                     vars=locals())
@@ -972,7 +968,7 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE',
                     PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO
                     LIBSMBCONF REG_FULL FNAME_UTIL
                     LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
-                    RPCCLI_SRVSVC NPA_TSTREAM INIT_NETLOGON
+                    RPCCLI_SRVSVC NPA_TSTREAM INIT_NETLOGON INIT_SAMR
                     ''',
                     vars=locals())
 
@@ -1191,6 +1187,9 @@ bld.SAMBA_SUBSYSTEM('INIT_LSA',
 bld.SAMBA_SUBSYSTEM('INIT_NETLOGON',
                     source='rpc_client/init_netlogon.c')
 
+bld.SAMBA_SUBSYSTEM('INIT_SAMR',
+                    source='rpc_client/init_samr.c')
+
 ########################## BINARIES #################################
 
 bld.SAMBA_BINARY('smbd/smbd',
@@ -1241,6 +1240,7 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
                  LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
                  RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_DSSETUP RPCCLI_DFS
                  RPCCLI_DRSUAPI RPCCLI_NTSVCS RPCCLI_EVENTLOG INIT_NETLOGON
+                 INIT_SAMR
                  ''',
                  vars=locals())
 
@@ -1261,7 +1261,7 @@ bld.SAMBA_BINARY('net',
                  RPC_CLIENT_SCHANNEL TOKEN_UTIL
                  LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
                  RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL RPCCLI_DSSETUP
-                 RPCCLI_INITSHUTDOWN RPCCLI_DRSUAPI INIT_NETLOGON
+                 RPCCLI_INITSHUTDOWN RPCCLI_DRSUAPI INIT_NETLOGON INIT_SAMR
                 ''',
                  vars=locals())