diff options
| author | Günther Deschner <gd@samba.org> | 2010-11-30 23:04:23 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-11-30 23:27:15 +0100 |
| commit | c2911952519089ed472d33143511d55d10752304 (patch) | |
| tree | 4f3a3047109c9a5a4e0fcba79741a3c1685ce6e4 /source3 | |
| parent | ef129716a4d0d44df5fcb5039398c6e5d9c0e589 (diff) | |
| download | samba-c2911952519089ed472d33143511d55d10752304.tar.gz samba-c2911952519089ed472d33143511d55d10752304.tar.bz2 samba-c2911952519089ed472d33143511d55d10752304.zip | |
s3-waf: convert RPC_SAMR into a subsystem.
Guenther
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/rpc_server/wscript_build | 9 | ||||
| -rw-r--r-- | source3/wscript_build | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build index 59c19d5da7..7d46f5af69 100644 --- 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 eb0d69ff76..0ce3f5649d 100644 --- 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}', |