summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2005-11-13 06:46:05 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2005-11-13 06:46:05 +0000
commita6b588d649d6fcc933aa356f3c36a1d2f6391976 (patch)
tree70ac33505ec6effe85d5875648a8c5a9c8479469
parent3290efc7596300c49f88d15a1f44033551fa5aac (diff)
downloadrtems-a6b588d649d6fcc933aa356f3c36a1d2f6391976.tar.bz2
Convert to using *_PROGRAMS.
-rw-r--r--testsuites/itrontests/itronhello/Makefile.am21
-rw-r--r--testsuites/itrontests/itronmbf01/Makefile.am21
-rw-r--r--testsuites/itrontests/itronmbox01/Makefile.am21
-rw-r--r--testsuites/itrontests/itronsem01/Makefile.am21
-rw-r--r--testsuites/itrontests/itrontask01/Makefile.am21
-rw-r--r--testsuites/itrontests/itrontask02/Makefile.am21
-rw-r--r--testsuites/itrontests/itrontask03/Makefile.am21
-rw-r--r--testsuites/itrontests/itrontask04/Makefile.am21
-rw-r--r--testsuites/itrontests/itrontime01/Makefile.am21
-rw-r--r--testsuites/libtests/cpuuse/Makefile.am19
-rw-r--r--testsuites/libtests/malloctest/Makefile.am19
-rw-r--r--testsuites/libtests/monitor/Makefile.am18
-rw-r--r--testsuites/libtests/putenvtest/Makefile.am18
-rw-r--r--testsuites/libtests/rtems++/Makefile.am21
-rw-r--r--testsuites/libtests/rtmonuse/Makefile.am19
-rw-r--r--testsuites/libtests/stackchk/Makefile.am19
-rw-r--r--testsuites/libtests/termios/Makefile.am18
-rw-r--r--testsuites/mptests/mp01/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp01/node2/Makefile.am21
-rw-r--r--testsuites/mptests/mp02/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp02/node2/Makefile.am21
-rw-r--r--testsuites/mptests/mp03/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp03/node2/Makefile.am21
-rw-r--r--testsuites/mptests/mp04/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp04/node2/Makefile.am21
-rw-r--r--testsuites/mptests/mp05/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp05/node2/Makefile.am21
-rw-r--r--testsuites/mptests/mp06/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp06/node2/Makefile.am21
-rw-r--r--testsuites/mptests/mp07/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp07/node2/Makefile.am21
-rw-r--r--testsuites/mptests/mp08/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp08/node2/Makefile.am21
-rw-r--r--testsuites/mptests/mp09/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp09/node2/Makefile.am21
-rw-r--r--testsuites/mptests/mp10/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp10/node2/Makefile.am21
-rw-r--r--testsuites/mptests/mp11/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp11/node2/Makefile.am21
-rw-r--r--testsuites/mptests/mp12/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp12/node2/Makefile.am21
-rw-r--r--testsuites/mptests/mp13/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp13/node2/Makefile.am21
-rw-r--r--testsuites/mptests/mp14/node1/Makefile.am21
-rw-r--r--testsuites/mptests/mp14/node2/Makefile.am21
-rw-r--r--testsuites/psxtests/psx01/Makefile.am20
-rw-r--r--testsuites/psxtests/psx02/Makefile.am20
-rw-r--r--testsuites/psxtests/psx03/Makefile.am20
-rw-r--r--testsuites/psxtests/psx04/Makefile.am20
-rw-r--r--testsuites/psxtests/psx05/Makefile.am20
-rw-r--r--testsuites/psxtests/psx06/Makefile.am20
-rw-r--r--testsuites/psxtests/psx07/Makefile.am20
-rw-r--r--testsuites/psxtests/psx08/Makefile.am20
-rw-r--r--testsuites/psxtests/psx09/Makefile.am20
-rw-r--r--testsuites/psxtests/psx10/Makefile.am20
-rw-r--r--testsuites/psxtests/psx11/Makefile.am20
-rw-r--r--testsuites/psxtests/psx12/Makefile.am20
-rw-r--r--testsuites/psxtests/psx13/Makefile.am20
-rw-r--r--testsuites/psxtests/psxcancel/Makefile.am20
-rw-r--r--testsuites/psxtests/psxchroot01/Makefile.am20
-rw-r--r--testsuites/psxtests/psxfile01/Makefile.am20
-rw-r--r--testsuites/psxtests/psxhdrs/Makefile.am6
-rw-r--r--testsuites/psxtests/psxmount/Makefile.am20
-rw-r--r--testsuites/psxtests/psxmsgq01/Makefile.am20
-rw-r--r--testsuites/psxtests/psxreaddir/Makefile.am20
-rw-r--r--testsuites/psxtests/psxsem01/Makefile.am20
-rw-r--r--testsuites/psxtests/psxstat/Makefile.am20
-rw-r--r--testsuites/psxtests/psxtime/Makefile.am19
-rw-r--r--testsuites/psxtests/psxtimer/Makefile.am20
-rw-r--r--testsuites/samples/base_mp/node1/Makefile.am21
-rw-r--r--testsuites/samples/base_mp/node2/Makefile.am21
-rw-r--r--testsuites/samples/base_sp/Makefile.am21
-rw-r--r--testsuites/samples/cdtest/Makefile.am20
-rw-r--r--testsuites/samples/fileio/Makefile.am19
-rw-r--r--testsuites/samples/hello/Makefile.am21
-rw-r--r--testsuites/samples/iostream/Makefile.am22
-rw-r--r--testsuites/samples/loopback/Makefile.am19
-rw-r--r--testsuites/samples/minimum/Makefile.am21
-rw-r--r--testsuites/samples/paranoia/Makefile.am22
-rw-r--r--testsuites/samples/pppd/Makefile.am20
-rw-r--r--testsuites/samples/ticker/Makefile.am21
-rw-r--r--testsuites/samples/unlimited/Makefile.am21
-rw-r--r--testsuites/tmitrontests/tmitronsem01/Makefile.am19
-rw-r--r--testsuites/tmtests/tm01/Makefile.am19
-rw-r--r--testsuites/tmtests/tm02/Makefile.am20
-rw-r--r--testsuites/tmtests/tm03/Makefile.am20
-rw-r--r--testsuites/tmtests/tm04/Makefile.am20
-rw-r--r--testsuites/tmtests/tm05/Makefile.am20
-rw-r--r--testsuites/tmtests/tm06/Makefile.am20
-rw-r--r--testsuites/tmtests/tm07/Makefile.am20
-rw-r--r--testsuites/tmtests/tm08/Makefile.am20
-rw-r--r--testsuites/tmtests/tm09/Makefile.am20
-rw-r--r--testsuites/tmtests/tm10/Makefile.am20
-rw-r--r--testsuites/tmtests/tm11/Makefile.am20
-rw-r--r--testsuites/tmtests/tm12/Makefile.am20
-rw-r--r--testsuites/tmtests/tm13/Makefile.am20
-rw-r--r--testsuites/tmtests/tm14/Makefile.am20
-rw-r--r--testsuites/tmtests/tm15/Makefile.am20
-rw-r--r--testsuites/tmtests/tm16/Makefile.am20
-rw-r--r--testsuites/tmtests/tm17/Makefile.am20
-rw-r--r--testsuites/tmtests/tm18/Makefile.am20
-rw-r--r--testsuites/tmtests/tm19/Makefile.am20
-rw-r--r--testsuites/tmtests/tm20/Makefile.am20
-rw-r--r--testsuites/tmtests/tm21/Makefile.am20
-rw-r--r--testsuites/tmtests/tm22/Makefile.am20
-rw-r--r--testsuites/tmtests/tm23/Makefile.am20
-rw-r--r--testsuites/tmtests/tm24/Makefile.am20
-rw-r--r--testsuites/tmtests/tm25/Makefile.am20
-rw-r--r--testsuites/tmtests/tm26/Makefile.am19
-rw-r--r--testsuites/tmtests/tm27/Makefile.am20
-rw-r--r--testsuites/tmtests/tm28/Makefile.am20
-rw-r--r--testsuites/tmtests/tm29/Makefile.am20
-rw-r--r--testsuites/tmtests/tmck/Makefile.am20
-rw-r--r--testsuites/tmtests/tmoverhd/Makefile.am20
114 files changed, 951 insertions, 1348 deletions
diff --git a/testsuites/itrontests/itronhello/Makefile.am b/testsuites/itrontests/itronhello/Makefile.am
index f00d66ebe5..45d5aa61ad 100644
--- a/testsuites/itrontests/itronhello/Makefile.am
+++ b/testsuites/itrontests/itronhello/Makefile.am
@@ -2,32 +2,29 @@
## $Id$
##
-PGM = ${ARCH}/itronhello.exe
-
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itronhello.exe
+itronhello_exe_SOURCES = init.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = itronhello.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = itronhello.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+itronhello_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itronhello_exe_OBJECTS) $(itronhello_exe_LDADD)
+LINK_LIBS = $(itronhello_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+itronhello.exe$(EXEEXT): $(itronhello_exe_OBJECTS) $(itronhello_exe_DEPENDENCIES)
+ @rm -f itronhello.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itronmbf01/Makefile.am b/testsuites/itrontests/itronmbf01/Makefile.am
index df8f999bd5..b224171abf 100644
--- a/testsuites/itrontests/itronmbf01/Makefile.am
+++ b/testsuites/itrontests/itronmbf01/Makefile.am
@@ -2,32 +2,29 @@
## $Id$
##
-PGM = ${ARCH}/itronmbf01.exe
-
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itronmbf01.exe
+itronmbf01_exe_SOURCES = init.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = itronmbf01.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = itronmbf01.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+itronmbf01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itronmbf01_exe_OBJECTS) $(itronmbf01_exe_LDADD)
+LINK_LIBS = $(itronmbf01_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+itronmbf01.exe$(EXEEXT): $(itronmbf01_exe_OBJECTS) $(itronmbf01_exe_DEPENDENCIES)
+ @rm -f itronmbf01.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itronmbox01/Makefile.am b/testsuites/itrontests/itronmbox01/Makefile.am
index 4e18e54046..75c7c35820 100644
--- a/testsuites/itrontests/itronmbox01/Makefile.am
+++ b/testsuites/itrontests/itronmbox01/Makefile.am
@@ -2,32 +2,29 @@
## $Id$
##
-PGM = ${ARCH}/itronmbox01.exe
-
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itronmbox01.exe
+itronmbox01_exe_SOURCES = init.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = itronmbox01.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = itronmbox01.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+itronmbox01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itronmbox01_exe_OBJECTS) $(itronmbox01_exe_LDADD)
+LINK_LIBS = $(itronmbox01_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+itronmbox01.exe$(EXEEXT): $(itronmbox01_exe_OBJECTS) $(itronmbox01_exe_DEPENDENCIES)
+ @rm -f itronmbox01.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itronsem01/Makefile.am b/testsuites/itrontests/itronsem01/Makefile.am
index 21449bbdb2..de66f5b46e 100644
--- a/testsuites/itrontests/itronsem01/Makefile.am
+++ b/testsuites/itrontests/itronsem01/Makefile.am
@@ -2,32 +2,29 @@
## $Id$
##
-PGM = ${ARCH}/itronsem01.exe
-
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itronsem01.exe
+itronsem01_exe_SOURCES = init.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = itronsem01.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = itronsem01.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+itronsem01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itronsem01_exe_OBJECTS) $(itronsem01_exe_LDADD)
+LINK_LIBS = $(itronsem01_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+itronsem01.exe$(EXEEXT): $(itronsem01_exe_OBJECTS) $(itronsem01_exe_DEPENDENCIES)
+ @rm -f itronsem01.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask01/Makefile.am b/testsuites/itrontests/itrontask01/Makefile.am
index 54d6817850..3682072559 100644
--- a/testsuites/itrontests/itrontask01/Makefile.am
+++ b/testsuites/itrontests/itrontask01/Makefile.am
@@ -2,32 +2,29 @@
## $Id$
##
-PGM = ${ARCH}/itrontask01.exe
-
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = itrontask01.exe
+itrontask01_exe_SOURCES = init.c task1.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = itrontask01.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = itrontask01.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+itrontask01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itrontask01_exe_OBJECTS) $(itrontask01_exe_LDADD)
+LINK_LIBS = $(itrontask01_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+itrontask01.exe$(EXEEXT): $(itrontask01_exe_OBJECTS) $(itrontask01_exe_DEPENDENCIES)
+ @rm -f itrontask01.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask02/Makefile.am b/testsuites/itrontests/itrontask02/Makefile.am
index 866f30267d..649da06055 100644
--- a/testsuites/itrontests/itrontask02/Makefile.am
+++ b/testsuites/itrontests/itrontask02/Makefile.am
@@ -2,32 +2,29 @@
## $Id$
##
-PGM = ${ARCH}/itrontask02.exe
-
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c dormant.c system.h
+rtems_tests_PROGRAMS = itrontask02.exe
+itrontask02_exe_SOURCES = init.c dormant.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = itrontask02.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = itrontask02.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+itrontask02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itrontask02_exe_OBJECTS) $(itrontask02_exe_LDADD)
+LINK_LIBS = $(itrontask02_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+itrontask02.exe$(EXEEXT): $(itrontask02_exe_OBJECTS) $(itrontask02_exe_DEPENDENCIES)
+ @rm -f itrontask02.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask03/Makefile.am b/testsuites/itrontests/itrontask03/Makefile.am
index a1bb5a0349..e1c63c7b90 100644
--- a/testsuites/itrontests/itrontask03/Makefile.am
+++ b/testsuites/itrontests/itrontask03/Makefile.am
@@ -2,32 +2,29 @@
## $Id$
##
-PGM = ${ARCH}/itrontask03.exe
-
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c preempt.c task1.c task2.c task3.c system.h
+rtems_tests_PROGRAMS = itrontask03.exe
+itrontask03_exe_SOURCES = init.c preempt.c task1.c task2.c task3.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = itrontask03.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = itrontask03.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+itrontask03_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itrontask03_exe_OBJECTS) $(itrontask03_exe_LDADD)
+LINK_LIBS = $(itrontask03_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+itrontask03.exe$(EXEEXT): $(itrontask03_exe_OBJECTS) $(itrontask03_exe_DEPENDENCIES)
+ @rm -f itrontask03.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask04/Makefile.am b/testsuites/itrontests/itrontask04/Makefile.am
index 9672582ba1..d9bc3adf0b 100644
--- a/testsuites/itrontests/itrontask04/Makefile.am
+++ b/testsuites/itrontests/itrontask04/Makefile.am
@@ -2,32 +2,29 @@
## $Id$
##
-PGM = ${ARCH}/itrontask04.exe
-
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
+rtems_tests_PROGRAMS = itrontask04.exe
+itrontask04_exe_SOURCES = init.c task1.c task2.c task3.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = itrontask04.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = itrontask04.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+itrontask04_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itrontask04_exe_OBJECTS) $(itrontask04_exe_LDADD)
+LINK_LIBS = $(itrontask04_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+itrontask04.exe$(EXEEXT): $(itrontask04_exe_OBJECTS) $(itrontask04_exe_DEPENDENCIES)
+ @rm -f itrontask04.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontime01/Makefile.am b/testsuites/itrontests/itrontime01/Makefile.am
index 9e51654861..4fd888bc91 100644
--- a/testsuites/itrontests/itrontime01/Makefile.am
+++ b/testsuites/itrontests/itrontime01/Makefile.am
@@ -2,32 +2,29 @@
## $Id$
##
-PGM = ${ARCH}/itrontime01.exe
-
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itrontime01.exe
+itrontime01_exe_SOURCES = init.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = itrontime01.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = itrontime01.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+itrontime01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itrontime01_exe_OBJECTS) $(itrontime01_exe_LDADD)
+LINK_LIBS = $(itrontime01_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+itrontime01.exe$(EXEEXT): $(itrontime01_exe_OBJECTS) $(itrontime01_exe_DEPENDENCIES)
+ @rm -f itrontime01.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/cpuuse/Makefile.am b/testsuites/libtests/cpuuse/Makefile.am
index 76c1a131dc..1b9a9475d2 100644
--- a/testsuites/libtests/cpuuse/Makefile.am
+++ b/testsuites/libtests/cpuuse/Makefile.am
@@ -4,28 +4,25 @@
MANAGERS = io rate_monotonic
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
+rtems_tests_PROGRAMS = cpuuse.exe
+cpuuse_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 = cpuuse.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/cpuuse.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+cpuuse_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(cpuuse_exe_OBJECTS) $(cpuuse_exe_LDADD)
+LINK_LIBS = $(cpuuse_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+cpuuse.exe$(EXEEXT): $(cpuuse_exe_OBJECTS) $(cpuuse_exe_DEPENDENCIES)
+ @rm -f cpuuse.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/malloctest/Makefile.am b/testsuites/libtests/malloctest/Makefile.am
index e539b38d2a..40c93908f2 100644
--- a/testsuites/libtests/malloctest/Makefile.am
+++ b/testsuites/libtests/malloctest/Makefile.am
@@ -4,28 +4,25 @@
MANAGERS = io
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = malloctest.exe
+malloctest_exe_SOURCES = init.c task1.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = malloctest.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/malloctest.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+malloctest_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(malloctest_exe_OBJECTS) $(malloctest_exe_LDADD)
+LINK_LIBS = $(malloctest_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+malloctest.exe$(EXEEXT): $(malloctest_exe_OBJECTS) $(malloctest_exe_DEPENDENCIES)
+ @rm -f malloctest.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/monitor/Makefile.am b/testsuites/libtests/monitor/Makefile.am
index a07f2d3e27..ff8cd8e222 100644
--- a/testsuites/libtests/monitor/Makefile.am
+++ b/testsuites/libtests/monitor/Makefile.am
@@ -5,26 +5,22 @@
MANAGERS = dpmem event io msg mp part region sem signal timer rate_monotonic \
ext
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
-
-testsdir = $(libdir)/tests
-
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/monitor.exe
+rtems_tests_PROGRAMS = monitor.exe
+monitor_exe_SOURCES = init.c system.h
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+monitor_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(monitor_exe_OBJECTS) $(monitor_exe_LDADD)
+LINK_LIBS = $(monitor_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+monitor.exe$(EXEEXT): $(monitor_exe_OBJECTS) $(monitor_exe_DEPENDENCIES)
+ @rm -f monitor.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/putenvtest/Makefile.am b/testsuites/libtests/putenvtest/Makefile.am
index 4d4a30114a..5254bbc0cc 100644
--- a/testsuites/libtests/putenvtest/Makefile.am
+++ b/testsuites/libtests/putenvtest/Makefile.am
@@ -4,26 +4,22 @@
MANAGERS = io
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c
-
-testsdir = $(libdir)/tests
-
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/putenvtest.exe
+rtems_tests_PROGRAMS = putenvtest.exe
+putenvtest_exe_SOURCES = init.c
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+putenvtest_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(putenvtest_exe_OBJECTS) $(putenvtest_exe_LDADD)
+LINK_LIBS = $(putenvtest_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+putenvtest.exe$(EXEEXT): $(putenvtest_exe_OBJECTS) $(putenvtest_exe_DEPENDENCIES)
+ @rm -f putenvtest.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/rtems++/Makefile.am b/testsuites/libtests/rtems++/Makefile.am
index 6bd6a1299a..12bd3a835e 100644
--- a/testsuites/libtests/rtems++/Makefile.am
+++ b/testsuites/libtests/rtems++/Makefile.am
@@ -5,31 +5,30 @@
MANAGERS = event io msg sem signal timer rate_monotonic
if HAS_CXX
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = Init.cc Task1.cc Task2.cc Task3.cc System.h
+rtems_tests_PROGRAMS = rtems++.exe
+rtems___exe_SOURCES = Init.cc Task1.cc Task2.cc Task3.cc System.h
endif
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = rtems++.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = rtems++.doc
-PGM = ${ARCH}/rtems++.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
if HAS_CXX
-LD_LIBS = -lrtems++
+rtems___exe_LDLIBS = -lrtems++
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+rtems___exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-$(PGM): ${ARCH}/$(dirstamp)
+LINK_OBJS = $(rtems___exe_OBJECTS) $(rtems___exe_LDADD)
+LINK_LIBS = $(rtems___exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+rtems++.exe$(EXEEXT): $(rtems___exe_OBJECTS) $(rtems___exe_DEPENDENCIES)
+ @rm -f rtems++.exe$(EXEEXT)
$(make-cxx-exe)
endif
diff --git a/testsuites/libtests/rtmonuse/Makefile.am b/testsuites/libtests/rtmonuse/Makefile.am
index 54790d7e60..cbb561b3ae 100644
--- a/testsuites/libtests/rtmonuse/Makefile.am
+++ b/testsuites/libtests/rtmonuse/Makefile.am
@@ -4,28 +4,25 @@
MANAGERS = io rate_monotonic
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c getall.c task1.c system.h
+rtems_tests_PROGRAMS = rtmonuse.exe
+rtmonuse_exe_SOURCES = init.c getall.c task1.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = rtmonuse.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/rtmonuse.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+rtmonuse_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(rtmonuse_exe_OBJECTS) $(rtmonuse_exe_LDADD)
+LINK_LIBS = $(rtmonuse_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+rtmonuse.exe$(EXEEXT): $(rtmonuse_exe_OBJECTS) $(rtmonuse_exe_DEPENDENCIES)
+ @rm -f rtmonuse.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/stackchk/Makefile.am b/testsuites/libtests/stackchk/Makefile.am
index c7eb439a78..a260668c91 100644
--- a/testsuites/libtests/stackchk/Makefile.am
+++ b/testsuites/libtests/stackchk/Makefile.am
@@ -4,28 +4,25 @@
MANAGERS = io
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = blow.c init.c task1.c system.h
+rtems_tests_PROGRAMS = stackchk.exe
+stackchk_exe_SOURCES = blow.c init.c task1.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = stackchk.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/stackchk.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+stackchk_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(stackchk_exe_OBJECTS) $(stackchk_exe_LDADD)
+LINK_LIBS = $(stackchk_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+stackchk.exe$(EXEEXT): $(stackchk_exe_OBJECTS) $(stackchk_exe_DEPENDENCIES)
+ @rm -f stackchk.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/termios/Makefile.am b/testsuites/libtests/termios/Makefile.am
index 31197d6826..b9ec8f81ba 100644
--- a/testsuites/libtests/termios/Makefile.am
+++ b/testsuites/libtests/termios/Makefile.am
@@ -4,26 +4,22 @@
MANAGERS = io
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c
-
-testsdir = $(libdir)/tests
-
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/termios.exe
+rtems_tests_PROGRAMS = termios.exe
+termios_exe_SOURCES = init.c
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+termios_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(termios_exe_OBJECTS) $(termios_exe_LDADD)
+LINK_LIBS = $(termios_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+termios.exe$(EXEEXT): $(termios_exe_OBJECTS) $(termios_exe_DEPENDENCIES)
+ @rm -f termios.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am
index 4983d73d0d..a83e0a403b 100644
--- a/testsuites/mptests/mp01/node1/Makefile.am
+++ b/testsuites/mptests/mp01/node1/Makefile.am
@@ -4,17 +4,14 @@
MANAGERS = io mp
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp01-node1.exe
+mp01_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp01-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp01-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
@@ -22,13 +19,13 @@ include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-PGM = $(ARCH)/mp01-node1.exe
-
-tests_SCRIPTS = $(PGM)
+mp01_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-$(PGM): ${ARCH}/$(dirstamp)
+LINK_OBJS = $(mp01_node1_exe_OBJECTS) $(mp01_node1_exe_LDADD)
+LINK_LIBS = $(mp01_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp01-node1.exe$(EXEEXT): $(mp01_node1_exe_OBJECTS) $(mp01_node1_exe_DEPENDENCIES)
+ @rm -f mp01-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am
index 6a7b397977..97a7ab1c5a 100644
--- a/testsuites/mptests/mp01/node2/Makefile.am
+++ b/testsuites/mptests/mp01/node2/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp01-node2.exe
-
MANAGERS = io mp
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp01-node2.exe
+mp01_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp01-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp01-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp01_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp01_node2_exe_OBJECTS) $(mp01_node2_exe_LDADD)
+LINK_LIBS = $(mp01_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp01-node2.exe$(EXEEXT): $(mp01_node2_exe_OBJECTS) $(mp01_node2_exe_DEPENDENCIES)
+ @rm -f mp01-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am
index f01b4911fe..4fa7487c71 100644
--- a/testsuites/mptests/mp02/node1/Makefile.am
+++ b/testsuites/mptests/mp02/node1/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp02-node1.exe
-
MANAGERS = io mp
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp02-node1.exe
+mp02_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp02-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp02-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp02_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp02_node1_exe_OBJECTS) $(mp02_node1_exe_LDADD)
+LINK_LIBS = $(mp02_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp02-node1.exe$(EXEEXT): $(mp02_node1_exe_OBJECTS) $(mp02_node1_exe_DEPENDENCIES)
+ @rm -f mp02-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am
index a9fa753d53..b61821f4e2 100644
--- a/testsuites/mptests/mp02/node2/Makefile.am
+++ b/testsuites/mptests/mp02/node2/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp02-node2.exe
-
MANAGERS = io mp
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp02-node2.exe
+mp02_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp02-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp02-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp02_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp02_node2_exe_OBJECTS) $(mp02_node2_exe_LDADD)
+LINK_LIBS = $(mp02_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp02-node2.exe$(EXEEXT): $(mp02_node2_exe_OBJECTS) $(mp02_node2_exe_DEPENDENCIES)
+ @rm -f mp02-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am
index eecb928ab5..39112a24b4 100644
--- a/testsuites/mptests/mp03/node1/Makefile.am
+++ b/testsuites/mptests/mp03/node1/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp03-node1.exe
-
MANAGERS = io mp timer event
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../delay.c ../system.h
+rtems_tests_PROGRAMS = mp03-node1.exe
+mp03_node1_exe_SOURCES = ../init.c ../task1.c ../delay.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp03-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp03-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp03_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp03_node1_exe_OBJECTS) $(mp03_node1_exe_LDADD)
+LINK_LIBS = $(mp03_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp03-node1.exe$(EXEEXT): $(mp03_node1_exe_OBJECTS) $(mp03_node1_exe_DEPENDENCIES)
+ @rm -f mp03-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am
index ad95377715..d21fe15db5 100644
--- a/testsuites/mptests/mp03/node2/Makefile.am
+++ b/testsuites/mptests/mp03/node2/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp03-node2.exe
-
MANAGERS = io mp timer event
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../delay.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp03-node2.exe
+mp03_node2_exe_SOURCES = ../init.c ../delay.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp03-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp03-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp03_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp03_node2_exe_OBJECTS) $(mp03_node2_exe_LDADD)
+LINK_LIBS = $(mp03_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp03-node2.exe$(EXEEXT): $(mp03_node2_exe_OBJECTS) $(mp03_node2_exe_DEPENDENCIES)
+ @rm -f mp03-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am
index a55e18e7e7..b38fd3b99e 100644
--- a/testsuites/mptests/mp04/node1/Makefile.am
+++ b/testsuites/mptests/mp04/node1/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp04-node1.exe
-
MANAGERS = io mp
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp04-node1.exe
+mp04_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp04-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp04-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp04_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp04_node1_exe_OBJECTS) $(mp04_node1_exe_LDADD)
+LINK_LIBS = $(mp04_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp04-node1.exe$(EXEEXT): $(mp04_node1_exe_OBJECTS) $(mp04_node1_exe_DEPENDENCIES)
+ @rm -f mp04-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am
index ed5e92a05a..21f1f0c5cb 100644
--- a/testsuites/mptests/mp04/node2/Makefile.am
+++ b/testsuites/mptests/mp04/node2/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp04-node2.exe
-
MANAGERS = io mp
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp04-node2.exe
+mp04_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp04-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp04-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp04_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp04_node2_exe_OBJECTS) $(mp04_node2_exe_LDADD)
+LINK_LIBS = $(mp04_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp04-node2.exe$(EXEEXT): $(mp04_node2_exe_OBJECTS) $(mp04_node2_exe_DEPENDENCIES)
+ @rm -f mp04-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am
index 1c62a86fb8..931b8cda0a 100644
--- a/testsuites/mptests/mp05/node1/Makefile.am
+++ b/testsuites/mptests/mp05/node1/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp05-node1.exe
-
MANAGERS = io mp signal timer
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp05-node1.exe
+mp05_node1_exe_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp05-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp05-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp05_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp05_node1_exe_OBJECTS) $(mp05_node1_exe_LDADD)
+LINK_LIBS = $(mp05_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp05-node1.exe$(EXEEXT): $(mp05_node1_exe_OBJECTS) $(mp05_node1_exe_DEPENDENCIES)
+ @rm -f mp05-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am
index 79cf60192a..cbcc359268 100644
--- a/testsuites/mptests/mp05/node2/Makefile.am
+++ b/testsuites/mptests/mp05/node2/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp05-node2.exe
-
MANAGERS = io mp signal timer
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp05-node2.exe
+mp05_node2_exe_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp05-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp05-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp05_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp05_node2_exe_OBJECTS) $(mp05_node2_exe_LDADD)
+LINK_LIBS = $(mp05_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp05-node2.exe$(EXEEXT): $(mp05_node2_exe_OBJECTS) $(mp05_node2_exe_DEPENDENCIES)
+ @rm -f mp05-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am
index 445a51c32f..a81821cf10 100644
--- a/testsuites/mptests/mp06/node1/Makefile.am
+++ b/testsuites/mptests/mp06/node1/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp06-node1.exe
-
MANAGERS = io mp event timer
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp06-node1.exe
+mp06_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp06-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp06-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp06_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp06_node1_exe_OBJECTS) $(mp06_node1_exe_LDADD)
+LINK_LIBS = $(mp06_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp06-node1.exe$(EXEEXT): $(mp06_node1_exe_OBJECTS) $(mp06_node1_exe_DEPENDENCIES)
+ @rm -f mp06-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am
index 84552d0085..9899489a58 100644
--- a/testsuites/mptests/mp06/node2/Makefile.am
+++ b/testsuites/mptests/mp06/node2/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp06-node2.exe
-
MANAGERS = io mp event timer
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp06-node2.exe
+mp06_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp06-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp06-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp06_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp06_node2_exe_OBJECTS) $(mp06_node2_exe_LDADD)
+LINK_LIBS = $(mp06_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp06-node2.exe$(EXEEXT): $(mp06_node2_exe_OBJECTS) $(mp06_node2_exe_DEPENDENCIES)
+ @rm -f mp06-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am
index d6da75335f..07579d9368 100644
--- a/testsuites/mptests/mp07/node1/Makefile.am
+++ b/testsuites/mptests/mp07/node1/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp07-node1.exe
-
MANAGERS = io mp event timer
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp07-node1.exe
+mp07_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp07-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp07-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp07_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp07_node1_exe_OBJECTS) $(mp07_node1_exe_LDADD)
+LINK_LIBS = $(mp07_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp07-node1.exe$(EXEEXT): $(mp07_node1_exe_OBJECTS) $(mp07_node1_exe_DEPENDENCIES)
+ @rm -f mp07-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am
index 167f51a937..e8232b874c 100644
--- a/testsuites/mptests/mp07/node2/Makefile.am
+++ b/testsuites/mptests/mp07/node2/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp07-node2.exe
-
MANAGERS = io mp event timer
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp07-node2.exe
+mp07_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp07-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp07-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp07_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp07_node2_exe_OBJECTS) $(mp07_node2_exe_LDADD)
+LINK_LIBS = $(mp07_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp07-node2.exe$(EXEEXT): $(mp07_node2_exe_OBJECTS) $(mp07_node2_exe_DEPENDENCIES)
+ @rm -f mp07-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am
index f5fc6a953f..f778d67b45 100644
--- a/testsuites/mptests/mp08/node1/Makefile.am
+++ b/testsuites/mptests/mp08/node1/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp08-node1.exe
-
MANAGERS = io mp semaphore
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp08-node1.exe
+mp08_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp08-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp08-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp08_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp08_node1_exe_OBJECTS) $(mp08_node1_exe_LDADD)
+LINK_LIBS = $(mp08_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp08-node1.exe$(EXEEXT): $(mp08_node1_exe_OBJECTS) $(mp08_node1_exe_DEPENDENCIES)
+ @rm -f mp08-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am
index a759a32265..641b27ff8c 100644
--- a/testsuites/mptests/mp08/node2/Makefile.am
+++ b/testsuites/mptests/mp08/node2/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp08-node2.exe
-
MANAGERS = io mp semaphore
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp08-node2.exe
+mp08_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp08-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp08-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp08_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp08_node2_exe_OBJECTS) $(mp08_node2_exe_LDADD)
+LINK_LIBS = $(mp08_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp08-node2.exe$(EXEEXT): $(mp08_node2_exe_OBJECTS) $(mp08_node2_exe_DEPENDENCIES)
+ @rm -f mp08-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am
index 3bed29255c..4094154d95 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/mptests/mp09/node1/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp09-node1.exe
-
MANAGERS = io mp message
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
+rtems_tests_PROGRAMS = mp09-node1.exe
+mp09_node1_exe_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp09-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp09-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp09_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp09_node1_exe_OBJECTS) $(mp09_node1_exe_LDADD)
+LINK_LIBS = $(mp09_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp09-node1.exe$(EXEEXT): $(mp09_node1_exe_OBJECTS) $(mp09_node1_exe_DEPENDENCIES)
+ @rm -f mp09-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am
index 4988f8299e..add1aabfbf 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/mptests/mp09/node2/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp09-node2.exe
-
MANAGERS = io mp message
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
+rtems_tests_PROGRAMS = mp09-node2.exe
+mp09_node2_exe_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp09-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp09-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp09_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp09_node2_exe_OBJECTS) $(mp09_node2_exe_LDADD)
+LINK_LIBS = $(mp09_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp09-node2.exe$(EXEEXT): $(mp09_node2_exe_OBJECTS) $(mp09_node2_exe_DEPENDENCIES)
+ @rm -f mp09-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am
index 389b46bb76..c44f5dcc8e 100644
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ b/testsuites/mptests/mp10/node1/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp10-node1.exe
-
MANAGERS = io mp message semaphore
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
+rtems_tests_PROGRAMS = mp10-node1.exe
+mp10_node1_exe_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp10-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp10-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp10_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp10_node1_exe_OBJECTS) $(mp10_node1_exe_LDADD)
+LINK_LIBS = $(mp10_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp10-node1.exe$(EXEEXT): $(mp10_node1_exe_OBJECTS) $(mp10_node1_exe_DEPENDENCIES)
+ @rm -f mp10-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am
index e07addd599..7577d92692 100644
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ b/testsuites/mptests/mp10/node2/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp10-node2.exe
-
MANAGERS = io mp message semaphore
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
+rtems_tests_PROGRAMS = mp10-node2.exe
+mp10_node2_exe_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp10-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp10-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp10_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp10_node2_exe_OBJECTS) $(mp10_node2_exe_LDADD)
+LINK_LIBS = $(mp10_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp10-node2.exe$(EXEEXT): $(mp10_node2_exe_OBJECTS) $(mp10_node2_exe_DEPENDENCIES)
+ @rm -f mp10-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am
index 1799654cb1..c596d33ac2 100644
--- a/testsuites/mptests/mp11/node1/Makefile.am
+++ b/testsuites/mptests/mp11/node1/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp11-node1.exe
-
MANAGERS = io mp message partition semaphore
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../system.h
+rtems_tests_PROGRAMS = mp11-node1.exe
+mp11_node1_exe_SOURCES = ../init.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp11-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp11-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp11_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp11_node1_exe_OBJECTS) $(mp11_node1_exe_LDADD)
+LINK_LIBS = $(mp11_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp11-node1.exe$(EXEEXT): $(mp11_node1_exe_OBJECTS) $(mp11_node1_exe_DEPENDENCIES)
+ @rm -f mp11-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am
index 5bd9a42a74..56e0082b7f 100644
--- a/testsuites/mptests/mp11/node2/Makefile.am
+++ b/testsuites/mptests/mp11/node2/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp11-node2.exe
-
MANAGERS = io mp message partition semaphore
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../system.h
+rtems_tests_PROGRAMS = mp11-node2.exe
+mp11_node2_exe_SOURCES = ../init.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp11-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp11-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp11_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp11_node2_exe_OBJECTS) $(mp11_node2_exe_LDADD)
+LINK_LIBS = $(mp11_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp11-node2.exe$(EXEEXT): $(mp11_node2_exe_OBJECTS) $(mp11_node2_exe_DEPENDENCIES)
+ @rm -f mp11-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am
index c7ec6674d8..e5a8cd0272 100644
--- a/testsuites/mptests/mp12/node1/Makefile.am
+++ b/testsuites/mptests/mp12/node1/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp12-node1.exe
-
MANAGERS = io mp partition
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../system.h
+rtems_tests_PROGRAMS = mp12-node1.exe
+mp12_node1_exe_SOURCES = ../init.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp12-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp12-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp12_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp12_node1_exe_OBJECTS) $(mp12_node1_exe_LDADD)
+LINK_LIBS = $(mp12_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp12-node1.exe$(EXEEXT): $(mp12_node1_exe_OBJECTS) $(mp12_node1_exe_DEPENDENCIES)
+ @rm -f mp12-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am
index fead43b668..67005171c1 100644
--- a/testsuites/mptests/mp12/node2/Makefile.am
+++ b/testsuites/mptests/mp12/node2/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp12-node2.exe
-
MANAGERS = io mp partition
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../system.h
+rtems_tests_PROGRAMS = mp12-node2.exe
+mp12_node2_exe_SOURCES = ../init.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp12-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp12-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp12_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp12_node2_exe_OBJECTS) $(mp12_node2_exe_LDADD)
+LINK_LIBS = $(mp12_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp12-node2.exe$(EXEEXT): $(mp12_node2_exe_OBJECTS) $(mp12_node2_exe_DEPENDENCIES)
+ @rm -f mp12-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am
index e13f4960ec..b3b96b58d3 100644
--- a/testsuites/mptests/mp13/node1/Makefile.am
+++ b/testsuites/mptests/mp13/node1/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp13-node1.exe
-
MANAGERS = io mp message semaphore
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
+rtems_tests_PROGRAMS = mp13-node1.exe
+mp13_node1_exe_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp13-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp13-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp13_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp13_node1_exe_OBJECTS) $(mp13_node1_exe_LDADD)
+LINK_LIBS = $(mp13_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp13-node1.exe$(EXEEXT): $(mp13_node1_exe_OBJECTS) $(mp13_node1_exe_DEPENDENCIES)
+ @rm -f mp13-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am
index 40158520e7..e285e8f666 100644
--- a/testsuites/mptests/mp13/node2/Makefile.am
+++ b/testsuites/mptests/mp13/node2/Makefile.am
@@ -2,34 +2,31 @@
## $Id$
##
-PGM = $(ARCH)/mp13-node2.exe
-
MANAGERS = io mp message semaphore
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
+rtems_tests_PROGRAMS = mp13-node2.exe
+mp13_node2_exe_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp13-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp13-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp13_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp13_node2_exe_OBJECTS) $(mp13_node2_exe_LDADD)
+LINK_LIBS = $(mp13_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp13-node2.exe$(EXEEXT): $(mp13_node2_exe_OBJECTS) $(mp13_node2_exe_DEPENDENCIES)
+ @rm -f mp13-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am
index 403683229d..29c06bf210 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -2,36 +2,33 @@
## $Id$
##
-PGM = $(ARCH)/mp14-node1.exe
-
MANAGERS = io mp event partition semaphore timer message
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
+rtems_tests_PROGRAMS = mp14-node1.exe
+mp14_node1_exe_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp14-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp14-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp14_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
AM_CPPFLAGS += -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp14_node1_exe_OBJECTS) $(mp14_node1_exe_LDADD)
+LINK_LIBS = $(mp14_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp14-node1.exe$(EXEEXT): $(mp14_node1_exe_OBJECTS) $(mp14_node1_exe_DEPENDENCIES)
+ @rm -f mp14-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am
index 373291ab29..5a4ce979da 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -2,36 +2,33 @@
## $Id$
##
-PGM = $(ARCH)/mp14-node2.exe
-
MANAGERS = io mp event partition semaphore timer message
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
+rtems_tests_PROGRAMS = mp14-node2.exe
+mp14_node2_exe_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = mp14-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = mp14-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+mp14_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
AM_CPPFLAGS += -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp14_node2_exe_OBJECTS) $(mp14_node2_exe_LDADD)
+LINK_LIBS = $(mp14_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+mp14-node2.exe$(EXEEXT): $(mp14_node2_exe_OBJECTS) $(mp14_node2_exe_DEPENDENCIES)
+ @rm -f mp14-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx01/Makefile.am b/testsuites/psxtests/psx01/Makefile.am
index 8ae52652e7..4f2650c935 100644
--- a/testsuites/psxtests/psx01/Makefile.am
+++ b/testsuites/psxtests/psx01/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx01.exe
+psx01_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psx01.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psx01.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psx01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psx01_exe_OBJECTS) $(psx01_exe_LDADD)
+LINK_LIBS = $(psx01_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psx01.exe$(EXEEXT): $(psx01_exe_OBJECTS) $(psx01_exe_DEPENDENCIES)
+ @rm -f psx01.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx02/Makefile.am b/testsuites/psxtests/psx02/Makefile.am
index 81f73c4776..00bc7d6c0f 100644
--- a/testsuites/psxtests/psx02/Makefile.am
+++ b/testsuites/psxtests/psx02/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx02.exe
+psx02_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psx02.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psx02.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psx02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psx02_exe_OBJECTS) $(psx02_exe_LDADD)
+LINK_LIBS = $(psx02_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psx02.exe$(EXEEXT): $(psx02_exe_OBJECTS) $(psx02_exe_DEPENDENCIES)
+ @rm -f psx02.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx03/Makefile.am b/testsuites/psxtests/psx03/Makefile.am
index 2829ec1f8c..ad0c059a72 100644
--- a/testsuites/psxtests/psx03/Makefile.am
+++ b/testsuites/psxtests/psx03/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx03.exe
+psx03_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psx03.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psx03.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psx03_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psx03_exe_OBJECTS) $(psx03_exe_LDADD)
+LINK_LIBS = $(psx03_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psx03.exe$(EXEEXT): $(psx03_exe_OBJECTS) $(psx03_exe_DEPENDENCIES)
+ @rm -f psx03.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx04/Makefile.am b/testsuites/psxtests/psx04/Makefile.am
index aed2764356..0d16db7f65 100644
--- a/testsuites/psxtests/psx04/Makefile.am
+++ b/testsuites/psxtests/psx04/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx04.exe
+psx04_exe_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psx04.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psx04.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psx04_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psx04_exe_OBJECTS) $(psx04_exe_LDADD)
+LINK_LIBS = $(psx04_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psx04.exe$(EXEEXT): $(psx04_exe_OBJECTS) $(psx04_exe_DEPENDENCIES)
+ @rm -f psx04.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx05/Makefile.am b/testsuites/psxtests/psx05/Makefile.am
index 75fd488728..0b783f9a23 100644
--- a/testsuites/psxtests/psx05/Makefile.am
+++ b/testsuites/psxtests/psx05/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx05.exe
+psx05_exe_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psx05.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psx05.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psx05_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psx05_exe_OBJECTS) $(psx05_exe_LDADD)
+LINK_LIBS = $(psx05_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psx05.exe$(EXEEXT): $(psx05_exe_OBJECTS) $(psx05_exe_DEPENDENCIES)
+ @rm -f psx05.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx06/Makefile.am b/testsuites/psxtests/psx06/Makefile.am
index 2c1a376b14..dbf8daa346 100644
--- a/testsuites/psxtests/psx06/Makefile.am
+++ b/testsuites/psxtests/psx06/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task.c task2.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx06.exe
+psx06_exe_SOURCES = init.c task.c task2.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psx06.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psx06.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psx06_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psx06_exe_OBJECTS) $(psx06_exe_LDADD)
+LINK_LIBS = $(psx06_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psx06.exe$(EXEEXT): $(psx06_exe_OBJECTS) $(psx06_exe_DEPENDENCIES)
+ @rm -f psx06.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx07/Makefile.am b/testsuites/psxtests/psx07/Makefile.am
index 61a33fbb37..785cc529b0 100644
--- a/testsuites/psxtests/psx07/Makefile.am
+++ b/testsuites/psxtests/psx07/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx07.exe
+psx07_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psx07.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psx07.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psx07_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psx07_exe_OBJECTS) $(psx07_exe_LDADD)
+LINK_LIBS = $(psx07_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psx07.exe$(EXEEXT): $(psx07_exe_OBJECTS) $(psx07_exe_DEPENDENCIES)
+ @rm -f psx07.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx08/Makefile.am b/testsuites/psxtests/psx08/Makefile.am
index 5a2d16533c..c7726a2150 100644
--- a/testsuites/psxtests/psx08/Makefile.am
+++ b/testsuites/psxtests/psx08/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx08.exe
+psx08_exe_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psx08.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psx08.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psx08_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psx08_exe_OBJECTS) $(psx08_exe_LDADD)
+LINK_LIBS = $(psx08_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psx08.exe$(EXEEXT): $(psx08_exe_OBJECTS) $(psx08_exe_DEPENDENCIES)
+ @rm -f psx08.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx09/Makefile.am b/testsuites/psxtests/psx09/Makefile.am
index 32897b9f54..9b62afeda6 100644
--- a/testsuites/psxtests/psx09/Makefile.am
+++ b/testsuites/psxtests/psx09/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx09.exe
+psx09_exe_SOURCES = init.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psx09.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psx09.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psx09_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psx09_exe_OBJECTS) $(psx09_exe_LDADD)
+LINK_LIBS = $(psx09_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psx09.exe$(EXEEXT): $(psx09_exe_OBJECTS) $(psx09_exe_DEPENDENCIES)
+ @rm -f psx09.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx10/Makefile.am b/testsuites/psxtests/psx10/Makefile.am
index 48a22ef5b3..2685bbdc26 100644
--- a/testsuites/psxtests/psx10/Makefile.am
+++ b/testsuites/psxtests/psx10/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx10.exe
+psx10_exe_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psx10.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psx10.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psx10_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psx10_exe_OBJECTS) $(psx10_exe_LDADD)
+LINK_LIBS = $(psx10_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psx10.exe$(EXEEXT): $(psx10_exe_OBJECTS) $(psx10_exe_DEPENDENCIES)
+ @rm -f psx10.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx11/Makefile.am b/testsuites/psxtests/psx11/Makefile.am
index e90abbe9a8..67a43ab9d9 100644
--- a/testsuites/psxtests/psx11/Makefile.am
+++ b/testsuites/psxtests/psx11/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx11.exe
+psx11_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psx11.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psx11.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psx11_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psx11_exe_OBJECTS) $(psx11_exe_LDADD)
+LINK_LIBS = $(psx11_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psx11.exe$(EXEEXT): $(psx11_exe_OBJECTS) $(psx11_exe_DEPENDENCIES)
+ @rm -f psx11.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx12/Makefile.am b/testsuites/psxtests/psx12/Makefile.am
index 360cd916dc..b5e6c19fe6 100644
--- a/testsuites/psxtests/psx12/Makefile.am
+++ b/testsuites/psxtests/psx12/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx12.exe
+psx12_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psx12.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psx12.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psx12_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psx12_exe_OBJECTS) $(psx12_exe_LDADD)
+LINK_LIBS = $(psx12_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psx12.exe$(EXEEXT): $(psx12_exe_OBJECTS) $(psx12_exe_DEPENDENCIES)
+ @rm -f psx12.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx13/Makefile.am b/testsuites/psxtests/psx13/Makefile.am
index cf215e755f..732a72ef35 100644
--- a/testsuites/psxtests/psx13/Makefile.am
+++ b/testsuites/psxtests/psx13/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psx13.exe
+psx13_exe_SOURCES = main.c test.c ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psx13.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psx13.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psx13_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psx13_exe_OBJECTS) $(psx13_exe_LDADD)
+LINK_LIBS = $(psx13_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psx13.exe$(EXEEXT): $(psx13_exe_OBJECTS) $(psx13_exe_DEPENDENCIES)
+ @rm -f psx13.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxcancel/Makefile.am b/testsuites/psxtests/psxcancel/Makefile.am
index 9cb672f468..18fa58c3f7 100644
--- a/testsuites/psxtests/psxcancel/Makefile.am
+++ b/testsuites/psxtests/psxcancel/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxcancel.exe
+psxcancel_exe_SOURCES = init.c ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psxcancel.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psxcancel.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psxcancel_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psxcancel_exe_OBJECTS) $(psxcancel_exe_LDADD)
+LINK_LIBS = $(psxcancel_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psxcancel.exe$(EXEEXT): $(psxcancel_exe_OBJECTS) $(psxcancel_exe_DEPENDENCIES)
+ @rm -f psxcancel.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxchroot01/Makefile.am b/testsuites/psxtests/psxchroot01/Makefile.am
index b046a166b7..28637a1a2c 100644
--- a/testsuites/psxtests/psxchroot01/Makefile.am
+++ b/testsuites/psxtests/psxchroot01/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxchroot01.exe
+psxchroot01_exe_SOURCES = main.c test.c ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psxchroot01.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psxchroot01.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psxchroot01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psxchroot01_exe_OBJECTS) $(psxchroot01_exe_LDADD)
+LINK_LIBS = $(psxchroot01_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psxchroot01.exe$(EXEEXT): $(psxchroot01_exe_OBJECTS) $(psxchroot01_exe_DEPENDENCIES)
+ @rm -f psxchroot01.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxfile01/Makefile.am b/testsuites/psxtests/psxfile01/Makefile.am
index ec2a15faee..d6c0665e63 100644
--- a/testsuites/psxtests/psxfile01/Makefile.am
+++ b/testsuites/psxtests/psxfile01/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = main.c test.c test_cat.c test_extend.c test_write.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxfile01.exe
+psxfile01_exe_SOURCES = main.c test.c test_cat.c test_extend.c test_write.c ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psxfile01.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psxfile01.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psxfile01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psxfile01_exe_OBJECTS) $(psxfile01_exe_LDADD)
+LINK_LIBS = $(psxfile01_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psxfile01.exe$(EXEEXT): $(psxfile01_exe_OBJECTS) $(psxfile01_exe_DEPENDENCIES)
+ @rm -f psxfile01.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxhdrs/Makefile.am b/testsuites/psxtests/psxhdrs/Makefile.am
index 6b380d143f..696fba07d9 100644
--- a/testsuites/psxtests/psxhdrs/Makefile.am
+++ b/testsuites/psxtests/psxhdrs/Makefile.am
@@ -25,14 +25,8 @@ lib_a_SOURCES = clock01.c clock02.c clock03.c clock04.c clock05.c clock06.c \
time08.c time09.c time10.c time11.c time12.c time13.c timer01.c \
timer02.c timer03.c timer04.c timer05.c timer06.c timer07.c
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-all-local: ${OBJS}
-
-EXTRA_DIST =
-
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxmount/Makefile.am b/testsuites/psxtests/psxmount/Makefile.am
index 941f077b02..cd9b4af0b5 100644
--- a/testsuites/psxtests/psxmount/Makefile.am
+++ b/testsuites/psxtests/psxmount/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxmount.exe
+psxmount_exe_SOURCES = main.c test.c ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psxmount.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psxmount.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psxmount_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psxmount_exe_OBJECTS) $(psxmount_exe_LDADD)
+LINK_LIBS = $(psxmount_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psxmount.exe$(EXEEXT): $(psxmount_exe_OBJECTS) $(psxmount_exe_DEPENDENCIES)
+ @rm -f psxmount.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxmsgq01/Makefile.am b/testsuites/psxtests/psxmsgq01/Makefile.am
index 63701d95a4..11de0a1e4f 100644
--- a/testsuites/psxtests/psxmsgq01/Makefile.am
+++ b/testsuites/psxtests/psxmsgq01/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psxmsgq01.exe
+psxmsgq01_exe_SOURCES = init.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psxmsgq01.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psxmsgq01.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psxmsgq01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psxmsgq01_exe_OBJECTS) $(psxmsgq01_exe_LDADD)
+LINK_LIBS = $(psxmsgq01_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psxmsgq01.exe$(EXEEXT): $(psxmsgq01_exe_OBJECTS) $(psxmsgq01_exe_DEPENDENCIES)
+ @rm -f psxmsgq01.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxreaddir/Makefile.am b/testsuites/psxtests/psxreaddir/Makefile.am
index 54ea43d016..68cc17c511 100644
--- a/testsuites/psxtests/psxreaddir/Makefile.am
+++ b/testsuites/psxtests/psxreaddir/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxreaddir.exe
+psxreaddir_exe_SOURCES = main.c test.c ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psxreaddir.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psxreaddir.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psxreaddir_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psxreaddir_exe_OBJECTS) $(psxreaddir_exe_LDADD)
+LINK_LIBS = $(psxreaddir_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psxreaddir.exe$(EXEEXT): $(psxreaddir_exe_OBJECTS) $(psxreaddir_exe_DEPENDENCIES)
+ @rm -f psxreaddir.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxsem01/Makefile.am b/testsuites/psxtests/psxsem01/Makefile.am
index 696d9b35a2..40a4ad66a7 100644
--- a/testsuites/psxtests/psxsem01/Makefile.am
+++ b/testsuites/psxtests/psxsem01/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psxsem01.exe
+psxsem01_exe_SOURCES = init.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psxsem01.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psxsem01.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psxsem01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psxsem01_exe_OBJECTS) $(psxsem01_exe_LDADD)
+LINK_LIBS = $(psxsem01_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psxsem01.exe$(EXEEXT): $(psxsem01_exe_OBJECTS) $(psxsem01_exe_DEPENDENCIES)
+ @rm -f psxsem01.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxstat/Makefile.am b/testsuites/psxtests/psxstat/Makefile.am
index 2824cf4bde..e86c6435a1 100644
--- a/testsuites/psxtests/psxstat/Makefile.am
+++ b/testsuites/psxtests/psxstat/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxstat.exe
+psxstat_exe_SOURCES = main.c test.c ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psxstat.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psxstat.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psxstat_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psxstat_exe_OBJECTS) $(psxstat_exe_LDADD)
+LINK_LIBS = $(psxstat_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psxstat.exe$(EXEEXT): $(psxstat_exe_OBJECTS) $(psxstat_exe_DEPENDENCIES)
+ @rm -f psxstat.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxtime/Makefile.am b/testsuites/psxtests/psxtime/Makefile.am
index 7db672bf86..927403a979 100644
--- a/testsuites/psxtests/psxtime/Makefile.am
+++ b/testsuites/psxtests/psxtime/Makefile.am
@@ -4,28 +4,25 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = main.c test.c
+rtems_tests_PROGRAMS = psxtime.exe
+psxtime_exe_SOURCES = main.c test.c
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psxtime.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psxtime.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psxtime_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psxtime_exe_OBJECTS) $(psxtime_exe_LDADD)
+LINK_LIBS = $(psxtime_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psxtime.exe$(EXEEXT): $(psxtime_exe_OBJECTS) $(psxtime_exe_DEPENDENCIES)
+ @rm -f psxtime.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxtimer/Makefile.am b/testsuites/psxtests/psxtimer/Makefile.am
index e5503720c3..8b92a5858a 100644
--- a/testsuites/psxtests/psxtimer/Makefile.am
+++ b/testsuites/psxtests/psxtimer/Makefile.am
@@ -4,30 +4,26 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = psxtimer.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psxtimer.exe
+psxtimer_exe_SOURCES = psxtimer.c system.h ../include/pmacros.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = psxtimer.scn
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/psxtimer.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+psxtimer_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
-
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(psxtimer_exe_OBJECTS) $(psxtimer_exe_LDADD)
+LINK_LIBS = $(psxtimer_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+psxtimer.exe$(EXEEXT): $(psxtimer_exe_OBJECTS) $(psxtimer_exe_DEPENDENCIES)
+ @rm -f psxtimer.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index 589bb1828f..588096a573 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -2,32 +2,29 @@
## $Id$
##
-PGM = ${ARCH}/base_mp-node1.exe
-
MANAGERS = io mp
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../apptask.c ../system.h
+rtems_tests_PROGRAMS = base_mp-node1.exe
+base_mp_node1_exe_SOURCES = ../init.c ../apptask.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = base_mp-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = base_mp-node1.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+base_mp_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=1 -I.
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(base_mp_node1_exe_OBJECTS) $(base_mp_node1_exe_LDADD)
+LINK_LIBS = $(base_mp_node1_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+base_mp-node1.exe$(EXEEXT): $(base_mp_node1_exe_OBJECTS) $(base_mp_node1_exe_DEPENDENCIES)
+ @rm -f base_mp-node1.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index 6f1b23800e..474418808d 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -2,32 +2,29 @@
## $Id$
##
-PGM = ${ARCH}/base_mp-node2.exe
-
MANAGERS = io mp
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../apptask.c ../system.h
+rtems_tests_PROGRAMS = base_mp-node2.exe
+base_mp_node2_exe_SOURCES = ../init.c ../apptask.c ../system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = base_mp-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = base_mp-node2.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+base_mp_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -DNODE_NUMBER=2 -I.
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(base_mp_node2_exe_OBJECTS) $(base_mp_node2_exe_LDADD)
+LINK_LIBS = $(base_mp_node2_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+base_mp-node2.exe$(EXEEXT): $(base_mp_node2_exe_OBJECTS) $(base_mp_node2_exe_DEPENDENCIES)
+ @rm -f base_mp-node2.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index 71dfbf6111..6974a9ee5a 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -2,30 +2,27 @@
## $Id$
##
-PGM = ${ARCH}/base_sp.exe
-
MANAGERS = io
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c apptask.c system.h
+rtems_tests_PROGRAMS = base_sp.exe
+base_sp_exe_SOURCES = init.c apptask.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = base_sp.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = base_sp.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+base_sp_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(base_sp_exe_OBJECTS) $(base_sp_exe_LDADD)
+LINK_LIBS = $(base_sp_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+base_sp.exe$(EXEEXT): $(base_sp_exe_OBJECTS) $(base_sp_exe_DEPENDENCIES)
+ @rm -f base_sp.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index ecab477989..e8d93e122f 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -2,32 +2,30 @@
## $Id$
##
-PGM = ${ARCH}/cdtest.exe
-
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c main.cc system.h
+rtems_tests_PROGRAMS = cdtest.exe
+cdtest_exe_SOURCES = init.c main.cc system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = cdtest.scn
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+cdtest_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
# AM_CPPFLAGS += -DRTEMS_TEST_IO_STREAM
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(cdtest_exe_OBJECTS) $(cdtest_exe_LDADD)
+LINK_LIBS = $(cdtest_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+cdtest.exe$(EXEEXT): $(cdtest_exe_OBJECTS) $(cdtest_exe_DEPENDENCIES)
+ @rm -f cdtest.exe$(EXEEXT)
+ $(make-exe)
$(make-cxx-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am
index 2f3e7579c9..ecaaaa570f 100644
--- a/testsuites/samples/fileio/Makefile.am
+++ b/testsuites/samples/fileio/Makefile.am
@@ -2,18 +2,14 @@
## Makefile.am,v 1.9 2002/08/11 05:18:59 ralf Exp
##
-
MANAGERS = io message semaphore
if LIBCHIP
-PGM = ${ARCH}/fileio.exe
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
-OBJS = $(lib_a_OBJECTS)
+rtems_tests_PROGRAMS = fileio.exe
+fileio_exe_SOURCES = init.c system.h
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = fileio.doc
endif
@@ -21,13 +17,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-
if LIBCHIP
-$(PGM): ${ARCH}/$(dirstamp)
+fileio_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(fileio_exe_OBJECTS) $(fileio_exe_LDADD)
+LINK_LIBS = $(fileio_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+fileio.exe$(EXEEXT): $(fileio_exe_OBJECTS) $(fileio_exe_DEPENDENCIES)
+ @rm -f fileio.exe$(EXEEXT)
$(make-exe)
endif
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index f10bd46fde..200c3e08a8 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -2,30 +2,27 @@
## $Id$
##
-PGM = ${ARCH}/hello.exe
-
MANAGERS = io
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = hello.exe
+hello_exe_SOURCES = init.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = hello.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = hello.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+hello_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(hello_exe_OBJECTS) $(hello_exe_LDADD)
+LINK_LIBS = $(hello_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+hello.exe$(EXEEXT): $(hello_exe_OBJECTS) $(hello_exe_DEPENDENCIES)
+ @rm -f hello.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am
index 3b18f6120a..a50e972d07 100644
--- a/testsuites/samples/iostream/Makefile.am
+++ b/testsuites/samples/iostream/Makefile.am
@@ -2,30 +2,28 @@
## $Id$
##
-PGM = ${ARCH}/iostream.exe
-
MANAGERS = io
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.cc system.h
+rtems_tests_PROGRAMS = iostream.exe
+iostream_exe_SOURCES = init.cc system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = iostream.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = iostream.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+iostream_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(iostream_exe_OBJECTS) $(iostream_exe_LDADD)
+LINK_LIBS = $(iostream_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+iostream.exe$(EXEEXT): $(iostream_exe_OBJECTS) $(iostream_exe_DEPENDENCIES)
+ @rm -f iostream.exe$(EXEEXT)
+ $(make-exe)
$(make-cxx-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index 471b33628a..1cd69f6504 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -2,28 +2,25 @@
## $Id$
##
-PGM = ${ARCH}/loopback.exe
-
MANAGERS = io event
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c
+rtems_tests_PROGRAMS = loopback.exe
+loopback_exe_SOURCES = init.c
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = loopback.scn
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+loopback_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(loopback_exe_OBJECTS) $(loopback_exe_LDADD)
+LINK_LIBS = $(loopback_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+loopback.exe$(EXEEXT): $(loopback_exe_OBJECTS) $(loopback_exe_DEPENDENCIES)
+ @rm -f loopback.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index d9e2f52b52..e321b15028 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -2,32 +2,29 @@
## $Id$
##
-PGM = ${ARCH}/minimum.exe
-
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c
+rtems_tests_PROGRAMS = minimum.exe
+minimum_exe_SOURCES = init.c
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = minimum.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = minimum.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+minimum_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
# This test should not be executed
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(minimum_exe_OBJECTS) $(minimum_exe_LDADD)
+LINK_LIBS = $(minimum_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+minimum.exe$(EXEEXT): $(minimum_exe_OBJECTS) $(minimum_exe_DEPENDENCIES)
+ @rm -f minimum.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index 3509d54348..ca23ff87ea 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -2,34 +2,30 @@
## $Id$
##
-PGM = ${ARCH}/paranoia.exe
-
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c paranoia.c system.h
+rtems_tests_PROGRAMS = paranoia.exe
+paranoia_exe_SOURCES = init.c paranoia.c system.h
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = paranoia.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-
-$(PGM): ${ARCH}/$(dirstamp)
+paranoia_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
# -DCYGNUS turns on more verbose msgs
AM_CPPFLAGS += -DNOSIGNAL -DCYGNUS -DNOMAIN
-LD_LIBS = -lm
+paranoia_exe_LDLIBS = -lm
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(paranoia_exe_OBJECTS) $(paranoia_exe_LDADD)
+LINK_LIBS = $(paranoia_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+paranoia.exe$(EXEEXT): $(paranoia_exe_OBJECTS) $(paranoia_exe_DEPENDENCIES)
+ @rm -f paranoia.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index d7b37fd9e7..9aec709f6c 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -2,28 +2,24 @@
## $Id$
##
-PGM = ${ARCH}/pppd.exe
-
MANAGERS = io event semaphore
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c pppdapp.c netconfig.h system.h
-
-OBJS = $(lib_a_OBJECTS)
-
-testsdir = $(libdir)/tests
+rtems_tests_PROGRAMS = pppd.exe
+pppd_exe_SOURCES = init.c pppdapp.c netconfig.h system.h
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+pppd_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-LD_LIBS = -lpppd
+pppd_exe_LDLIBS = -lpppd
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(pppd_exe_OBJECTS) $(pppd_exe_LDADD)
+LINK_LIBS = $(pppd_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+pppd.exe$(EXEEXT): $(pppd_exe_OBJECTS) $(pppd_exe_DEPENDENCIES)
+ @rm -f pppd.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index 15ff8ad8d9..4676da5113 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -2,30 +2,27 @@
## $Id$
##
-PGM = ${ARCH}/ticker.exe
-
MANAGERS = io
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c tasks.c system.h
+rtems_tests_PROGRAMS = ticker.exe
+ticker_exe_SOURCES = init.c tasks.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = ticker.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = ticker.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+ticker_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(ticker_exe_OBJECTS) $(ticker_exe_LDADD)
+LINK_LIBS = $(ticker_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+ticker.exe$(EXEEXT): $(ticker_exe_OBJECTS) $(ticker_exe_DEPENDENCIES)
+ @rm -f ticker.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index 98c4f47934..0c512a634e 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -2,30 +2,27 @@
## $Id$
##
-PGM = ${ARCH}/unlimited.exe
-
MANAGERS = io event
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c test1.c test2.c test3.c system.h
+rtems_tests_PROGRAMS = unlimited.exe
+unlimited_exe_SOURCES = init.c test1.c test2.c test3.c system.h
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
dist_scn_DATA = unlimited.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = unlimited.doc
-OBJS = $(lib_a_OBJECTS)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+unlimited_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(unlimited_exe_OBJECTS) $(unlimited_exe_LDADD)
+LINK_LIBS = $(unlimited_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+unlimited.exe$(EXEEXT): $(unlimited_exe_OBJECTS) $(unlimited_exe_DEPENDENCIES)
+ @rm -f unlimited.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmitrontests/tmitronsem01/Makefile.am b/testsuites/tmitrontests/tmitronsem01/Makefile.am
index 1dc25aafc9..97305e4dff 100644
--- a/testsuites/tmitrontests/tmitronsem01/Makefile.am
+++ b/testsuites/tmitrontests/tmitronsem01/Makefile.am
@@ -4,30 +4,27 @@
MANAGERS = all
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = tmitronsem01.exe
+tmitronsem01_exe_SOURCES = init.c system.h
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
dist_doc_DATA = tmitronsem01.doc
-OBJS = $(lib_a_OBJECTS)
-
-PGM = ${ARCH}/tmitronsem01.exe
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
-$(PGM): ${ARCH}/$(dirstamp)
+tmitronsem01_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 = $(tmitronsem01_exe_OBJECTS) $(tmitronsem01_exe_LDADD)
+LINK_LIBS = $(tmitronsem01_exe_LDLIBS)
-$(PGM): $(OBJS) $(LINK_FILES)
+tmitronsem01.exe$(EXEEXT): $(tmitronsem01_exe_OBJECTS) $(tmitronsem01_exe_DEPENDENCIES)
+ @rm -f tmitronsem01.exe$(EXEEXT)
$(make-exe)
include $(top_srcdir)/../automake/local.am
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