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/librpc | |
| 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/librpc')
| -rw-r--r-- | source4/librpc/config.mk | 19 | ||||
| -rw-r--r-- | source4/librpc/rpc/config.mk | 18 |
2 files changed, 14 insertions, 23 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index d87ac86ce5..4ca36a6b3b 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -26,8 +26,6 @@ REQUIRED_SUBSYSTEMS = LIBCOMPRESSION # End SUBSYSTEM NDR_COMPRESSION ################################################ -include rpc/config.mk - [SUBSYSTEM::NDR_SECURITY_HELPER] OBJ_FILES = ndr/ndr_sec_helper.o ndr/ndr_sec.o @@ -127,7 +125,7 @@ REQUIRED_SUBSYSTEMS = LIBNDR [SUBSYSTEM::NDR_SAMR] OBJ_FILES = gen_ndr/ndr_samr.o NOPROTO = YES -REQUIRED_SUBSYSTEMS = LIBNDR +REQUIRED_SUBSYSTEMS = LIBNDR NDR_LSA [SUBSYSTEM::NDR_SPOOLSS] OBJ_FILES = gen_ndr/ndr_spoolss.o @@ -273,7 +271,7 @@ REQUIRED_SUBSYSTEMS = LIBNDR [SUBSYSTEM::NDR_KRB5PAC] OBJ_FILES = gen_ndr/ndr_krb5pac.o NOPROTO = YES -REQUIRED_SUBSYSTEMS = LIBNDR NDR_KRB5PAC_UTIL +REQUIRED_SUBSYSTEMS = LIBNDR NDR_KRB5PAC_UTIL NDR_NETLOGON [SUBSYSTEM::NDR_KRB5PAC_UTIL] OBJ_FILES = ndr/ndr_krb5pac.o @@ -522,7 +520,18 @@ MINOR_VERSION = 0 DESCRIPTION = DCE/RPC client library RELEASE_VERSION = 1 PUBLIC_HEADERS = rpc/dcerpc.h -REQUIRED_SUBSYSTEMS = LIBNDR RPC_RAW LIBSMB NDR_MISC NDR_DCERPC NDR_SCHANNEL NDR_LSA NDR_NETLOGON NDR_SAMR NDR_UNIXINFO RPC_NDR_NETLOGON RPC_NDR_EPMAPPER +PRIVATE_PROTO_HEADER = rpc/dcerpc_proto.h +OBJ_FILES = \ + rpc/dcerpc.o \ + rpc/dcerpc_auth.o \ + rpc/dcerpc_schannel.o \ + rpc/dcerpc_util.o \ + rpc/dcerpc_error.o \ + rpc/dcerpc_smb.o \ + rpc/dcerpc_smb2.o \ + rpc/dcerpc_sock.o \ + rpc/dcerpc_connect.o +REQUIRED_SUBSYSTEMS = SOCKET LIBNDR LIBSMB NDR_MISC NDR_DCERPC NDR_SCHANNEL NDR_LSA NDR_NETLOGON NDR_SAMR NDR_UNIXINFO RPC_NDR_NETLOGON RPC_NDR_EPMAPPER # End SUBSYSTEM LIBRPC ################################################ diff --git a/source4/librpc/rpc/config.mk b/source4/librpc/rpc/config.mk deleted file mode 100644 index 7206d2f651..0000000000 --- a/source4/librpc/rpc/config.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################ -# Start SUBSYSTEM RPC_RAW -[SUBSYSTEM::RPC_RAW] -PRIVATE_PROTO_HEADER = dcerpc_proto.h -OBJ_FILES = \ - dcerpc.o \ - dcerpc_auth.o \ - dcerpc_schannel.o \ - dcerpc_util.o \ - dcerpc_error.o \ - dcerpc_smb.o \ - dcerpc_smb2.o \ - dcerpc_sock.o \ - dcerpc_connect.o -REQUIRED_SUBSYSTEMS = SOCKET -# End SUBSYSTEM RPC_RAW -################################################ - |