From eefe30b7d8e17ed744318417954669bacf2b3ac0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 14 Mar 2006 15:02:05 +0000
Subject: r14379: Build torture/rpc/ as a seperate smbtorture module. Move
 helper functions for rpc out of torture/torture.c (This used to be commit
 1d2d970f3b8aef3f36c2befb94b5dd72c0086639)

---
 source4/torture/config.mk | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'source4/torture/config.mk')

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index cd6c896475..b6381af3f9 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -73,9 +73,9 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = \
 		com dcom
 
-#################################
-# Start SUBSYSTEM TORTURE_RPC
-[SUBSYSTEM::TORTURE_RPC]
+[MODULE::torture_rpc]
+SUBSYSTEM = smbtorture
+INIT_FUNCTION = torture_rpc_init
 PRIVATE_PROTO_HEADER = \
 		rpc/proto.h
 OBJ_FILES = \
@@ -115,7 +115,8 @@ OBJ_FILES = \
 		rpc/bind.o \
 		rpc/dssetup.o \
 		rpc/alter_context.o \
-		rpc/bench.o
+		rpc/bench.o \
+		rpc/rpc.o
 REQUIRED_SUBSYSTEMS = \
 		NDR_TABLE RPC_NDR_UNIXINFO RPC_NDR_SAMR RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
 		RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
@@ -123,8 +124,6 @@ REQUIRED_SUBSYSTEMS = \
 		RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \
 		RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
 		RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER 
-# End SUBSYSTEM TORTURE_RPC
-#################################
 
 #################################
 # Start SUBSYSTEM TORTURE_RAP
@@ -219,7 +218,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start BINARY smbtorture
 [BINARY::smbtorture]
 INSTALLDIR = BINDIR
-PRIVATE_PROTO_HEADER = torture.h
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		torture.o \
 		torture_util.o
@@ -227,7 +226,6 @@ REQUIRED_SUBSYSTEMS = \
 		TORTURE_BASIC \
 		TORTURE_RAW \
 		TORTURE_SMB2 \
-		TORTURE_RPC \
 		TORTURE_RAP \
 		TORTURE_AUTH \
 		TORTURE_LOCAL \
-- 
cgit