From 87b3d384c6d26852d5c26cb8740eb42836193577 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 30 Oct 2010 14:16:35 +1100 Subject: s4-cluster: make cluster a private shared lib --- source4/cluster/wscript_build | 9 +++++---- source4/smbd/wscript_build | 12 ++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'source4') diff --git a/source4/cluster/wscript_build b/source4/cluster/wscript_build index 0b0555dd0b..995e166eca 100644 --- a/source4/cluster/wscript_build +++ b/source4/cluster/wscript_build @@ -1,7 +1,8 @@ #!/usr/bin/env python -bld.SAMBA_SUBSYSTEM('CLUSTER', - source='cluster.c local.c', - deps='TDB_WRAP' - ) +bld.SAMBA_LIBRARY('cluster', + source='cluster.c local.c', + deps='tdb-wrap samba-hostconfig talloc', + private_library=True + ) diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build index 41bddc659a..ce8a5d2e04 100644 --- a/source4/smbd/wscript_build +++ b/source4/smbd/wscript_build @@ -20,7 +20,7 @@ bld.SAMBA_BINARY('samba', manpages='samba.8', subsystem_name='service', deps='''events process_model service samba-hostconfig samba-util POPT_SAMBA PIDFILE - popt gensec registry ntptr ntvfs share CLUSTER COMMON_SCHANNELDB SECRETS''', + popt gensec registry ntptr ntvfs share cluster COMMON_SCHANNELDB SECRETS''', pyembed=True, install_path='${SBINDIR}' ) @@ -32,7 +32,7 @@ bld.SAMBA_MODULE('process_model_single', source='process_single.c', subsystem='process_model', init_function='process_model_single_init', - deps='CLUSTER process_model samba-sockets', + deps='cluster process_model samba-sockets', internal_module=False ) @@ -41,7 +41,7 @@ bld.SAMBA_MODULE('process_model_standard', source='process_standard.c', subsystem='process_model', init_function='process_model_standard_init', - deps='events LDBSAMBA process_model samba-sockets CLUSTER', + deps='events LDBSAMBA process_model samba-sockets cluster', internal_module=False ) @@ -51,7 +51,7 @@ bld.SAMBA_MODULE('process_model_thread', subsystem='process_model', init_function='process_model_thread_init', enabled=False, - deps='pthread samba-sockets CLUSTER process_model', + deps='pthread samba-sockets cluster process_model', internal_module=False ) @@ -60,7 +60,7 @@ bld.SAMBA_MODULE('process_model_prefork', source='process_prefork.c', subsystem='process_model', init_function='process_model_prefork_init', - deps='events LDBSAMBA CLUSTER samba-sockets process_model', + deps='events LDBSAMBA cluster samba-sockets process_model', internal_module=False ) @@ -68,7 +68,7 @@ bld.SAMBA_MODULE('process_model_onefork', source='process_onefork.c', subsystem='process_model', init_function='process_model_onefork_init', - deps='events LDBSAMBA process_model CLUSTER samba-sockets', + deps='events LDBSAMBA process_model cluster samba-sockets', internal_module=False ) -- cgit