Eliminate _exe_/.exe.

28 files changed, 196 insertions, 196 deletions

diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am
index 8537fe4314..b98220a345 100644
--- a/testsuites/mptests/mp01/node1/Makefile.am
+++ b/testsuites/mptests/mp01/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp01-node1.exe
-mp01_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp01-node1
+mp01_node1_SOURCES = ../init.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp01-node1.scn
 dist_rtems_tests_DATA += mp01-node1.doc
@@ -17,13 +17,13 @@ include $(top_srcdir)/../automake/leaf.am
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-mp01_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp01_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(mp01_node1_exe_OBJECTS) $(mp01_node1_exe_LDADD)
-LINK_LIBS = $(mp01_node1_exe_LDLIBS)
+LINK_OBJS = $(mp01_node1_OBJECTS) $(mp01_node1_LDADD)
+LINK_LIBS = $(mp01_node1_LDLIBS)
 
-mp01-node1.exe$(EXEEXT): $(mp01_node1_exe_OBJECTS) $(mp01_node1_exe_DEPENDENCIES)
-	@rm -f mp01-node1.exe$(EXEEXT)
+mp01-node1$(EXEEXT): $(mp01_node1_OBJECTS) $(mp01_node1_DEPENDENCIES)
+	@rm -f mp01-node1$(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 6fe0b840ba..f7ed4e814d 100644
--- a/testsuites/mptests/mp01/node2/Makefile.am
+++ b/testsuites/mptests/mp01/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp01-node2.exe
-mp01_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp01-node2
+mp01_node2_SOURCES = ../init.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp01-node2.scn
 dist_rtems_tests_DATA += mp01-node2.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp01_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp01_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp01_node2_exe_OBJECTS) $(mp01_node2_exe_LDADD)
-LINK_LIBS = $(mp01_node2_exe_LDLIBS)
+LINK_OBJS = $(mp01_node2_OBJECTS) $(mp01_node2_LDADD)
+LINK_LIBS = $(mp01_node2_LDLIBS)
 
-mp01-node2.exe$(EXEEXT): $(mp01_node2_exe_OBJECTS) $(mp01_node2_exe_DEPENDENCIES)
-	@rm -f mp01-node2.exe$(EXEEXT)
+mp01-node2$(EXEEXT): $(mp01_node2_OBJECTS) $(mp01_node2_DEPENDENCIES)
+	@rm -f mp01-node2$(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 96b5310ecb..3b5b751e9a 100644
--- a/testsuites/mptests/mp02/node1/Makefile.am
+++ b/testsuites/mptests/mp02/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp02-node1.exe
-mp02_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp02-node1
+mp02_node1_SOURCES = ../init.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp02-node1.scn
 dist_rtems_tests_DATA += mp02-node1.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp02_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp02_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp02_node1_exe_OBJECTS) $(mp02_node1_exe_LDADD)
-LINK_LIBS = $(mp02_node1_exe_LDLIBS)
+LINK_OBJS = $(mp02_node1_OBJECTS) $(mp02_node1_LDADD)
+LINK_LIBS = $(mp02_node1_LDLIBS)
 
-mp02-node1.exe$(EXEEXT): $(mp02_node1_exe_OBJECTS) $(mp02_node1_exe_DEPENDENCIES)
-	@rm -f mp02-node1.exe$(EXEEXT)
+mp02-node1$(EXEEXT): $(mp02_node1_OBJECTS) $(mp02_node1_DEPENDENCIES)
+	@rm -f mp02-node1$(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 b5b720bdb9..9db734b11e 100644
--- a/testsuites/mptests/mp02/node2/Makefile.am
+++ b/testsuites/mptests/mp02/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp02-node2.exe
-mp02_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp02-node2
+mp02_node2_SOURCES = ../init.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp02-node2.scn
 dist_rtems_tests_DATA += mp02-node2.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp02_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp02_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp02_node2_exe_OBJECTS) $(mp02_node2_exe_LDADD)
