Eliminate scndir, docdir. Use rtems_testsdir instead.

40 files changed, 49 insertions, 98 deletions

diff --git a/testsuites/libtests/cpuuse/Makefile.am b/testsuites/libtests/cpuuse/Makefile.am
index 1b9a9475d2..9ec0ba0210 100644
--- a/testsuites/libtests/cpuuse/Makefile.am
+++ b/testsuites/libtests/cpuuse/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io rate_monotonic
 rtems_tests_PROGRAMS = cpuuse.exe
 cpuuse_exe_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = cpuuse.scn
+dist_rtems_tests_DATA = cpuuse.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/libtests/malloctest/Makefile.am b/testsuites/libtests/malloctest/Makefile.am
index 40c93908f2..8dee7770d6 100644
--- a/testsuites/libtests/malloctest/Makefile.am
+++ b/testsuites/libtests/malloctest/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io
 rtems_tests_PROGRAMS = malloctest.exe
 malloctest_exe_SOURCES = init.c task1.c system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = malloctest.scn
+dist_rtems_tests_DATA = malloctest.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/libtests/rtems++/Makefile.am b/testsuites/libtests/rtems++/Makefile.am
index 12bd3a835e..71b920cb4e 100644
--- a/testsuites/libtests/rtems++/Makefile.am
+++ b/testsuites/libtests/rtems++/Makefile.am
@@ -9,10 +9,8 @@ rtems_tests_PROGRAMS = rtems++.exe
 rtems___exe_SOURCES = Init.cc Task1.cc Task2.cc Task3.cc System.h
 endif
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = rtems++.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = rtems++.doc
+dist_rtems_tests_DATA = rtems++.scn
+dist_rtems_tests_DATA += rtems++.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/libtests/rtmonuse/Makefile.am b/testsuites/libtests/rtmonuse/Makefile.am
index cbb561b3ae..369ae69354 100644
--- a/testsuites/libtests/rtmonuse/Makefile.am
+++ b/testsuites/libtests/rtmonuse/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io rate_monotonic
 rtems_tests_PROGRAMS = rtmonuse.exe
 rtmonuse_exe_SOURCES = init.c getall.c task1.c system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = rtmonuse.scn
+dist_rtems_tests_DATA = rtmonuse.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/libtests/stackchk/Makefile.am b/testsuites/libtests/stackchk/Makefile.am
index a260668c91..1631016be4 100644
--- a/testsuites/libtests/stackchk/Makefile.am
+++ b/testsuites/libtests/stackchk/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io
 rtems_tests_PROGRAMS = stackchk.exe
 stackchk_exe_SOURCES = blow.c init.c task1.c system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = stackchk.scn
+dist_rtems_tests_DATA = stackchk.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psx01/Makefile.am b/testsuites/psxtests/psx01/Makefile.am
index 4f2650c935..638f1f59cf 100644
--- a/testsuites/psxtests/psx01/Makefile.am
+++ b/testsuites/psxtests/psx01/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psx01.exe
 psx01_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psx01.scn
+dist_rtems_tests_DATA = psx01.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psx02/Makefile.am b/testsuites/psxtests/psx02/Makefile.am
index 00bc7d6c0f..2dc0d54129 100644
--- a/testsuites/psxtests/psx02/Makefile.am
+++ b/testsuites/psxtests/psx02/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psx02.exe
 psx02_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psx02.scn
+dist_rtems_tests_DATA = psx02.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psx03/Makefile.am b/testsuites/psxtests/psx03/Makefile.am
index ad0c059a72..3d74745134 100644
--- a/testsuites/psxtests/psx03/Makefile.am
+++ b/testsuites/psxtests/psx03/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psx03.exe
 psx03_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psx03.scn
+dist_rtems_tests_DATA = psx03.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psx04/Makefile.am b/testsuites/psxtests/psx04/Makefile.am
index 0d16db7f65..424af74777 100644
--- a/testsuites/psxtests/psx04/Makefile.am
+++ b/testsuites/psxtests/psx04/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psx04.exe
 psx04_exe_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psx04.scn
