diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-01-02 00:16:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:49:35 -0500 |
| commit | bc4aebfaecf52678eb40aee2fd4bd81a315c554d (patch) | |
| tree | db09ef34f7adc46c9fd6a1398bc225eac0b85917 /source4/smbd | |
| parent | 55eaed5aa2c1c4a6c417278ca08652f12fb9e7b9 (diff) | |
| download | samba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.tar.gz samba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.tar.xz samba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.zip | |
r12670: Make a couple of dependencies stricter
Re-introduce and use the OUTPUT_TYPE property for MODULEs to force
specific modules to always be included
(This used to be commit f9eede3d40098eddc3618ee48f9253cdddb94a6f)
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/config.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index 7378b3b2c3..6acc30fcaf 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -14,6 +14,7 @@ REQUIRED_SUBSYSTEMS = \ # Start MODULE server_service_smb [MODULE::server_service_smb] INIT_FUNCTION = server_service_smb_init +OUTPUT_TYPE = MERGEDOBJ SUBSYSTEM = SERVER_SERVICE REQUIRED_SUBSYSTEMS = \ SMB @@ -25,6 +26,7 @@ REQUIRED_SUBSYSTEMS = \ [MODULE::server_service_rpc] INIT_FUNCTION = server_service_rpc_init SUBSYSTEM = SERVER_SERVICE +OUTPUT_TYPE = MERGEDOBJ REQUIRED_SUBSYSTEMS = \ DCERPC # End MODULE server_rpc |