diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-11-01 12:57:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:10 -0500 |
| commit | 83899037dcb87cb1d49373bfd1a8edb464adbc55 (patch) | |
| tree | 271c4c7e2bfbe3c827c48684705ce32e39c5af42 | |
| parent | 6ef03e7a846a4b858eec0b9953f03306f46b77e3 (diff) | |
| download | samba-83899037dcb87cb1d49373bfd1a8edb464adbc55.tar.gz samba-83899037dcb87cb1d49373bfd1a8edb464adbc55.tar.bz2 samba-83899037dcb87cb1d49373bfd1a8edb464adbc55.zip | |
r3433: Use .mk file for librpc/
(This used to be commit c1f345eefdce3f6fc9e3a526543b2b9a6441e566)
| -rw-r--r-- | source4/librpc/config.m4 | 22 | ||||
| -rw-r--r-- | source4/librpc/config.mk | 35 | ||||
| -rw-r--r-- | source4/librpc/idl/dcom.idl | 2 | ||||
| -rw-r--r-- | source4/librpc/idl/epmapper.idl | 1 | ||||
| -rw-r--r-- | source4/librpc/idl/exchange.idl | 2 |
5 files changed, 42 insertions, 20 deletions
diff --git a/source4/librpc/config.m4 b/source4/librpc/config.m4 index 5c5ba9321c..1a95d341e3 100644 --- a/source4/librpc/config.m4 +++ b/source4/librpc/config.m4 @@ -1,12 +1,9 @@ dnl # LIBRPC subsystem -SMB_SUBSYSTEM(LIBNDR_RAW,[], - [librpc/ndr/ndr.o - librpc/ndr/ndr_basic.o - librpc/ndr/ndr_sec.o - librpc/ndr/ndr_spoolss_buf.o]) +SMB_SUBSYSTEM_MK(LIBNDR_RAW,librpc/config.mk) SMB_SUBSYSTEM_NOPROTO(LIBNDR_GEN) +SMB_MODULE_MK(ndr_echo, LIBNDR_GEN_ECHO, STATIC, librpc/config.m4) SMB_SUBSYSTEM(LIBNDR_GEN,[], [librpc/gen_ndr/tables.o librpc/gen_ndr/ndr_audiosrv.o @@ -50,16 +47,5 @@ SMB_SUBSYSTEM(LIBNDR_GEN,[], librpc/gen_ndr/ndr_krb5pac.o librpc/gen_ndr/ndr_schannel.o]) -SMB_SUBSYSTEM(LIBRPC_RAW,[], - [librpc/rpc/dcerpc.o - librpc/rpc/dcerpc_auth.o - librpc/rpc/dcerpc_util.o - librpc/rpc/dcerpc_error.o - librpc/rpc/dcerpc_schannel.o - librpc/rpc/dcerpc_ntlm.o - librpc/rpc/dcerpc_spnego.o - librpc/rpc/dcerpc_smb.o - librpc/rpc/dcerpc_sock.o]) - -SMB_SUBSYSTEM(LIBRPC,[],[],[], - [LIBNDR_RAW LIBNDR_GEN LIBRPC_RAW]) +SMB_SUBSYSTEM_MK(LIBRPC_RAW,librpc/config.mk) +SMB_SUBSYSTEM_MK(LIBRPC,librpc/config.mk) diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk new file mode 100644 index 0000000000..6e33b5c104 --- /dev/null +++ b/source4/librpc/config.mk @@ -0,0 +1,35 @@ +################################################ +# Start SUBSYSTEM LIBNDR_RAW +[SUBSYSTEM::LIBNDR_RAW] +INIT_OBJ_FILES = \ + librpc/ndr/ndr.o +ADD_OBJ_FILES = \ + librpc/ndr/ndr_basic.o \ + librpc/ndr/ndr_sec.o \ + librpc/ndr/ndr_spoolss_buf.o +# End SUBSYSTEM LIBNDR_RAW +################################################ + +################################################ +# Start SUBSYSTEM LIBRPC_RAW +[SUBSYSTEM::LIBRPC_RAW] +INIT_OBJ_FILES = \ + librpc/rpc/dcerpc.o +ADD_OBJ_FILES = \ + librpc/rpc/dcerpc_auth.o \ + librpc/rpc/dcerpc_util.o \ + librpc/rpc/dcerpc_error.o \ + librpc/rpc/dcerpc_schannel.o \ + librpc/rpc/dcerpc_ntlm.o \ + librpc/rpc/dcerpc_spnego.o \ + librpc/rpc/dcerpc_smb.o \ + librpc/rpc/dcerpc_sock.o +# End SUBSYSTEM LIBRPC_RAW +################################################ + +################################################ +# Start SUBSYSTEM LIBRPC +[SUBSYSTEM::LIBRPC] +REQUIRED_SUBSYSTEMS = LIBNDR_RAW LIBNDR_GEN LIBRPC_RAW +# End SUBSYSTEM LIBRPC +################################################ diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl index c7a714a488..1d32d723c6 100644 --- a/source4/librpc/idl/dcom.idl +++ b/source4/librpc/idl/dcom.idl @@ -270,7 +270,7 @@ interface ObjectRpcBaseTypes [ object, uuid("00000000-0000-0000-C000-000000000046"), - helpstring("Base interface for most COM interfaces") + helpstring("Base interface for all COM interfaces") ] interface IUnknown { diff --git a/source4/librpc/idl/epmapper.idl b/source4/librpc/idl/epmapper.idl index ce1776f34e..2bff814a45 100644 --- a/source4/librpc/idl/epmapper.idl +++ b/source4/librpc/idl/epmapper.idl @@ -13,6 +13,7 @@ http://www.opengroup.org/onlinepubs/9629399/chap6.htm#tagcjh_11_02_03_01: bindin version(3.0), endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", "ncalrpc:[EPMAPPER]", "ncacn_unix_stream:[/tmp/epmapper]"), + helpstring("EndPoint Mapper"), pointer_default(unique) ] interface epmapper diff --git a/source4/librpc/idl/exchange.idl b/source4/librpc/idl/exchange.idl index ddf9a5d1ce..82e783a0dc 100644 --- a/source4/librpc/idl/exchange.idl +++ b/source4/librpc/idl/exchange.idl @@ -224,7 +224,7 @@ System Attendant Private Interface [ uuid("c840a7dc-42c0-1a10-b4b9-08002b2fe182"), - helpstring("Unknwon") + helpstring("Unknown") ] interface exchange_unknown { void unknown_dummy(); |