+dist_rtems_tests_DATA = psx04.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psx05/Makefile.am b/testsuites/psxtests/psx05/Makefile.am
index 0b783f9a23..8b81c779e6 100644
--- a/testsuites/psxtests/psx05/Makefile.am
+++ b/testsuites/psxtests/psx05/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psx05.exe
 psx05_exe_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psx05.scn
+dist_rtems_tests_DATA = psx05.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psx06/Makefile.am b/testsuites/psxtests/psx06/Makefile.am
index dbf8daa346..044f5df0f2 100644
--- a/testsuites/psxtests/psx06/Makefile.am
+++ b/testsuites/psxtests/psx06/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psx06.exe
 psx06_exe_SOURCES = init.c task.c task2.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psx06.scn
+dist_rtems_tests_DATA = psx06.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psx07/Makefile.am b/testsuites/psxtests/psx07/Makefile.am
index 785cc529b0..f2f31127af 100644
--- a/testsuites/psxtests/psx07/Makefile.am
+++ b/testsuites/psxtests/psx07/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psx07.exe
 psx07_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psx07.scn
+dist_rtems_tests_DATA = psx07.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psx08/Makefile.am b/testsuites/psxtests/psx08/Makefile.am
index c7726a2150..0d0cadbc25 100644
--- a/testsuites/psxtests/psx08/Makefile.am
+++ b/testsuites/psxtests/psx08/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psx08.exe
 psx08_exe_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psx08.scn
+dist_rtems_tests_DATA = psx08.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psx09/Makefile.am b/testsuites/psxtests/psx09/Makefile.am
index 9b62afeda6..9c802fff54 100644
--- a/testsuites/psxtests/psx09/Makefile.am
+++ b/testsuites/psxtests/psx09/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psx09.exe
 psx09_exe_SOURCES = init.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psx09.scn
+dist_rtems_tests_DATA = psx09.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psx10/Makefile.am b/testsuites/psxtests/psx10/Makefile.am
index 2685bbdc26..ee5f0c93f4 100644
--- a/testsuites/psxtests/psx10/Makefile.am
+++ b/testsuites/psxtests/psx10/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psx10.exe
 psx10_exe_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psx10.scn
+dist_rtems_tests_DATA = psx10.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psx11/Makefile.am b/testsuites/psxtests/psx11/Makefile.am
index 67a43ab9d9..1fee1af3bd 100644
--- a/testsuites/psxtests/psx11/Makefile.am
+++ b/testsuites/psxtests/psx11/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psx11.exe
 psx11_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psx11.scn
+dist_rtems_tests_DATA = psx11.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psx12/Makefile.am b/testsuites/psxtests/psx12/Makefile.am
index b5e6c19fe6..6095d0d684 100644
--- a/testsuites/psxtests/psx12/Makefile.am
+++ b/testsuites/psxtests/psx12/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psx12.exe
 psx12_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psx12.scn
+dist_rtems_tests_DATA = psx12.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psx13/Makefile.am b/testsuites/psxtests/psx13/Makefile.am
index 732a72ef35..12cd768d04 100644
--- a/testsuites/psxtests/psx13/Makefile.am
+++ b/testsuites/psxtests/psx13/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psx13.exe
 psx13_exe_SOURCES = main.c test.c ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psx13.scn
+dist_rtems_tests_DATA = psx13.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psxcancel/Makefile.am b/testsuites/psxtests/psxcancel/Makefile.am
index 18fa58c3f7..61b030fc2c 100644
--- a/testsuites/psxtests/psxcancel/Makefile.am
+++ b/testsuites/psxtests/psxcancel/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psxcancel.exe
 psxcancel_exe_SOURCES = init.c ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psxcancel.scn
