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>

diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 8da2ea12c512a6e7800fb2cdf06b79bce228418e..41bddc659a33b091e8115afb210f2c22714c4b26 100644 (file)
--- 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
+                  )