-LINK_LIBS = $(mp02_node2_exe_LDLIBS)
+LINK_OBJS = $(mp02_node2_OBJECTS) $(mp02_node2_LDADD)
+LINK_LIBS = $(mp02_node2_LDLIBS)
 
-mp02-node2.exe$(EXEEXT): $(mp02_node2_exe_OBJECTS) $(mp02_node2_exe_DEPENDENCIES)
-	@rm -f mp02-node2.exe$(EXEEXT)
+mp02-node2$(EXEEXT): $(mp02_node2_OBJECTS) $(mp02_node2_DEPENDENCIES)
+	@rm -f mp02-node2$(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 566a5a8c5a..c6306effe6 100644
--- a/testsuites/mptests/mp03/node1/Makefile.am
+++ b/testsuites/mptests/mp03/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp03-node1.exe
-mp03_node1_exe_SOURCES = ../init.c ../task1.c ../delay.c ../system.h
+rtems_tests_PROGRAMS = mp03-node1
+mp03_node1_SOURCES = ../init.c ../task1.c ../delay.c ../system.h
 
 dist_rtems_tests_DATA = mp03-node1.scn
 dist_rtems_tests_DATA += mp03-node1.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp03_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp03_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp03_node1_exe_OBJECTS) $(mp03_node1_exe_LDADD)
-LINK_LIBS = $(mp03_node1_exe_LDLIBS)
+LINK_OBJS = $(mp03_node1_OBJECTS) $(mp03_node1_LDADD)
+LINK_LIBS = $(mp03_node1_LDLIBS)
 
-mp03-node1.exe$(EXEEXT): $(mp03_node1_exe_OBJECTS) $(mp03_node1_exe_DEPENDENCIES)
-	@rm -f mp03-node1.exe$(EXEEXT)
+mp03-node1$(EXEEXT): $(mp03_node1_OBJECTS) $(mp03_node1_DEPENDENCIES)
+	@rm -f mp03-node1$(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 266863a23b..84fc672ef7 100644
--- a/testsuites/mptests/mp03/node2/Makefile.am
+++ b/testsuites/mptests/mp03/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp03-node2.exe
-mp03_node2_exe_SOURCES = ../init.c ../delay.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp03-node2
+mp03_node2_SOURCES = ../init.c ../delay.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp03-node2.scn
 dist_rtems_tests_DATA += mp03-node2.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp03_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp03_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp03_node2_exe_OBJECTS) $(mp03_node2_exe_LDADD)
-LINK_LIBS = $(mp03_node2_exe_LDLIBS)
+LINK_OBJS = $(mp03_node2_OBJECTS) $(mp03_node2_LDADD)
+LINK_LIBS = $(mp03_node2_LDLIBS)
 
-mp03-node2.exe$(EXEEXT): $(mp03_node2_exe_OBJECTS) $(mp03_node2_exe_DEPENDENCIES)
-	@rm -f mp03-node2.exe$(EXEEXT)
+mp03-node2$(EXEEXT): $(mp03_node2_OBJECTS) $(mp03_node2_DEPENDENCIES)
+	@rm -f mp03-node2$(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 ae5b6a0bd3..3f0321b14b 100644
--- a/testsuites/mptests/mp04/node1/Makefile.am
+++ b/testsuites/mptests/mp04/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp04-node1.exe
-mp04_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp04-node1
+mp04_node1_SOURCES = ../init.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp04-node1.scn
 dist_rtems_tests_DATA += mp04-node1.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp04_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp04_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp04_node1_exe_OBJECTS) $(mp04_node1_exe_LDADD)
-LINK_LIBS = $(mp04_node1_exe_LDLIBS)
+LINK_OBJS = $(mp04_node1_OBJECTS) $(mp04_node1_LDADD)
+LINK_LIBS = $(mp04_node1_LDLIBS)
 