+dist_rtems_tests_DATA = psxcancel.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psxchroot01/Makefile.am b/testsuites/psxtests/psxchroot01/Makefile.am
index 28637a1a2c..40eef3f6c9 100644
--- a/testsuites/psxtests/psxchroot01/Makefile.am
+++ b/testsuites/psxtests/psxchroot01/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psxchroot01.exe
 psxchroot01_exe_SOURCES = main.c test.c ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psxchroot01.scn
+dist_rtems_tests_DATA = psxchroot01.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psxfile01/Makefile.am b/testsuites/psxtests/psxfile01/Makefile.am
index d6c0665e63..a6caffa442 100644
--- a/testsuites/psxtests/psxfile01/Makefile.am
+++ b/testsuites/psxtests/psxfile01/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psxfile01.exe
 psxfile01_exe_SOURCES = main.c test.c test_cat.c test_extend.c test_write.c ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psxfile01.scn
+dist_rtems_tests_DATA = psxfile01.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psxmount/Makefile.am b/testsuites/psxtests/psxmount/Makefile.am
index cd9b4af0b5..c03cf60261 100644
--- a/testsuites/psxtests/psxmount/Makefile.am
+++ b/testsuites/psxtests/psxmount/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psxmount.exe
 psxmount_exe_SOURCES = main.c test.c ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psxmount.scn
+dist_rtems_tests_DATA = psxmount.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psxmsgq01/Makefile.am b/testsuites/psxtests/psxmsgq01/Makefile.am
index 11de0a1e4f..ed0a004974 100644
--- a/testsuites/psxtests/psxmsgq01/Makefile.am
+++ b/testsuites/psxtests/psxmsgq01/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psxmsgq01.exe
 psxmsgq01_exe_SOURCES = init.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psxmsgq01.scn
+dist_rtems_tests_DATA = psxmsgq01.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psxreaddir/Makefile.am b/testsuites/psxtests/psxreaddir/Makefile.am
index 68cc17c511..dad53db111 100644
--- a/testsuites/psxtests/psxreaddir/Makefile.am
+++ b/testsuites/psxtests/psxreaddir/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psxreaddir.exe
 psxreaddir_exe_SOURCES = main.c test.c ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psxreaddir.scn
+dist_rtems_tests_DATA = psxreaddir.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psxsem01/Makefile.am b/testsuites/psxtests/psxsem01/Makefile.am
index 40a4ad66a7..a578c7e7e0 100644
--- a/testsuites/psxtests/psxsem01/Makefile.am
+++ b/testsuites/psxtests/psxsem01/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psxsem01.exe
 psxsem01_exe_SOURCES = init.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psxsem01.scn
+dist_rtems_tests_DATA = psxsem01.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psxstat/Makefile.am b/testsuites/psxtests/psxstat/Makefile.am
index e86c6435a1..c26b4aff5c 100644
--- a/testsuites/psxtests/psxstat/Makefile.am
+++ b/testsuites/psxtests/psxstat/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psxstat.exe
 psxstat_exe_SOURCES = main.c test.c ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psxstat.scn
+dist_rtems_tests_DATA = psxstat.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psxtime/Makefile.am b/testsuites/psxtests/psxtime/Makefile.am
index 927403a979..b0d1963977 100644
--- a/testsuites/psxtests/psxtime/Makefile.am
+++ b/testsuites/psxtests/psxtime/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psxtime.exe
 psxtime_exe_SOURCES = main.c test.c
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psxtime.scn
+dist_rtems_tests_DATA = psxtime.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/psxtests/psxtimer/Makefile.am b/testsuites/psxtests/psxtimer/Makefile.am
index 8b92a5858a..c0defa10ad 100644
--- a/testsuites/psxtests/psxtimer/Makefile.am
+++ b/testsuites/psxtests/psxtimer/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = psxtimer.exe
 psxtimer_exe_SOURCES = psxtimer.c system.h ../include/pmacros.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = psxtimer.scn
