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/rpc_server | |
| parent | 55eaed5aa2c1c4a6c417278ca08652f12fb9e7b9 (diff) | |
| download | samba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.tar.gz samba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.tar.bz2 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/rpc_server')
| -rw-r--r-- | source4/rpc_server/config.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk index f6ec5d3080..ac4ca4962a 100644 --- a/source4/rpc_server/config.mk +++ b/source4/rpc_server/config.mk @@ -119,6 +119,7 @@ REQUIRED_SUBSYSTEMS = \ [MODULE::dcerpc_winreg] INIT_FUNCTION = dcerpc_server_winreg_init SUBSYSTEM = DCERPC +OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ winreg/rpc_winreg.o REQUIRED_SUBSYSTEMS = \ @@ -159,6 +160,7 @@ REQUIRED_SUBSYSTEMS = \ [MODULE::dcerpc_spoolss] INIT_FUNCTION = dcerpc_server_spoolss_init SUBSYSTEM = DCERPC +OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ spoolss/dcesrv_spoolss.o REQUIRED_SUBSYSTEMS = \ @@ -207,7 +209,8 @@ OBJ_FILES = \ handles.o REQUIRED_SUBSYSTEMS = \ LIBCLI_AUTH \ - LIBNDR + LIBNDR \ + LIBRPC # # End SUBSYSTEM DCERPC ################################################ |