Convert to use *_PROGRAMS.

32 files changed, 286 insertions, 382 deletions

diff --git a/testsuites/sptests/sp01/Makefile.am b/testsuites/sptests/sp01/Makefile.am
index ff45c5c113..b735f45b2f 100644
--- a/testsuites/sptests/sp01/Makefile.am
+++ b/testsuites/sptests/sp01/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp01.exe
+sp01_exe_SOURCES = init.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp01.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp01.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp01.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp01_exe_OBJECTS) $(sp01_exe_LDADD)
+LINK_LIBS = $(sp01_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp01.exe$(EXEEXT): $(sp01_exe_OBJECTS) $(sp01_exe_DEPENDENCIES)
+	@rm -f sp01.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp02/Makefile.am b/testsuites/sptests/sp02/Makefile.am
index 76d637120e..0cf09caef0 100644
--- a/testsuites/sptests/sp02/Makefile.am
+++ b/testsuites/sptests/sp02/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c task2.c task3.c preempt.c system.h
+rtems_tests_PROGRAMS = sp02.exe
+sp02_exe_SOURCES = init.c task1.c task2.c task3.c preempt.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp02.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp02.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp02.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp02_exe_OBJECTS) $(sp02_exe_LDADD)
+LINK_LIBS = $(sp02_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp02.exe$(EXEEXT): $(sp02_exe_OBJECTS) $(sp02_exe_DEPENDENCIES)
+	@rm -f sp02.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp03/Makefile.am b/testsuites/sptests/sp03/Makefile.am
index 2825101bc8..62915583fe 100644
--- a/testsuites/sptests/sp03/Makefile.am
+++ b/testsuites/sptests/sp03/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c task2.c system.h
+rtems_tests_PROGRAMS = sp03.exe
+sp03_exe_SOURCES = init.c task1.c task2.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp03.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp03.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp03.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp03_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp03_exe_OBJECTS) $(sp03_exe_LDADD)
+LINK_LIBS = $(sp03_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp03.exe$(EXEEXT): $(sp03_exe_OBJECTS) $(sp03_exe_DEPENDENCIES)
+	@rm -f sp03.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp04/Makefile.am b/testsuites/sptests/sp04/Makefile.am
index 50fa40a4e9..bfe0a8ce95 100644
--- a/testsuites/sptests/sp04/Makefile.am
+++ b/testsuites/sptests/sp04/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
+rtems_tests_PROGRAMS = sp04.exe
+sp04_exe_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp04.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp04.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp04.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp04_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp04_exe_OBJECTS) $(sp04_exe_LDADD)
+LINK_LIBS = $(sp04_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp04.exe$(EXEEXT): $(sp04_exe_OBJECTS) $(sp04_exe_DEPENDENCIES)
+	@rm -f sp04.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp05/Makefile.am b/testsuites/sptests/sp05/Makefile.am
index 625d02c671..b31d95cd73 100644
--- a/testsuites/sptests/sp05/Makefile.am
+++ b/testsuites/sptests/sp05/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
+rtems_tests_PROGRAMS = sp05.exe
+sp05_exe_SOURCES = init.c task1.c task2.c task3.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp05.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp05.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp05.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp05_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp05_exe_OBJECTS) $(sp05_exe_LDADD)
+LINK_LIBS = $(sp05_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp05.exe$(EXEEXT): $(sp05_exe_OBJECTS) $(sp05_exe_DEPENDENCIES)
+	@rm -f sp05.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp06/Makefile.am b/testsuites/sptests/sp06/Makefile.am
index 7164858809..1b4a45fe34 100644
--- a/testsuites/sptests/sp06/Makefile.am
+++ b/testsuites/sptests/sp06/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
+rtems_tests_PROGRAMS = sp06.exe
+sp06_exe_SOURCES = init.c task1.c task2.c task3.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp06.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp06.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp06.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp06_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp06_exe_OBJECTS) $(sp06_exe_LDADD)
+LINK_LIBS = $(sp06_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp06.exe$(EXEEXT): $(sp06_exe_OBJECTS) $(sp06_exe_DEPENDENCIES)
+	@rm -f sp06.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp07/Makefile.am b/testsuites/sptests/sp07/Makefile.am
index 6e9707a2c9..0d95bd1826 100644
--- a/testsuites/sptests/sp07/Makefile.am
+++ b/testsuites/sptests/sp07/Makefile.am
@@ -4,31 +4,28 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c buffered_io.c task1.c task2.c task3.c task4.c taskexit.c \
+rtems_tests_PROGRAMS = sp07.exe
+sp07_exe_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
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp07.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp07.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp07.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp07_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp07_exe_OBJECTS) $(sp07_exe_LDADD)
+LINK_LIBS = $(sp07_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp07.exe$(EXEEXT): $(sp07_exe_OBJECTS) $(sp07_exe_DEPENDENCIES)
+	@rm -f sp07.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp08/Makefile.am b/testsuites/sptests/sp08/Makefile.am
index 844895c669..6929b27906 100644
--- a/testsuites/sptests/sp08/Makefile.am
+++ b/testsuites/sptests/sp08/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp08.exe
+sp08_exe_SOURCES = init.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp08.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp08.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp08.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp08_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp08_exe_OBJECTS) $(sp08_exe_LDADD)
+LINK_LIBS = $(sp08_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp08.exe$(EXEEXT): $(sp08_exe_OBJECTS) $(sp08_exe_DEPENDENCIES)
+	@rm -f sp08.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp09/Makefile.am b/testsuites/sptests/sp09/Makefile.am
index 348c1d1d15..993010dc5d 100644
--- a/testsuites/sptests/sp09/Makefile.am
+++ b/testsuites/sptests/sp09/Makefile.am
@@ -5,33 +5,30 @@
 MANAGERS = io message dual_ported_memory event multi_processor region \
     semaphore signal rate_monotonic timer partition
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen04.c \
+rtems_tests_PROGRAMS = sp09.exe
+sp09_exe_SOURCES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen04.c \
     screen05.c screen06.c screen07.c screen08.c screen09.c screen10.c \
     screen11.c screen12.c screen13.c screen14.c task1.c task2.c task3.c \
     task4.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp09.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp09.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp09.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp09_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp09_exe_OBJECTS) $(sp09_exe_LDADD)
