Convert to using *_PROGRAMS.

31 files changed, 248 insertions, 370 deletions

diff --git a/testsuites/tmtests/tm01/Makefile.am b/testsuites/tmtests/tm01/Makefile.am
index 9599774a52..7685c91e94 100644
--- a/testsuites/tmtests/tm01/Makefile.am
+++ b/testsuites/tmtests/tm01/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io semaphore
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm01.exe
+tm01_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm01.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm01.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm01_exe_OBJECTS) $(tm01_exe_LDADD)
+LINK_LIBS = $(tm01_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm01.exe$(EXEEXT): $(tm01_exe_OBJECTS) $(tm01_exe_DEPENDENCIES)
+	@rm -f tm01.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm02/Makefile.am b/testsuites/tmtests/tm02/Makefile.am
index bd9d132cc1..4dc3e056b5 100644
--- a/testsuites/tmtests/tm02/Makefile.am
+++ b/testsuites/tmtests/tm02/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io semaphore
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm02.exe
+tm02_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm02.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm02.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm02_exe_OBJECTS) $(tm02_exe_LDADD)
+LINK_LIBS = $(tm02_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm02.exe$(EXEEXT): $(tm02_exe_OBJECTS) $(tm02_exe_DEPENDENCIES)
+	@rm -f tm02.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm03/Makefile.am b/testsuites/tmtests/tm03/Makefile.am
index 3edeb15fd3..5a51dd0ee0 100644
--- a/testsuites/tmtests/tm03/Makefile.am
+++ b/testsuites/tmtests/tm03/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io semaphore
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm03.exe
+tm03_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm03.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm03.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm03_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm03_exe_OBJECTS) $(tm03_exe_LDADD)
+LINK_LIBS = $(tm03_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm03.exe$(EXEEXT): $(tm03_exe_OBJECTS) $(tm03_exe_DEPENDENCIES)
+	@rm -f tm03.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm04/Makefile.am b/testsuites/tmtests/tm04/Makefile.am
index 604943a53c..0152e1fc28 100644
--- a/testsuites/tmtests/tm04/Makefile.am
+++ b/testsuites/tmtests/tm04/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io semaphore
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm04.exe
+tm04_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm04.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm04.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm04_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm04_exe_OBJECTS) $(tm04_exe_LDADD)
+LINK_LIBS = $(tm04_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm04.exe$(EXEEXT): $(tm04_exe_OBJECTS) $(tm04_exe_DEPENDENCIES)
+	@rm -f tm04.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm05/Makefile.am b/testsuites/tmtests/tm05/Makefile.am
index 1e331b76c3..eedb7b1f00 100644
--- a/testsuites/tmtests/tm05/Makefile.am
+++ b/testsuites/tmtests/tm05/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm05.exe
+tm05_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm05.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm05.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm05_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm05_exe_OBJECTS) $(tm05_exe_LDADD)
+LINK_LIBS = $(tm05_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm05.exe$(EXEEXT): $(tm05_exe_OBJECTS) $(tm05_exe_DEPENDENCIES)
+	@rm -f tm05.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm06/Makefile.am b/testsuites/tmtests/tm06/Makefile.am
index 7796047b94..5105c42239 100644
--- a/testsuites/tmtests/tm06/Makefile.am
+++ b/testsuites/tmtests/tm06/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm06.exe
+tm06_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm06.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm06.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm06_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm06_exe_OBJECTS) $(tm06_exe_LDADD)
+LINK_LIBS = $(tm06_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm06.exe$(EXEEXT): $(tm06_exe_OBJECTS) $(tm06_exe_DEPENDENCIES)
+	@rm -f tm06.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm07/Makefile.am b/testsuites/tmtests/tm07/Makefile.am
index 4a841a864b..79cc5e4363 100644
--- a/testsuites/tmtests/tm07/Makefile.am
+++ b/testsuites/tmtests/tm07/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm07.exe
+tm07_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm07.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm07.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm07_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm07_exe_OBJECTS) $(tm07_exe_LDADD)
+LINK_LIBS = $(tm07_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm07.exe$(EXEEXT): $(tm07_exe_OBJECTS) $(tm07_exe_DEPENDENCIES)
+	@rm -f tm07.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm08/Makefile.am b/testsuites/tmtests/tm08/Makefile.am
index fb581bb144..70d7a2ba95 100644
--- a/testsuites/tmtests/tm08/Makefile.am
+++ b/testsuites/tmtests/tm08/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm08.exe
+tm08_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm08.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm08.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm08_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm08_exe_OBJECTS) $(tm08_exe_LDADD)
+LINK_LIBS = $(tm08_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm08.exe$(EXEEXT): $(tm08_exe_OBJECTS) $(tm08_exe_DEPENDENCIES)
+	@rm -f tm08.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm09/Makefile.am b/testsuites/tmtests/tm09/Makefile.am
index 08b5e7f46a..6306633562 100644
--- a/testsuites/tmtests/tm09/Makefile.am
+++ b/testsuites/tmtests/tm09/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io message
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm09.exe
+tm09_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm09.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm09.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm09_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm09_exe_OBJECTS) $(tm09_exe_LDADD)
+LINK_LIBS = $(tm09_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm09.exe$(EXEEXT): $(tm09_exe_OBJECTS) $(tm09_exe_DEPENDENCIES)
+	@rm -f tm09.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm10/Makefile.am b/testsuites/tmtests/tm10/Makefile.am
index f4ce1ad27c..017e9c74f9 100644
--- a/testsuites/tmtests/tm10/Makefile.am
+++ b/testsuites/tmtests/tm10/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io message
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm10.exe
+tm10_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm10.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm10.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm10_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm10_exe_OBJECTS) $(tm10_exe_LDADD)
+LINK_LIBS = $(tm10_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm10.exe$(EXEEXT): $(tm10_exe_OBJECTS) $(tm10_exe_DEPENDENCIES)
+	@rm -f tm10.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm11/Makefile.am b/testsuites/tmtests/tm11/Makefile.am
index 93a68b8985..0fe5eaf588 100644
--- a/testsuites/tmtests/tm11/Makefile.am
+++ b/testsuites/tmtests/tm11/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io message
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm11.exe
+tm11_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm11.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm11.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm11_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm11_exe_OBJECTS) $(tm11_exe_LDADD)
+LINK_LIBS = $(tm11_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm11.exe$(EXEEXT): $(tm11_exe_OBJECTS) $(tm11_exe_DEPENDENCIES)
+	@rm -f tm11.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm12/Makefile.am b/testsuites/tmtests/tm12/Makefile.am
index 3487f236e3..8508fa0be4 100644
--- a/testsuites/tmtests/tm12/Makefile.am
+++ b/testsuites/tmtests/tm12/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io message
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm12.exe
+tm12_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm12.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm12.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm12_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm12_exe_OBJECTS) $(tm12_exe_LDADD)
+LINK_LIBS = $(tm12_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm12.exe$(EXEEXT): $(tm12_exe_OBJECTS) $(tm12_exe_DEPENDENCIES)
+	@rm -f tm12.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm13/Makefile.am b/testsuites/tmtests/tm13/Makefile.am
index 229003001c..4eaf1e864b 100644
--- a/testsuites/tmtests/tm13/Makefile.am
+++ b/testsuites/tmtests/tm13/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io message
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm13.exe
+tm13_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm13.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm13.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm13_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm13_exe_OBJECTS) $(tm13_exe_LDADD)
+LINK_LIBS = $(tm13_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm13.exe$(EXEEXT): $(tm13_exe_OBJECTS) $(tm13_exe_DEPENDENCIES)
+	@rm -f tm13.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm14/Makefile.am b/testsuites/tmtests/tm14/Makefile.am
index f6e4e94a15..49053e0b0d 100644
--- a/testsuites/tmtests/tm14/Makefile.am
+++ b/testsuites/tmtests/tm14/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io message
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm14.exe
+tm14_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm14.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm14.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm14_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm14_exe_OBJECTS) $(tm14_exe_LDADD)
+LINK_LIBS = $(tm14_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm14.exe$(EXEEXT): $(tm14_exe_OBJECTS) $(tm14_exe_DEPENDENCIES)
+	@rm -f tm14.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm15/Makefile.am b/testsuites/tmtests/tm15/Makefile.am
index d2c3bd3d99..019f95f40d 100644
--- a/testsuites/tmtests/tm15/Makefile.am
+++ b/testsuites/tmtests/tm15/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io event
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm15.exe
+tm15_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm15.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm15.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm15_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm15_exe_OBJECTS) $(tm15_exe_LDADD)
+LINK_LIBS = $(tm15_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm15.exe$(EXEEXT): $(tm15_exe_OBJECTS) $(tm15_exe_DEPENDENCIES)
+	@rm -f tm15.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm16/Makefile.am b/testsuites/tmtests/tm16/Makefile.am
index d554d24c8b..1c35923cf8 100644
--- a/testsuites/tmtests/tm16/Makefile.am
+++ b/testsuites/tmtests/tm16/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io event
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm16.exe
+tm16_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm16.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm16.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm16_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm16_exe_OBJECTS) $(tm16_exe_LDADD)
+LINK_LIBS = $(tm16_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm16.exe$(EXEEXT): $(tm16_exe_OBJECTS) $(tm16_exe_DEPENDENCIES)
+	@rm -f tm16.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm17/Makefile.am b/testsuites/tmtests/tm17/Makefile.am
index 91968f5d33..465ebfc3d0 100644
--- a/testsuites/tmtests/tm17/Makefile.am
+++ b/testsuites/tmtests/tm17/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm17.exe
+tm17_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm17.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm17.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm17_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm17_exe_OBJECTS) $(tm17_exe_LDADD)
+LINK_LIBS = $(tm17_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm17.exe$(EXEEXT): $(tm17_exe_OBJECTS) $(tm17_exe_DEPENDENCIES)
+	@rm -f tm17.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm18/Makefile.am b/testsuites/tmtests/tm18/Makefile.am
index f54d3a8500..9fb7eb635b 100644
--- a/testsuites/tmtests/tm18/Makefile.am
+++ b/testsuites/tmtests/tm18/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm18.exe
+tm18_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm18.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm18.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm18_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm18_exe_OBJECTS) $(tm18_exe_LDADD)
+LINK_LIBS = $(tm18_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm18.exe$(EXEEXT): $(tm18_exe_OBJECTS) $(tm18_exe_DEPENDENCIES)
+	@rm -f tm18.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm19/Makefile.am b/testsuites/tmtests/tm19/Makefile.am
index 84d9f75a9d..9561d992f0 100644
--- a/testsuites/tmtests/tm19/Makefile.am
+++ b/testsuites/tmtests/tm19/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io signal
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm19.exe
+tm19_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm19.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm19.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm19_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm19_exe_OBJECTS) $(tm19_exe_LDADD)
+LINK_LIBS = $(tm19_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm19.exe$(EXEEXT): $(tm19_exe_OBJECTS) $(tm19_exe_DEPENDENCIES)
+	@rm -f tm19.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm20/Makefile.am b/testsuites/tmtests/tm20/Makefile.am
index 903d3bcf68..c3386f29f7 100644
--- a/testsuites/tmtests/tm20/Makefile.am
+++ b/testsuites/tmtests/tm20/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io partition region
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm20.exe
+tm20_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm20.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm20.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm20_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm20_exe_OBJECTS) $(tm20_exe_LDADD)
+LINK_LIBS = $(tm20_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm20.exe$(EXEEXT): $(tm20_exe_OBJECTS) $(tm20_exe_DEPENDENCIES)
+	@rm -f tm20.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm21/Makefile.am b/testsuites/tmtests/tm21/Makefile.am
index 61db32aae1..c5a50e9542 100644
--- a/testsuites/tmtests/tm21/Makefile.am
+++ b/testsuites/tmtests/tm21/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io dpmem message partition region semaphore rate_monotonic timer
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm21.exe
+tm21_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm21.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm21.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm21_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm21_exe_OBJECTS) $(tm21_exe_LDADD)
+LINK_LIBS = $(tm21_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm21.exe$(EXEEXT): $(tm21_exe_OBJECTS) $(tm21_exe_DEPENDENCIES)
+	@rm -f tm21.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm22/Makefile.am b/testsuites/tmtests/tm22/Makefile.am
index ee6ffee5f8..c288bbe5fc 100644
--- a/testsuites/tmtests/tm22/Makefile.am
+++ b/testsuites/tmtests/tm22/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io message
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm22.exe
+tm22_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm22.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm22.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm22_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm22_exe_OBJECTS) $(tm22_exe_LDADD)
+LINK_LIBS = $(tm22_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm22.exe$(EXEEXT): $(tm22_exe_OBJECTS) $(tm22_exe_DEPENDENCIES)
+	@rm -f tm22.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm23/Makefile.am b/testsuites/tmtests/tm23/Makefile.am
index c8a28a77d6..61150e395b 100644
--- a/testsuites/tmtests/tm23/Makefile.am
+++ b/testsuites/tmtests/tm23/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io event timer
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm23.exe
+tm23_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm23.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm23.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm23_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm23_exe_OBJECTS) $(tm23_exe_LDADD)
+LINK_LIBS = $(tm23_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm23.exe$(EXEEXT): $(tm23_exe_OBJECTS) $(tm23_exe_DEPENDENCIES)
+	@rm -f tm23.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm24/Makefile.am b/testsuites/tmtests/tm24/Makefile.am
index 8df2cb56c7..7c7847792b 100644
--- a/testsuites/tmtests/tm24/Makefile.am
+++ b/testsuites/tmtests/tm24/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io message
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm24.exe
+tm24_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm24.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm24.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm24_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm24_exe_OBJECTS) $(tm24_exe_LDADD)
+LINK_LIBS = $(tm24_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm24.exe$(EXEEXT): $(tm24_exe_OBJECTS) $(tm24_exe_DEPENDENCIES)
+	@rm -f tm24.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm25/Makefile.am b/testsuites/tmtests/tm25/Makefile.am
index 3994640b43..c4c66acadd 100644
--- a/testsuites/tmtests/tm25/Makefile.am
+++ b/testsuites/tmtests/tm25/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io semaphore
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm25.exe
+tm25_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm25.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm25.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm25_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm25_exe_OBJECTS) $(tm25_exe_LDADD)
+LINK_LIBS = $(tm25_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm25.exe$(EXEEXT): $(tm25_exe_OBJECTS) $(tm25_exe_DEPENDENCIES)
+	@rm -f tm25.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm26/Makefile.am b/testsuites/tmtests/tm26/Makefile.am
index f46fccda9f..a72d62bd22 100644
--- a/testsuites/tmtests/tm26/Makefile.am
+++ b/testsuites/tmtests/tm26/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io semaphore
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h fptest.h ../include/timesys.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm26.exe
+tm26_exe_SOURCES = task1.c system.h fptest.h ../include/timesys.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm26.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm26.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm26_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm26_exe_OBJECTS) $(tm26_exe_LDADD)
+LINK_LIBS = $(tm26_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm26.exe$(EXEEXT): $(tm26_exe_OBJECTS) $(tm26_exe_DEPENDENCIES)
+	@rm -f tm26.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm27/Makefile.am b/testsuites/tmtests/tm27/Makefile.am
index a689a80cb6..02fcbd0a63 100644
--- a/testsuites/tmtests/tm27/Makefile.am
+++ b/testsuites/tmtests/tm27/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm27.exe
+tm27_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm27.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm27.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm27_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm27_exe_OBJECTS) $(tm27_exe_LDADD)
+LINK_LIBS = $(tm27_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm27.exe$(EXEEXT): $(tm27_exe_OBJECTS) $(tm27_exe_DEPENDENCIES)
+	@rm -f tm27.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm28/Makefile.am b/testsuites/tmtests/tm28/Makefile.am
index 0739a09159..bbcd87b21f 100644
--- a/testsuites/tmtests/tm28/Makefile.am
+++ b/testsuites/tmtests/tm28/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io dpmem
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm28.exe
+tm28_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm28.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm28.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm28_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm28_exe_OBJECTS) $(tm28_exe_LDADD)
+LINK_LIBS = $(tm28_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm28.exe$(EXEEXT): $(tm28_exe_OBJECTS) $(tm28_exe_DEPENDENCIES)
+	@rm -f tm28.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm29/Makefile.am b/testsuites/tmtests/tm29/Makefile.am
index 0db3c9f492..1431a528b1 100644
--- a/testsuites/tmtests/tm29/Makefile.am
+++ b/testsuites/tmtests/tm29/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io rate_monotonic
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tm29.exe
+tm29_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tm29.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tm29.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tm29_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tm29_exe_OBJECTS) $(tm29_exe_LDADD)
+LINK_LIBS = $(tm29_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tm29.exe$(EXEEXT): $(tm29_exe_OBJECTS) $(tm29_exe_DEPENDENCIES)
+	@rm -f tm29.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tmck/Makefile.am b/testsuites/tmtests/tmck/Makefile.am
index d86420a74a..cf1ede17ec 100644
--- a/testsuites/tmtests/tmck/Makefile.am
+++ b/testsuites/tmtests/tmck/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = task1.c system.h ../include/timesys.h
+rtems_tests_PROGRAMS = tmck.exe
+tmck_exe_SOURCES = task1.c system.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tmck.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tmck.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tmck_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tmck_exe_OBJECTS) $(tmck_exe_LDADD)
+LINK_LIBS = $(tmck_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tmck.exe$(EXEEXT): $(tmck_exe_OBJECTS) $(tmck_exe_DEPENDENCIES)
+	@rm -f tmck.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tmoverhd/Makefile.am b/testsuites/tmtests/tmoverhd/Makefile.am
index 8d7e109120..6387280bbe 100644
--- a/testsuites/tmtests/tmoverhd/Makefile.am
+++ b/testsuites/tmtests/tmoverhd/Makefile.am
@@ -4,31 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = testtask.c empty.c system.h dumrtems.h ../include/timesys.h
+rtems_tests_PROGRAMS = tmoverhd.exe
+tmoverhd_exe_SOURCES = testtask.c empty.c system.h dumrtems.h ../include/timesys.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = tmoverhd.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tmoverhd.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+tmoverhd_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(tmoverhd_exe_OBJECTS) $(tmoverhd_exe_LDADD)
+LINK_LIBS = $(tmoverhd_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+tmoverhd.exe$(EXEEXT): $(tmoverhd_exe_OBJECTS) $(tmoverhd_exe_DEPENDENCIES)
+	@rm -f tmoverhd.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am