summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2005-11-10 22:21:20 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2005-11-10 22:21:20 +0000
commitcb2818800de7e130429cf2d18d4a950faf5e5eaa (patch)
tree40eb540e4d5168676b91d7d0eb6c600b5ad5f735
parentReflect changes to TEST variable contents. (diff)
downloadrtems-cb2818800de7e130429cf2d18d4a950faf5e5eaa.tar.bz2
Eliminate DOCTYPES.
-rw-r--r--testsuites/itrontests/itronhello/Makefile.am3
-rw-r--r--testsuites/itrontests/itronmbf01/Makefile.am3
-rw-r--r--testsuites/itrontests/itronmbox01/Makefile.am3
-rw-r--r--testsuites/itrontests/itronsem01/Makefile.am3
-rw-r--r--testsuites/itrontests/itrontask01/Makefile.am3
-rw-r--r--testsuites/itrontests/itrontask02/Makefile.am3
-rw-r--r--testsuites/itrontests/itrontask03/Makefile.am3
-rw-r--r--testsuites/itrontests/itrontask04/Makefile.am3
-rw-r--r--testsuites/itrontests/itrontime01/Makefile.am3
-rw-r--r--testsuites/libtests/cpuuse/Makefile.am3
-rw-r--r--testsuites/libtests/malloctest/Makefile.am3
-rw-r--r--testsuites/libtests/monitor/Makefile.am2
-rw-r--r--testsuites/libtests/putenvtest/Makefile.am3
-rw-r--r--testsuites/libtests/rtems++/Makefile.am3
-rw-r--r--testsuites/libtests/rtmonuse/Makefile.am3
-rw-r--r--testsuites/libtests/stackchk/Makefile.am3
-rw-r--r--testsuites/libtests/termios/Makefile.am3
-rw-r--r--testsuites/mptests/mp01/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp01/node2/Makefile.am3
-rw-r--r--testsuites/mptests/mp02/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp02/node2/Makefile.am3
-rw-r--r--testsuites/mptests/mp03/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp03/node2/Makefile.am3
-rw-r--r--testsuites/mptests/mp04/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp04/node2/Makefile.am3
-rw-r--r--testsuites/mptests/mp05/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp05/node2/Makefile.am3
-rw-r--r--testsuites/mptests/mp06/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp06/node2/Makefile.am3
-rw-r--r--testsuites/mptests/mp07/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp07/node2/Makefile.am3
-rw-r--r--testsuites/mptests/mp08/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp08/node2/Makefile.am3
-rw-r--r--testsuites/mptests/mp09/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp09/node2/Makefile.am3
-rw-r--r--testsuites/mptests/mp10/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp10/node2/Makefile.am3
-rw-r--r--testsuites/mptests/mp11/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp11/node2/Makefile.am3
-rw-r--r--testsuites/mptests/mp12/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp12/node2/Makefile.am3
-rw-r--r--testsuites/mptests/mp13/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp13/node2/Makefile.am3
-rw-r--r--testsuites/mptests/mp14/node1/Makefile.am3
-rw-r--r--testsuites/mptests/mp14/node2/Makefile.am3
-rw-r--r--testsuites/psxtests/psx01/Makefile.am3
-rw-r--r--testsuites/psxtests/psx02/Makefile.am3
-rw-r--r--testsuites/psxtests/psx03/Makefile.am3
-rw-r--r--testsuites/psxtests/psx04/Makefile.am3
-rw-r--r--testsuites/psxtests/psx05/Makefile.am3
-rw-r--r--testsuites/psxtests/psx06/Makefile.am3
-rw-r--r--testsuites/psxtests/psx07/Makefile.am3
-rw-r--r--testsuites/psxtests/psx08/Makefile.am3
-rw-r--r--testsuites/psxtests/psx09/Makefile.am3
-rw-r--r--testsuites/psxtests/psx10/Makefile.am3
-rw-r--r--testsuites/psxtests/psx11/Makefile.am3
-rw-r--r--testsuites/psxtests/psx12/Makefile.am3
-rw-r--r--testsuites/psxtests/psx13/Makefile.am3
-rw-r--r--testsuites/psxtests/psxcancel/Makefile.am3
-rw-r--r--testsuites/psxtests/psxchroot01/Makefile.am3
-rw-r--r--testsuites/psxtests/psxfile01/Makefile.am3
-rw-r--r--testsuites/psxtests/psxmount/Makefile.am3
-rw-r--r--testsuites/psxtests/psxmsgq01/Makefile.am3
-rw-r--r--testsuites/psxtests/psxreaddir/Makefile.am3
-rw-r--r--testsuites/psxtests/psxsem01/Makefile.am3
-rw-r--r--testsuites/psxtests/psxstat/Makefile.am3
-rw-r--r--testsuites/psxtests/psxtime/Makefile.am3
-rw-r--r--testsuites/psxtests/psxtimer/Makefile.am3
-rw-r--r--testsuites/samples/base_sp/Makefile.am3
-rw-r--r--testsuites/samples/cdtest/Makefile.am3
-rw-r--r--testsuites/samples/fileio/Makefile.am3
-rw-r--r--testsuites/samples/hello/Makefile.am3
-rw-r--r--testsuites/samples/iostream/Makefile.am3
-rw-r--r--testsuites/samples/loopback/Makefile.am3
-rw-r--r--testsuites/samples/minimum/Makefile.am3
-rw-r--r--testsuites/samples/paranoia/Makefile.am3
-rw-r--r--testsuites/samples/ticker/Makefile.am3
-rw-r--r--testsuites/samples/unlimited/Makefile.am3
-rw-r--r--testsuites/sptests/sp01/Makefile.am3
-rw-r--r--testsuites/sptests/sp02/Makefile.am3
-rw-r--r--testsuites/sptests/sp03/Makefile.am3
-rw-r--r--testsuites/sptests/sp04/Makefile.am3
-rw-r--r--testsuites/sptests/sp05/Makefile.am3
-rw-r--r--testsuites/sptests/sp06/Makefile.am3
-rw-r--r--testsuites/sptests/sp07/Makefile.am3
-rw-r--r--testsuites/sptests/sp08/Makefile.am3
-rw-r--r--testsuites/sptests/sp09/Makefile.am3
-rw-r--r--testsuites/sptests/sp11/Makefile.am3
-rw-r--r--testsuites/sptests/sp12/Makefile.am3
-rw-r--r--testsuites/sptests/sp13/Makefile.am3
-rw-r--r--testsuites/sptests/sp14/Makefile.am3
-rw-r--r--testsuites/sptests/sp15/Makefile.am3
-rw-r--r--testsuites/sptests/sp16/Makefile.am3
-rw-r--r--testsuites/sptests/sp17/Makefile.am3
-rw-r--r--testsuites/sptests/sp19/Makefile.am3
-rw-r--r--testsuites/sptests/sp20/Makefile.am3
-rw-r--r--testsuites/sptests/sp21/Makefile.am3
-rw-r--r--testsuites/sptests/sp22/Makefile.am3
-rw-r--r--testsuites/sptests/sp23/Makefile.am3
-rw-r--r--testsuites/sptests/sp24/Makefile.am3
-rw-r--r--testsuites/sptests/sp25/Makefile.am3
-rw-r--r--testsuites/sptests/sp26/Makefile.am3
-rw-r--r--testsuites/sptests/sp27/Makefile.am3
-rw-r--r--testsuites/sptests/sp28/Makefile.am3
-rw-r--r--testsuites/sptests/sp29/Makefile.am3
-rw-r--r--testsuites/sptests/sp30/Makefile.am3
-rw-r--r--testsuites/sptests/sp31/Makefile.am3
-rw-r--r--testsuites/sptests/sp32/Makefile.am3
-rw-r--r--testsuites/sptests/spfatal/Makefile.am3
-rw-r--r--testsuites/sptests/spsize/Makefile.am3
-rw-r--r--testsuites/tmitrontests/tmitronsem01/Makefile.am3
-rw-r--r--testsuites/tmtests/tm01/Makefile.am3
-rw-r--r--testsuites/tmtests/tm02/Makefile.am3
-rw-r--r--testsuites/tmtests/tm03/Makefile.am3
-rw-r--r--testsuites/tmtests/tm04/Makefile.am3
-rw-r--r--testsuites/tmtests/tm05/Makefile.am3
-rw-r--r--testsuites/tmtests/tm06/Makefile.am3
-rw-r--r--testsuites/tmtests/tm07/Makefile.am3
-rw-r--r--testsuites/tmtests/tm08/Makefile.am3
-rw-r--r--testsuites/tmtests/tm09/Makefile.am3
-rw-r--r--testsuites/tmtests/tm10/Makefile.am3
-rw-r--r--testsuites/tmtests/tm11/Makefile.am3
-rw-r--r--testsuites/tmtests/tm12/Makefile.am3
-rw-r--r--testsuites/tmtests/tm13/Makefile.am3
-rw-r--r--testsuites/tmtests/tm14/Makefile.am3
-rw-r--r--testsuites/tmtests/tm15/Makefile.am3
-rw-r--r--testsuites/tmtests/tm16/Makefile.am3
-rw-r--r--testsuites/tmtests/tm17/Makefile.am3
-rw-r--r--testsuites/tmtests/tm18/Makefile.am3
-rw-r--r--testsuites/tmtests/tm19/Makefile.am3
-rw-r--r--testsuites/tmtests/tm20/Makefile.am3
-rw-r--r--testsuites/tmtests/tm21/Makefile.am3
-rw-r--r--testsuites/tmtests/tm22/Makefile.am3
-rw-r--r--testsuites/tmtests/tm23/Makefile.am3
-rw-r--r--testsuites/tmtests/tm24/Makefile.am3
-rw-r--r--testsuites/tmtests/tm25/Makefile.am3
-rw-r--r--testsuites/tmtests/tm26/Makefile.am3
-rw-r--r--testsuites/tmtests/tm27/Makefile.am3
-rw-r--r--testsuites/tmtests/tm28/Makefile.am3
-rw-r--r--testsuites/tmtests/tm29/Makefile.am3
-rw-r--r--testsuites/tmtests/tmck/Makefile.am3
-rw-r--r--testsuites/tmtests/tmoverhd/Makefile.am3
142 files changed, 142 insertions, 283 deletions
diff --git a/testsuites/itrontests/itronhello/Makefile.am b/testsuites/itrontests/itronhello/Makefile.am
index c6e8daff15..3d01f522f5 100644
--- a/testsuites/itrontests/itronhello/Makefile.am
+++ b/testsuites/itrontests/itronhello/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/itrontests/itronmbf01/Makefile.am b/testsuites/itrontests/itronmbf01/Makefile.am
index e05cee26af..e29ee87b77 100644
--- a/testsuites/itrontests/itronmbf01/Makefile.am
+++ b/testsuites/itrontests/itronmbf01/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/itrontests/itronmbox01/Makefile.am b/testsuites/itrontests/itronmbox01/Makefile.am
index 76ff63e928..6a9f26bf27 100644
--- a/testsuites/itrontests/itronmbox01/Makefile.am
+++ b/testsuites/itrontests/itronmbox01/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/itrontests/itronsem01/Makefile.am b/testsuites/itrontests/itronsem01/Makefile.am
index 55158c2a61..c942e74cef 100644
--- a/testsuites/itrontests/itronsem01/Makefile.am
+++ b/testsuites/itrontests/itronsem01/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/itrontests/itrontask01/Makefile.am b/testsuites/itrontests/itrontask01/Makefile.am
index 8e592ef057..0548e3b3e3 100644
--- a/testsuites/itrontests/itrontask01/Makefile.am
+++ b/testsuites/itrontests/itrontask01/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/itrontests/itrontask02/Makefile.am b/testsuites/itrontests/itrontask02/Makefile.am
index 9cf72e97f6..06f8fac64f 100644
--- a/testsuites/itrontests/itrontask02/Makefile.am
+++ b/testsuites/itrontests/itrontask02/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c dormant.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/itrontests/itrontask03/Makefile.am b/testsuites/itrontests/itrontask03/Makefile.am
index 7958b95497..1dac4248fd 100644
--- a/testsuites/itrontests/itrontask03/Makefile.am
+++ b/testsuites/itrontests/itrontask03/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c preempt.c task1.c task2.c task3.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/itrontests/itrontask04/Makefile.am b/testsuites/itrontests/itrontask04/Makefile.am
index 262ee71908..feb8bdb335 100644
--- a/testsuites/itrontests/itrontask04/Makefile.am
+++ b/testsuites/itrontests/itrontask04/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/itrontests/itrontime01/Makefile.am b/testsuites/itrontests/itrontime01/Makefile.am
index 97de6c717b..e09d720960 100644
--- a/testsuites/itrontests/itrontime01/Makefile.am
+++ b/testsuites/itrontests/itrontime01/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/libtests/cpuuse/Makefile.am b/testsuites/libtests/cpuuse/Makefile.am
index 66c6a57fe5..370e791063 100644
--- a/testsuites/libtests/cpuuse/Makefile.am
+++ b/testsuites/libtests/cpuuse/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io rate_monotonic
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/libtests/malloctest/Makefile.am b/testsuites/libtests/malloctest/Makefile.am
index 609f983e51..31b19d4e6e 100644
--- a/testsuites/libtests/malloctest/Makefile.am
+++ b/testsuites/libtests/malloctest/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c system.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/libtests/monitor/Makefile.am b/testsuites/libtests/monitor/Makefile.am
index fa15549778..23b73c9326 100644
--- a/testsuites/libtests/monitor/Makefile.am
+++ b/testsuites/libtests/monitor/Makefile.am
@@ -10,7 +10,7 @@ MANAGERS = dpmem event io msg mp part region sem signal timer rate_monotonic \
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c system.h
-DOCTYPES = scn
+DOCS = $(TEST).scn
DOCS = #$(DOCTYPES:%=$(TEST).%)
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/libtests/putenvtest/Makefile.am b/testsuites/libtests/putenvtest/Makefile.am
index 14324785fd..1ebb9ac2cd 100644
--- a/testsuites/libtests/putenvtest/Makefile.am
+++ b/testsuites/libtests/putenvtest/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c
-DOCTYPES =
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS =
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/libtests/rtems++/Makefile.am b/testsuites/libtests/rtems++/Makefile.am
index 50f630dd6d..12e608782b 100644
--- a/testsuites/libtests/rtems++/Makefile.am
+++ b/testsuites/libtests/rtems++/Makefile.am
@@ -11,8 +11,7 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = Init.cc Task1.cc Task2.cc Task3.cc System.h
endif
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
diff --git a/testsuites/libtests/rtmonuse/Makefile.am b/testsuites/libtests/rtmonuse/Makefile.am
index 70408915b6..2f4e933ac6 100644
--- a/testsuites/libtests/rtmonuse/Makefile.am
+++ b/testsuites/libtests/rtmonuse/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io rate_monotonic
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c getall.c task1.c system.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/libtests/stackchk/Makefile.am b/testsuites/libtests/stackchk/Makefile.am
index 09e215dc48..c908b7338d 100644
--- a/testsuites/libtests/stackchk/Makefile.am
+++ b/testsuites/libtests/stackchk/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = blow.c init.c task1.c system.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/libtests/termios/Makefile.am b/testsuites/libtests/termios/Makefile.am
index 079d8091d8..0325fcd7d4 100644
--- a/testsuites/libtests/termios/Makefile.am
+++ b/testsuites/libtests/termios/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c
-DOCTYPES =
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS =
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am
index 4e4fde8518..ca05c67f2b 100644
--- a/testsuites/mptests/mp01/node1/Makefile.am
+++ b/testsuites/mptests/mp01/node1/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am
index 42157913e2..135dd3805c 100644
--- a/testsuites/mptests/mp01/node2/Makefile.am
+++ b/testsuites/mptests/mp01/node2/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am
index 7a585d8722..092952bb2d 100644
--- a/testsuites/mptests/mp02/node1/Makefile.am
+++ b/testsuites/mptests/mp02/node1/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am
index 3547e2e6d0..88348cfc9a 100644
--- a/testsuites/mptests/mp02/node2/Makefile.am
+++ b/testsuites/mptests/mp02/node2/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am
index 4ddb460951..de67dfc60c 100644
--- a/testsuites/mptests/mp03/node1/Makefile.am
+++ b/testsuites/mptests/mp03/node1/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp timer event
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../delay.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am
index 37d80bbb82..551e98ae53 100644
--- a/testsuites/mptests/mp03/node2/Makefile.am
+++ b/testsuites/mptests/mp03/node2/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp timer event
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../delay.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am
index 9f6d162aa4..6dca34d094 100644
--- a/testsuites/mptests/mp04/node1/Makefile.am
+++ b/testsuites/mptests/mp04/node1/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am
index a2e49d0243..99b0e1c216 100644
--- a/testsuites/mptests/mp04/node2/Makefile.am
+++ b/testsuites/mptests/mp04/node2/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am
index e4c4f24727..1004e3d54a 100644
--- a/testsuites/mptests/mp05/node1/Makefile.am
+++ b/testsuites/mptests/mp05/node1/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp signal timer
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am
index fbcf67cd6e..20297fc081 100644
--- a/testsuites/mptests/mp05/node2/Makefile.am
+++ b/testsuites/mptests/mp05/node2/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp signal timer
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am
index 611b249b1b..14a1da5896 100644
--- a/testsuites/mptests/mp06/node1/Makefile.am
+++ b/testsuites/mptests/mp06/node1/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp event timer
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am
index d1b9eacbed..95bbb7cd38 100644
--- a/testsuites/mptests/mp06/node2/Makefile.am
+++ b/testsuites/mptests/mp06/node2/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp event timer
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am
index ff9f043166..a905f0e8c0 100644
--- a/testsuites/mptests/mp07/node1/Makefile.am
+++ b/testsuites/mptests/mp07/node1/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp event timer
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am
index 40711ca67e..042d1769bf 100644
--- a/testsuites/mptests/mp07/node2/Makefile.am
+++ b/testsuites/mptests/mp07/node2/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp event timer
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am
index d54cb96a86..2e570b7287 100644
--- a/testsuites/mptests/mp08/node1/Makefile.am
+++ b/testsuites/mptests/mp08/node1/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am
index 855e899c4f..e090b09a94 100644
--- a/testsuites/mptests/mp08/node2/Makefile.am
+++ b/testsuites/mptests/mp08/node2/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am
index 1255e895ad..38996c1793 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/mptests/mp09/node1/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp message
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am
index 492a5f54dc..58a99f158f 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/mptests/mp09/node2/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp message
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am
index 5969aba99e..6be299221d 100644
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ b/testsuites/mptests/mp10/node1/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp message semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am
index 9ee4106f91..34ec53ba94 100644
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ b/testsuites/mptests/mp10/node2/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp message semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am
index 46e9e418f5..52b0589647 100644
--- a/testsuites/mptests/mp11/node1/Makefile.am
+++ b/testsuites/mptests/mp11/node1/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp message partition semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am
index f9a89992a8..af3255ee6e 100644
--- a/testsuites/mptests/mp11/node2/Makefile.am
+++ b/testsuites/mptests/mp11/node2/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp message partition semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am
index 96d3c887da..82e84dc4e0 100644
--- a/testsuites/mptests/mp12/node1/Makefile.am
+++ b/testsuites/mptests/mp12/node1/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp partition
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am
index 2465854bc3..664a18d585 100644
--- a/testsuites/mptests/mp12/node2/Makefile.am
+++ b/testsuites/mptests/mp12/node2/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp partition
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am
index 116f37ba2e..c3ef92dfce 100644
--- a/testsuites/mptests/mp13/node1/Makefile.am
+++ b/testsuites/mptests/mp13/node1/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp message semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am
index 887bab55a1..5cd9157aa2 100644
--- a/testsuites/mptests/mp13/node2/Makefile.am
+++ b/testsuites/mptests/mp13/node2/Makefile.am
@@ -11,8 +11,7 @@ MANAGERS = io mp message semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am
index 01b89c2e3b..2a707d4824 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -12,8 +12,7 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am
index 57b3509e90..93797ce4a2 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -12,8 +12,7 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psx01/Makefile.am b/testsuites/psxtests/psx01/Makefile.am
index ffd5575bdd..a245e7d1c8 100644
--- a/testsuites/psxtests/psx01/Makefile.am
+++ b/testsuites/psxtests/psx01/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psx02/Makefile.am b/testsuites/psxtests/psx02/Makefile.am
index 1e726b03a6..34f2272502 100644
--- a/testsuites/psxtests/psx02/Makefile.am
+++ b/testsuites/psxtests/psx02/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psx03/Makefile.am b/testsuites/psxtests/psx03/Makefile.am
index f491521d76..2eb4c9d410 100644
--- a/testsuites/psxtests/psx03/Makefile.am
+++ b/testsuites/psxtests/psx03/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psx04/Makefile.am b/testsuites/psxtests/psx04/Makefile.am
index ddc0e2b138..9ed1ac5148 100644
--- a/testsuites/psxtests/psx04/Makefile.am
+++ b/testsuites/psxtests/psx04/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psx05/Makefile.am b/testsuites/psxtests/psx05/Makefile.am
index dc1835da4a..08b0e17766 100644
--- a/testsuites/psxtests/psx05/Makefile.am
+++ b/testsuites/psxtests/psx05/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psx06/Makefile.am b/testsuites/psxtests/psx06/Makefile.am
index ea4fb3cbab..5ccd45c13f 100644
--- a/testsuites/psxtests/psx06/Makefile.am
+++ b/testsuites/psxtests/psx06/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task.c task2.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psx07/Makefile.am b/testsuites/psxtests/psx07/Makefile.am
index f7c084a984..38aa6b17d3 100644
--- a/testsuites/psxtests/psx07/Makefile.am
+++ b/testsuites/psxtests/psx07/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psx08/Makefile.am b/testsuites/psxtests/psx08/Makefile.am
index 53ccb33c06..7e280e518d 100644
--- a/testsuites/psxtests/psx08/Makefile.am
+++ b/testsuites/psxtests/psx08/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psx09/Makefile.am b/testsuites/psxtests/psx09/Makefile.am
index 2ae0d6a9d9..980e6711e1 100644
--- a/testsuites/psxtests/psx09/Makefile.am
+++ b/testsuites/psxtests/psx09/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psx10/Makefile.am b/testsuites/psxtests/psx10/Makefile.am
index ddc3645d09..1a70037454 100644
--- a/testsuites/psxtests/psx10/Makefile.am
+++ b/testsuites/psxtests/psx10/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psx11/Makefile.am b/testsuites/psxtests/psx11/Makefile.am
index fcf810edaf..e94c9bcb17 100644
--- a/testsuites/psxtests/psx11/Makefile.am
+++ b/testsuites/psxtests/psx11/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psx12/Makefile.am b/testsuites/psxtests/psx12/Makefile.am
index c457cafec9..34bbe2bd41 100644
--- a/testsuites/psxtests/psx12/Makefile.am
+++ b/testsuites/psxtests/psx12/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psx13/Makefile.am b/testsuites/psxtests/psx13/Makefile.am
index 961e7371af..ebd4882b51 100644
--- a/testsuites/psxtests/psx13/Makefile.am
+++ b/testsuites/psxtests/psx13/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = main.c test.c ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psxcancel/Makefile.am b/testsuites/psxtests/psxcancel/Makefile.am
index 68250873b2..64853840fc 100644
--- a/testsuites/psxtests/psxcancel/Makefile.am
+++ b/testsuites/psxtests/psxcancel/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psxchroot01/Makefile.am b/testsuites/psxtests/psxchroot01/Makefile.am
index 688ef6786a..5f53af39a8 100644
--- a/testsuites/psxtests/psxchroot01/Makefile.am
+++ b/testsuites/psxtests/psxchroot01/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = main.c test.c ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psxfile01/Makefile.am b/testsuites/psxtests/psxfile01/Makefile.am
index c7922c0181..f38d4fef35 100644
--- a/testsuites/psxtests/psxfile01/Makefile.am
+++ b/testsuites/psxtests/psxfile01/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = main.c test.c test_cat.c test_extend.c test_write.c ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psxmount/Makefile.am b/testsuites/psxtests/psxmount/Makefile.am
index b333d843b8..21269b3c5d 100644
--- a/testsuites/psxtests/psxmount/Makefile.am
+++ b/testsuites/psxtests/psxmount/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = main.c test.c ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psxmsgq01/Makefile.am b/testsuites/psxtests/psxmsgq01/Makefile.am
index 432540962c..69ae98aa0f 100644
--- a/testsuites/psxtests/psxmsgq01/Makefile.am
+++ b/testsuites/psxtests/psxmsgq01/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psxreaddir/Makefile.am b/testsuites/psxtests/psxreaddir/Makefile.am
index 71b8548515..ee99087622 100644
--- a/testsuites/psxtests/psxreaddir/Makefile.am
+++ b/testsuites/psxtests/psxreaddir/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = main.c test.c ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psxsem01/Makefile.am b/testsuites/psxtests/psxsem01/Makefile.am
index 22c63a855a..462b52b969 100644
--- a/testsuites/psxtests/psxsem01/Makefile.am
+++ b/testsuites/psxtests/psxsem01/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psxstat/Makefile.am b/testsuites/psxtests/psxstat/Makefile.am
index 5f1ac37869..4f5583c68f 100644
--- a/testsuites/psxtests/psxstat/Makefile.am
+++ b/testsuites/psxtests/psxstat/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = main.c test.c ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psxtime/Makefile.am b/testsuites/psxtests/psxtime/Makefile.am
index c2cc664fd6..fd7c3aa693 100644
--- a/testsuites/psxtests/psxtime/Makefile.am
+++ b/testsuites/psxtests/psxtime/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = main.c test.c
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/psxtests/psxtimer/Makefile.am b/testsuites/psxtests/psxtimer/Makefile.am
index 92c254ef05..7bef1b7a63 100644
--- a/testsuites/psxtests/psxtimer/Makefile.am
+++ b/testsuites/psxtests/psxtimer/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = psxtimer.c system.h ../include/pmacros.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index 22aa563d34..2c406f5c6c 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c apptask.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index 365f721e96..4b66b8426a 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c main.cc system.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am
index 0c6924c698..54f66cd936 100644
--- a/testsuites/samples/fileio/Makefile.am
+++ b/testsuites/samples/fileio/Makefile.am
@@ -13,8 +13,7 @@ lib_a_SOURCES = init.c system.h
OBJS = $(lib_a_OBJECTS)
endif
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index 7cc2e741ad..b6d07c6464 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am
index f45a9b66d3..a7394f6610 100644
--- a/testsuites/samples/iostream/Makefile.am
+++ b/testsuites/samples/iostream/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.cc system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index 21120d3865..18f6f02e3b 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = io event
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index a47d40f22b..26cee5a052 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index b6af7412b2..526ef6d42b 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c paranoia.c system.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index d6c6145551..3e4c3e955f 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c tasks.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index ef09117150..43c264bb0f 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -10,8 +10,7 @@ MANAGERS = io event
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c test1.c test2.c test3.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp01/Makefile.am b/testsuites/sptests/sp01/Makefile.am
index a269874d3e..0cea74eac4 100644
--- a/testsuites/sptests/sp01/Makefile.am
+++ b/testsuites/sptests/sp01/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp02/Makefile.am b/testsuites/sptests/sp02/Makefile.am
index 2815072d08..a025e84890 100644
--- a/testsuites/sptests/sp02/Makefile.am
+++ b/testsuites/sptests/sp02/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c task2.c task3.c preempt.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp03/Makefile.am b/testsuites/sptests/sp03/Makefile.am
index 70d20e6233..a4252fcf8a 100644
--- a/testsuites/sptests/sp03/Makefile.am
+++ b/testsuites/sptests/sp03/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c task2.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp04/Makefile.am b/testsuites/sptests/sp04/Makefile.am
index 9bdbc78395..4624fa4405 100644
--- a/testsuites/sptests/sp04/Makefile.am
+++ b/testsuites/sptests/sp04/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp05/Makefile.am b/testsuites/sptests/sp05/Makefile.am
index 981ca83b50..035743d326 100644
--- a/testsuites/sptests/sp05/Makefile.am
+++ b/testsuites/sptests/sp05/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp06/Makefile.am b/testsuites/sptests/sp06/Makefile.am
index a3698958e8..39862e0944 100644
--- a/testsuites/sptests/sp06/Makefile.am
+++ b/testsuites/sptests/sp06/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp07/Makefile.am b/testsuites/sptests/sp07/Makefile.am
index 1690e74f8b..1489e18aaa 100644
--- a/testsuites/sptests/sp07/Makefile.am
+++ b/testsuites/sptests/sp07/Makefile.am
@@ -10,8 +10,7 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c buffered_io.c task1.c task2.c task3.c task4.c taskexit.c \
tcreate.c tdelete.c trestart.c tstart.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp08/Makefile.am b/testsuites/sptests/sp08/Makefile.am
index 194d40c6e4..25d1cbeaeb 100644
--- a/testsuites/sptests/sp08/Makefile.am
+++ b/testsuites/sptests/sp08/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp09/Makefile.am b/testsuites/sptests/sp09/Makefile.am
index 0d1c75344d..a82b1eb212 100644
--- a/testsuites/sptests/sp09/Makefile.am
+++ b/testsuites/sptests/sp09/Makefile.am
@@ -13,8 +13,7 @@ lib_a_SOURCES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen04.c
screen11.c screen12.c screen13.c screen14.c task1.c task2.c task3.c \
task4.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp11/Makefile.am b/testsuites/sptests/sp11/Makefile.am
index c2ec983dd0..e697b6b623 100644
--- a/testsuites/sptests/sp11/Makefile.am
+++ b/testsuites/sptests/sp11/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io event timer
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c task2.c timer.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp12/Makefile.am b/testsuites/sptests/sp12/Makefile.am
index b8abfb4a56..ee037ba10e 100644
--- a/testsuites/sptests/sp12/Makefile.am
+++ b/testsuites/sptests/sp12/Makefile.am
@@ -10,8 +10,7 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c pridrv.c \
pritask.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp13/Makefile.am b/testsuites/sptests/sp13/Makefile.am
index c43268de00..abf215d334 100644
--- a/testsuites/sptests/sp13/Makefile.am
+++ b/testsuites/sptests/sp13/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io message
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c fillbuff.c putbuff.c task1.c task2.c task3.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp14/Makefile.am b/testsuites/sptests/sp14/Makefile.am
index 0d2899d31d..f95c7e999c 100644
--- a/testsuites/sptests/sp14/Makefile.am
+++ b/testsuites/sptests/sp14/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io signal timer
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c asr.c task1.c task2.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp15/Makefile.am b/testsuites/sptests/sp15/Makefile.am
index 48769a4d0c..84abf760fc 100644
--- a/testsuites/sptests/sp15/Makefile.am
+++ b/testsuites/sptests/sp15/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io partition
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp16/Makefile.am b/testsuites/sptests/sp16/Makefile.am
index 3ecddd9379..c83d0be6e0 100644
--- a/testsuites/sptests/sp16/Makefile.am
+++ b/testsuites/sptests/sp16/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io region
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp17/Makefile.am b/testsuites/sptests/sp17/Makefile.am
index e27f439380..e7acdd61e2 100644
--- a/testsuites/sptests/sp17/Makefile.am
+++ b/testsuites/sptests/sp17/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io signal
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c asr.c task1.c task2.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp19/Makefile.am b/testsuites/sptests/sp19/Makefile.am
index f7674c171d..6c6a38207d 100644
--- a/testsuites/sptests/sp19/Makefile.am
+++ b/testsuites/sptests/sp19/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c first.c fptask.c task1.c system.h fptest.h inttest.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp20/Makefile.am b/testsuites/sptests/sp20/Makefile.am
index 8fb20a4d04..d0bff00533 100644
--- a/testsuites/sptests/sp20/Makefile.am
+++ b/testsuites/sptests/sp20/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io rate_monotonic
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c getall.c task1.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp21/Makefile.am b/testsuites/sptests/sp21/Makefile.am
index 1bbbe6bbf3..741f4fe741 100644
--- a/testsuites/sptests/sp21/Makefile.am
+++ b/testsuites/sptests/sp21/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp22/Makefile.am b/testsuites/sptests/sp22/Makefile.am
index 3d10bf6e6b..b194bc2d80 100644
--- a/testsuites/sptests/sp22/Makefile.am
+++ b/testsuites/sptests/sp22/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io timer
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c prtime.c delay.c task1.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp23/Makefile.am b/testsuites/sptests/sp23/Makefile.am
index c57f553cd5..7396284313 100644
--- a/testsuites/sptests/sp23/Makefile.am
+++ b/testsuites/sptests/sp23/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io dual_ported_memory
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp24/Makefile.am b/testsuites/sptests/sp24/Makefile.am
index 0b06a7e861..d532d9e8a0 100644
--- a/testsuites/sptests/sp24/Makefile.am
+++ b/testsuites/sptests/sp24/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io event timer
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c resume.c task1.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp25/Makefile.am b/testsuites/sptests/sp25/Makefile.am
index 7b3cb4f45e..fe2062318e 100644
--- a/testsuites/sptests/sp25/Makefile.am
+++ b/testsuites/sptests/sp25/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io region
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp26/Makefile.am b/testsuites/sptests/sp26/Makefile.am
index 95965eea7c..1d9e4e03a4 100644
--- a/testsuites/sptests/sp26/Makefile.am
+++ b/testsuites/sptests/sp26/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io region event
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c task1.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp27/Makefile.am b/testsuites/sptests/sp27/Makefile.am
index 3d40ae8ca9..e767377709 100644
--- a/testsuites/sptests/sp27/Makefile.am
+++ b/testsuites/sptests/sp27/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp28/Makefile.am b/testsuites/sptests/sp28/Makefile.am
index 5927d048aa..fa1413e538 100644
--- a/testsuites/sptests/sp28/Makefile.am
+++ b/testsuites/sptests/sp28/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp29/Makefile.am b/testsuites/sptests/sp29/Makefile.am
index 7067b3fd59..da9c49c0ae 100644
--- a/testsuites/sptests/sp29/Makefile.am
+++ b/testsuites/sptests/sp29/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp30/Makefile.am b/testsuites/sptests/sp30/Makefile.am
index bd79075b32..e721148ed3 100644
--- a/testsuites/sptests/sp30/Makefile.am
+++ b/testsuites/sptests/sp30/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c resume.c task1.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp31/Makefile.am b/testsuites/sptests/sp31/Makefile.am
index 12e330fc2f..aafbea4f05 100644
--- a/testsuites/sptests/sp31/Makefile.am
+++ b/testsuites/sptests/sp31/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = delay.c init.c prtime.c task1.c system.h
-DOCTYPES = doc scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp32/Makefile.am b/testsuites/sptests/sp32/Makefile.am
index 2c989f205a..1e5d12a445 100644
--- a/testsuites/sptests/sp32/Makefile.am
+++ b/testsuites/sptests/sp32/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io rate_monotonic
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/spfatal/Makefile.am b/testsuites/sptests/spfatal/Makefile.am
index 3a860c21d9..43e6706b45 100644
--- a/testsuites/sptests/spfatal/Makefile.am
+++ b/testsuites/sptests/spfatal/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c puterr.c fatal.c task1.c system.h
-DOCTYPES = scn doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/spsize/Makefile.am b/testsuites/sptests/spsize/Makefile.am
index ce471c85f6..41fe4f3a05 100644
--- a/testsuites/sptests/spsize/Makefile.am
+++ b/testsuites/sptests/spsize/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c getint.c size.c system.h
-DOCTYPES = scn
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).scn
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmitrontests/tmitronsem01/Makefile.am b/testsuites/tmitrontests/tmitronsem01/Makefile.am
index 348e673626..05c520500c 100644
--- a/testsuites/tmitrontests/tmitronsem01/Makefile.am
+++ b/testsuites/tmitrontests/tmitronsem01/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = all
noinst_LIBRARIES = lib.a
lib_a_SOURCES = init.c system.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm01/Makefile.am b/testsuites/tmtests/tm01/Makefile.am
index 4502f6e0d5..d6d6106d5b 100644
--- a/testsuites/tmtests/tm01/Makefile.am
+++ b/testsuites/tmtests/tm01/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm02/Makefile.am b/testsuites/tmtests/tm02/Makefile.am
index f7a8dee822..3df60bec03 100644
--- a/testsuites/tmtests/tm02/Makefile.am
+++ b/testsuites/tmtests/tm02/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm03/Makefile.am b/testsuites/tmtests/tm03/Makefile.am
index b6d18d6fec..15d810cdae 100644
--- a/testsuites/tmtests/tm03/Makefile.am
+++ b/testsuites/tmtests/tm03/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm04/Makefile.am b/testsuites/tmtests/tm04/Makefile.am
index 57b2f0b7d8..c1525196c3 100644
--- a/testsuites/tmtests/tm04/Makefile.am
+++ b/testsuites/tmtests/tm04/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm05/Makefile.am b/testsuites/tmtests/tm05/Makefile.am
index e3fe6fa4cc..fd009cfc5e 100644
--- a/testsuites/tmtests/tm05/Makefile.am
+++ b/testsuites/tmtests/tm05/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm06/Makefile.am b/testsuites/tmtests/tm06/Makefile.am
index 678cbd6bd3..a526295ed6 100644
--- a/testsuites/tmtests/tm06/Makefile.am
+++ b/testsuites/tmtests/tm06/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm07/Makefile.am b/testsuites/tmtests/tm07/Makefile.am
index fed01c59c4..8427b29c5c 100644
--- a/testsuites/tmtests/tm07/Makefile.am
+++ b/testsuites/tmtests/tm07/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm08/Makefile.am b/testsuites/tmtests/tm08/Makefile.am
index 449cc3ce7c..9a8a480f97 100644
--- a/testsuites/tmtests/tm08/Makefile.am
+++ b/testsuites/tmtests/tm08/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm09/Makefile.am b/testsuites/tmtests/tm09/Makefile.am
index df50a9c80c..4d90994d46 100644
--- a/testsuites/tmtests/tm09/Makefile.am
+++ b/testsuites/tmtests/tm09/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io message
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm10/Makefile.am b/testsuites/tmtests/tm10/Makefile.am
index cb590b1d73..050233aae5 100644
--- a/testsuites/tmtests/tm10/Makefile.am
+++ b/testsuites/tmtests/tm10/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io message
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm11/Makefile.am b/testsuites/tmtests/tm11/Makefile.am
index 0968da0bf4..5f5041ed0e 100644
--- a/testsuites/tmtests/tm11/Makefile.am
+++ b/testsuites/tmtests/tm11/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io message
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm12/Makefile.am b/testsuites/tmtests/tm12/Makefile.am
index e62cac0fd8..82584dab1d 100644
--- a/testsuites/tmtests/tm12/Makefile.am
+++ b/testsuites/tmtests/tm12/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io message
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm13/Makefile.am b/testsuites/tmtests/tm13/Makefile.am
index 86a9e069df..36f9552ae8 100644
--- a/testsuites/tmtests/tm13/Makefile.am
+++ b/testsuites/tmtests/tm13/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io message
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm14/Makefile.am b/testsuites/tmtests/tm14/Makefile.am
index f94fa9d1ad..f4d3300b78 100644
--- a/testsuites/tmtests/tm14/Makefile.am
+++ b/testsuites/tmtests/tm14/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io message
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm15/Makefile.am b/testsuites/tmtests/tm15/Makefile.am
index 37611df12f..a04bedac45 100644
--- a/testsuites/tmtests/tm15/Makefile.am
+++ b/testsuites/tmtests/tm15/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io event
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm16/Makefile.am b/testsuites/tmtests/tm16/Makefile.am
index 5d9704a7d0..853c9f75bc 100644
--- a/testsuites/tmtests/tm16/Makefile.am
+++ b/testsuites/tmtests/tm16/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io event
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm17/Makefile.am b/testsuites/tmtests/tm17/Makefile.am
index 05f387aa48..61063a207e 100644
--- a/testsuites/tmtests/tm17/Makefile.am
+++ b/testsuites/tmtests/tm17/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm18/Makefile.am b/testsuites/tmtests/tm18/Makefile.am
index 7e453d2e48..b430c5d5bb 100644
--- a/testsuites/tmtests/tm18/Makefile.am
+++ b/testsuites/tmtests/tm18/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm19/Makefile.am b/testsuites/tmtests/tm19/Makefile.am
index 0c5e329947..7a7ad814b6 100644
--- a/testsuites/tmtests/tm19/Makefile.am
+++ b/testsuites/tmtests/tm19/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io signal
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm20/Makefile.am b/testsuites/tmtests/tm20/Makefile.am
index 9a59c82b64..e11f79bca4 100644
--- a/testsuites/tmtests/tm20/Makefile.am
+++ b/testsuites/tmtests/tm20/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io partition region
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm21/Makefile.am b/testsuites/tmtests/tm21/Makefile.am
index 1d9f967b72..138bfbd08b 100644
--- a/testsuites/tmtests/tm21/Makefile.am
+++ b/testsuites/tmtests/tm21/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io dpmem message partition region semaphore rate_monotonic timer
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm22/Makefile.am b/testsuites/tmtests/tm22/Makefile.am
index 508a388be1..14183530c4 100644
--- a/testsuites/tmtests/tm22/Makefile.am
+++ b/testsuites/tmtests/tm22/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io message
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm23/Makefile.am b/testsuites/tmtests/tm23/Makefile.am
index 800987f503..834f2449b3 100644
--- a/testsuites/tmtests/tm23/Makefile.am
+++ b/testsuites/tmtests/tm23/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io event timer
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm24/Makefile.am b/testsuites/tmtests/tm24/Makefile.am
index efaeea9e45..ea6e8ea72e 100644
--- a/testsuites/tmtests/tm24/Makefile.am
+++ b/testsuites/tmtests/tm24/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io message
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm25/Makefile.am b/testsuites/tmtests/tm25/Makefile.am
index 7f7783339a..c4eae98a55 100644
--- a/testsuites/tmtests/tm25/Makefile.am
+++ b/testsuites/tmtests/tm25/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm26/Makefile.am b/testsuites/tmtests/tm26/Makefile.am
index b228eaaa58..76d416b7dc 100644
--- a/testsuites/tmtests/tm26/Makefile.am
+++ b/testsuites/tmtests/tm26/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io semaphore
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h fptest.h ../include/timesys.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm27/Makefile.am b/testsuites/tmtests/tm27/Makefile.am
index 21a0541044..581e1dca89 100644
--- a/testsuites/tmtests/tm27/Makefile.am
+++ b/testsuites/tmtests/tm27/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm28/Makefile.am b/testsuites/tmtests/tm28/Makefile.am
index f0c7a85231..8fff0345d8 100644
--- a/testsuites/tmtests/tm28/Makefile.am
+++ b/testsuites/tmtests/tm28/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io dpmem
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tm29/Makefile.am b/testsuites/tmtests/tm29/Makefile.am
index 8dc4ae78f2..c16a99a871 100644
--- a/testsuites/tmtests/tm29/Makefile.am
+++ b/testsuites/tmtests/tm29/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io rate_monotonic
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tmck/Makefile.am b/testsuites/tmtests/tmck/Makefile.am
index 138e8454fd..d4abd3437f 100644
--- a/testsuites/tmtests/tmck/Makefile.am
+++ b/testsuites/tmtests/tmck/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = task1.c system.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/tmtests/tmoverhd/Makefile.am b/testsuites/tmtests/tmoverhd/Makefile.am
index 6bd8fd1af8..2ff8450327 100644
--- a/testsuites/tmtests/tmoverhd/Makefile.am
+++ b/testsuites/tmtests/tmoverhd/Makefile.am
@@ -9,8 +9,7 @@ MANAGERS = io
noinst_LIBRARIES = lib.a
lib_a_SOURCES = testtask.c empty.c system.h dumrtems.h ../include/timesys.h
-DOCTYPES = doc
-DOCS = $(DOCTYPES:%=$(TEST).%)
+DOCS = $(TEST).doc
OBJS = $(lib_a_OBJECTS)