s3-waf: convert RPC_SAMR into a subsystem.

Guenther

diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index 59c19d5da7d3c06bdf23b354e030981b9bf0275e..7d46f5af69d5439da501681bef0659453cbbbd47 100644 (file)
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -2,7 +2,7 @@
 
 RPC_LSARPC_SRC = '''srv_lsa_nt.c ../../librpc/gen_ndr/srv_lsa.c'''
 RPC_NETLOGON_SRC = '''srv_netlog_nt.c ../../librpc/gen_ndr/srv_netlogon.c'''
-RPC_SAMR_SRC = '''srv_samr_nt.c ../../librpc/gen_ndr/srv_samr.c
+RPC_SAMR_SRC = '''srv_samr_nt.c
                srv_samr_util.c
                srv_samr_chgpasswd.c'''
 RPC_INITSHUTDOWN_SRC = '''srv_initshutdown_nt.c ../../librpc/gen_ndr/srv_initshutdown.c'''
@@ -22,6 +22,10 @@ bld.SAMBA_SUBSYSTEM('rpc',
                     source='srv_pipe_register.c',
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('RPC_SAMR',
+                    source=RPC_SAMR_SRC,
+                    vars=locals())
+
 bld.SAMBA_MODULE('rpc_lsarpc',
                  subsystem='rpc',
                  source=RPC_LSARPC_SRC,
@@ -31,7 +35,8 @@ bld.SAMBA_MODULE('rpc_lsarpc',
 
 bld.SAMBA_MODULE('rpc_samr',
                  subsystem='rpc',
-                 source=RPC_SAMR_SRC,
+                 source='../../librpc/gen_ndr/srv_samr.c',
+                 deps='RPC_SAMR',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_SAMR'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_SAMR'))

diff --git a/source3/wscript_build b/source3/wscript_build
index eb0d69ff76a38d8b23bac6806be274f95a2d0732..0ce3f5649d1346540a6342e3c44909d23b1035c5 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -416,9 +416,7 @@ WINBINDD_SRC = '''${WINBINDD_SRC1}
                   ${RPC_NCACN_NP}
                   ${TDB_VALIDATE_SRC}
                   rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c
-                  rpc_server/srv_samr_nt.c ../librpc/gen_ndr/srv_samr.c
-                  rpc_server/srv_samr_util.c
-                  rpc_server/srv_samr_chgpasswd.c
+                  ../librpc/gen_ndr/srv_samr.c
                   rpc_server/srv_pipe_register.c'''
 
 MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
@@ -1216,6 +1214,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
                  TOKEN_UTIL
                  LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
                  RPCCLI_DSSETUP NPA_TSTREAM INIT_NETLOGON
+                 RPC_SAMR
                  ''',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}',