+dist_rtems_tests_DATA = psxtimer.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index 588096a573..d11367d6b5 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
 rtems_tests_PROGRAMS = base_mp-node1.exe
 base_mp_node1_exe_SOURCES = ../init.c ../apptask.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = base_mp-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = base_mp-node1.doc
+dist_rtems_tests_DATA = base_mp-node1.scn
+dist_rtems_tests_DATA += base_mp-node1.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index 474418808d..e184d77292 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
 rtems_tests_PROGRAMS = base_mp-node2.exe
 base_mp_node2_exe_SOURCES = ../init.c ../apptask.c ../system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = base_mp-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = base_mp-node2.doc
+dist_rtems_tests_DATA = base_mp-node2.scn
+dist_rtems_tests_DATA += base_mp-node2.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index 6974a9ee5a..7b2d9d5d69 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
 rtems_tests_PROGRAMS = base_sp.exe
 base_sp_exe_SOURCES = init.c apptask.c system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = base_sp.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = base_sp.doc
+dist_rtems_tests_DATA = base_sp.scn
+dist_rtems_tests_DATA += base_sp.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index 7026827972..598a12c1ff 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = cdtest.exe
 cdtest_exe_SOURCES = init.c main.cc system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = cdtest.scn
+dist_rtems_tests_DATA = cdtest.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am
index ecaaaa570f..71e2805c77 100644
--- a/testsuites/samples/fileio/Makefile.am
+++ b/testsuites/samples/fileio/Makefile.am
@@ -9,8 +9,7 @@ if LIBCHIP
 rtems_tests_PROGRAMS = fileio.exe
 fileio_exe_SOURCES = init.c system.h
 
-docdir = $(rtems_testsdir)
-dist_doc_DATA = fileio.doc
+dist_rtems_tests_DATA = fileio.doc
 endif
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index 200c3e08a8..883d6856ee 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
 rtems_tests_PROGRAMS = hello.exe
 hello_exe_SOURCES = init.c system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = hello.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = hello.doc
+dist_rtems_tests_DATA = hello.scn
+dist_rtems_tests_DATA += hello.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am
index 0688c559d4..a2020fc702 100644
--- a/testsuites/samples/iostream/Makefile.am
+++ b/testsuites/samples/iostream/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
 rtems_tests_PROGRAMS = iostream.exe
 iostream_exe_SOURCES = init.cc system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = iostream.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = iostream.doc
+dist_rtems_tests_DATA = iostream.scn
+dist_rtems_tests_DATA += iostream.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index 1cd69f6504..a03ddc85d0 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io event
 rtems_tests_PROGRAMS = loopback.exe
 loopback_exe_SOURCES = init.c
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = loopback.scn
+dist_rtems_tests_DATA = loopback.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index e321b15028..7275dedbdd 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
 rtems_tests_PROGRAMS = minimum.exe
 minimum_exe_SOURCES = init.c
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = minimum.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = minimum.doc
+dist_rtems_tests_DATA = minimum.scn
+dist_rtems_tests_DATA += minimum.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index ca23ff87ea..f8858747c7 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
 rtems_tests_PROGRAMS = paranoia.exe
 paranoia_exe_SOURCES = init.c paranoia.c system.h
 
-docdir = $(rtems_testsdir)
-dist_doc_DATA = paranoia.doc
+dist_rtems_tests_DATA = paranoia.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index 4676da5113..b501e6ad34 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
 rtems_tests_PROGRAMS = ticker.exe
 ticker_exe_SOURCES = init.c tasks.c system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = ticker.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = ticker.doc
+dist_rtems_tests_DATA = ticker.scn
+dist_rtems_tests_DATA += ticker.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index 0c512a634e..55d0b42d86 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io event
 rtems_tests_PROGRAMS = unlimited.exe
 unlimited_exe_SOURCES = init.c test1.c test2.c test3.c system.h
 
-scndir = $(rtems_testsdir)
-dist_scn_DATA = unlimited.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = unlimited.doc
+dist_rtems_tests_DATA = unlimited.scn
+dist_rtems_tests_DATA += unlimited.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am