-mp04-node1.exe$(EXEEXT): $(mp04_node1_exe_OBJECTS) $(mp04_node1_exe_DEPENDENCIES)
-	@rm -f mp04-node1.exe$(EXEEXT)
+mp04-node1$(EXEEXT): $(mp04_node1_OBJECTS) $(mp04_node1_DEPENDENCIES)
+	@rm -f mp04-node1$(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 98fd156b22..1041015ce6 100644
--- a/testsuites/mptests/mp04/node2/Makefile.am
+++ b/testsuites/mptests/mp04/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp04-node2.exe
-mp04_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp04-node2
+mp04_node2_SOURCES = ../init.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp04-node2.scn
 dist_rtems_tests_DATA += mp04-node2.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp04_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp04_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp04_node2_exe_OBJECTS) $(mp04_node2_exe_LDADD)
-LINK_LIBS = $(mp04_node2_exe_LDLIBS)
+LINK_OBJS = $(mp04_node2_OBJECTS) $(mp04_node2_LDADD)
+LINK_LIBS = $(mp04_node2_LDLIBS)
 
-mp04-node2.exe$(EXEEXT): $(mp04_node2_exe_OBJECTS) $(mp04_node2_exe_DEPENDENCIES)
-	@rm -f mp04-node2.exe$(EXEEXT)
+mp04-node2$(EXEEXT): $(mp04_node2_OBJECTS) $(mp04_node2_DEPENDENCIES)
+	@rm -f mp04-node2$(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 f8b014c491..d4dc09fa08 100644
--- a/testsuites/mptests/mp05/node1/Makefile.am
+++ b/testsuites/mptests/mp05/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp05-node1.exe
-mp05_node1_exe_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp05-node1
+mp05_node1_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp05-node1.scn
 dist_rtems_tests_DATA += mp05-node1.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp05_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp05_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp05_node1_exe_OBJECTS) $(mp05_node1_exe_LDADD)
-LINK_LIBS = $(mp05_node1_exe_LDLIBS)
+LINK_OBJS = $(mp05_node1_OBJECTS) $(mp05_node1_LDADD)
+LINK_LIBS = $(mp05_node1_LDLIBS)
 
-mp05-node1.exe$(EXEEXT): $(mp05_node1_exe_OBJECTS) $(mp05_node1_exe_DEPENDENCIES)
-	@rm -f mp05-node1.exe$(EXEEXT)
+mp05-node1$(EXEEXT): $(mp05_node1_OBJECTS) $(mp05_node1_DEPENDENCIES)
+	@rm -f mp05-node1$(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 5a9ae06c47..c9281f7670 100644
--- a/testsuites/mptests/mp05/node2/Makefile.am
+++ b/testsuites/mptests/mp05/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp05-node2.exe
-mp05_node2_exe_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp05-node2
+mp05_node2_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp05-node2.scn
 dist_rtems_tests_DATA += mp05-node2.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp05_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp05_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp05_node2_exe_OBJECTS) $(mp05_node2_exe_LDADD)
-LINK_LIBS = $(mp05_node2_exe_LDLIBS)
+LINK_OBJS = $(mp05_node2_OBJECTS) $(mp05_node2_LDADD)
+LINK_LIBS = $(mp05_node2_LDLIBS)
 
-mp05-node2.exe$(EXEEXT): $(mp05_node2_exe_OBJECTS) $(mp05_node2_exe_DEPENDENCIES)
-	@rm -f mp05-node2.exe$(EXEEXT)
+mp05-node2$(EXEEXT): $(mp05_node2_OBJECTS) $(mp05_node2_DEPENDENCIES)
+	@rm -f mp05-node2$(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 fb019adaa5..6d786e8b91 100644
--- a/testsuites/mptests/mp06/node1/Makefile.am
+++ b/testsuites/mptests/mp06/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp06-node1.exe
-mp06_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp06-node1
+mp06_node1_SOURCES = ../init.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp06-node1.scn
 dist_rtems_tests_DATA += mp06-node1.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp06_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp06_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp06_node1_exe_OBJECTS) $(mp06_node1_exe_LDADD)
-LINK_LIBS = $(mp06_node1_exe_LDLIBS)
+LINK_OBJS = $(mp06_node1_OBJECTS) $(mp06_node1_LDADD)
+LINK_LIBS = $(mp06_node1_LDLIBS)
 
