add the TORTURE SUBSYSTEM to the config.m4 scheme

tridge:
I'll convert all stuff first to this scheme
and then move to the scheme with two files per subsystems
so we'll later something like config.m4 and config.mk...

metze
(This used to be commit 39e1a9b0c55138695e9736612b62ddada157d690)

3 files changed, 36 insertions, 23 deletions

diff --git a/source4/Makefile.in b/source4/Makefile.in
index 9dffc1c2f1..f5f0d203b4 100644
--- a/source4/Makefile.in
+++ b/source4/Makefile.in
@@ -221,25 +221,14 @@ CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
 	     $(LIB_OBJ) \
              $(READLINE_OBJ) $(POPT_LIB_OBJ)
 
-SMBTORTURE_RAW_OBJ = torture/raw/qfsinfo.o torture/raw/qfileinfo.o torture/raw/setfileinfo.o \
-		torture/raw/search.o torture/raw/close.o torture/raw/open.o torture/raw/mkdir.o \
-		torture/raw/oplock.o torture/raw/notify.o torture/raw/mux.o torture/raw/ioctl.o \
-		torture/raw/chkpath.o torture/raw/unlink.o torture/raw/read.o torture/raw/context.o \
-		torture/raw/write.o torture/raw/lock.o torture/raw/rename.o torture/raw/seek.o 
-
-SMBTORTURE_RPC_OBJ = torture/rpc/lsa.o torture/rpc/echo.o torture/rpc/dfs.o \
-		torture/rpc/spoolss.o torture/rpc/samr.o torture/rpc/wkssvc.o \
-		torture/rpc/srvsvc.o torture/rpc/atsvc.o torture/rpc/eventlog.o \
-		torture/rpc/epmapper.o torture/rpc/winreg.o torture/rpc/mgmt.o \
-		torture/rpc/scanner.o torture/rpc/autoidl.o torture/rpc/netlogon.o
-
-SMBTORTURE_OBJ1 = torture/torture.o torture/torture_util.o torture/nbio.o torture/scanner.o \
-		torture/utable.o torture/denytest.o torture/mangle_test.o \
-		torture/aliases.o libcli/raw/clirewrite.o $(SMBTORTURE_RAW_OBJ) \
-		$(SMBTORTURE_RPC_OBJ)
-
-SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(SECRETS_OBJ) \
-		$(LIBSMB_OBJ) $(PARAM_OBJ) $(LIB_OBJ)
+TORTURE_RAW_OBJS = @TORTURE_RAW_OBJS@
+
+TORTURE_RPC_OBJS = @TORTURE_RPC_OBJS@
+
+TORTURE_OBJS = @TORTURE_OBJS@
+
+SMBTORTURE_OBJS = $(TORTURE_OBJS) $(SECRETS_OBJ) $(LIBSMB_OBJ) $(PARAM_OBJ) $(LIB_OBJ)
+SMBTORTURE_LIBS = $(LIBS)
 
 GENTEST_OBJ = torture/gentest.o torture/torture_util.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
 		$(LIB_OBJ) libcli/raw/clirewrite.o
@@ -256,7 +245,7 @@ NDRDUMP_OBJ = utils/ndrdump.o utils/rewrite.o \
 PROTO_OBJ = $(SMBD_OBJ_SRV) \
 	    $(SMBD_OBJ_MAIN) $(PROCESS_MODEL_OBJS) \
 	    $(LIBSMB_OBJ) \
-	    $(SMBTORTURE_OBJ1) \
+	    $(TORTURE_OBJS) \
 	    $(PARAM_OBJ) $(SECRETS_OBJ) \
 	    $(READLINE_OBJ) $(CLIENT_OBJ1) \
 	    $(LIB_OBJ) $(POPT_LIB_OBJ)
@@ -385,10 +374,9 @@ bin/smbclient@EXEEXT@: $(CLIENT_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @BUILD_POPT@
 
-
-bin/smbtorture@EXEEXT@: $(SMBTORTURE_OBJ) bin/.dummy
+bin/smbtorture@EXEEXT@: $(SMBTORTURE_OBJS) bin/.dummy
 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(LIBS)
+	@$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJS) $(LDFLAGS) $(SMBTORTURE_LIBS)
 
 bin/ndrdump@EXEEXT@: $(NDRDUMP_OBJ) bin/.dummy
 	@echo Linking $@
diff --git a/source4/configure.in b/source4/configure.in
index f356d4a655..45a6580f06 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -1990,6 +1990,7 @@ sinclude(auth/config.m4)
 sinclude(passdb/config.m4)
 sinclude(ntvfs/config.m4)
 sinclude(rpc_server/config.m4)
+sinclude(torture/config.m4)
 
 AC_DEFINE_UNQUOTED(STRING_STATIC_MODULES, "$string_static_modules", [String list of builtin modules])
 
diff --git a/source4/torture/config.m4 b/source4/torture/config.m4
new file mode 100755
index 0000000000..0d6e375bca
--- /dev/null
+++ b/source4/torture/config.m4
@@ -0,0 +1,24 @@
+dnl # TORTURE subsystem
+
+SMB_SUBSYSTEM(TORTURE_RAW,[],
+		[torture/raw/qfsinfo.o torture/raw/qfileinfo.o torture/raw/setfileinfo.o \
+		torture/raw/search.o torture/raw/close.o torture/raw/open.o torture/raw/mkdir.o \
+		torture/raw/oplock.o torture/raw/notify.o torture/raw/mux.o torture/raw/ioctl.o \
+		torture/raw/chkpath.o torture/raw/unlink.o torture/raw/read.o torture/raw/context.o \
+		torture/raw/write.o torture/raw/lock.o torture/raw/rename.o torture/raw/seek.o],
+		torture/raw/torture_raw_public_proto.h)
+
+SMB_SUBSYSTEM(TORTURE_RPC,[],
+		[torture/rpc/lsa.o torture/rpc/echo.o torture/rpc/dfs.o \
+		torture/rpc/spoolss.o torture/rpc/samr.o torture/rpc/wkssvc.o \
+		torture/rpc/srvsvc.o torture/rpc/atsvc.o torture/rpc/eventlog.o \
+		torture/rpc/epmapper.o torture/rpc/winreg.o torture/rpc/mgmt.o \
+		torture/rpc/scanner.o torture/rpc/autoidl.o torture/rpc/netlogon.o],
+		torture/rpc/torture_rpc_public_proto.h)
+
+SMB_SUBSYSTEM(TORTURE,[],
+		[torture/torture.o torture/torture_util.o torture/nbio.o torture/scanner.o \
+		torture/utable.o torture/denytest.o torture/mangle_test.o \
+		torture/aliases.o libcli/raw/clirewrite.o \$(TORTURE_RAW_OBJS) \
+		\$(TORTURE_RPC_OBJS)],
+		torture/torture_public_proto.h)