summaryrefslogtreecommitdiff
path: root/source4/smbd/process_model.mk
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-11-06 23:23:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:36 -0500
commit71db46ea665606384f2be1be708c74c97c9adfb2 (patch)
tree24c84e12f4fc925f3ec1e69348493d7222df1e44 /source4/smbd/process_model.mk
parentb012ab557b8f8a2f58dfbbe8b7818f3e6d8cf38f (diff)
downloadsamba-71db46ea665606384f2be1be708c74c97c9adfb2.tar.gz
samba-71db46ea665606384f2be1be708c74c97c9adfb2.tar.bz2
samba-71db46ea665606384f2be1be708c74c97c9adfb2.zip
r3586: Fix some of the issues with the module init functions.
Both subsystems and modules can now have init functions, which can be specified in .mk files (INIT_FUNCTION = ...) The build system will define : - SUBSYSTEM_init_static_modules that calls the init functions of all statically compiled modules. Failing to load will generate an error which is not fatal - BINARY_init_subsystems that calls the init functions (if defined) for the subsystems the binary depends on This removes the hack with the "static bool Initialised = " and the "lazy_init" functions (This used to be commit 7a8244761bfdfdfb48f8264d76951ebdfbf7bd8a)
Diffstat (limited to 'source4/smbd/process_model.mk')
-rw-r--r--source4/smbd/process_model.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk
index 6a4048700f..d4329e2014 100644
--- a/source4/smbd/process_model.mk
+++ b/source4/smbd/process_model.mk
@@ -3,6 +3,7 @@
################################################
# Start MODULE process_model_single
[MODULE::process_model_single]
+INIT_FUNCTION = process_model_single_init
INIT_OBJ_FILES = \
smbd/process_single.o
# End MODULE process_model_single
@@ -11,6 +12,7 @@ INIT_OBJ_FILES = \
################################################
# Start MODULE process_model_standard
[MODULE::process_model_standard]
+INIT_FUNCTION = process_model_standard_init
INIT_OBJ_FILES = \
smbd/process_standard.o
# End MODULE process_model_standard
@@ -19,6 +21,7 @@ INIT_OBJ_FILES = \
################################################
# Start MODULE process_model_thread
[MODULE::process_model_thread]
+INIT_FUNCTION = process_model_thread_init
INIT_OBJ_FILES = \
smbd/process_thread.o
REQUIRED_LIBRARIES = \
@@ -29,8 +32,9 @@ REQUIRED_LIBRARIES = \
################################################
# Start SUBSYSTEM PROCESS_MODEL
[SUBSYSTEM::PROCESS_MODEL]
+INIT_FUNCTION = process_model_init
INIT_OBJ_FILES = \
smbd/process_model.o
#
# End SUBSYSTEM PROCESS_MODEL
-################################################ \ No newline at end of file
+################################################