-mp06-node1.exe$(EXEEXT): $(mp06_node1_exe_OBJECTS) $(mp06_node1_exe_DEPENDENCIES)
-	@rm -f mp06-node1.exe$(EXEEXT)
+mp06-node1$(EXEEXT): $(mp06_node1_OBJECTS) $(mp06_node1_DEPENDENCIES)
+	@rm -f mp06-node1$(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 b2979fd759..79f15f2d99 100644
--- a/testsuites/mptests/mp06/node2/Makefile.am
+++ b/testsuites/mptests/mp06/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp06-node2.exe
-mp06_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp06-node2
+mp06_node2_SOURCES = ../init.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp06-node2.scn
 dist_rtems_tests_DATA += mp06-node2.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp06_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp06_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp06_node2_exe_OBJECTS) $(mp06_node2_exe_LDADD)
-LINK_LIBS = $(mp06_node2_exe_LDLIBS)
+LINK_OBJS = $(mp06_node2_OBJECTS) $(mp06_node2_LDADD)
+LINK_LIBS = $(mp06_node2_LDLIBS)
 
-mp06-node2.exe$(EXEEXT): $(mp06_node2_exe_OBJECTS) $(mp06_node2_exe_DEPENDENCIES)
-	@rm -f mp06-node2.exe$(EXEEXT)
+mp06-node2$(EXEEXT): $(mp06_node2_OBJECTS) $(mp06_node2_DEPENDENCIES)
+	@rm -f mp06-node2$(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 3e22e34852..881db82b70 100644
--- a/testsuites/mptests/mp07/node1/Makefile.am
+++ b/testsuites/mptests/mp07/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp07-node1.exe
-mp07_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp07-node1
+mp07_node1_SOURCES = ../init.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp07-node1.scn
 dist_rtems_tests_DATA += mp07-node1.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp07_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp07_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp07_node1_exe_OBJECTS) $(mp07_node1_exe_LDADD)
-LINK_LIBS = $(mp07_node1_exe_LDLIBS)
+LINK_OBJS = $(mp07_node1_OBJECTS) $(mp07_node1_LDADD)
+LINK_LIBS = $(mp07_node1_LDLIBS)
 
-mp07-node1.exe$(EXEEXT): $(mp07_node1_exe_OBJECTS) $(mp07_node1_exe_DEPENDENCIES)
-	@rm -f mp07-node1.exe$(EXEEXT)
+mp07-node1$(EXEEXT): $(mp07_node1_OBJECTS) $(mp07_node1_DEPENDENCIES)
+	@rm -f mp07-node1$(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 5261803831..fff2532f95 100644
--- a/testsuites/mptests/mp07/node2/Makefile.am
+++ b/testsuites/mptests/mp07/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp07-node2.exe
-mp07_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp07-node2
+mp07_node2_SOURCES = ../init.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp07-node2.scn
 dist_rtems_tests_DATA += mp07-node2.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp07_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp07_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp07_node2_exe_OBJECTS) $(mp07_node2_exe_LDADD)
-LINK_LIBS = $(mp07_node2_exe_LDLIBS)
+LINK_OBJS = $(mp07_node2_OBJECTS) $(mp07_node2_LDADD)
+LINK_LIBS = $(mp07_node2_LDLIBS)
 
-mp07-node2.exe$(EXEEXT): $(mp07_node2_exe_OBJECTS) $(mp07_node2_exe_DEPENDENCIES)
-	@rm -f mp07-node2.exe$(EXEEXT)
+mp07-node2$(EXEEXT): $(mp07_node2_OBJECTS) $(mp07_node2_DEPENDENCIES)
+	@rm -f mp07-node2$(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 4f89389e36..3cb9604f0f 100644
--- a/testsuites/mptests/mp08/node1/Makefile.am
+++ b/testsuites/mptests/mp08/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp08-node1.exe
-mp08_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp08-node1
+mp08_node1_SOURCES = ../init.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp08-node1.scn
 dist_rtems_tests_DATA += mp08-node1.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp08_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp08_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp08_node1_exe_OBJECTS) $(mp08_node1_exe_LDADD)
