s3-waf: convert RPC_LSARPC into a subsystem.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Dec  1 00:13:58 CET 2010 on sn-devel-104

diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index 7d46f5af69d5439da501681bef0659453cbbbd47..0e0d1c67c951ddeb4b457721d5d584de0205baec 100644 (file)
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-RPC_LSARPC_SRC = '''srv_lsa_nt.c ../../librpc/gen_ndr/srv_lsa.c'''
+RPC_LSARPC_SRC = '''srv_lsa_nt.c'''
 RPC_NETLOGON_SRC = '''srv_netlog_nt.c ../../librpc/gen_ndr/srv_netlogon.c'''
 RPC_SAMR_SRC = '''srv_samr_nt.c
                srv_samr_util.c
@@ -26,9 +26,14 @@ bld.SAMBA_SUBSYSTEM('RPC_SAMR',
                     source=RPC_SAMR_SRC,
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('RPC_LSARPC',
+                    source=RPC_LSARPC_SRC,
+                    vars=locals())
+
 bld.SAMBA_MODULE('rpc_lsarpc',
                  subsystem='rpc',
-                 source=RPC_LSARPC_SRC,
+                 source='../../librpc/gen_ndr/srv_lsa.c',
+                 deps='RPC_LSARPC',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_LSARPC'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_LSARPC'))

diff --git a/source3/wscript_build b/source3/wscript_build
index 0ce3f5649d1346540a6342e3c44909d23b1035c5..876b4bec65c7c64c05c23f8fa4f9d99ec6ebc5bf 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -415,7 +415,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
 WINBINDD_SRC = '''${WINBINDD_SRC1}
                   ${RPC_NCACN_NP}
                   ${TDB_VALIDATE_SRC}
-                  rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c
+                  ../librpc/gen_ndr/srv_lsa.c
                   ../librpc/gen_ndr/srv_samr.c
                   rpc_server/srv_pipe_register.c'''
 
@@ -1214,7 +1214,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
                  TOKEN_UTIL
                  LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
                  RPCCLI_DSSETUP NPA_TSTREAM INIT_NETLOGON
-                 RPC_SAMR
+                 RPC_SAMR RPC_LSARPC
                  ''',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}',