diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-11-14 16:22:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:47 -0500 |
| commit | 8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71 (patch) | |
| tree | 8e8ccaddb94efc6a85ab6c339cab76cea1f44085 /source4/smbd | |
| parent | 7367d23713a34a6c29a492adb365292399adffe8 (diff) | |
| download | samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.tar.gz samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.tar.bz2 samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.zip | |
r3733: More build system fixes/features:
- Use .mk files directly (no need for a SMB_*_MK() macro when adding a new SUBSYSTEM, MODULE or BINARY). This allows addition of new modules and subsystems without running configure
- Add support for generating .dot files with the Samba4 dependency tree (as used by the graphviz and springgraph utilities)
(This used to be commit 64826da834e26ee0488674e27a0eae36491ee179)
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/config.m4 | 11 | ||||
| -rw-r--r-- | source4/smbd/config.mk | 4 | ||||
| -rw-r--r-- | source4/smbd/process_model.m4 | 7 | ||||
| -rw-r--r-- | source4/smbd/process_model.mk | 3 |
4 files changed, 7 insertions, 18 deletions
diff --git a/source4/smbd/config.m4 b/source4/smbd/config.m4 deleted file mode 100644 index 5142e81f84..0000000000 --- a/source4/smbd/config.m4 +++ /dev/null @@ -1,11 +0,0 @@ -dnl # server subsystem - -SMB_MODULE_MK(server_service_auth,SERVER_SERVICE,STATIC,smbd/config.mk) -SMB_MODULE_MK(server_service_smb,SERVER_SERVICE,STATIC,smbd/config.mk) -SMB_MODULE_MK(server_service_rpc,SERVER_SERVICE,STATIC,smbd/config.mk) -SMB_MODULE_MK(server_service_ldap,SERVER_SERVICE,STATIC,smbd/config.mk) - -SMB_SUBSYSTEM_MK(SERVER_SERVICE,smbd/config.mk) -SMB_SUBSYSTEM_MK(SERVER,smbd/config.mk) - -SMB_BINARY_MK(smbd, smbd/config.mk) diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index 7c5fe74da9..52e8e69c30 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -4,6 +4,7 @@ # Start MODULE server_service_auth [MODULE::server_service_auth] INIT_FUNCTION = server_service_auth_init +SUBSYSTEM = SERVER_SERVICE REQUIRED_SUBSYSTEMS = \ AUTH # End MODULE server_auth @@ -13,6 +14,7 @@ REQUIRED_SUBSYSTEMS = \ # Start MODULE server_service_smb [MODULE::server_service_smb] INIT_FUNCTION = server_service_smb_init +SUBSYSTEM = SERVER_SERVICE REQUIRED_SUBSYSTEMS = \ SMB # End MODULE server_smb @@ -22,6 +24,7 @@ REQUIRED_SUBSYSTEMS = \ # Start MODULE server_service_rpc [MODULE::server_service_rpc] INIT_FUNCTION = server_service_rpc_init +SUBSYSTEM = SERVER_SERVICE REQUIRED_SUBSYSTEMS = \ DCERPC # End MODULE server_rpc @@ -31,6 +34,7 @@ REQUIRED_SUBSYSTEMS = \ # Start MODULE server_service_ldap [MODULE::server_service_ldap] INIT_FUNCTION = server_service_ldap_init +SUBSYSTEM = SERVER_SERVICE REQUIRED_SUBSYSTEMS = \ LDAP # End MODULE server_ldap diff --git a/source4/smbd/process_model.m4 b/source4/smbd/process_model.m4 index a3101253f0..d53b4de3a3 100644 --- a/source4/smbd/process_model.m4 +++ b/source4/smbd/process_model.m4 @@ -1,8 +1,5 @@ dnl # Server process model subsystem -SMB_MODULE_MK(process_model_single,PROCESS_MODEL,STATIC,smbd/process_model.mk) -SMB_MODULE_MK(process_model_standard,PROCESS_MODEL,STATIC,smbd/process_model.mk) - ################################################# # check for pthread support AC_MSG_CHECKING(whether to use pthreads) @@ -25,7 +22,3 @@ AC_MSG_RESULT(no) ) SMB_EXT_LIB(PTHREAD,[-lpthread]) - -SMB_MODULE_MK(process_model_thread,PROCESS_MODEL,NOT,smbd/process_model.mk) - -SMB_SUBSYSTEM_MK(PROCESS_MODEL,smbd/process_model.mk) diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk index d4a9b69f4a..70ccddd828 100644 --- a/source4/smbd/process_model.mk +++ b/source4/smbd/process_model.mk @@ -4,6 +4,7 @@ # Start MODULE process_model_single [MODULE::process_model_single] INIT_FUNCTION = process_model_single_init +SUBSYSTEM = PROCESS_MODEL INIT_OBJ_FILES = \ smbd/process_single.o # End MODULE process_model_single @@ -13,6 +14,7 @@ INIT_OBJ_FILES = \ # Start MODULE process_model_standard [MODULE::process_model_standard] INIT_FUNCTION = process_model_standard_init +SUBSYSTEM = PROCESS_MODEL INIT_OBJ_FILES = \ smbd/process_standard.o # End MODULE process_model_standard @@ -22,6 +24,7 @@ INIT_OBJ_FILES = \ # Start MODULE process_model_thread [MODULE::process_model_thread] INIT_FUNCTION = process_model_thread_init +SUBSYSTEM = PROCESS_MODEL INIT_OBJ_FILES = \ smbd/process_thread.o REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD |