summaryrefslogtreecommitdiffstats
path: root/testsuites/mptests
diff options
context:
space:
mode:
Diffstat (limited to 'testsuites/mptests')
-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
28 files changed, 252 insertions, 336 deletions
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