svn commit: samba r3433 - in branches/SAMBA_4_0/source/librpc: . idl

[jelmer at samba.org]

Author: jelmer
Date: 2004-11-01 12:57:51 +0000 (Mon, 01 Nov 2004)
New Revision: 3433

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3433

Log:
Use .mk file for librpc/

Added:
   branches/SAMBA_4_0/source/librpc/config.mk
Modified:
   branches/SAMBA_4_0/source/librpc/config.m4
   branches/SAMBA_4_0/source/librpc/idl/dcom.idl
   branches/SAMBA_4_0/source/librpc/idl/epmapper.idl
   branches/SAMBA_4_0/source/librpc/idl/exchange.idl


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/config.m4
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.m4	2004-11-01 12:40:43 UTC (rev 3432)
+++ branches/SAMBA_4_0/source/librpc/config.m4	2004-11-01 12:57:51 UTC (rev 3433)
@@ -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 @@
 		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)

Added: branches/SAMBA_4_0/source/librpc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.mk	2004-11-01 12:40:43 UTC (rev 3432)
+++ branches/SAMBA_4_0/source/librpc/config.mk	2004-11-01 12:57:51 UTC (rev 3433)
@@ -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
+################################################

Modified: branches/SAMBA_4_0/source/librpc/idl/dcom.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/dcom.idl	2004-11-01 12:40:43 UTC (rev 3432)
+++ branches/SAMBA_4_0/source/librpc/idl/dcom.idl	2004-11-01 12:57:51 UTC (rev 3433)
@@ -270,7 +270,7 @@
 [
 	object,
 	uuid("00000000-0000-0000-C000-000000000046"),
-	helpstring("Base interface for most COM interfaces")
+	helpstring("Base interface for all COM interfaces")
 ]
 interface IUnknown
 {

Modified: branches/SAMBA_4_0/source/librpc/idl/epmapper.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/epmapper.idl	2004-11-01 12:40:43 UTC (rev 3432)
+++ branches/SAMBA_4_0/source/librpc/idl/epmapper.idl	2004-11-01 12:57:51 UTC (rev 3433)
@@ -13,6 +13,7 @@
  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

Modified: branches/SAMBA_4_0/source/librpc/idl/exchange.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/exchange.idl	2004-11-01 12:40:43 UTC (rev 3432)
+++ branches/SAMBA_4_0/source/librpc/idl/exchange.idl	2004-11-01 12:57:51 UTC (rev 3433)
@@ -224,7 +224,7 @@
 
 [
 	uuid("c840a7dc-42c0-1a10-b4b9-08002b2fe182"),
-	helpstring("Unknwon")
+	helpstring("Unknown")
 ] interface exchange_unknown
 {
 	void unknown_dummy();