+LINK_LIBS = $(sp09_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp09.exe$(EXEEXT): $(sp09_exe_OBJECTS) $(sp09_exe_DEPENDENCIES)
+	@rm -f sp09.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp11/Makefile.am b/testsuites/sptests/sp11/Makefile.am
index b28792ebb6..28b327733c 100644
--- a/testsuites/sptests/sp11/Makefile.am
+++ b/testsuites/sptests/sp11/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io event timer
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c task2.c timer.c system.h
+rtems_tests_PROGRAMS = sp11.exe
+sp11_exe_SOURCES = init.c task1.c task2.c timer.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp11.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp11.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp11.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp11_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp11_exe_OBJECTS) $(sp11_exe_LDADD)
+LINK_LIBS = $(sp11_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp11.exe$(EXEEXT): $(sp11_exe_OBJECTS) $(sp11_exe_DEPENDENCIES)
+	@rm -f sp11.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp12/Makefile.am b/testsuites/sptests/sp12/Makefile.am
index be3071eecb..d96e7642c1 100644
--- a/testsuites/sptests/sp12/Makefile.am
+++ b/testsuites/sptests/sp12/Makefile.am
@@ -4,31 +4,28 @@
 
 MANAGERS = io semaphore
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c pridrv.c \
+rtems_tests_PROGRAMS = sp12.exe
+sp12_exe_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c pridrv.c \
     pritask.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp12.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp12.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp12.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp12_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp12_exe_OBJECTS) $(sp12_exe_LDADD)
