Eliminate DOCTYPES.

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)

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)
 

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
 
 
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)