-LINK_LIBS = $(mp08_node1_exe_LDLIBS)
+LINK_OBJS = $(mp08_node1_OBJECTS) $(mp08_node1_LDADD)
+LINK_LIBS = $(mp08_node1_LDLIBS)
 
-mp08-node1.exe$(EXEEXT): $(mp08_node1_exe_OBJECTS) $(mp08_node1_exe_DEPENDENCIES)
-	@rm -f mp08-node1.exe$(EXEEXT)
+mp08-node1$(EXEEXT): $(mp08_node1_OBJECTS) $(mp08_node1_DEPENDENCIES)
+	@rm -f mp08-node1$(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 49829915da..75052dd8be 100644
--- a/testsuites/mptests/mp08/node2/Makefile.am
+++ b/testsuites/mptests/mp08/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp08-node2.exe
-mp08_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
+rtems_tests_PROGRAMS = mp08-node2
+mp08_node2_SOURCES = ../init.c ../task1.c ../system.h
 
 dist_rtems_tests_DATA = mp08-node2.scn
 dist_rtems_tests_DATA += mp08-node2.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp08_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp08_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp08_node2_exe_OBJECTS) $(mp08_node2_exe_LDADD)
-LINK_LIBS = $(mp08_node2_exe_LDLIBS)
+LINK_OBJS = $(mp08_node2_OBJECTS) $(mp08_node2_LDADD)
+LINK_LIBS = $(mp08_node2_LDLIBS)
 
-mp08-node2.exe$(EXEEXT): $(mp08_node2_exe_OBJECTS) $(mp08_node2_exe_DEPENDENCIES)
-	@rm -f mp08-node2.exe$(EXEEXT)
+mp08-node2$(EXEEXT): $(mp08_node2_OBJECTS) $(mp08_node2_DEPENDENCIES)
+	@rm -f mp08-node2$(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 e40107c103..04f9065dc5 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/mptests/mp09/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp09-node1.exe
-mp09_node1_exe_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
+rtems_tests_PROGRAMS = mp09-node1
+mp09_node1_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
 dist_rtems_tests_DATA = mp09-node1.scn
 dist_rtems_tests_DATA += mp09-node1.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp09_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp09_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp09_node1_exe_OBJECTS) $(mp09_node1_exe_LDADD)
-LINK_LIBS = $(mp09_node1_exe_LDLIBS)
+LINK_OBJS = $(mp09_node1_OBJECTS) $(mp09_node1_LDADD)
+LINK_LIBS = $(mp09_node1_LDLIBS)
 
-mp09-node1.exe$(EXEEXT): $(mp09_node1_exe_OBJECTS) $(mp09_node1_exe_DEPENDENCIES)
-	@rm -f mp09-node1.exe$(EXEEXT)
+mp09-node1$(EXEEXT): $(mp09_node1_OBJECTS) $(mp09_node1_DEPENDENCIES)
+	@rm -f mp09-node1$(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 bc19af7325..be82e36d7c 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/mptests/mp09/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp09-node2.exe
-mp09_node2_exe_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
+rtems_tests_PROGRAMS = mp09-node2
+mp09_node2_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
 dist_rtems_tests_DATA = mp09-node2.scn
 dist_rtems_tests_DATA += mp09-node2.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp09_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp09_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp09_node2_exe_OBJECTS) $(mp09_node2_exe_LDADD)
-LINK_LIBS = $(mp09_node2_exe_LDLIBS)
+LINK_OBJS = $(mp09_node2_OBJECTS) $(mp09_node2_LDADD)
+LINK_LIBS = $(mp09_node2_LDLIBS)
 
-mp09-node2.exe$(EXEEXT): $(mp09_node2_exe_OBJECTS) $(mp09_node2_exe_DEPENDENCIES)
-	@rm -f mp09-node2.exe$(EXEEXT)
+mp09-node2$(EXEEXT): $(mp09_node2_OBJECTS) $(mp09_node2_DEPENDENCIES)
+	@rm -f mp09-node2$(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 47d7f25221..e241d7a039 100644
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ b/testsuites/mptests/mp10/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp10-node1.exe
-mp10_node1_exe_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
+rtems_tests_PROGRAMS = mp10-node1
+mp10_node1_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
 
 dist_rtems_tests_DATA = mp10-node1.scn
 dist_rtems_tests_DATA += mp10-node1.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp10_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp10_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp10_node1_exe_OBJECTS) $(mp10_node1_exe_LDADD)
-LINK_LIBS = $(mp10_node1_exe_LDLIBS)
+LINK_OBJS = $(mp10_node1_OBJECTS) $(mp10_node1_LDADD)
+LINK_LIBS = $(mp10_node1_LDLIBS)
 
-mp10-node1.exe$(EXEEXT): $(mp10_node1_exe_OBJECTS) $(mp10_node1_exe_DEPENDENCIES)
-	@rm -f mp10-node1.exe$(EXEEXT)
+mp10-node1$(EXEEXT): $(mp10_node1_OBJECTS) $(mp10_node1_DEPENDENCIES)
+	@rm -f mp10-node1$(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 19390ae5ed..2678fdb8c5 100644
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ b/testsuites/mptests/mp10/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp10-node2.exe
-mp10_node2_exe_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
+rtems_tests_PROGRAMS = mp10-node2
+mp10_node2_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
 
 dist_rtems_tests_DATA = mp10-node2.scn
 dist_rtems_tests_DATA += mp10-node2.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp10_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp10_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp10_node2_exe_OBJECTS) $(mp10_node2_exe_LDADD)
-LINK_LIBS = $(mp10_node2_exe_LDLIBS)
+LINK_OBJS = $(mp10_node2_OBJECTS) $(mp10_node2_LDADD)
+LINK_LIBS = $(mp10_node2_LDLIBS)
 
-mp10-node2.exe$(EXEEXT): $(mp10_node2_exe_OBJECTS) $(mp10_node2_exe_DEPENDENCIES)
-	@rm -f mp10-node2.exe$(EXEEXT)
+mp10-node2$(EXEEXT): $(mp10_node2_OBJECTS) $(mp10_node2_DEPENDENCIES)
+	@rm -f mp10-node2$(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 01cda6bde5..8aed220b11 100644
--- a/testsuites/mptests/mp11/node1/Makefile.am
+++ b/testsuites/mptests/mp11/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp11-node1.exe
-mp11_node1_exe_SOURCES = ../init.c ../system.h
+rtems_tests_PROGRAMS = mp11-node1
+mp11_node1_SOURCES = ../init.c ../system.h
 
 dist_rtems_tests_DATA = mp11-node1.scn
 dist_rtems_tests_DATA += mp11-node1.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp11_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp11_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp11_node1_exe_OBJECTS) $(mp11_node1_exe_LDADD)
-LINK_LIBS = $(mp11_node1_exe_LDLIBS)
+LINK_OBJS = $(mp11_node1_OBJECTS) $(mp11_node1_LDADD)
+LINK_LIBS = $(mp11_node1_LDLIBS)
 
-mp11-node1.exe$(EXEEXT): $(mp11_node1_exe_OBJECTS) $(mp11_node1_exe_DEPENDENCIES)
-	@rm -f mp11-node1.exe$(EXEEXT)
+mp11-node1$(EXEEXT): $(mp11_node1_OBJECTS) $(mp11_node1_DEPENDENCIES)
+	@rm -f mp11-node1$(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 b5e353aaa6..2c0b59c6cc 100644
--- a/testsuites/mptests/mp11/node2/Makefile.am
+++ b/testsuites/mptests/mp11/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp11-node2.exe
-mp11_node2_exe_SOURCES = ../init.c ../system.h
+rtems_tests_PROGRAMS = mp11-node2
+mp11_node2_SOURCES = ../init.c ../system.h
 
 dist_rtems_tests_DATA = mp11-node2.scn
 dist_rtems_tests_DATA += mp11-node2.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp11_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp11_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp11_node2_exe_OBJECTS) $(mp11_node2_exe_LDADD)
-LINK_LIBS = $(mp11_node2_exe_LDLIBS)
+LINK_OBJS = $(mp11_node2_OBJECTS) $(mp11_node2_LDADD)
+LINK_LIBS = $(mp11_node2_LDLIBS)
 
-mp11-node2.exe$(EXEEXT): $(mp11_node2_exe_OBJECTS) $(mp11_node2_exe_DEPENDENCIES)
-	@rm -f mp11-node2.exe$(EXEEXT)
+mp11-node2$(EXEEXT): $(mp11_node2_OBJECTS) $(mp11_node2_DEPENDENCIES)
+	@rm -f mp11-node2$(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 47b28b94b6..9442e02b22 100644
--- a/testsuites/mptests/mp12/node1/Makefile.am
+++ b/testsuites/mptests/mp12/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp12-node1.exe
-mp12_node1_exe_SOURCES = ../init.c ../system.h
+rtems_tests_PROGRAMS = mp12-node1
+mp12_node1_SOURCES = ../init.c ../system.h
 
 dist_rtems_tests_DATA = mp12-node1.scn
 dist_rtems_tests_DATA += mp12-node1.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp12_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp12_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp12_node1_exe_OBJECTS) $(mp12_node1_exe_LDADD)
-LINK_LIBS = $(mp12_node1_exe_LDLIBS)
+LINK_OBJS = $(mp12_node1_OBJECTS) $(mp12_node1_LDADD)
+LINK_LIBS = $(mp12_node1_LDLIBS)
 
-mp12-node1.exe$(EXEEXT): $(mp12_node1_exe_OBJECTS) $(mp12_node1_exe_DEPENDENCIES)
-	@rm -f mp12-node1.exe$(EXEEXT)
+mp12-node1$(EXEEXT): $(mp12_node1_OBJECTS) $(mp12_node1_DEPENDENCIES)
+	@rm -f mp12-node1$(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 fb0d05f5e1..2f1af4146b 100644
--- a/testsuites/mptests/mp12/node2/Makefile.am
+++ b/testsuites/mptests/mp12/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp12-node2.exe
-mp12_node2_exe_SOURCES = ../init.c ../system.h
+rtems_tests_PROGRAMS = mp12-node2
+mp12_node2_SOURCES = ../init.c ../system.h
 
 dist_rtems_tests_DATA = mp12-node2.scn
 dist_rtems_tests_DATA += mp12-node2.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp12_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp12_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp12_node2_exe_OBJECTS) $(mp12_node2_exe_LDADD)
-LINK_LIBS = $(mp12_node2_exe_LDLIBS)
+LINK_OBJS = $(mp12_node2_OBJECTS) $(mp12_node2_LDADD)
+LINK_LIBS = $(mp12_node2_LDLIBS)
 
-mp12-node2.exe$(EXEEXT): $(mp12_node2_exe_OBJECTS) $(mp12_node2_exe_DEPENDENCIES)
-	@rm -f mp12-node2.exe$(EXEEXT)
+mp12-node2$(EXEEXT): $(mp12_node2_OBJECTS) $(mp12_node2_DEPENDENCIES)
+	@rm -f mp12-node2$(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 7720910f45..98d6ecff9b 100644
--- a/testsuites/mptests/mp13/node1/Makefile.am
+++ b/testsuites/mptests/mp13/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp13-node1.exe
-mp13_node1_exe_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
+rtems_tests_PROGRAMS = mp13-node1
+mp13_node1_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
 
 dist_rtems_tests_DATA = mp13-node1.scn
 dist_rtems_tests_DATA += mp13-node1.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp13_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp13_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp13_node1_exe_OBJECTS) $(mp13_node1_exe_LDADD)
-LINK_LIBS = $(mp13_node1_exe_LDLIBS)
+LINK_OBJS = $(mp13_node1_OBJECTS) $(mp13_node1_LDADD)
+LINK_LIBS = $(mp13_node1_LDLIBS)
 
-mp13-node1.exe$(EXEEXT): $(mp13_node1_exe_OBJECTS) $(mp13_node1_exe_DEPENDENCIES)
-	@rm -f mp13-node1.exe$(EXEEXT)
+mp13-node1$(EXEEXT): $(mp13_node1_OBJECTS) $(mp13_node1_DEPENDENCIES)
+	@rm -f mp13-node1$(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 aa47702cbd..85ed17d8fb 100644
--- a/testsuites/mptests/mp13/node2/Makefile.am
+++ b/testsuites/mptests/mp13/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp13-node2.exe
-mp13_node2_exe_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
+rtems_tests_PROGRAMS = mp13-node2
+mp13_node2_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
 
 dist_rtems_tests_DATA = mp13-node2.scn
 dist_rtems_tests_DATA += mp13-node2.doc
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp13_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp13_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(mp13_node2_exe_OBJECTS) $(mp13_node2_exe_LDADD)
-LINK_LIBS = $(mp13_node2_exe_LDLIBS)
+LINK_OBJS = $(mp13_node2_OBJECTS) $(mp13_node2_LDADD)
+LINK_LIBS = $(mp13_node2_LDLIBS)
 
-mp13-node2.exe$(EXEEXT): $(mp13_node2_exe_OBJECTS) $(mp13_node2_exe_DEPENDENCIES)
-	@rm -f mp13-node2.exe$(EXEEXT)
+mp13-node2$(EXEEXT): $(mp13_node2_OBJECTS) $(mp13_node2_DEPENDENCIES)
+	@rm -f mp13-node2$(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 1b95ac57d0..9cc96bdcae 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp14-node1.exe
-mp14_node1_exe_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
+rtems_tests_PROGRAMS = mp14-node1
+mp14_node1_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
     ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
 dist_rtems_tests_DATA = mp14-node1.scn
@@ -15,18 +15,18 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp14_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp14_node1_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
 
-LINK_OBJS = $(mp14_node1_exe_OBJECTS) $(mp14_node1_exe_LDADD)
-LINK_LIBS = $(mp14_node1_exe_LDLIBS)
+LINK_OBJS = $(mp14_node1_OBJECTS) $(mp14_node1_LDADD)
+LINK_LIBS = $(mp14_node1_LDLIBS)
 
-mp14-node1.exe$(EXEEXT): $(mp14_node1_exe_OBJECTS) $(mp14_node1_exe_DEPENDENCIES)
-	@rm -f mp14-node1.exe$(EXEEXT)
+mp14-node1$(EXEEXT): $(mp14_node1_OBJECTS) $(mp14_node1_DEPENDENCIES)
+	@rm -f mp14-node1$(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 954c689fa0..572d0b048e 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = mp14-node2.exe
-mp14_node2_exe_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
+rtems_tests_PROGRAMS = mp14-node2
+mp14_node2_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
     ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
 dist_rtems_tests_DATA = mp14-node2.scn
@@ -15,18 +15,18 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-mp14_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+mp14_node2_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
 
-LINK_OBJS = $(mp14_node2_exe_OBJECTS) $(mp14_node2_exe_LDADD)
-LINK_LIBS = $(mp14_node2_exe_LDLIBS)
+LINK_OBJS = $(mp14_node2_OBJECTS) $(mp14_node2_LDADD)
+LINK_LIBS = $(mp14_node2_LDLIBS)
 
-mp14-node2.exe$(EXEEXT): $(mp14_node2_exe_OBJECTS) $(mp14_node2_exe_DEPENDENCIES)
-	@rm -f mp14-node2.exe$(EXEEXT)
+mp14-node2$(EXEEXT): $(mp14_node2_OBJECTS) $(mp14_node2_DEPENDENCIES)
+	@rm -f mp14-node2$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am