+LINK_LIBS = $(sp12_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp12.exe$(EXEEXT): $(sp12_exe_OBJECTS) $(sp12_exe_DEPENDENCIES)
+	@rm -f sp12.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp13/Makefile.am b/testsuites/sptests/sp13/Makefile.am
index c9c52ddd09..9fd37227d1 100644
--- a/testsuites/sptests/sp13/Makefile.am
+++ b/testsuites/sptests/sp13/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io message
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c fillbuff.c putbuff.c task1.c task2.c task3.c system.h
+rtems_tests_PROGRAMS = sp13.exe
+sp13_exe_SOURCES = init.c fillbuff.c putbuff.c task1.c task2.c task3.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp13.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp13.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp13.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp13_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp13_exe_OBJECTS) $(sp13_exe_LDADD)
+LINK_LIBS = $(sp13_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp13.exe$(EXEEXT): $(sp13_exe_OBJECTS) $(sp13_exe_DEPENDENCIES)
+	@rm -f sp13.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp14/Makefile.am b/testsuites/sptests/sp14/Makefile.am
index aa56a3ab58..f01e5cad7c 100644
--- a/testsuites/sptests/sp14/Makefile.am
+++ b/testsuites/sptests/sp14/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io signal timer
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c asr.c task1.c task2.c system.h
+rtems_tests_PROGRAMS = sp14.exe
+sp14_exe_SOURCES = init.c asr.c task1.c task2.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp14.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp14.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp14.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp14_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp14_exe_OBJECTS) $(sp14_exe_LDADD)
+LINK_LIBS = $(sp14_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp14.exe$(EXEEXT): $(sp14_exe_OBJECTS) $(sp14_exe_DEPENDENCIES)
+	@rm -f sp14.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp15/Makefile.am b/testsuites/sptests/sp15/Makefile.am
index bc0c2181c7..16fd78d107 100644
--- a/testsuites/sptests/sp15/Makefile.am
+++ b/testsuites/sptests/sp15/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io partition
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp15.exe
+sp15_exe_SOURCES = init.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp15.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp15.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp15.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp15_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp15_exe_OBJECTS) $(sp15_exe_LDADD)
+LINK_LIBS = $(sp15_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp15.exe$(EXEEXT): $(sp15_exe_OBJECTS) $(sp15_exe_DEPENDENCIES)
+	@rm -f sp15.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp16/Makefile.am b/testsuites/sptests/sp16/Makefile.am
index 8ad6da940a..96519482f8 100644
--- a/testsuites/sptests/sp16/Makefile.am
+++ b/testsuites/sptests/sp16/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io region
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c system.h
+rtems_tests_PROGRAMS = sp16.exe
+sp16_exe_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp16.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp16.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp16.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp16_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp16_exe_OBJECTS) $(sp16_exe_LDADD)
+LINK_LIBS = $(sp16_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp16.exe$(EXEEXT): $(sp16_exe_OBJECTS) $(sp16_exe_DEPENDENCIES)
+	@rm -f sp16.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp17/Makefile.am b/testsuites/sptests/sp17/Makefile.am
index cc7b07b542..e72b4a5602 100644
--- a/testsuites/sptests/sp17/Makefile.am
+++ b/testsuites/sptests/sp17/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io signal
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c asr.c task1.c task2.c system.h
+rtems_tests_PROGRAMS = sp17.exe
+sp17_exe_SOURCES = init.c asr.c task1.c task2.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp17.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp17.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp17.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp17_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp17_exe_OBJECTS) $(sp17_exe_LDADD)
+LINK_LIBS = $(sp17_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp17.exe$(EXEEXT): $(sp17_exe_OBJECTS) $(sp17_exe_DEPENDENCIES)
+	@rm -f sp17.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp19/Makefile.am b/testsuites/sptests/sp19/Makefile.am
index 2898c9bd36..833b33d51c 100644
--- a/testsuites/sptests/sp19/Makefile.am
+++ b/testsuites/sptests/sp19/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c first.c fptask.c task1.c system.h fptest.h inttest.h
+rtems_tests_PROGRAMS = sp19.exe
+sp19_exe_SOURCES = init.c first.c fptask.c task1.c system.h fptest.h inttest.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp19.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp19.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp19.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp19_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp19_exe_OBJECTS) $(sp19_exe_LDADD)
+LINK_LIBS = $(sp19_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp19.exe$(EXEEXT): $(sp19_exe_OBJECTS) $(sp19_exe_DEPENDENCIES)
+	@rm -f sp19.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp20/Makefile.am b/testsuites/sptests/sp20/Makefile.am
index d836a55612..01c147ed20 100644
--- a/testsuites/sptests/sp20/Makefile.am
+++ b/testsuites/sptests/sp20/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io rate_monotonic
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c getall.c task1.c system.h
+rtems_tests_PROGRAMS = sp20.exe
+sp20_exe_SOURCES = init.c getall.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp20.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp20.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp20.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp20_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp20_exe_OBJECTS) $(sp20_exe_LDADD)
+LINK_LIBS = $(sp20_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp20.exe$(EXEEXT): $(sp20_exe_OBJECTS) $(sp20_exe_DEPENDENCIES)
+	@rm -f sp20.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp21/Makefile.am b/testsuites/sptests/sp21/Makefile.am
index 95fbc90602..2e6cb01696 100644
--- a/testsuites/sptests/sp21/Makefile.am
+++ b/testsuites/sptests/sp21/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp21.exe
+sp21_exe_SOURCES = init.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp21.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp21.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp21.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp21_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp21_exe_OBJECTS) $(sp21_exe_LDADD)
+LINK_LIBS = $(sp21_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp21.exe$(EXEEXT): $(sp21_exe_OBJECTS) $(sp21_exe_DEPENDENCIES)
+	@rm -f sp21.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp22/Makefile.am b/testsuites/sptests/sp22/Makefile.am
index e4bdbd1f4d..cf218619b8 100644
--- a/testsuites/sptests/sp22/Makefile.am
+++ b/testsuites/sptests/sp22/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io timer
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c prtime.c delay.c task1.c system.h
+rtems_tests_PROGRAMS = sp22.exe
+sp22_exe_SOURCES = init.c prtime.c delay.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp22.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp22.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp22.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp22_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp22_exe_OBJECTS) $(sp22_exe_LDADD)
+LINK_LIBS = $(sp22_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp22.exe$(EXEEXT): $(sp22_exe_OBJECTS) $(sp22_exe_DEPENDENCIES)
+	@rm -f sp22.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp23/Makefile.am b/testsuites/sptests/sp23/Makefile.am
index 71c690f5fd..d8012e09d0 100644
--- a/testsuites/sptests/sp23/Makefile.am
+++ b/testsuites/sptests/sp23/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io dual_ported_memory
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp23.exe
+sp23_exe_SOURCES = init.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp23.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp23.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp23.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp23_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp23_exe_OBJECTS) $(sp23_exe_LDADD)
+LINK_LIBS = $(sp23_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp23.exe$(EXEEXT): $(sp23_exe_OBJECTS) $(sp23_exe_DEPENDENCIES)
+	@rm -f sp23.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp24/Makefile.am b/testsuites/sptests/sp24/Makefile.am
index 34317817c5..4ccea0919e 100644
--- a/testsuites/sptests/sp24/Makefile.am
+++ b/testsuites/sptests/sp24/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io event timer
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c resume.c task1.c system.h
+rtems_tests_PROGRAMS = sp24.exe
+sp24_exe_SOURCES = init.c resume.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp24.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp24.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp24.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp24_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp24_exe_OBJECTS) $(sp24_exe_LDADD)
+LINK_LIBS = $(sp24_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp24.exe$(EXEEXT): $(sp24_exe_OBJECTS) $(sp24_exe_DEPENDENCIES)
+	@rm -f sp24.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp25/Makefile.am b/testsuites/sptests/sp25/Makefile.am
index 00cda487c7..fd585764fd 100644
--- a/testsuites/sptests/sp25/Makefile.am
+++ b/testsuites/sptests/sp25/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io region
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp25.exe
+sp25_exe_SOURCES = init.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp25.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp25.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp25.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp25_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp25_exe_OBJECTS) $(sp25_exe_LDADD)
+LINK_LIBS = $(sp25_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp25.exe$(EXEEXT): $(sp25_exe_OBJECTS) $(sp25_exe_DEPENDENCIES)
+	@rm -f sp25.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp26/Makefile.am b/testsuites/sptests/sp26/Makefile.am
index 9005f9a000..214eaf6200 100644
--- a/testsuites/sptests/sp26/Makefile.am
+++ b/testsuites/sptests/sp26/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io region event
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp26.exe
+sp26_exe_SOURCES = init.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp26.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp26.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp26.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp26_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp26_exe_OBJECTS) $(sp26_exe_LDADD)
+LINK_LIBS = $(sp26_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp26.exe$(EXEEXT): $(sp26_exe_OBJECTS) $(sp26_exe_DEPENDENCIES)
+	@rm -f sp26.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp27/Makefile.am b/testsuites/sptests/sp27/Makefile.am
index a8cff9fd0f..9c3851390f 100644
--- a/testsuites/sptests/sp27/Makefile.am
+++ b/testsuites/sptests/sp27/Makefile.am
@@ -4,28 +4,25 @@
 
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c
+rtems_tests_PROGRAMS = sp27.exe
+sp27_exe_SOURCES = init.c
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp27.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp27.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp27.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp27_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp27_exe_OBJECTS) $(sp27_exe_LDADD)
+LINK_LIBS = $(sp27_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp27.exe$(EXEEXT): $(sp27_exe_OBJECTS) $(sp27_exe_DEPENDENCIES)
+	@rm -f sp27.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp28/Makefile.am b/testsuites/sptests/sp28/Makefile.am
index a4d031ed18..63c2fb3276 100644
--- a/testsuites/sptests/sp28/Makefile.am
+++ b/testsuites/sptests/sp28/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c
+rtems_tests_PROGRAMS = sp28.exe
+sp28_exe_SOURCES = init.c
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp28.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp28.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp28.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp28_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp28_exe_OBJECTS) $(sp28_exe_LDADD)
+LINK_LIBS = $(sp28_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp28.exe$(EXEEXT): $(sp28_exe_OBJECTS) $(sp28_exe_DEPENDENCIES)
+	@rm -f sp28.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp29/Makefile.am b/testsuites/sptests/sp29/Makefile.am
index 05fe7d3dfd..245178a2b8 100644
--- a/testsuites/sptests/sp29/Makefile.am
+++ b/testsuites/sptests/sp29/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c
+rtems_tests_PROGRAMS = sp29.exe
+sp29_exe_SOURCES = init.c
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp29.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp29.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp29.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp29_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp29_exe_OBJECTS) $(sp29_exe_LDADD)
+LINK_LIBS = $(sp29_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp29.exe$(EXEEXT): $(sp29_exe_OBJECTS) $(sp29_exe_DEPENDENCIES)
+	@rm -f sp29.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp30/Makefile.am b/testsuites/sptests/sp30/Makefile.am
index 7cbcade495..dfbcda75d0 100644
--- a/testsuites/sptests/sp30/Makefile.am
+++ b/testsuites/sptests/sp30/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c resume.c task1.c system.h
+rtems_tests_PROGRAMS = sp30.exe
+sp30_exe_SOURCES = init.c resume.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp30.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp30.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp30.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp30_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp30_exe_OBJECTS) $(sp30_exe_LDADD)
+LINK_LIBS = $(sp30_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp30.exe$(EXEEXT): $(sp30_exe_OBJECTS) $(sp30_exe_DEPENDENCIES)
+	@rm -f sp30.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp31/Makefile.am b/testsuites/sptests/sp31/Makefile.am
index c05a372bd2..8e9afbcbf9 100644
--- a/testsuites/sptests/sp31/Makefile.am
+++ b/testsuites/sptests/sp31/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = delay.c init.c prtime.c task1.c system.h
+rtems_tests_PROGRAMS = sp31.exe
+sp31_exe_SOURCES = delay.c init.c prtime.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp31.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = sp31.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp31.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp31_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp31_exe_OBJECTS) $(sp31_exe_LDADD)
+LINK_LIBS = $(sp31_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp31.exe$(EXEEXT): $(sp31_exe_OBJECTS) $(sp31_exe_DEPENDENCIES)
+	@rm -f sp31.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp32/Makefile.am b/testsuites/sptests/sp32/Makefile.am
index 0093ca847c..b1747ef617 100644
--- a/testsuites/sptests/sp32/Makefile.am
+++ b/testsuites/sptests/sp32/Makefile.am
@@ -4,28 +4,25 @@
 
 MANAGERS = io rate_monotonic
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c
+rtems_tests_PROGRAMS = sp32.exe
+sp32_exe_SOURCES = init.c
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = sp32.scn
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/sp32.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+sp32_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(sp32_exe_OBJECTS) $(sp32_exe_LDADD)
+LINK_LIBS = $(sp32_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+sp32.exe$(EXEEXT): $(sp32_exe_OBJECTS) $(sp32_exe_DEPENDENCIES)
+	@rm -f sp32.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spfatal/Makefile.am b/testsuites/sptests/spfatal/Makefile.am
index ede696b68a..24c4484934 100644
--- a/testsuites/sptests/spfatal/Makefile.am
+++ b/testsuites/sptests/spfatal/Makefile.am
@@ -4,30 +4,27 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c puterr.c fatal.c task1.c system.h
+rtems_tests_PROGRAMS = spfatal.exe
+spfatal_exe_SOURCES = init.c puterr.c fatal.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = spfatal.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = spfatal.doc
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/spfatal.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+spfatal_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(spfatal_exe_OBJECTS) $(spfatal_exe_LDADD)
+LINK_LIBS = $(spfatal_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+spfatal.exe$(EXEEXT): $(spfatal_exe_OBJECTS) $(spfatal_exe_DEPENDENCIES)
+	@rm -f spfatal.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spsize/Makefile.am b/testsuites/sptests/spsize/Makefile.am
index ab312d059e..ee23b78383 100644
--- a/testsuites/sptests/spsize/Makefile.am
+++ b/testsuites/sptests/spsize/Makefile.am
@@ -4,28 +4,25 @@
 
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c getint.c size.c system.h
+rtems_tests_PROGRAMS = spsize.exe
+spsize_exe_SOURCES = init.c getint.c size.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = spsize.scn
 
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/spsize.exe
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+spsize_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(spsize_exe_OBJECTS) $(spsize_exe_LDADD)
+LINK_LIBS = $(spsize_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+spsize.exe$(EXEEXT): $(spsize_exe_OBJECTS) $(spsize_exe_DEPENDENCIES)
+	@rm -f spsize.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am