From 52b410401a527cbc9294f10c01ee53d766bb5ac7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 17 Mar 2006 16:27:22 +0000
Subject: r14520: Split up smbtorture binary into a core (torture.c) and UI
 frontend (smbtorture.c) (This used to be commit
 7f9c11e7b1d7f6ce943900860febe0f43ea6548e)

---
 source4/torture/config.mk | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

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

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 4711aba27d..af80699093 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -1,9 +1,27 @@
 # TORTURE subsystem
+[LIBRARY::torture]
+PUBLIC_HEADERS = torture.h
+PUBLIC_PROTO_HEADER = proto.h
+OBJ_FILES = \
+		torture.o \
+		torture_util.o
+REQUIRED_SUBSYSTEMS = \
+		TORTURE_RAW \
+		TORTURE_SMB2 \
+		TORTURE_RAP \
+		TORTURE_AUTH \
+		TORTURE_LOCAL \
+		TORTURE_NBENCH \
+		TORTURE_LDAP \
+		TORTURE_NBT \
+		TORTURE_NET \
+		CONFIG \
+		LIBBASIC
 
 #################################
 # Start SUBSYSTEM TORTURE_BASIC
 [MODULE::TORTURE_BASIC]
-SUBSYSTEM = smbtorture
+SUBSYSTEM = torture
 INIT_FUNCTION = torture_base_init
 PRIVATE_PROTO_HEADER = \
 		basic/proto.h
@@ -68,7 +86,7 @@ include smb2/config.mk
 
 [MODULE::torture_com]
 INIT_FUNCTION = torture_com_init
-SUBSYSTEM = smbtorture
+SUBSYSTEM = torture
 PRIVATE_PROTO_HEADER = \
 		com/proto.h
 OBJ_FILES = \
@@ -79,7 +97,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::torture_rpc]
 # TORTURE_NET and TORTURE_NBT use functions from torture_rpc...
 OUTPUT_TYPE = MERGEDOBJ
-SUBSYSTEM = smbtorture
+SUBSYSTEM = torture
 INIT_FUNCTION = torture_rpc_init
 PRIVATE_PROTO_HEADER = \
 		rpc/proto.h
@@ -223,23 +241,10 @@ REQUIRED_SUBSYSTEMS = \
 # Start BINARY smbtorture
 [BINARY::smbtorture]
 INSTALLDIR = BINDIR
-PUBLIC_HEADERS = torture.h
-PUBLIC_PROTO_HEADER = proto.h
 OBJ_FILES = \
-		torture.o \
-		torture_util.o
+		smbtorture.o
 REQUIRED_SUBSYSTEMS = \
-		TORTURE_RAW \
-		TORTURE_SMB2 \
-		TORTURE_RAP \
-		TORTURE_AUTH \
-		TORTURE_LOCAL \
-		TORTURE_NBENCH \
-		TORTURE_LDAP \
-		TORTURE_NBT \
-		TORTURE_NET \
-		CONFIG \
-		LIBBASIC \
+		torture \
 		LIBPOPT \
 		POPT_SAMBA \
 		POPT_CREDENTIALS
-- 
cgit