summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-30 11:27:33 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-30 23:49:00 +1100
commita57e0ae7031971f45f41cf88c4a1573e8646681b (patch)
tree5761509fe824dcf56c64ab4f6c314a8de4b302ed /source4
parent046d38faa5e78f2bdcfcdb3b1582427c2ecc80b8 (diff)
downloadsamba-a57e0ae7031971f45f41cf88c4a1573e8646681b.tar.gz
samba-a57e0ae7031971f45f41cf88c4a1573e8646681b.tar.bz2
samba-a57e0ae7031971f45f41cf88c4a1573e8646681b.zip
s4-smbd: make our process models into real modules
this simplifies some of the dependencies between bin/samba and the various services, making it easier to get a clean depenency tree Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/smbd/wscript_build85
1 files changed, 46 insertions, 39 deletions
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 8da2ea12c5..41bddc659a 100644
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -1,10 +1,11 @@
#!/usr/bin/env python
-bld.SAMBA_SUBSYSTEM('service',
- source='service.c service_stream.c service_named_pipe.c service_task.c',
- autoproto='service_proto.h',
- deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi CREDENTIALS LIBTSOCKET LIBSAMBA_TSOCKET process_model'
- )
+bld.SAMBA_LIBRARY('service',
+ source='service.c service_stream.c service_named_pipe.c service_task.c',
+ autoproto='service_proto.h',
+ deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi CREDENTIALS LIBTSOCKET LIBSAMBA_TSOCKET process_model',
+ private_library=True
+ )
bld.SAMBA_SUBSYSTEM('PIDFILE',
@@ -19,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 DCESRV COMMON_SCHANNELDB SECRETS''',
+ popt gensec registry ntptr ntvfs share CLUSTER COMMON_SCHANNELDB SECRETS''',
pyembed=True,
install_path='${SBINDIR}'
)
@@ -28,48 +29,54 @@ bld.SAMBA_BINARY('samba',
bld.SAMBA_MODULE('process_model_single',
- source='process_single.c',
- subsystem='process_model',
- init_function='process_model_single_init',
- internal_module=True
- )
+ source='process_single.c',
+ subsystem='process_model',
+ init_function='process_model_single_init',
+ deps='CLUSTER process_model samba-sockets',
+ internal_module=False
+ )
bld.SAMBA_MODULE('process_model_standard',
- source='process_standard.c',
- subsystem='process_model',
- init_function='process_model_standard_init',
- deps='events LDBSAMBA'
- )
+ source='process_standard.c',
+ subsystem='process_model',
+ init_function='process_model_standard_init',
+ deps='events LDBSAMBA process_model samba-sockets CLUSTER',
+ internal_module=False
+ )
bld.SAMBA_MODULE('process_model_thread',
- source='process_thread.c',
- subsystem='process_model',
- init_function='process_model_thread_init',
- enabled=False,
- deps='pthread'
- )
+ source='process_thread.c',
+ subsystem='process_model',
+ init_function='process_model_thread_init',
+ enabled=False,
+ deps='pthread samba-sockets CLUSTER process_model',
+ internal_module=False
+ )
bld.SAMBA_MODULE('process_model_prefork',
- source='process_prefork.c',
- subsystem='process_model',
- init_function='process_model_prefork_init',
- deps='events'
- )
+ source='process_prefork.c',
+ subsystem='process_model',
+ init_function='process_model_prefork_init',
+ deps='events LDBSAMBA CLUSTER samba-sockets process_model',
+ internal_module=False
+ )
bld.SAMBA_MODULE('process_model_onefork',
- source='process_onefork.c',
- subsystem='process_model',
- init_function='process_model_onefork_init',
- deps='events'
- )
-
-
-bld.SAMBA_SUBSYSTEM('process_model',
- source='process_model.c',
- autoproto='process_model_proto.h',
- deps='samba-util samba-hostconfig'
- )
+ source='process_onefork.c',
+ subsystem='process_model',
+ init_function='process_model_onefork_init',
+ deps='events LDBSAMBA process_model CLUSTER samba-sockets',
+ internal_module=False
+ )
+
+
+bld.SAMBA_LIBRARY('process_model',
+ source='process_model.c',
+ autoproto='process_model_proto.h',
+ deps='samba-util samba-hostconfig',
+ private_library=True
+ )