Eliminate _exe_/.exe.

author: Ralf Corsepius <ralf.corsepius@rtems.org> 2009-04-03 12:55:13 +0000
committer: Ralf Corsepius <ralf.corsepius@rtems.org> 2009-04-03 12:55:13 +0000
commit: 3d5483771c21619e164e5a5cc308802027785dcc (patch)
tree: e5517f30599b1c7b69c80a159ccae6851146508e /testsuites
parent: 2009-04-03 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
download: rtems-3d5483771c21619e164e5a5cc308802027785dcc.tar.bz2
190 files changed, 1331 insertions, 1331 deletions
diff --git a/testsuites/itrontests/itronhello/Makefile.am b/testsuites/itrontests/itronhello/Makefile.am
index b5d7d54c98..9ad8162204 100644
--- a/testsuites/itrontests/itronhello/Makefile.am
+++ b/testsuites/itrontests/itronhello/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = itronhello.exe
-itronhello_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itronhello
+itronhello_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = itronhello.scn
 dist_rtems_tests_DATA += itronhello.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-itronhello_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+itronhello_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(itronhello_exe_OBJECTS) $(itronhello_exe_LDADD)
-LINK_LIBS = $(itronhello_exe_LDLIBS)
+LINK_OBJS = $(itronhello_OBJECTS) $(itronhello_LDADD)
+LINK_LIBS = $(itronhello_LDLIBS)
 
-itronhello.exe$(EXEEXT): $(itronhello_exe_OBJECTS) $(itronhello_exe_DEPENDENCIES)
-	@rm -f itronhello.exe$(EXEEXT)
+itronhello$(EXEEXT): $(itronhello_OBJECTS) $(itronhello_DEPENDENCIES)
+	@rm -f itronhello$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itronmbf01/Makefile.am b/testsuites/itrontests/itronmbf01/Makefile.am
index fa1ffbdcb6..7c784d07e7 100644
--- a/testsuites/itrontests/itronmbf01/Makefile.am
+++ b/testsuites/itrontests/itronmbf01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = itronmbf01.exe
-itronmbf01_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itronmbf01
+itronmbf01_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = itronmbf01.scn
 dist_rtems_tests_DATA += itronmbf01.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-itronmbf01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+itronmbf01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(itronmbf01_exe_OBJECTS) $(itronmbf01_exe_LDADD)
-LINK_LIBS = $(itronmbf01_exe_LDLIBS)
+LINK_OBJS = $(itronmbf01_OBJECTS) $(itronmbf01_LDADD)
+LINK_LIBS = $(itronmbf01_LDLIBS)
 
-itronmbf01.exe$(EXEEXT): $(itronmbf01_exe_OBJECTS) $(itronmbf01_exe_DEPENDENCIES)
-	@rm -f itronmbf01.exe$(EXEEXT)
+itronmbf01$(EXEEXT): $(itronmbf01_OBJECTS) $(itronmbf01_DEPENDENCIES)
+	@rm -f itronmbf01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itronmbox01/Makefile.am b/testsuites/itrontests/itronmbox01/Makefile.am
index 8a7e2fbeea..31cc5216eb 100644
--- a/testsuites/itrontests/itronmbox01/Makefile.am
+++ b/testsuites/itrontests/itronmbox01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = itronmbox01.exe
-itronmbox01_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itronmbox01
+itronmbox01_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = itronmbox01.scn
 dist_rtems_tests_DATA += itronmbox01.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-itronmbox01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+itronmbox01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(itronmbox01_exe_OBJECTS) $(itronmbox01_exe_LDADD)
-LINK_LIBS = $(itronmbox01_exe_LDLIBS)
+LINK_OBJS = $(itronmbox01_OBJECTS) $(itronmbox01_LDADD)
+LINK_LIBS = $(itronmbox01_LDLIBS)
 
-itronmbox01.exe$(EXEEXT): $(itronmbox01_exe_OBJECTS) $(itronmbox01_exe_DEPENDENCIES)
-	@rm -f itronmbox01.exe$(EXEEXT)
+itronmbox01$(EXEEXT): $(itronmbox01_OBJECTS) $(itronmbox01_DEPENDENCIES)
+	@rm -f itronmbox01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itronsem01/Makefile.am b/testsuites/itrontests/itronsem01/Makefile.am
index e26cf7d33a..a303ff0c06 100644
--- a/testsuites/itrontests/itronsem01/Makefile.am
+++ b/testsuites/itrontests/itronsem01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = itronsem01.exe
-itronsem01_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itronsem01
+itronsem01_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = itronsem01.scn
 dist_rtems_tests_DATA += itronsem01.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-itronsem01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+itronsem01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(itronsem01_exe_OBJECTS) $(itronsem01_exe_LDADD)
-LINK_LIBS = $(itronsem01_exe_LDLIBS)
+LINK_OBJS = $(itronsem01_OBJECTS) $(itronsem01_LDADD)
+LINK_LIBS = $(itronsem01_LDLIBS)
 
-itronsem01.exe$(EXEEXT): $(itronsem01_exe_OBJECTS) $(itronsem01_exe_DEPENDENCIES)
-	@rm -f itronsem01.exe$(EXEEXT)
+itronsem01$(EXEEXT): $(itronsem01_OBJECTS) $(itronsem01_DEPENDENCIES)
+	@rm -f itronsem01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask01/Makefile.am b/testsuites/itrontests/itrontask01/Makefile.am
index 21ba64d682..57ff06cb17 100644
--- a/testsuites/itrontests/itrontask01/Makefile.am
+++ b/testsuites/itrontests/itrontask01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = itrontask01.exe
-itrontask01_exe_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = itrontask01
+itrontask01_SOURCES = init.c task1.c system.h
 
 dist_rtems_tests_DATA = itrontask01.scn
 dist_rtems_tests_DATA += itrontask01.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-itrontask01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+itrontask01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(itrontask01_exe_OBJECTS) $(itrontask01_exe_LDADD)
-LINK_LIBS = $(itrontask01_exe_LDLIBS)
+LINK_OBJS = $(itrontask01_OBJECTS) $(itrontask01_LDADD)
+LINK_LIBS = $(itrontask01_LDLIBS)
 
-itrontask01.exe$(EXEEXT): $(itrontask01_exe_OBJECTS) $(itrontask01_exe_DEPENDENCIES)
-	@rm -f itrontask01.exe$(EXEEXT)
+itrontask01$(EXEEXT): $(itrontask01_OBJECTS) $(itrontask01_DEPENDENCIES)
+	@rm -f itrontask01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask02/Makefile.am b/testsuites/itrontests/itrontask02/Makefile.am
index d5a0313423..4ce8357798 100644
--- a/testsuites/itrontests/itrontask02/Makefile.am
+++ b/testsuites/itrontests/itrontask02/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = itrontask02.exe
-itrontask02_exe_SOURCES = init.c dormant.c system.h
+rtems_tests_PROGRAMS = itrontask02
+itrontask02_SOURCES = init.c dormant.c system.h
 
 dist_rtems_tests_DATA = itrontask02.scn
 dist_rtems_tests_DATA += itrontask02.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-itrontask02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+itrontask02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(itrontask02_exe_OBJECTS) $(itrontask02_exe_LDADD)
-LINK_LIBS = $(itrontask02_exe_LDLIBS)
+LINK_OBJS = $(itrontask02_OBJECTS) $(itrontask02_LDADD)
+LINK_LIBS = $(itrontask02_LDLIBS)
 
-itrontask02.exe$(EXEEXT): $(itrontask02_exe_OBJECTS) $(itrontask02_exe_DEPENDENCIES)
-	@rm -f itrontask02.exe$(EXEEXT)
+itrontask02$(EXEEXT): $(itrontask02_OBJECTS) $(itrontask02_DEPENDENCIES)
+	@rm -f itrontask02$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask03/Makefile.am b/testsuites/itrontests/itrontask03/Makefile.am
index 9d8d5f79d6..5d4a514977 100644
--- a/testsuites/itrontests/itrontask03/Makefile.am
+++ b/testsuites/itrontests/itrontask03/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = itrontask03.exe
-itrontask03_exe_SOURCES = init.c preempt.c task1.c task2.c task3.c system.h
+rtems_tests_PROGRAMS = itrontask03
+itrontask03_SOURCES = init.c preempt.c task1.c task2.c task3.c system.h
 
 dist_rtems_tests_DATA = itrontask03.scn
 dist_rtems_tests_DATA += itrontask03.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-itrontask03_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+itrontask03_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(itrontask03_exe_OBJECTS) $(itrontask03_exe_LDADD)
-LINK_LIBS = $(itrontask03_exe_LDLIBS)
+LINK_OBJS = $(itrontask03_OBJECTS) $(itrontask03_LDADD)
+LINK_LIBS = $(itrontask03_LDLIBS)
 
-itrontask03.exe$(EXEEXT): $(itrontask03_exe_OBJECTS) $(itrontask03_exe_DEPENDENCIES)
-	@rm -f itrontask03.exe$(EXEEXT)
+itrontask03$(EXEEXT): $(itrontask03_OBJECTS) $(itrontask03_DEPENDENCIES)
+	@rm -f itrontask03$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask04/Makefile.am b/testsuites/itrontests/itrontask04/Makefile.am
index 0f08d07d0a..9d9673b19e 100644
--- a/testsuites/itrontests/itrontask04/Makefile.am
+++ b/testsuites/itrontests/itrontask04/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = itrontask04.exe
-itrontask04_exe_SOURCES = init.c task1.c task2.c task3.c system.h
+rtems_tests_PROGRAMS = itrontask04
+itrontask04_SOURCES = init.c task1.c task2.c task3.c system.h
 
 dist_rtems_tests_DATA = itrontask04.scn
 dist_rtems_tests_DATA += itrontask04.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-itrontask04_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+itrontask04_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(itrontask04_exe_OBJECTS) $(itrontask04_exe_LDADD)
-LINK_LIBS = $(itrontask04_exe_LDLIBS)
+LINK_OBJS = $(itrontask04_OBJECTS) $(itrontask04_LDADD)
+LINK_LIBS = $(itrontask04_LDLIBS)
 
-itrontask04.exe$(EXEEXT): $(itrontask04_exe_OBJECTS) $(itrontask04_exe_DEPENDENCIES)
-	@rm -f itrontask04.exe$(EXEEXT)
+itrontask04$(EXEEXT): $(itrontask04_OBJECTS) $(itrontask04_DEPENDENCIES)
+	@rm -f itrontask04$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontime01/Makefile.am b/testsuites/itrontests/itrontime01/Makefile.am
index 6a4c37a1f4..61654d861f 100644
--- a/testsuites/itrontests/itrontime01/Makefile.am
+++ b/testsuites/itrontests/itrontime01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = itrontime01.exe
-itrontime01_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itrontime01
+itrontime01_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = itrontime01.scn
 dist_rtems_tests_DATA += itrontime01.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-itrontime01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+itrontime01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(itrontime01_exe_OBJECTS) $(itrontime01_exe_LDADD)
-LINK_LIBS = $(itrontime01_exe_LDLIBS)
+LINK_OBJS = $(itrontime01_OBJECTS) $(itrontime01_LDADD)
+LINK_LIBS = $(itrontime01_LDLIBS)
 
-itrontime01.exe$(EXEEXT): $(itrontime01_exe_OBJECTS) $(itrontime01_exe_DEPENDENCIES)
-	@rm -f itrontime01.exe$(EXEEXT)
+itrontime01$(EXEEXT): $(itrontime01_OBJECTS) $(itrontime01_DEPENDENCIES)
+	@rm -f itrontime01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/cpuuse/Makefile.am b/testsuites/libtests/cpuuse/Makefile.am
index 72906c045a..0b31a92d46 100644
--- a/testsuites/libtests/cpuuse/Makefile.am
+++ b/testsuites/libtests/cpuuse/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io rate_monotonic semaphore extension
 
-rtems_tests_PROGRAMS = cpuuse.exe
-cpuuse_exe_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
+rtems_tests_PROGRAMS = cpuuse
+cpuuse_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
 
 dist_rtems_tests_DATA = cpuuse.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-cpuuse_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+cpuuse_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(cpuuse_exe_OBJECTS) $(cpuuse_exe_LDADD)
-LINK_LIBS = $(cpuuse_exe_LDLIBS)
+LINK_OBJS = $(cpuuse_OBJECTS) $(cpuuse_LDADD)
+LINK_LIBS = $(cpuuse_LDLIBS)
 
-cpuuse.exe$(EXEEXT): $(cpuuse_exe_OBJECTS) $(cpuuse_exe_DEPENDENCIES)
-	@rm -f cpuuse.exe$(EXEEXT)
+cpuuse$(EXEEXT): $(cpuuse_OBJECTS) $(cpuuse_DEPENDENCIES)
+	@rm -f cpuuse$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/malloctest/Makefile.am b/testsuites/libtests/malloctest/Makefile.am
index 05e9b9043d..673dac457e 100644
--- a/testsuites/libtests/malloctest/Makefile.am
+++ b/testsuites/libtests/malloctest/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = malloctest.exe
-malloctest_exe_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = malloctest
+malloctest_SOURCES = init.c task1.c system.h
 
 dist_rtems_tests_DATA = malloctest.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-malloctest_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+malloctest_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(malloctest_exe_OBJECTS) $(malloctest_exe_LDADD)
-LINK_LIBS = $(malloctest_exe_LDLIBS)
+LINK_OBJS = $(malloctest_OBJECTS) $(malloctest_LDADD)
+LINK_LIBS = $(malloctest_LDLIBS)
 
-malloctest.exe$(EXEEXT): $(malloctest_exe_OBJECTS) $(malloctest_exe_DEPENDENCIES)
-	@rm -f malloctest.exe$(EXEEXT)
+malloctest$(EXEEXT): $(malloctest_OBJECTS) $(malloctest_DEPENDENCIES)
+	@rm -f malloctest$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/monitor/Makefile.am b/testsuites/libtests/monitor/Makefile.am
index ff8cd8e222..202c337684 100644
--- a/testsuites/libtests/monitor/Makefile.am
+++ b/testsuites/libtests/monitor/Makefile.am
@@ -5,22 +5,22 @@
 MANAGERS = dpmem event io msg mp part region sem signal timer rate_monotonic \
     ext
 
-rtems_tests_PROGRAMS = monitor.exe
-monitor_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = monitor
+monitor_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
 
-monitor_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+monitor_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(monitor_exe_OBJECTS) $(monitor_exe_LDADD)
-LINK_LIBS = $(monitor_exe_LDLIBS)
+LINK_OBJS = $(monitor_OBJECTS) $(monitor_LDADD)
+LINK_LIBS = $(monitor_LDLIBS)
 
-monitor.exe$(EXEEXT): $(monitor_exe_OBJECTS) $(monitor_exe_DEPENDENCIES)
-	@rm -f monitor.exe$(EXEEXT)
+monitor$(EXEEXT): $(monitor_OBJECTS) $(monitor_DEPENDENCIES)
+	@rm -f monitor$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/monitor02/Makefile.am b/testsuites/libtests/monitor02/Makefile.am
index fa89b64520..2792026063 100644
--- a/testsuites/libtests/monitor02/Makefile.am
+++ b/testsuites/libtests/monitor02/Makefile.am
@@ -5,22 +5,22 @@
 MANAGERS = dpmem event io msg mp part region sem signal timer rate_monotonic \
     ext
 
-rtems_tests_PROGRAMS = monitor02.exe
-monitor02_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = monitor02
+monitor02_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
 
-monitor02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+monitor02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(monitor02_exe_OBJECTS) $(monitor02_exe_LDADD)
-LINK_LIBS = $(monitor02_exe_LDLIBS)
+LINK_OBJS = $(monitor02_OBJECTS) $(monitor02_LDADD)
+LINK_LIBS = $(monitor02_LDLIBS)
 
-monitor02.exe$(EXEEXT): $(monitor02_exe_OBJECTS) $(monitor02_exe_DEPENDENCIES)
-	@rm -f monitor02.exe$(EXEEXT)
+monitor02$(EXEEXT): $(monitor02_OBJECTS) $(monitor02_DEPENDENCIES)
+	@rm -f monitor02$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/putenvtest/Makefile.am b/testsuites/libtests/putenvtest/Makefile.am
index cf59944c2c..87d0849699 100644
--- a/testsuites/libtests/putenvtest/Makefile.am
+++ b/testsuites/libtests/putenvtest/Makefile.am
@@ -4,22 +4,22 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = putenvtest.exe
-putenvtest_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = putenvtest
+putenvtest_SOURCES = init.c
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-putenvtest_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+putenvtest_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(putenvtest_exe_OBJECTS) $(putenvtest_exe_LDADD)
-LINK_LIBS = $(putenvtest_exe_LDLIBS)
+LINK_OBJS = $(putenvtest_OBJECTS) $(putenvtest_LDADD)
+LINK_LIBS = $(putenvtest_LDLIBS)
 
-putenvtest.exe$(EXEEXT): $(putenvtest_exe_OBJECTS) $(putenvtest_exe_DEPENDENCIES)
-	@rm -f putenvtest.exe$(EXEEXT)
+putenvtest$(EXEEXT): $(putenvtest_OBJECTS) $(putenvtest_DEPENDENCIES)
+	@rm -f putenvtest$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/rtems++/Makefile.am b/testsuites/libtests/rtems++/Makefile.am
index 71b920cb4e..d618ab862d 100644
--- a/testsuites/libtests/rtems++/Makefile.am
+++ b/testsuites/libtests/rtems++/Makefile.am
@@ -5,8 +5,8 @@
 MANAGERS = event io msg sem signal timer rate_monotonic
 
 if HAS_CXX
-rtems_tests_PROGRAMS = rtems++.exe
-rtems___exe_SOURCES = Init.cc Task1.cc Task2.cc Task3.cc System.h
+rtems_tests_PROGRAMS = rtems++
+rtems___SOURCES = Init.cc Task1.cc Task2.cc Task3.cc System.h
 endif
 
 dist_rtems_tests_DATA = rtems++.scn
@@ -17,16 +17,16 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
 if HAS_CXX
-rtems___exe_LDLIBS = -lrtems++
+rtems___LDLIBS = -lrtems++
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-rtems___exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+rtems___LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(rtems___exe_OBJECTS) $(rtems___exe_LDADD)
-LINK_LIBS = $(rtems___exe_LDLIBS)
+LINK_OBJS = $(rtems___OBJECTS) $(rtems___LDADD)
+LINK_LIBS = $(rtems___LDLIBS)
 
-rtems++.exe$(EXEEXT): $(rtems___exe_OBJECTS) $(rtems___exe_DEPENDENCIES)
-	@rm -f rtems++.exe$(EXEEXT)
+rtems++$(EXEEXT): $(rtems___OBJECTS) $(rtems___DEPENDENCIES)
+	@rm -f rtems++$(EXEEXT)
 	$(make-cxx-exe)
 endif
 
diff --git a/testsuites/libtests/rtmonuse/Makefile.am b/testsuites/libtests/rtmonuse/Makefile.am
index 633ddea086..14a730fab5 100644
--- a/testsuites/libtests/rtmonuse/Makefile.am
+++ b/testsuites/libtests/rtmonuse/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io rate_monotonic semaphore
 
-rtems_tests_PROGRAMS = rtmonuse.exe
-rtmonuse_exe_SOURCES = init.c getall.c task1.c system.h
+rtems_tests_PROGRAMS = rtmonuse
+rtmonuse_SOURCES = init.c getall.c task1.c system.h
 
 dist_rtems_tests_DATA = rtmonuse.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-rtmonuse_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+rtmonuse_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(rtmonuse_exe_OBJECTS) $(rtmonuse_exe_LDADD)
-LINK_LIBS = $(rtmonuse_exe_LDLIBS)
+LINK_OBJS = $(rtmonuse_OBJECTS) $(rtmonuse_LDADD)
+LINK_LIBS = $(rtmonuse_LDLIBS)
 
-rtmonuse.exe$(EXEEXT): $(rtmonuse_exe_OBJECTS) $(rtmonuse_exe_DEPENDENCIES)
-	@rm -f rtmonuse.exe$(EXEEXT)
+rtmonuse$(EXEEXT): $(rtmonuse_OBJECTS) $(rtmonuse_DEPENDENCIES)
+	@rm -f rtmonuse$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/stackchk/Makefile.am b/testsuites/libtests/stackchk/Makefile.am
index c827a75abb..ee2b19af47 100644
--- a/testsuites/libtests/stackchk/Makefile.am
+++ b/testsuites/libtests/stackchk/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = stackchk.exe
-stackchk_exe_SOURCES = blow.c init.c task1.c system.h
+rtems_tests_PROGRAMS = stackchk
+stackchk_SOURCES = blow.c init.c task1.c system.h
 
 dist_rtems_tests_DATA = stackchk.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-stackchk_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+stackchk_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(stackchk_exe_OBJECTS) $(stackchk_exe_LDADD)
-LINK_LIBS = $(stackchk_exe_LDLIBS)
+LINK_OBJS = $(stackchk_OBJECTS) $(stackchk_LDADD)
+LINK_LIBS = $(stackchk_LDLIBS)
 
-stackchk.exe$(EXEEXT): $(stackchk_exe_OBJECTS) $(stackchk_exe_DEPENDENCIES)
-	@rm -f stackchk.exe$(EXEEXT)
+stackchk$(EXEEXT): $(stackchk_OBJECTS) $(stackchk_DEPENDENCIES)
+	@rm -f stackchk$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/termios/Makefile.am b/testsuites/libtests/termios/Makefile.am
index 38583ce765..c53fc9347a 100644
--- a/testsuites/libtests/termios/Makefile.am
+++ b/testsuites/libtests/termios/Makefile.am
@@ -4,22 +4,22 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = termios.exe
-termios_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = termios
+termios_SOURCES = init.c
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-termios_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+termios_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(termios_exe_OBJECTS) $(termios_exe_LDADD)
-LINK_LIBS = $(termios_exe_LDLIBS)
+LINK_OBJS = $(termios_OBJECTS) $(termios_LDADD)
+LINK_LIBS = $(termios_LDLIBS)
 
-termios.exe$(EXEEXT): $(termios_exe_OBJECTS) $(termios_exe_DEPENDENCIES)
-	@rm -f termios.exe$(EXEEXT)
+termios$(EXEEXT): $(termios_OBJECTS) $(termios_DEPENDENCIES)
+	@rm -f termios$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/tztest/Makefile.am b/testsuites/libtests/tztest/Makefile.am
index ec5356bd8e..f5ce3acba5 100644
--- a/testsuites/libtests/tztest/Makefile.am
+++ b/testsuites/libtests/tztest/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = tztest.exe
-tztest_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = tztest
+tztest_SOURCES = init.c
 
 dist_rtems_tests_DATA = tztest.scn
 
@@ -15,11 +15,11 @@ include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(tztest_exe_OBJECTS) $(tztest_exe_LDADD)
-LINK_LIBS = $(tztest_exe_LDLIBS)
+LINK_OBJS = $(tztest_OBJECTS) $(tztest_LDADD)
+LINK_LIBS = $(tztest_LDLIBS)
 
-tztest.exe$(EXEEXT): $(tztest_exe_OBJECTS) $(tztest_exe_DEPENDENCIES)
-	@rm -f tztest.exe$(EXEEXT)
+tztest$(EXEEXT): $(tztest_OBJECTS) $(tztest_DEPENDENCIES)
+	@rm -f tztest$(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 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
diff --git a/testsuites/psxtests/psx01/Makefile.am b/testsuites/psxtests/psx01/Makefile.am
index 638f1f59cf..40911591f3 100644
--- a/testsuites/psxtests/psx01/Makefile.am
+++ b/testsuites/psxtests/psx01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx01.exe
-psx01_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx01
+psx01_SOURCES = init.c task.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx01.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx01_exe_OBJECTS) $(psx01_exe_LDADD)
-LINK_LIBS = $(psx01_exe_LDLIBS)
+LINK_OBJS = $(psx01_OBJECTS) $(psx01_LDADD)
+LINK_LIBS = $(psx01_LDLIBS)
 
-psx01.exe$(EXEEXT): $(psx01_exe_OBJECTS) $(psx01_exe_DEPENDENCIES)
-	@rm -f psx01.exe$(EXEEXT)
+psx01$(EXEEXT): $(psx01_OBJECTS) $(psx01_DEPENDENCIES)
+	@rm -f psx01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx02/Makefile.am b/testsuites/psxtests/psx02/Makefile.am
index 2dc0d54129..d47b564eb6 100644
--- a/testsuites/psxtests/psx02/Makefile.am
+++ b/testsuites/psxtests/psx02/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx02.exe
-psx02_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx02
+psx02_SOURCES = init.c task.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx02.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx02_exe_OBJECTS) $(psx02_exe_LDADD)
-LINK_LIBS = $(psx02_exe_LDLIBS)
+LINK_OBJS = $(psx02_OBJECTS) $(psx02_LDADD)
+LINK_LIBS = $(psx02_LDLIBS)
 
-psx02.exe$(EXEEXT): $(psx02_exe_OBJECTS) $(psx02_exe_DEPENDENCIES)
-	@rm -f psx02.exe$(EXEEXT)
+psx02$(EXEEXT): $(psx02_OBJECTS) $(psx02_DEPENDENCIES)
+	@rm -f psx02$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx03/Makefile.am b/testsuites/psxtests/psx03/Makefile.am
index 3d74745134..aed0b946a7 100644
--- a/testsuites/psxtests/psx03/Makefile.am
+++ b/testsuites/psxtests/psx03/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx03.exe
-psx03_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx03
+psx03_SOURCES = init.c task.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx03.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx03_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx03_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx03_exe_OBJECTS) $(psx03_exe_LDADD)
-LINK_LIBS = $(psx03_exe_LDLIBS)
+LINK_OBJS = $(psx03_OBJECTS) $(psx03_LDADD)
+LINK_LIBS = $(psx03_LDLIBS)
 
-psx03.exe$(EXEEXT): $(psx03_exe_OBJECTS) $(psx03_exe_DEPENDENCIES)
-	@rm -f psx03.exe$(EXEEXT)
+psx03$(EXEEXT): $(psx03_OBJECTS) $(psx03_DEPENDENCIES)
+	@rm -f psx03$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx04/Makefile.am b/testsuites/psxtests/psx04/Makefile.am
index 424af74777..1ae6abaebf 100644
--- a/testsuites/psxtests/psx04/Makefile.am
+++ b/testsuites/psxtests/psx04/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx04.exe
-psx04_exe_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx04
+psx04_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx04.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx04_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx04_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx04_exe_OBJECTS) $(psx04_exe_LDADD)
-LINK_LIBS = $(psx04_exe_LDLIBS)
+LINK_OBJS = $(psx04_OBJECTS) $(psx04_LDADD)
+LINK_LIBS = $(psx04_LDLIBS)
 
-psx04.exe$(EXEEXT): $(psx04_exe_OBJECTS) $(psx04_exe_DEPENDENCIES)
-	@rm -f psx04.exe$(EXEEXT)
+psx04$(EXEEXT): $(psx04_OBJECTS) $(psx04_DEPENDENCIES)
+	@rm -f psx04$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx05/Makefile.am b/testsuites/psxtests/psx05/Makefile.am
index 8b81c779e6..206c4cd9fc 100644
--- a/testsuites/psxtests/psx05/Makefile.am
+++ b/testsuites/psxtests/psx05/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx05.exe
-psx05_exe_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx05
+psx05_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx05.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx05_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx05_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx05_exe_OBJECTS) $(psx05_exe_LDADD)
-LINK_LIBS = $(psx05_exe_LDLIBS)
+LINK_OBJS = $(psx05_OBJECTS) $(psx05_LDADD)
+LINK_LIBS = $(psx05_LDLIBS)
 
-psx05.exe$(EXEEXT): $(psx05_exe_OBJECTS) $(psx05_exe_DEPENDENCIES)
-	@rm -f psx05.exe$(EXEEXT)
+psx05$(EXEEXT): $(psx05_OBJECTS) $(psx05_DEPENDENCIES)
+	@rm -f psx05$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx06/Makefile.am b/testsuites/psxtests/psx06/Makefile.am
index 044f5df0f2..a5850654e2 100644
--- a/testsuites/psxtests/psx06/Makefile.am
+++ b/testsuites/psxtests/psx06/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx06.exe
-psx06_exe_SOURCES = init.c task.c task2.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx06
+psx06_SOURCES = init.c task.c task2.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx06.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx06_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx06_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx06_exe_OBJECTS) $(psx06_exe_LDADD)
-LINK_LIBS = $(psx06_exe_LDLIBS)
+LINK_OBJS = $(psx06_OBJECTS) $(psx06_LDADD)
+LINK_LIBS = $(psx06_LDLIBS)
 
-psx06.exe$(EXEEXT): $(psx06_exe_OBJECTS) $(psx06_exe_DEPENDENCIES)
-	@rm -f psx06.exe$(EXEEXT)
+psx06$(EXEEXT): $(psx06_OBJECTS) $(psx06_DEPENDENCIES)
+	@rm -f psx06$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx07/Makefile.am b/testsuites/psxtests/psx07/Makefile.am
index f2f31127af..9169743b90 100644
--- a/testsuites/psxtests/psx07/Makefile.am
+++ b/testsuites/psxtests/psx07/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx07.exe
-psx07_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx07
+psx07_SOURCES = init.c task.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx07.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx07_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx07_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx07_exe_OBJECTS) $(psx07_exe_LDADD)
-LINK_LIBS = $(psx07_exe_LDLIBS)
+LINK_OBJS = $(psx07_OBJECTS) $(psx07_LDADD)
+LINK_LIBS = $(psx07_LDLIBS)
 
-psx07.exe$(EXEEXT): $(psx07_exe_OBJECTS) $(psx07_exe_DEPENDENCIES)
-	@rm -f psx07.exe$(EXEEXT)
+psx07$(EXEEXT): $(psx07_OBJECTS) $(psx07_DEPENDENCIES)
+	@rm -f psx07$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx08/Makefile.am b/testsuites/psxtests/psx08/Makefile.am
index 0d0cadbc25..4d28da8a6c 100644
--- a/testsuites/psxtests/psx08/Makefile.am
+++ b/testsuites/psxtests/psx08/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx08.exe
-psx08_exe_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx08
+psx08_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx08.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx08_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx08_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx08_exe_OBJECTS) $(psx08_exe_LDADD)
-LINK_LIBS = $(psx08_exe_LDLIBS)
+LINK_OBJS = $(psx08_OBJECTS) $(psx08_LDADD)
+LINK_LIBS = $(psx08_LDLIBS)
 
-psx08.exe$(EXEEXT): $(psx08_exe_OBJECTS) $(psx08_exe_DEPENDENCIES)
-	@rm -f psx08.exe$(EXEEXT)
+psx08$(EXEEXT): $(psx08_OBJECTS) $(psx08_DEPENDENCIES)
+	@rm -f psx08$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx09/Makefile.am b/testsuites/psxtests/psx09/Makefile.am
index 9c802fff54..1450ce3dee 100644
--- a/testsuites/psxtests/psx09/Makefile.am
+++ b/testsuites/psxtests/psx09/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx09.exe
-psx09_exe_SOURCES = init.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx09
+psx09_SOURCES = init.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx09.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx09_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx09_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx09_exe_OBJECTS) $(psx09_exe_LDADD)
-LINK_LIBS = $(psx09_exe_LDLIBS)
+LINK_OBJS = $(psx09_OBJECTS) $(psx09_LDADD)
+LINK_LIBS = $(psx09_LDLIBS)
 
-psx09.exe$(EXEEXT): $(psx09_exe_OBJECTS) $(psx09_exe_DEPENDENCIES)
-	@rm -f psx09.exe$(EXEEXT)
+psx09$(EXEEXT): $(psx09_OBJECTS) $(psx09_DEPENDENCIES)
+	@rm -f psx09$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx10/Makefile.am b/testsuites/psxtests/psx10/Makefile.am
index ee5f0c93f4..e4b787a124 100644
--- a/testsuites/psxtests/psx10/Makefile.am
+++ b/testsuites/psxtests/psx10/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx10.exe
-psx10_exe_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx10
+psx10_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx10.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx10_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx10_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx10_exe_OBJECTS) $(psx10_exe_LDADD)
-LINK_LIBS = $(psx10_exe_LDLIBS)
+LINK_OBJS = $(psx10_OBJECTS) $(psx10_LDADD)
+LINK_LIBS = $(psx10_LDLIBS)
 
-psx10.exe$(EXEEXT): $(psx10_exe_OBJECTS) $(psx10_exe_DEPENDENCIES)
-	@rm -f psx10.exe$(EXEEXT)
+psx10$(EXEEXT): $(psx10_OBJECTS) $(psx10_DEPENDENCIES)
+	@rm -f psx10$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx11/Makefile.am b/testsuites/psxtests/psx11/Makefile.am
index 1fee1af3bd..d5e5ff821e 100644
--- a/testsuites/psxtests/psx11/Makefile.am
+++ b/testsuites/psxtests/psx11/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx11.exe
-psx11_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx11
+psx11_SOURCES = init.c task.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx11.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx11_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx11_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx11_exe_OBJECTS) $(psx11_exe_LDADD)
-LINK_LIBS = $(psx11_exe_LDLIBS)
+LINK_OBJS = $(psx11_OBJECTS) $(psx11_LDADD)
+LINK_LIBS = $(psx11_LDLIBS)
 
-psx11.exe$(EXEEXT): $(psx11_exe_OBJECTS) $(psx11_exe_DEPENDENCIES)
-	@rm -f psx11.exe$(EXEEXT)
+psx11$(EXEEXT): $(psx11_OBJECTS) $(psx11_DEPENDENCIES)
+	@rm -f psx11$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx12/Makefile.am b/testsuites/psxtests/psx12/Makefile.am
index 6095d0d684..c52875f437 100644
--- a/testsuites/psxtests/psx12/Makefile.am
+++ b/testsuites/psxtests/psx12/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx12.exe
-psx12_exe_SOURCES = init.c task.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx12
+psx12_SOURCES = init.c task.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx12.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx12_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx12_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx12_exe_OBJECTS) $(psx12_exe_LDADD)
-LINK_LIBS = $(psx12_exe_LDLIBS)
+LINK_OBJS = $(psx12_OBJECTS) $(psx12_LDADD)
+LINK_LIBS = $(psx12_LDLIBS)
 
-psx12.exe$(EXEEXT): $(psx12_exe_OBJECTS) $(psx12_exe_DEPENDENCIES)
-	@rm -f psx12.exe$(EXEEXT)
+psx12$(EXEEXT): $(psx12_OBJECTS) $(psx12_DEPENDENCIES)
+	@rm -f psx12$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx13/Makefile.am b/testsuites/psxtests/psx13/Makefile.am
index 12cd768d04..898f8f2bf5 100644
--- a/testsuites/psxtests/psx13/Makefile.am
+++ b/testsuites/psxtests/psx13/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx13.exe
-psx13_exe_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psx13
+psx13_SOURCES = main.c test.c ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx13.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx13_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx13_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx13_exe_OBJECTS) $(psx13_exe_LDADD)
-LINK_LIBS = $(psx13_exe_LDLIBS)
+LINK_OBJS = $(psx13_OBJECTS) $(psx13_LDADD)
+LINK_LIBS = $(psx13_LDLIBS)
 
-psx13.exe$(EXEEXT): $(psx13_exe_OBJECTS) $(psx13_exe_DEPENDENCIES)
-	@rm -f psx13.exe$(EXEEXT)
+psx13$(EXEEXT): $(psx13_OBJECTS) $(psx13_DEPENDENCIES)
+	@rm -f psx13$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx14/Makefile.am b/testsuites/psxtests/psx14/Makefile.am
index e90eb2e1a1..ccbe9c3ffd 100644
--- a/testsuites/psxtests/psx14/Makefile.am
+++ b/testsuites/psxtests/psx14/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psx14.exe
-psx14_exe_SOURCES = init.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psx14
+psx14_SOURCES = init.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psx14.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx14_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psx14_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psx14_exe_OBJECTS) $(psx14_exe_LDADD)
-LINK_LIBS = $(psx14_exe_LDLIBS)
+LINK_OBJS = $(psx14_OBJECTS) $(psx14_LDADD)
+LINK_LIBS = $(psx14_LDLIBS)
 
-psx14.exe$(EXEEXT): $(psx14_exe_OBJECTS) $(psx14_exe_DEPENDENCIES)
-	@rm -f psx14.exe$(EXEEXT)
+psx14$(EXEEXT): $(psx14_OBJECTS) $(psx14_DEPENDENCIES)
+	@rm -f psx14$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxbarrier01/Makefile.am b/testsuites/psxtests/psxbarrier01/Makefile.am
index 27c5687409..8101eaed53 100644
--- a/testsuites/psxtests/psxbarrier01/Makefile.am
+++ b/testsuites/psxtests/psxbarrier01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxbarrier01.exe
-psxbarrier01_exe_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxbarrier01
+psxbarrier01_SOURCES = main.c test.c ../include/pmacros.h
 
 scndir = $(rtems_testsdir)
 dist_scn_DATA = psxbarrier01.scn
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxbarrier01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxbarrier01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxbarrier01_exe_OBJECTS) $(psxbarrier01_exe_LDADD)
-LINK_LIBS = $(psxbarrier01_exe_LDLIBS)
+LINK_OBJS = $(psxbarrier01_OBJECTS) $(psxbarrier01_LDADD)
+LINK_LIBS = $(psxbarrier01_LDLIBS)
 
-psxbarrier01.exe$(EXEEXT): $(psxbarrier01_exe_OBJECTS) \
-    $(psxbarrier01_exe_DEPENDENCIES)
-	@rm -f psxbarrier01.exe$(EXEEXT)
+psxbarrier01$(EXEEXT): $(psxbarrier01_OBJECTS) \
+    $(psxbarrier01_DEPENDENCIES)
+	@rm -f psxbarrier01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxcancel/Makefile.am b/testsuites/psxtests/psxcancel/Makefile.am
index 61b030fc2c..4a7fb9b1a1 100644
--- a/testsuites/psxtests/psxcancel/Makefile.am
+++ b/testsuites/psxtests/psxcancel/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxcancel.exe
-psxcancel_exe_SOURCES = init.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxcancel
+psxcancel_SOURCES = init.c ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxcancel.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxcancel_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxcancel_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxcancel_exe_OBJECTS) $(psxcancel_exe_LDADD)
-LINK_LIBS = $(psxcancel_exe_LDLIBS)
+LINK_OBJS = $(psxcancel_OBJECTS) $(psxcancel_LDADD)
+LINK_LIBS = $(psxcancel_LDLIBS)
 
-psxcancel.exe$(EXEEXT): $(psxcancel_exe_OBJECTS) $(psxcancel_exe_DEPENDENCIES)
-	@rm -f psxcancel.exe$(EXEEXT)
+psxcancel$(EXEEXT): $(psxcancel_OBJECTS) $(psxcancel_DEPENDENCIES)
+	@rm -f psxcancel$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxchroot01/Makefile.am b/testsuites/psxtests/psxchroot01/Makefile.am
index 40eef3f6c9..2ec0c436a4 100644
--- a/testsuites/psxtests/psxchroot01/Makefile.am
+++ b/testsuites/psxtests/psxchroot01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxchroot01.exe
-psxchroot01_exe_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxchroot01
+psxchroot01_SOURCES = main.c test.c ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxchroot01.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxchroot01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxchroot01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxchroot01_exe_OBJECTS) $(psxchroot01_exe_LDADD)
-LINK_LIBS = $(psxchroot01_exe_LDLIBS)
+LINK_OBJS = $(psxchroot01_OBJECTS) $(psxchroot01_LDADD)
+LINK_LIBS = $(psxchroot01_LDLIBS)
 
-psxchroot01.exe$(EXEEXT): $(psxchroot01_exe_OBJECTS) $(psxchroot01_exe_DEPENDENCIES)
-	@rm -f psxchroot01.exe$(EXEEXT)
+psxchroot01$(EXEEXT): $(psxchroot01_OBJECTS) $(psxchroot01_DEPENDENCIES)
+	@rm -f psxchroot01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxcleanup/Makefile.am b/testsuites/psxtests/psxcleanup/Makefile.am
index 915e9dc659..ec4d111c7c 100644
--- a/testsuites/psxtests/psxcleanup/Makefile.am
+++ b/testsuites/psxtests/psxcleanup/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxcleanup.exe
-psxcleanup_exe_SOURCES = psxcleanup.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psxcleanup
+psxcleanup_SOURCES = psxcleanup.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxcleanup.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxcleanup_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxcleanup_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxcleanup_exe_OBJECTS) $(psxcleanup_exe_LDADD)
-LINK_LIBS = $(psxcleanup_exe_LDLIBS)
+LINK_OBJS = $(psxcleanup_OBJECTS) $(psxcleanup_LDADD)
+LINK_LIBS = $(psxcleanup_LDLIBS)
 
-psxcleanup.exe$(EXEEXT): $(psxcleanup_exe_OBJECTS) $(psxcleanup_exe_DEPENDENCIES)
-	@rm -f psxcleanup.exe$(EXEEXT)
+psxcleanup$(EXEEXT): $(psxcleanup_OBJECTS) $(psxcleanup_DEPENDENCIES)
+	@rm -f psxcleanup$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxenosys/Makefile.am b/testsuites/psxtests/psxenosys/Makefile.am
index a3bccd7508..6649f65c1d 100644
--- a/testsuites/psxtests/psxenosys/Makefile.am
+++ b/testsuites/psxtests/psxenosys/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxenosys.exe
-psxenosys_exe_SOURCES = init.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psxenosys
+psxenosys_SOURCES = init.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxenosys.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxenosys_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxenosys_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxenosys_exe_OBJECTS) $(psxenosys_exe_LDADD)
-LINK_LIBS = $(psxenosys_exe_LDLIBS)
+LINK_OBJS = $(psxenosys_OBJECTS) $(psxenosys_LDADD)
+LINK_LIBS = $(psxenosys_LDLIBS)
 
-psxenosys.exe$(EXEEXT): $(psxenosys_exe_OBJECTS) $(psxenosys_exe_DEPENDENCIES)
-	@rm -f psxenosys.exe$(EXEEXT)
+psxenosys$(EXEEXT): $(psxenosys_OBJECTS) $(psxenosys_DEPENDENCIES)
+	@rm -f psxenosys$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxfatal01/Makefile.am b/testsuites/psxtests/psxfatal01/Makefile.am
index fc04980ea6..d6adbda05f 100644
--- a/testsuites/psxtests/psxfatal01/Makefile.am
+++ b/testsuites/psxtests/psxfatal01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxfatal01.exe
-psxfatal01_exe_SOURCES = ../psxfatal_support/init.c ../psxfatal_support/system.h testcase.h
+rtems_tests_PROGRAMS = psxfatal01
+psxfatal01_SOURCES = ../psxfatal_support/init.c ../psxfatal_support/system.h testcase.h
 
 dist_rtems_tests_DATA = psxfatal01.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxfatal01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxfatal01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxfatal01_exe_OBJECTS) $(psxfatal01_exe_LDADD)
-LINK_LIBS = $(psxfatal01_exe_LDLIBS)
+LINK_OBJS = $(psxfatal01_OBJECTS) $(psxfatal01_LDADD)
+LINK_LIBS = $(psxfatal01_LDLIBS)
 
-psxfatal01.exe$(EXEEXT): $(psxfatal01_exe_OBJECTS) $(psxfatal01_exe_DEPENDENCIES)
-	@rm -f psxfatal01.exe$(EXEEXT)
+psxfatal01$(EXEEXT): $(psxfatal01_OBJECTS) $(psxfatal01_DEPENDENCIES)
+	@rm -f psxfatal01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxfatal02/Makefile.am b/testsuites/psxtests/psxfatal02/Makefile.am
index c1b5008552..28fe2389d5 100644
--- a/testsuites/psxtests/psxfatal02/Makefile.am
+++ b/testsuites/psxtests/psxfatal02/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxfatal02.exe
-psxfatal02_exe_SOURCES = ../psxfatal_support/init.c ../psxfatal_support/system.h testcase.h
+rtems_tests_PROGRAMS = psxfatal02
+psxfatal02_SOURCES = ../psxfatal_support/init.c ../psxfatal_support/system.h testcase.h
 
 dist_rtems_tests_DATA = psxfatal02.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxfatal02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxfatal02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxfatal02_exe_OBJECTS) $(psxfatal02_exe_LDADD)
-LINK_LIBS = $(psxfatal02_exe_LDLIBS)
+LINK_OBJS = $(psxfatal02_OBJECTS) $(psxfatal02_LDADD)
+LINK_LIBS = $(psxfatal02_LDLIBS)
 
-psxfatal02.exe$(EXEEXT): $(psxfatal02_exe_OBJECTS) $(psxfatal02_exe_DEPENDENCIES)
-	@rm -f psxfatal02.exe$(EXEEXT)
+psxfatal02$(EXEEXT): $(psxfatal02_OBJECTS) $(psxfatal02_DEPENDENCIES)
+	@rm -f psxfatal02$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxfile01/Makefile.am b/testsuites/psxtests/psxfile01/Makefile.am
index a6caffa442..519d7b81b1 100644
--- a/testsuites/psxtests/psxfile01/Makefile.am
+++ b/testsuites/psxtests/psxfile01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxfile01.exe
-psxfile01_exe_SOURCES = main.c test.c test_cat.c test_extend.c test_write.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxfile01
+psxfile01_SOURCES = main.c test.c test_cat.c test_extend.c test_write.c ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxfile01.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxfile01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxfile01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxfile01_exe_OBJECTS) $(psxfile01_exe_LDADD)
-LINK_LIBS = $(psxfile01_exe_LDLIBS)
+LINK_OBJS = $(psxfile01_OBJECTS) $(psxfile01_LDADD)
+LINK_LIBS = $(psxfile01_LDLIBS)
 
-psxfile01.exe$(EXEEXT): $(psxfile01_exe_OBJECTS) $(psxfile01_exe_DEPENDENCIES)
-	@rm -f psxfile01.exe$(EXEEXT)
+psxfile01$(EXEEXT): $(psxfile01_OBJECTS) $(psxfile01_DEPENDENCIES)
+	@rm -f psxfile01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxkey01/Makefile.am b/testsuites/psxtests/psxkey01/Makefile.am
index 6abd282e29..6755b25d6c 100644
--- a/testsuites/psxtests/psxkey01/Makefile.am
+++ b/testsuites/psxtests/psxkey01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxkey01.exe
-psxkey01_exe_SOURCES = init.c task.c system.h ../include/pmacros.h \
+rtems_tests_PROGRAMS = psxkey01
+psxkey01_SOURCES = init.c task.c system.h ../include/pmacros.h \
      ../../support/src/test_support.c
 
 
@@ -15,16 +15,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxkey01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxkey01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxkey01_exe_OBJECTS) $(psxkey01_exe_LDADD)
-LINK_LIBS = $(psxkey01_exe_LDLIBS)
+LINK_OBJS = $(psxkey01_OBJECTS) $(psxkey01_LDADD)
+LINK_LIBS = $(psxkey01_LDLIBS)
 
-psxkey01.exe$(EXEEXT): $(psxkey01_exe_OBJECTS) $(psxkey01_exe_DEPENDENCIES)
-	@rm -f psxkey01.exe$(EXEEXT)
+psxkey01$(EXEEXT): $(psxkey01_OBJECTS) $(psxkey01_DEPENDENCIES)
+	@rm -f psxkey01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxmount/Makefile.am b/testsuites/psxtests/psxmount/Makefile.am
index c03cf60261..205297f5c9 100644
--- a/testsuites/psxtests/psxmount/Makefile.am
+++ b/testsuites/psxtests/psxmount/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxmount.exe
-psxmount_exe_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxmount
+psxmount_SOURCES = main.c test.c ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxmount.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxmount_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxmount_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxmount_exe_OBJECTS) $(psxmount_exe_LDADD)
-LINK_LIBS = $(psxmount_exe_LDLIBS)
+LINK_OBJS = $(psxmount_OBJECTS) $(psxmount_LDADD)
+LINK_LIBS = $(psxmount_LDLIBS)
 
-psxmount.exe$(EXEEXT): $(psxmount_exe_OBJECTS) $(psxmount_exe_DEPENDENCIES)
-	@rm -f psxmount.exe$(EXEEXT)
+psxmount$(EXEEXT): $(psxmount_OBJECTS) $(psxmount_DEPENDENCIES)
+	@rm -f psxmount$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxmsgq01/Makefile.am b/testsuites/psxtests/psxmsgq01/Makefile.am
index 384c56a469..41ca0afb16 100644
--- a/testsuites/psxtests/psxmsgq01/Makefile.am
+++ b/testsuites/psxtests/psxmsgq01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxmsgq01.exe
-psxmsgq01_exe_SOURCES = init.c system.h ../include/pmacros.h \
+rtems_tests_PROGRAMS = psxmsgq01
+psxmsgq01_SOURCES = init.c system.h ../include/pmacros.h \
      ../../support/src/test_support.c
 
 
@@ -15,16 +15,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxmsgq01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxmsgq01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxmsgq01_exe_OBJECTS) $(psxmsgq01_exe_LDADD)
-LINK_LIBS = $(psxmsgq01_exe_LDLIBS)
+LINK_OBJS = $(psxmsgq01_OBJECTS) $(psxmsgq01_LDADD)
+LINK_LIBS = $(psxmsgq01_LDLIBS)
 
-psxmsgq01.exe$(EXEEXT): $(psxmsgq01_exe_OBJECTS) $(psxmsgq01_exe_DEPENDENCIES)
-	@rm -f psxmsgq01.exe$(EXEEXT)
+psxmsgq01$(EXEEXT): $(psxmsgq01_OBJECTS) $(psxmsgq01_DEPENDENCIES)
+	@rm -f psxmsgq01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxmsgq02/Makefile.am b/testsuites/psxtests/psxmsgq02/Makefile.am
index 61afdb8418..7d50113cfb 100644
--- a/testsuites/psxtests/psxmsgq02/Makefile.am
+++ b/testsuites/psxtests/psxmsgq02/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxmsgq02.exe
-psxmsgq02_exe_SOURCES = init.c system.h ../include/pmacros.h \
+rtems_tests_PROGRAMS = psxmsgq02
+psxmsgq02_SOURCES = init.c system.h ../include/pmacros.h \
      ../../support/src/test_support.c
 
 dist_rtems_tests_DATA = psxmsgq02.scn
@@ -14,16 +14,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxmsgq02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxmsgq02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxmsgq02_exe_OBJECTS) $(psxmsgq02_exe_LDADD)
-LINK_LIBS = $(psxmsgq02_exe_LDLIBS)
+LINK_OBJS = $(psxmsgq02_OBJECTS) $(psxmsgq02_LDADD)
+LINK_LIBS = $(psxmsgq02_LDLIBS)
 
-psxmsgq02.exe$(EXEEXT): $(psxmsgq02_exe_OBJECTS) $(psxmsgq02_exe_DEPENDENCIES)
-	@rm -f psxmsgq02.exe$(EXEEXT)
+psxmsgq02$(EXEEXT): $(psxmsgq02_OBJECTS) $(psxmsgq02_DEPENDENCIES)
+	@rm -f psxmsgq02$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxrdwrv/Makefile.am b/testsuites/psxtests/psxrdwrv/Makefile.am
index dc199c4601..6fc46278bd 100644
--- a/testsuites/psxtests/psxrdwrv/Makefile.am
+++ b/testsuites/psxtests/psxrdwrv/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxrdwrv.exe
-psxrdwrv_exe_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxrdwrv
+psxrdwrv_SOURCES = main.c test.c ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxrdwrv.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxrdwrv_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxrdwrv_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxrdwrv_exe_OBJECTS) $(psxrdwrv_exe_LDADD)
-LINK_LIBS = $(psxrdwrv_exe_LDLIBS)
+LINK_OBJS = $(psxrdwrv_OBJECTS) $(psxrdwrv_LDADD)
+LINK_LIBS = $(psxrdwrv_LDLIBS)
 
-psxrdwrv.exe$(EXEEXT): $(psxrdwrv_exe_OBJECTS) $(psxrdwrv_exe_DEPENDENCIES)
-	@rm -f psxrdwrv.exe$(EXEEXT)
+psxrdwrv$(EXEEXT): $(psxrdwrv_OBJECTS) $(psxrdwrv_DEPENDENCIES)
+	@rm -f psxrdwrv$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxreaddir/Makefile.am b/testsuites/psxtests/psxreaddir/Makefile.am
index dad53db111..87a1184d0a 100644
--- a/testsuites/psxtests/psxreaddir/Makefile.am
+++ b/testsuites/psxtests/psxreaddir/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxreaddir.exe
-psxreaddir_exe_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxreaddir
+psxreaddir_SOURCES = main.c test.c ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxreaddir.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxreaddir_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxreaddir_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxreaddir_exe_OBJECTS) $(psxreaddir_exe_LDADD)
-LINK_LIBS = $(psxreaddir_exe_LDLIBS)
+LINK_OBJS = $(psxreaddir_OBJECTS) $(psxreaddir_LDADD)
+LINK_LIBS = $(psxreaddir_LDLIBS)
 
-psxreaddir.exe$(EXEEXT): $(psxreaddir_exe_OBJECTS) $(psxreaddir_exe_DEPENDENCIES)
-	@rm -f psxreaddir.exe$(EXEEXT)
+psxreaddir$(EXEEXT): $(psxreaddir_OBJECTS) $(psxreaddir_DEPENDENCIES)
+	@rm -f psxreaddir$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxrwlock01/Makefile.am b/testsuites/psxtests/psxrwlock01/Makefile.am
index 3780b8d1dd..186a8f5d29 100644
--- a/testsuites/psxtests/psxrwlock01/Makefile.am
+++ b/testsuites/psxtests/psxrwlock01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxrwlock01.exe
-psxrwlock01_exe_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxrwlock01
+psxrwlock01_SOURCES = main.c test.c ../include/pmacros.h
 
 scndir = $(rtems_testsdir)
 dist_scn_DATA = psxrwlock01.scn
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxrwlock01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxrwlock01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxrwlock01_exe_OBJECTS) $(psxrwlock01_exe_LDADD)
-LINK_LIBS = $(psxrwlock01_exe_LDLIBS)
+LINK_OBJS = $(psxrwlock01_OBJECTS) $(psxrwlock01_LDADD)
+LINK_LIBS = $(psxrwlock01_LDLIBS)
 
-psxrwlock01.exe$(EXEEXT): $(psxrwlock01_exe_OBJECTS) \
-    $(psxrwlock01_exe_DEPENDENCIES)
-	@rm -f psxrwlock01.exe$(EXEEXT)
+psxrwlock01$(EXEEXT): $(psxrwlock01_OBJECTS) \
+    $(psxrwlock01_DEPENDENCIES)
+	@rm -f psxrwlock01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxsem01/Makefile.am b/testsuites/psxtests/psxsem01/Makefile.am
index a578c7e7e0..1bcebd2f81 100644
--- a/testsuites/psxtests/psxsem01/Makefile.am
+++ b/testsuites/psxtests/psxsem01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxsem01.exe
-psxsem01_exe_SOURCES = init.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psxsem01
+psxsem01_SOURCES = init.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxsem01.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxsem01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxsem01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxsem01_exe_OBJECTS) $(psxsem01_exe_LDADD)
-LINK_LIBS = $(psxsem01_exe_LDLIBS)
+LINK_OBJS = $(psxsem01_OBJECTS) $(psxsem01_LDADD)
+LINK_LIBS = $(psxsem01_LDLIBS)
 
-psxsem01.exe$(EXEEXT): $(psxsem01_exe_OBJECTS) $(psxsem01_exe_DEPENDENCIES)
-	@rm -f psxsem01.exe$(EXEEXT)
+psxsem01$(EXEEXT): $(psxsem01_OBJECTS) $(psxsem01_DEPENDENCIES)
+	@rm -f psxsem01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxsignal01/Makefile.am b/testsuites/psxtests/psxsignal01/Makefile.am
index 3d3f6da530..f0bd180cc2 100644
--- a/testsuites/psxtests/psxsignal01/Makefile.am
+++ b/testsuites/psxtests/psxsignal01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxsignal01.exe
-psxsignal01_exe_SOURCES = init.c task1.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psxsignal01
+psxsignal01_SOURCES = init.c task1.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxsignal01.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxsignal01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxsignal01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxsignal01_exe_OBJECTS) $(psxsignal01_exe_LDADD)
-LINK_LIBS = $(psxsignal01_exe_LDLIBS)
+LINK_OBJS = $(psxsignal01_OBJECTS) $(psxsignal01_LDADD)
+LINK_LIBS = $(psxsignal01_LDLIBS)
 
-psxsignal01.exe$(EXEEXT): $(psxsignal01_exe_OBJECTS) $(psxsignal01_exe_DEPENDENCIES)
-	@rm -f psxsignal01.exe$(EXEEXT)
+psxsignal01$(EXEEXT): $(psxsignal01_OBJECTS) $(psxsignal01_DEPENDENCIES)
+	@rm -f psxsignal01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxspin01/Makefile.am b/testsuites/psxtests/psxspin01/Makefile.am
index 0fe4158d3c..ee232b3249 100644
--- a/testsuites/psxtests/psxspin01/Makefile.am
+++ b/testsuites/psxtests/psxspin01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxspin01.exe
-psxspin01_exe_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxspin01
+psxspin01_SOURCES = main.c test.c ../include/pmacros.h
 
 scndir = $(rtems_testsdir)
 dist_scn_DATA = psxspin01.scn
@@ -14,17 +14,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxspin01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxspin01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxspin01_exe_OBJECTS) $(psxspin01_exe_LDADD)
-LINK_LIBS = $(psxspin01_exe_LDLIBS)
+LINK_OBJS = $(psxspin01_OBJECTS) $(psxspin01_LDADD)
+LINK_LIBS = $(psxspin01_LDLIBS)
 
-psxspin01.exe$(EXEEXT): $(psxspin01_exe_OBJECTS) \
-    $(psxspin01_exe_DEPENDENCIES)
-	@rm -f psxspin01.exe$(EXEEXT)
+psxspin01$(EXEEXT): $(psxspin01_OBJECTS) \
+    $(psxspin01_DEPENDENCIES)
+	@rm -f psxspin01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxstat/Makefile.am b/testsuites/psxtests/psxstat/Makefile.am
index c26b4aff5c..2e76209151 100644
--- a/testsuites/psxtests/psxstat/Makefile.am
+++ b/testsuites/psxtests/psxstat/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxstat.exe
-psxstat_exe_SOURCES = main.c test.c ../include/pmacros.h
+rtems_tests_PROGRAMS = psxstat
+psxstat_SOURCES = main.c test.c ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxstat.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxstat_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxstat_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxstat_exe_OBJECTS) $(psxstat_exe_LDADD)
-LINK_LIBS = $(psxstat_exe_LDLIBS)
+LINK_OBJS = $(psxstat_OBJECTS) $(psxstat_LDADD)
+LINK_LIBS = $(psxstat_LDLIBS)
 
-psxstat.exe$(EXEEXT): $(psxstat_exe_OBJECTS) $(psxstat_exe_DEPENDENCIES)
-	@rm -f psxstat.exe$(EXEEXT)
+psxstat$(EXEEXT): $(psxstat_OBJECTS) $(psxstat_DEPENDENCIES)
+	@rm -f psxstat$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxsysconf/Makefile.am b/testsuites/psxtests/psxsysconf/Makefile.am
index 9872d05c50..3708737802 100644
--- a/testsuites/psxtests/psxsysconf/Makefile.am
+++ b/testsuites/psxtests/psxsysconf/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxsysconf.exe
-psxsysconf_exe_SOURCES = init.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psxsysconf
+psxsysconf_SOURCES = init.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxsysconf.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxsysconf_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxsysconf_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxsysconf_exe_OBJECTS) $(psxsysconf_exe_LDADD)
-LINK_LIBS = $(psxsysconf_exe_LDLIBS)
+LINK_OBJS = $(psxsysconf_OBJECTS) $(psxsysconf_LDADD)
+LINK_LIBS = $(psxsysconf_LDLIBS)
 
-psxsysconf.exe$(EXEEXT): $(psxsysconf_exe_OBJECTS) $(psxsysconf_exe_DEPENDENCIES)
-	@rm -f psxsysconf.exe$(EXEEXT)
+psxsysconf$(EXEEXT): $(psxsysconf_OBJECTS) $(psxsysconf_DEPENDENCIES)
+	@rm -f psxsysconf$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxtime/Makefile.am b/testsuites/psxtests/psxtime/Makefile.am
index b0d1963977..d1f23beb61 100644
--- a/testsuites/psxtests/psxtime/Makefile.am
+++ b/testsuites/psxtests/psxtime/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxtime.exe
-psxtime_exe_SOURCES = main.c test.c
+rtems_tests_PROGRAMS = psxtime
+psxtime_SOURCES = main.c test.c
 
 dist_rtems_tests_DATA = psxtime.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxtime_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxtime_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtime_exe_OBJECTS) $(psxtime_exe_LDADD)
-LINK_LIBS = $(psxtime_exe_LDLIBS)
+LINK_OBJS = $(psxtime_OBJECTS) $(psxtime_LDADD)
+LINK_LIBS = $(psxtime_LDLIBS)
 
-psxtime.exe$(EXEEXT): $(psxtime_exe_OBJECTS) $(psxtime_exe_DEPENDENCIES)
-	@rm -f psxtime.exe$(EXEEXT)
+psxtime$(EXEEXT): $(psxtime_OBJECTS) $(psxtime_DEPENDENCIES)
+	@rm -f psxtime$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxtimer01/Makefile.am b/testsuites/psxtests/psxtimer01/Makefile.am
index 8e3000588d..5a2f096ca8 100644
--- a/testsuites/psxtests/psxtimer01/Makefile.am
+++ b/testsuites/psxtests/psxtimer01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxtimer01.exe
-psxtimer01_exe_SOURCES = psxtimer.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psxtimer01
+psxtimer01_SOURCES = psxtimer.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxtimer01.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxtimer01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxtimer01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtimer01_exe_OBJECTS) $(psxtimer01_exe_LDADD)
-LINK_LIBS = $(psxtimer01_exe_LDLIBS)
+LINK_OBJS = $(psxtimer01_OBJECTS) $(psxtimer01_LDADD)
+LINK_LIBS = $(psxtimer01_LDLIBS)
 
-psxtimer01.exe$(EXEEXT): $(psxtimer01_exe_OBJECTS) $(psxtimer01_exe_DEPENDENCIES)
-	@rm -f psxtimer01.exe$(EXEEXT)
+psxtimer01$(EXEEXT): $(psxtimer01_OBJECTS) $(psxtimer01_DEPENDENCIES)
+	@rm -f psxtimer01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxtimer02/Makefile.am b/testsuites/psxtests/psxtimer02/Makefile.am
index d3acc0aac1..fb1bbe713f 100644
--- a/testsuites/psxtests/psxtimer02/Makefile.am
+++ b/testsuites/psxtests/psxtimer02/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxtimer02.exe
-psxtimer02_exe_SOURCES = psxtimer.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psxtimer02
+psxtimer02_SOURCES = psxtimer.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxtimer02.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxtimer02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxtimer02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtimer02_exe_OBJECTS) $(psxtimer02_exe_LDADD)
-LINK_LIBS = $(psxtimer02_exe_LDLIBS)
+LINK_OBJS = $(psxtimer02_OBJECTS) $(psxtimer02_LDADD)
+LINK_LIBS = $(psxtimer02_LDLIBS)
 
-psxtimer02.exe$(EXEEXT): $(psxtimer02_exe_OBJECTS) $(psxtimer02_exe_DEPENDENCIES)
-	@rm -f psxtimer02.exe$(EXEEXT)
+psxtimer02$(EXEEXT): $(psxtimer02_OBJECTS) $(psxtimer02_DEPENDENCIES)
+	@rm -f psxtimer02$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxualarm/Makefile.am b/testsuites/psxtests/psxualarm/Makefile.am
index 302dc621f7..581172aca8 100644
--- a/testsuites/psxtests/psxualarm/Makefile.am
+++ b/testsuites/psxtests/psxualarm/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = psxualarm.exe
-psxualarm_exe_SOURCES = init.c system.h ../include/pmacros.h
+rtems_tests_PROGRAMS = psxualarm
+psxualarm_SOURCES = init.c system.h ../include/pmacros.h
 
 dist_rtems_tests_DATA = psxualarm.scn
 
@@ -13,16 +13,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxualarm_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+psxualarm_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxualarm_exe_OBJECTS) $(psxualarm_exe_LDADD)
-LINK_LIBS = $(psxulaarm_exe_LDLIBS)
+LINK_OBJS = $(psxualarm_OBJECTS) $(psxualarm_LDADD)
+LINK_LIBS = $(psxulaarm_LDLIBS)
 
-psxualarm.exe$(EXEEXT): $(psxualarm_exe_OBJECTS) $(psxualarm_exe_DEPENDENCIES)
-	@rm -f psxualarm.exe$(EXEEXT)
+psxualarm$(EXEEXT): $(psxualarm_OBJECTS) $(psxualarm_DEPENDENCIES)
+	@rm -f psxualarm$(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 ebe4b7770b..4c5afde775 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = base_mp-node1.exe
-base_mp_node1_exe_SOURCES = ../init.c ../apptask.c ../system.h
+rtems_tests_PROGRAMS = base_mp-node1
+base_mp_node1_SOURCES = ../init.c ../apptask.c ../system.h
 
 dist_rtems_tests_DATA = base_mp-node1.scn
 dist_rtems_tests_DATA += base_mp-node1.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-base_mp_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+base_mp_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I.
 
-LINK_OBJS = $(base_mp_node1_exe_OBJECTS) $(base_mp_node1_exe_LDADD)
-LINK_LIBS = $(base_mp_node1_exe_LDLIBS)
+LINK_OBJS = $(base_mp_node1_OBJECTS) $(base_mp_node1_LDADD)
+LINK_LIBS = $(base_mp_node1_LDLIBS)
 
-base_mp-node1.exe$(EXEEXT): $(base_mp_node1_exe_OBJECTS) $(base_mp_node1_exe_DEPENDENCIES)
-	@rm -f base_mp-node1.exe$(EXEEXT)
+base_mp-node1$(EXEEXT): $(base_mp_node1_OBJECTS) $(base_mp_node1_DEPENDENCIES)
+	@rm -f base_mp-node1$(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 a67e6c3a5d..d540845955 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = base_mp-node2.exe
-base_mp_node2_exe_SOURCES = ../init.c ../apptask.c ../system.h
+rtems_tests_PROGRAMS = base_mp-node2
+base_mp_node2_SOURCES = ../init.c ../apptask.c ../system.h
 
 dist_rtems_tests_DATA = base_mp-node2.scn
 dist_rtems_tests_DATA += base_mp-node2.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-base_mp_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+base_mp_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I.
 
-LINK_OBJS = $(base_mp_node2_exe_OBJECTS) $(base_mp_node2_exe_LDADD)
-LINK_LIBS = $(base_mp_node2_exe_LDLIBS)
+LINK_OBJS = $(base_mp_node2_OBJECTS) $(base_mp_node2_LDADD)
+LINK_LIBS = $(base_mp_node2_LDLIBS)
 
-base_mp-node2.exe$(EXEEXT): $(base_mp_node2_exe_OBJECTS) $(base_mp_node2_exe_DEPENDENCIES)
-	@rm -f base_mp-node2.exe$(EXEEXT)
+base_mp-node2$(EXEEXT): $(base_mp_node2_OBJECTS) $(base_mp_node2_DEPENDENCIES)
+	@rm -f base_mp-node2$(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 2a324114ae..9b573a6ed8 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = base_sp.exe
-base_sp_exe_SOURCES = init.c apptask.c system.h
+rtems_tests_PROGRAMS = base_sp
+base_sp_SOURCES = init.c apptask.c system.h
 
 dist_rtems_tests_DATA = base_sp.scn
 dist_rtems_tests_DATA += base_sp.doc
@@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-base_sp_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+base_sp_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(base_sp_exe_OBJECTS) $(base_sp_exe_LDADD)
-LINK_LIBS = $(base_sp_exe_LDLIBS)
+LINK_OBJS = $(base_sp_OBJECTS) $(base_sp_LDADD)
+LINK_LIBS = $(base_sp_LDLIBS)
 
-base_sp.exe$(EXEEXT): $(base_sp_exe_OBJECTS) $(base_sp_exe_DEPENDENCIES)
-	@rm -f base_sp.exe$(EXEEXT)
+base_sp$(EXEEXT): $(base_sp_OBJECTS) $(base_sp_DEPENDENCIES)
+	@rm -f base_sp$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/capture/Makefile.am b/testsuites/samples/capture/Makefile.am
index 75b95ad901..4b79faadba 100644
--- a/testsuites/samples/capture/Makefile.am
+++ b/testsuites/samples/capture/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = capture.exe
-capture_exe_SOURCES = init.c test1.c system.h
+rtems_tests_PROGRAMS = capture
+capture_SOURCES = init.c test1.c system.h
 
 dist_rtems_tests_DATA = capture.scn
 dist_rtems_tests_DATA += capture.doc
@@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-capture_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+capture_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(capture_exe_OBJECTS) $(capture_exe_LDADD)
-LINK_LIBS = $(capture_exe_LDLIBS)
+LINK_OBJS = $(capture_OBJECTS) $(capture_LDADD)
+LINK_LIBS = $(capture_LDLIBS)
 
-capture.exe$(EXEEXT): $(capture_exe_OBJECTS) $(capture_exe_DEPENDENCIES)
-	@rm -f capture.exe$(EXEEXT)
+capture$(EXEEXT): $(capture_OBJECTS) $(capture_DEPENDENCIES)
+	@rm -f capture$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index 598a12c1ff..738b95c7e1 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = cdtest.exe
-cdtest_exe_SOURCES = init.c main.cc system.h
+rtems_tests_PROGRAMS = cdtest
+cdtest_SOURCES = init.c main.cc system.h
 
 dist_rtems_tests_DATA = cdtest.scn
 
@@ -13,17 +13,17 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-cdtest_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+cdtest_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 # AM_CPPFLAGS += -DRTEMS_TEST_IO_STREAM
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(cdtest_exe_OBJECTS) $(cdtest_exe_LDADD)
-LINK_LIBS = $(cdtest_exe_LDLIBS)
+LINK_OBJS = $(cdtest_OBJECTS) $(cdtest_LDADD)
+LINK_LIBS = $(cdtest_LDLIBS)
 
-cdtest.exe$(EXEEXT): $(cdtest_exe_OBJECTS) $(cdtest_exe_DEPENDENCIES)
-	@rm -f cdtest.exe$(EXEEXT)
+cdtest$(EXEEXT): $(cdtest_OBJECTS) $(cdtest_DEPENDENCIES)
+	@rm -f cdtest$(EXEEXT)
 	$(make-cxx-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am
index 71e2805c77..e6cae04b6a 100644
--- a/testsuites/samples/fileio/Makefile.am
+++ b/testsuites/samples/fileio/Makefile.am
@@ -6,8 +6,8 @@ MANAGERS = io message semaphore
 
 if LIBCHIP
 
-rtems_tests_PROGRAMS = fileio.exe
-fileio_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = fileio
+fileio_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = fileio.doc
 endif
@@ -17,13 +17,13 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
 if LIBCHIP
-fileio_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+fileio_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(fileio_exe_OBJECTS) $(fileio_exe_LDADD)
-LINK_LIBS = $(fileio_exe_LDLIBS)
+LINK_OBJS = $(fileio_OBJECTS) $(fileio_LDADD)
+LINK_LIBS = $(fileio_LDLIBS)
 
-fileio.exe$(EXEEXT): $(fileio_exe_OBJECTS) $(fileio_exe_DEPENDENCIES)
-	@rm -f fileio.exe$(EXEEXT)
+fileio$(EXEEXT): $(fileio_OBJECTS) $(fileio_DEPENDENCIES)
+	@rm -f fileio$(EXEEXT)
 	$(make-exe)
 endif
 
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index e1aa159fc8..7a1a2d0587 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = hello.exe
-hello_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = hello
+hello_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = hello.scn
 dist_rtems_tests_DATA += hello.doc
@@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-hello_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+hello_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(hello_exe_OBJECTS) $(hello_exe_LDADD)
-LINK_LIBS = $(hello_exe_LDLIBS)
+LINK_OBJS = $(hello_OBJECTS) $(hello_LDADD)
+LINK_LIBS = $(hello_LDLIBS)
 
-hello.exe$(EXEEXT): $(hello_exe_OBJECTS) $(hello_exe_DEPENDENCIES)
-	@rm -f hello.exe$(EXEEXT)
+hello$(EXEEXT): $(hello_OBJECTS) $(hello_DEPENDENCIES)
+	@rm -f hello$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am
index db49fe8495..d47caccdf0 100644
--- a/testsuites/samples/iostream/Makefile.am
+++ b/testsuites/samples/iostream/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = cxx_iostream.exe
-cxx_iostream_exe_SOURCES = init.cc system.h
+rtems_tests_PROGRAMS = cxx_iostream
+cxx_iostream_SOURCES = init.cc system.h
 
 dist_rtems_tests_DATA = iostream.scn
 dist_rtems_tests_DATA += iostream.doc
@@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-cxx_iostream_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+cxx_iostream_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(cxx_iostream_exe_OBJECTS) $(cxx_iostream_exe_LDADD)
-LINK_LIBS = $(cxx_iostream_exe_LDLIBS)
+LINK_OBJS = $(cxx_iostream_OBJECTS) $(cxx_iostream_LDADD)
+LINK_LIBS = $(cxx_iostream_LDLIBS)
 
-cxx_iostream.exe$(EXEEXT): $(cxx_iostream_exe_OBJECTS) $(cxx_iostream_exe_DEPENDENCIES)
-	@rm -f cxx_iostream.exe$(EXEEXT)
+cxx_iostream$(EXEEXT): $(cxx_iostream_OBJECTS) $(cxx_iostream_DEPENDENCIES)
+	@rm -f cxx_iostream$(EXEEXT)
 	$(make-cxx-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index 26a7249467..761735ff33 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = loopback.exe
-loopback_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = loopback
+loopback_SOURCES = init.c
 
 dist_rtems_tests_DATA = loopback.scn
 
@@ -13,13 +13,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-loopback_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+loopback_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(loopback_exe_OBJECTS) $(loopback_exe_LDADD)
-LINK_LIBS = $(loopback_exe_LDLIBS)
+LINK_OBJS = $(loopback_OBJECTS) $(loopback_LDADD)
+LINK_LIBS = $(loopback_LDLIBS)
 
-loopback.exe$(EXEEXT): $(loopback_exe_OBJECTS) $(loopback_exe_DEPENDENCIES)
-	@rm -f loopback.exe$(EXEEXT)
+loopback$(EXEEXT): $(loopback_OBJECTS) $(loopback_DEPENDENCIES)
+	@rm -f loopback$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index e846b3bfe3..f850d1f81b 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = 
 
-rtems_tests_PROGRAMS = minimum.exe
-minimum_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = minimum
+minimum_SOURCES = init.c
 
 dist_rtems_tests_DATA = minimum.scn
 dist_rtems_tests_DATA += minimum.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-minimum_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+minimum_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 # 	This test should not be executed
 
-LINK_OBJS = $(minimum_exe_OBJECTS) $(minimum_exe_LDADD)
-LINK_LIBS = $(minimum_exe_LDLIBS)
+LINK_OBJS = $(minimum_OBJECTS) $(minimum_LDADD)
+LINK_LIBS = $(minimum_LDLIBS)
 
-minimum.exe$(EXEEXT): $(minimum_exe_OBJECTS) $(minimum_exe_DEPENDENCIES)
-	@rm -f minimum.exe$(EXEEXT)
+minimum$(EXEEXT): $(minimum_OBJECTS) $(minimum_DEPENDENCIES)
+	@rm -f minimum$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/nsecs/Makefile.am b/testsuites/samples/nsecs/Makefile.am
index 73fd791be8..af8ee148ee 100644
--- a/testsuites/samples/nsecs/Makefile.am
+++ b/testsuites/samples/nsecs/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = nsecs.exe
-nsecs_exe_SOURCES = init.c empty.c
+rtems_tests_PROGRAMS = nsecs
+nsecs_SOURCES = init.c empty.c
 
 dist_rtems_tests_DATA = nsecs.scn
 dist_rtems_tests_DATA += nsecs.doc
@@ -14,11 +14,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-LINK_OBJS = $(nsecs_exe_OBJECTS) $(nsecs_exe_LDADD)
-LINK_LIBS = $(nsecs_exe_LDLIBS)
+LINK_OBJS = $(nsecs_OBJECTS) $(nsecs_LDADD)
+LINK_LIBS = $(nsecs_LDLIBS)
 
-nsecs.exe$(EXEEXT): $(nsecs_exe_OBJECTS) $(nsecs_exe_DEPENDENCIES)
-	@rm -f nsecs.exe$(EXEEXT)
+nsecs$(EXEEXT): $(nsecs_OBJECTS) $(nsecs_DEPENDENCIES)
+	@rm -f nsecs$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index f8858747c7..959fc6cf37 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = paranoia.exe
-paranoia_exe_SOURCES = init.c paranoia.c system.h
+rtems_tests_PROGRAMS = paranoia
+paranoia_SOURCES = init.c paranoia.c system.h
 
 dist_rtems_tests_DATA = paranoia.doc
 
@@ -13,18 +13,18 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-paranoia_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+paranoia_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 #  -DCYGNUS   turns on more verbose msgs
 AM_CPPFLAGS += -DNOSIGNAL -DCYGNUS -DNOMAIN
 
-paranoia_exe_LDLIBS = -lm
+paranoia_LDLIBS = -lm
 
-LINK_OBJS = $(paranoia_exe_OBJECTS) $(paranoia_exe_LDADD)
-LINK_LIBS = $(paranoia_exe_LDLIBS)
+LINK_OBJS = $(paranoia_OBJECTS) $(paranoia_LDADD)
+LINK_LIBS = $(paranoia_LDLIBS)
 
-paranoia.exe$(EXEEXT): $(paranoia_exe_OBJECTS) $(paranoia_exe_DEPENDENCIES)
-	@rm -f paranoia.exe$(EXEEXT)
+paranoia$(EXEEXT): $(paranoia_OBJECTS) $(paranoia_DEPENDENCIES)
+	@rm -f paranoia$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index b35817d081..1d448afa65 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -4,22 +4,22 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = pppd.exe
-pppd_exe_SOURCES = init.c pppdapp.c netconfig.h system.h
+rtems_tests_PROGRAMS = pppd
+pppd_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
 
-pppd_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+pppd_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-pppd_exe_LDLIBS = -lpppd
+pppd_LDLIBS = -lpppd
 
-LINK_OBJS = $(pppd_exe_OBJECTS) $(pppd_exe_LDADD)
-LINK_LIBS = $(pppd_exe_LDLIBS)
+LINK_OBJS = $(pppd_OBJECTS) $(pppd_LDADD)
+LINK_LIBS = $(pppd_LDLIBS)
 
-pppd.exe$(EXEEXT): $(pppd_exe_OBJECTS) $(pppd_exe_DEPENDENCIES)
-	@rm -f pppd.exe$(EXEEXT)
+pppd$(EXEEXT): $(pppd_OBJECTS) $(pppd_DEPENDENCIES)
+	@rm -f pppd$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index d8e4a2bf0e..30f8ce4396 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = ticker.exe
-ticker_exe_SOURCES = init.c tasks.c system.h
+rtems_tests_PROGRAMS = ticker
+ticker_SOURCES = init.c tasks.c system.h
 
 dist_rtems_tests_DATA = ticker.scn
 dist_rtems_tests_DATA += ticker.doc
@@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-ticker_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+ticker_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(ticker_exe_OBJECTS) $(ticker_exe_LDADD)
-LINK_LIBS = $(ticker_exe_LDLIBS)
+LINK_OBJS = $(ticker_OBJECTS) $(ticker_LDADD)
+LINK_LIBS = $(ticker_LDLIBS)
 
-ticker.exe$(EXEEXT): $(ticker_exe_OBJECTS) $(ticker_exe_DEPENDENCIES)
-	@rm -f ticker.exe$(EXEEXT)
+ticker$(EXEEXT): $(ticker_OBJECTS) $(ticker_DEPENDENCIES)
+	@rm -f ticker$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index 3b681cf2bb..024f74e883 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io event semaphore
 
-rtems_tests_PROGRAMS = unlimited.exe
-unlimited_exe_SOURCES = init.c test1.c test2.c test3.c system.h
+rtems_tests_PROGRAMS = unlimited
+unlimited_SOURCES = init.c test1.c test2.c test3.c system.h
 
 dist_rtems_tests_DATA = unlimited.scn
 dist_rtems_tests_DATA += unlimited.doc
@@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-unlimited_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+unlimited_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(unlimited_exe_OBJECTS) $(unlimited_exe_LDADD)
-LINK_LIBS = $(unlimited_exe_LDLIBS)
+LINK_OBJS = $(unlimited_OBJECTS) $(unlimited_LDADD)
+LINK_LIBS = $(unlimited_LDLIBS)
 
-unlimited.exe$(EXEEXT): $(unlimited_exe_OBJECTS) $(unlimited_exe_DEPENDENCIES)
-	@rm -f unlimited.exe$(EXEEXT)
+unlimited$(EXEEXT): $(unlimited_OBJECTS) $(unlimited_DEPENDENCIES)
+	@rm -f unlimited$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp01/Makefile.am b/testsuites/sptests/sp01/Makefile.am
index cdbc08452a..3dd3232792 100644
--- a/testsuites/sptests/sp01/Makefile.am
+++ b/testsuites/sptests/sp01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore clock
 
-rtems_tests_PROGRAMS = sp01.exe
-sp01_exe_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp01
+sp01_SOURCES = init.c task1.c system.h
 
 dist_rtems_tests_DATA = sp01.scn
 dist_rtems_tests_DATA += sp01.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp01_exe_OBJECTS) $(sp01_exe_LDADD)
-LINK_LIBS = $(sp01_exe_LDLIBS)
+LINK_OBJS = $(sp01_OBJECTS) $(sp01_LDADD)
+LINK_LIBS = $(sp01_LDLIBS)
 
-sp01.exe$(EXEEXT): $(sp01_exe_OBJECTS) $(sp01_exe_DEPENDENCIES)
-	@rm -f sp01.exe$(EXEEXT)
+sp01$(EXEEXT): $(sp01_OBJECTS) $(sp01_DEPENDENCIES)
+	@rm -f sp01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp02/Makefile.am b/testsuites/sptests/sp02/Makefile.am
index 42b050b066..40b935c544 100644
--- a/testsuites/sptests/sp02/Makefile.am
+++ b/testsuites/sptests/sp02/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore clock
 
-rtems_tests_PROGRAMS = sp02.exe
-sp02_exe_SOURCES = init.c task1.c task2.c task3.c preempt.c system.h
+rtems_tests_PROGRAMS = sp02
+sp02_SOURCES = init.c task1.c task2.c task3.c preempt.c system.h
 
 dist_rtems_tests_DATA = sp02.scn
 dist_rtems_tests_DATA += sp02.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp02_exe_OBJECTS) $(sp02_exe_LDADD)
-LINK_LIBS = $(sp02_exe_LDLIBS)
+LINK_OBJS = $(sp02_OBJECTS) $(sp02_LDADD)
+LINK_LIBS = $(sp02_LDLIBS)
 
-sp02.exe$(EXEEXT): $(sp02_exe_OBJECTS) $(sp02_exe_DEPENDENCIES)
-	@rm -f sp02.exe$(EXEEXT)
+sp02$(EXEEXT): $(sp02_OBJECTS) $(sp02_DEPENDENCIES)
+	@rm -f sp02$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp03/Makefile.am b/testsuites/sptests/sp03/Makefile.am
index bedf79ae99..eaf8ad05ca 100644
--- a/testsuites/sptests/sp03/Makefile.am
+++ b/testsuites/sptests/sp03/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore clock
 
-rtems_tests_PROGRAMS = sp03.exe
-sp03_exe_SOURCES = init.c task1.c task2.c system.h
+rtems_tests_PROGRAMS = sp03
+sp03_SOURCES = init.c task1.c task2.c system.h
 
 dist_rtems_tests_DATA = sp03.scn
 dist_rtems_tests_DATA += sp03.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp03_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp03_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp03_exe_OBJECTS) $(sp03_exe_LDADD)
-LINK_LIBS = $(sp03_exe_LDLIBS)
+LINK_OBJS = $(sp03_OBJECTS) $(sp03_LDADD)
+LINK_LIBS = $(sp03_LDLIBS)
 
-sp03.exe$(EXEEXT): $(sp03_exe_OBJECTS) $(sp03_exe_DEPENDENCIES)
-	@rm -f sp03.exe$(EXEEXT)
+sp03$(EXEEXT): $(sp03_OBJECTS) $(sp03_DEPENDENCIES)
+	@rm -f sp03$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp04/Makefile.am b/testsuites/sptests/sp04/Makefile.am
index 1f6d8afb5a..5f358eb19f 100644
--- a/testsuites/sptests/sp04/Makefile.am
+++ b/testsuites/sptests/sp04/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore clock extension
 
-rtems_tests_PROGRAMS = sp04.exe
-sp04_exe_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
+rtems_tests_PROGRAMS = sp04
+sp04_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
 
 dist_rtems_tests_DATA = sp04.scn
 dist_rtems_tests_DATA += sp04.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp04_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp04_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp04_exe_OBJECTS) $(sp04_exe_LDADD)
-LINK_LIBS = $(sp04_exe_LDLIBS)
+LINK_OBJS = $(sp04_OBJECTS) $(sp04_LDADD)
+LINK_LIBS = $(sp04_LDLIBS)
 
-sp04.exe$(EXEEXT): $(sp04_exe_OBJECTS) $(sp04_exe_DEPENDENCIES)
-	@rm -f sp04.exe$(EXEEXT)
+sp04$(EXEEXT): $(sp04_OBJECTS) $(sp04_DEPENDENCIES)
+	@rm -f sp04$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp05/Makefile.am b/testsuites/sptests/sp05/Makefile.am
index 8e9854ca10..458dbe8e05 100644
--- a/testsuites/sptests/sp05/Makefile.am
+++ b/testsuites/sptests/sp05/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore clock
 
-rtems_tests_PROGRAMS = sp05.exe
-sp05_exe_SOURCES = init.c task1.c task2.c task3.c system.h
+rtems_tests_PROGRAMS = sp05
+sp05_SOURCES = init.c task1.c task2.c task3.c system.h
 
 dist_rtems_tests_DATA = sp05.scn
 dist_rtems_tests_DATA += sp05.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp05_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp05_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp05_exe_OBJECTS) $(sp05_exe_LDADD)
-LINK_LIBS = $(sp05_exe_LDLIBS)
+LINK_OBJS = $(sp05_OBJECTS) $(sp05_LDADD)
+LINK_LIBS = $(sp05_LDLIBS)
 
-sp05.exe$(EXEEXT): $(sp05_exe_OBJECTS) $(sp05_exe_DEPENDENCIES)
-	@rm -f sp05.exe$(EXEEXT)
+sp05$(EXEEXT): $(sp05_OBJECTS) $(sp05_DEPENDENCIES)
+	@rm -f sp05$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp06/Makefile.am b/testsuites/sptests/sp06/Makefile.am
index d7486463ff..b25dd57af3 100644
--- a/testsuites/sptests/sp06/Makefile.am
+++ b/testsuites/sptests/sp06/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore clock
 
-rtems_tests_PROGRAMS = sp06.exe
-sp06_exe_SOURCES = init.c task1.c task2.c task3.c system.h
+rtems_tests_PROGRAMS = sp06
+sp06_SOURCES = init.c task1.c task2.c task3.c system.h
 
 dist_rtems_tests_DATA = sp06.scn
 dist_rtems_tests_DATA += sp06.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp06_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp06_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp06_exe_OBJECTS) $(sp06_exe_LDADD)
-LINK_LIBS = $(sp06_exe_LDLIBS)
+LINK_OBJS = $(sp06_OBJECTS) $(sp06_LDADD)
+LINK_LIBS = $(sp06_LDLIBS)
 
-sp06.exe$(EXEEXT): $(sp06_exe_OBJECTS) $(sp06_exe_DEPENDENCIES)
-	@rm -f sp06.exe$(EXEEXT)
+sp06$(EXEEXT): $(sp06_OBJECTS) $(sp06_DEPENDENCIES)
+	@rm -f sp06$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp07/Makefile.am b/testsuites/sptests/sp07/Makefile.am
index 4322cfe925..36111dd019 100644
--- a/testsuites/sptests/sp07/Makefile.am
+++ b/testsuites/sptests/sp07/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore clock extension
 
-rtems_tests_PROGRAMS = sp07.exe
-sp07_exe_SOURCES = init.c buffered_io.c task1.c task2.c task3.c task4.c \
+rtems_tests_PROGRAMS = sp07
+sp07_SOURCES = init.c buffered_io.c task1.c task2.c task3.c task4.c \
     taskexit.c tcreate.c tdelete.c trestart.c tstart.c system.h
 
 dist_rtems_tests_DATA = sp07.scn
@@ -15,15 +15,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp07_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp07_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp07_exe_OBJECTS) $(sp07_exe_LDADD)
-LINK_LIBS = $(sp07_exe_LDLIBS)
+LINK_OBJS = $(sp07_OBJECTS) $(sp07_LDADD)
+LINK_LIBS = $(sp07_LDLIBS)
 
-sp07.exe$(EXEEXT): $(sp07_exe_OBJECTS) $(sp07_exe_DEPENDENCIES)
-	@rm -f sp07.exe$(EXEEXT)
+sp07$(EXEEXT): $(sp07_OBJECTS) $(sp07_DEPENDENCIES)
+	@rm -f sp07$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp08/Makefile.am b/testsuites/sptests/sp08/Makefile.am
index 14040d61cd..e61c96d63a 100644
--- a/testsuites/sptests/sp08/Makefile.am
+++ b/testsuites/sptests/sp08/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore clock
 
-rtems_tests_PROGRAMS = sp08.exe
-sp08_exe_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp08
+sp08_SOURCES = init.c task1.c system.h
 
 dist_rtems_tests_DATA = sp08.scn
 dist_rtems_tests_DATA += sp08.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp08_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp08_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp08_exe_OBJECTS) $(sp08_exe_LDADD)
-LINK_LIBS = $(sp08_exe_LDLIBS)
+LINK_OBJS = $(sp08_OBJECTS) $(sp08_LDADD)
+LINK_LIBS = $(sp08_LDLIBS)
 
-sp08.exe$(EXEEXT): $(sp08_exe_OBJECTS) $(sp08_exe_DEPENDENCIES)
-	@rm -f sp08.exe$(EXEEXT)
+sp08$(EXEEXT): $(sp08_OBJECTS) $(sp08_DEPENDENCIES)
+	@rm -f sp08$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp09/Makefile.am b/testsuites/sptests/sp09/Makefile.am
index c85cabffe7..4f796cb022 100644
--- a/testsuites/sptests/sp09/Makefile.am
+++ b/testsuites/sptests/sp09/Makefile.am
@@ -5,8 +5,8 @@
 MANAGERS = io clock message dual_ported_memory event multi_processor region \
     semaphore signal rate_monotonic timer partition
 
-rtems_tests_PROGRAMS = sp09.exe
-sp09_exe_SOURCES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen04.c \
+rtems_tests_PROGRAMS = sp09
+sp09_SOURCES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen04.c \
     screen05.c screen06.c screen07.c screen08.c screen09.c screen10.c \
     screen11.c screen12.c screen13.c screen14.c task1.c task2.c task3.c \
     task4.c system.h
@@ -18,15 +18,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp09_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp09_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp09_exe_OBJECTS) $(sp09_exe_LDADD)
-LINK_LIBS = $(sp09_exe_LDLIBS)
+LINK_OBJS = $(sp09_OBJECTS) $(sp09_LDADD)
+LINK_LIBS = $(sp09_LDLIBS)
 
-sp09.exe$(EXEEXT): $(sp09_exe_OBJECTS) $(sp09_exe_DEPENDENCIES)
-	@rm -f sp09.exe$(EXEEXT)
+sp09$(EXEEXT): $(sp09_OBJECTS) $(sp09_DEPENDENCIES)
+	@rm -f sp09$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp11/Makefile.am b/testsuites/sptests/sp11/Makefile.am
index f037fee20a..8ee044e658 100644
--- a/testsuites/sptests/sp11/Makefile.am
+++ b/testsuites/sptests/sp11/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io event timer clock semaphore
 
-rtems_tests_PROGRAMS = sp11.exe
-sp11_exe_SOURCES = init.c task1.c task2.c timer.c system.h
+rtems_tests_PROGRAMS = sp11
+sp11_SOURCES = init.c task1.c task2.c timer.c system.h
 
 dist_rtems_tests_DATA = sp11.scn
 dist_rtems_tests_DATA += sp11.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp11_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp11_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp11_exe_OBJECTS) $(sp11_exe_LDADD)
-LINK_LIBS = $(sp11_exe_LDLIBS)
+LINK_OBJS = $(sp11_OBJECTS) $(sp11_LDADD)
+LINK_LIBS = $(sp11_LDLIBS)
 
-sp11.exe$(EXEEXT): $(sp11_exe_OBJECTS) $(sp11_exe_DEPENDENCIES)
-	@rm -f sp11.exe$(EXEEXT)
+sp11$(EXEEXT): $(sp11_OBJECTS) $(sp11_DEPENDENCIES)
+	@rm -f sp11$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp12/Makefile.am b/testsuites/sptests/sp12/Makefile.am
index e3b7ab2325..03aa94fcdd 100644
--- a/testsuites/sptests/sp12/Makefile.am
+++ b/testsuites/sptests/sp12/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore clock
 
-rtems_tests_PROGRAMS = sp12.exe
-sp12_exe_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c pridrv.c \
+rtems_tests_PROGRAMS = sp12
+sp12_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c pridrv.c \
     pritask.c system.h
 
 dist_rtems_tests_DATA = sp12.scn
@@ -15,15 +15,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp12_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp12_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp12_exe_OBJECTS) $(sp12_exe_LDADD)
-LINK_LIBS = $(sp12_exe_LDLIBS)
+LINK_OBJS = $(sp12_OBJECTS) $(sp12_LDADD)
+LINK_LIBS = $(sp12_LDLIBS)
 
-sp12.exe$(EXEEXT): $(sp12_exe_OBJECTS) $(sp12_exe_DEPENDENCIES)
-	@rm -f sp12.exe$(EXEEXT)
+sp12$(EXEEXT): $(sp12_OBJECTS) $(sp12_DEPENDENCIES)
+	@rm -f sp12$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp13/Makefile.am b/testsuites/sptests/sp13/Makefile.am
index ebbe69e444..475f4e13e9 100644
--- a/testsuites/sptests/sp13/Makefile.am
+++ b/testsuites/sptests/sp13/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io message semaphore clock
 
-rtems_tests_PROGRAMS = sp13.exe
-sp13_exe_SOURCES = init.c fillbuff.c putbuff.c task1.c task2.c task3.c system.h
+rtems_tests_PROGRAMS = sp13
+sp13_SOURCES = init.c fillbuff.c putbuff.c task1.c task2.c task3.c system.h
 
 dist_rtems_tests_DATA = sp13.scn
 dist_rtems_tests_DATA += sp13.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp13_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp13_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp13_exe_OBJECTS) $(sp13_exe_LDADD)
-LINK_LIBS = $(sp13_exe_LDLIBS)
+LINK_OBJS = $(sp13_OBJECTS) $(sp13_LDADD)
+LINK_LIBS = $(sp13_LDLIBS)
 
-sp13.exe$(EXEEXT): $(sp13_exe_OBJECTS) $(sp13_exe_DEPENDENCIES)
-	@rm -f sp13.exe$(EXEEXT)
+sp13$(EXEEXT): $(sp13_OBJECTS) $(sp13_DEPENDENCIES)
+	@rm -f sp13$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp14/Makefile.am b/testsuites/sptests/sp14/Makefile.am
index 620555c688..efea9c1e4b 100644
--- a/testsuites/sptests/sp14/Makefile.am
+++ b/testsuites/sptests/sp14/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io signal timer semaphore clock
 
-rtems_tests_PROGRAMS = sp14.exe
-sp14_exe_SOURCES = init.c asr.c task1.c task2.c system.h
+rtems_tests_PROGRAMS = sp14
+sp14_SOURCES = init.c asr.c task1.c task2.c system.h
 
 dist_rtems_tests_DATA = sp14.scn
 dist_rtems_tests_DATA += sp14.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp14_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp14_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp14_exe_OBJECTS) $(sp14_exe_LDADD)
-LINK_LIBS = $(sp14_exe_LDLIBS)
+LINK_OBJS = $(sp14_OBJECTS) $(sp14_LDADD)
+LINK_LIBS = $(sp14_LDLIBS)
 
-sp14.exe$(EXEEXT): $(sp14_exe_OBJECTS) $(sp14_exe_DEPENDENCIES)
-	@rm -f sp14.exe$(EXEEXT)
+sp14$(EXEEXT): $(sp14_OBJECTS) $(sp14_DEPENDENCIES)
+	@rm -f sp14$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp15/Makefile.am b/testsuites/sptests/sp15/Makefile.am
index 4456b6560c..6e8e588f5e 100644
--- a/testsuites/sptests/sp15/Makefile.am
+++ b/testsuites/sptests/sp15/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io partition semaphore clock
 
-rtems_tests_PROGRAMS = sp15.exe
-sp15_exe_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp15
+sp15_SOURCES = init.c task1.c system.h
 
 dist_rtems_tests_DATA = sp15.scn
 dist_rtems_tests_DATA += sp15.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp15_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp15_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp15_exe_OBJECTS) $(sp15_exe_LDADD)
-LINK_LIBS = $(sp15_exe_LDLIBS)
+LINK_OBJS = $(sp15_OBJECTS) $(sp15_LDADD)
+LINK_LIBS = $(sp15_LDLIBS)
 
-sp15.exe$(EXEEXT): $(sp15_exe_OBJECTS) $(sp15_exe_DEPENDENCIES)
-	@rm -f sp15.exe$(EXEEXT)
+sp15$(EXEEXT): $(sp15_OBJECTS) $(sp15_DEPENDENCIES)
+	@rm -f sp15$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp16/Makefile.am b/testsuites/sptests/sp16/Makefile.am
index 79c88dabe9..84d196bff3 100644
--- a/testsuites/sptests/sp16/Makefile.am
+++ b/testsuites/sptests/sp16/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io region semaphore clock
 
-rtems_tests_PROGRAMS = sp16.exe
-sp16_exe_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c system.h
+rtems_tests_PROGRAMS = sp16
+sp16_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c system.h
 
 dist_rtems_tests_DATA = sp16.scn
 dist_rtems_tests_DATA += sp16.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp16_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp16_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp16_exe_OBJECTS) $(sp16_exe_LDADD)
-LINK_LIBS = $(sp16_exe_LDLIBS)
+LINK_OBJS = $(sp16_OBJECTS) $(sp16_LDADD)
+LINK_LIBS = $(sp16_LDLIBS)
 
-sp16.exe$(EXEEXT): $(sp16_exe_OBJECTS) $(sp16_exe_DEPENDENCIES)
-	@rm -f sp16.exe$(EXEEXT)
+sp16$(EXEEXT): $(sp16_OBJECTS) $(sp16_DEPENDENCIES)
+	@rm -f sp16$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp17/Makefile.am b/testsuites/sptests/sp17/Makefile.am
index 51427d3430..202381902e 100644
--- a/testsuites/sptests/sp17/Makefile.am
+++ b/testsuites/sptests/sp17/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io signal semaphore clock
 
-rtems_tests_PROGRAMS = sp17.exe
-sp17_exe_SOURCES = init.c asr.c task1.c task2.c system.h
+rtems_tests_PROGRAMS = sp17
+sp17_SOURCES = init.c asr.c task1.c task2.c system.h
 
 dist_rtems_tests_DATA = sp17.scn
 dist_rtems_tests_DATA += sp17.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp17_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp17_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp17_exe_OBJECTS) $(sp17_exe_LDADD)
-LINK_LIBS = $(sp17_exe_LDLIBS)
+LINK_OBJS = $(sp17_OBJECTS) $(sp17_LDADD)
+LINK_LIBS = $(sp17_LDLIBS)
 
-sp17.exe$(EXEEXT): $(sp17_exe_OBJECTS) $(sp17_exe_DEPENDENCIES)
-	@rm -f sp17.exe$(EXEEXT)
+sp17$(EXEEXT): $(sp17_OBJECTS) $(sp17_DEPENDENCIES)
+	@rm -f sp17$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp19/Makefile.am b/testsuites/sptests/sp19/Makefile.am
index 865a657912..d511f1d2ab 100644
--- a/testsuites/sptests/sp19/Makefile.am
+++ b/testsuites/sptests/sp19/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore clock
 
-rtems_tests_PROGRAMS = sp19.exe
-sp19_exe_SOURCES = init.c first.c fptask.c task1.c system.h fptest.h inttest.h
+rtems_tests_PROGRAMS = sp19
+sp19_SOURCES = init.c first.c fptask.c task1.c system.h fptest.h inttest.h
 
 dist_rtems_tests_DATA = sp19.scn
 dist_rtems_tests_DATA += sp19.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp19_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp19_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp19_exe_OBJECTS) $(sp19_exe_LDADD)
-LINK_LIBS = $(sp19_exe_LDLIBS)
+LINK_OBJS = $(sp19_OBJECTS) $(sp19_LDADD)
+LINK_LIBS = $(sp19_LDLIBS)
 
-sp19.exe$(EXEEXT): $(sp19_exe_OBJECTS) $(sp19_exe_DEPENDENCIES)
-	@rm -f sp19.exe$(EXEEXT)
+sp19$(EXEEXT): $(sp19_OBJECTS) $(sp19_DEPENDENCIES)
+	@rm -f sp19$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp20/Makefile.am b/testsuites/sptests/sp20/Makefile.am
index 9826ac64d6..d92f97dd1c 100644
--- a/testsuites/sptests/sp20/Makefile.am
+++ b/testsuites/sptests/sp20/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io rate_monotonic semaphore clock
 
-rtems_tests_PROGRAMS = sp20.exe
-sp20_exe_SOURCES = init.c getall.c task1.c system.h
+rtems_tests_PROGRAMS = sp20
+sp20_SOURCES = init.c getall.c task1.c system.h
 
 dist_rtems_tests_DATA = sp20.scn
 dist_rtems_tests_DATA += sp20.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp20_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp20_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp20_exe_OBJECTS) $(sp20_exe_LDADD)
-LINK_LIBS = $(sp20_exe_LDLIBS)
+LINK_OBJS = $(sp20_OBJECTS) $(sp20_LDADD)
+LINK_LIBS = $(sp20_LDLIBS)
 
-sp20.exe$(EXEEXT): $(sp20_exe_OBJECTS) $(sp20_exe_DEPENDENCIES)
-	@rm -f sp20.exe$(EXEEXT)
+sp20$(EXEEXT): $(sp20_OBJECTS) $(sp20_DEPENDENCIES)
+	@rm -f sp20$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp21/Makefile.am b/testsuites/sptests/sp21/Makefile.am
index 1823c61063..7d73800cdc 100644
--- a/testsuites/sptests/sp21/Makefile.am
+++ b/testsuites/sptests/sp21/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore clock
 
-rtems_tests_PROGRAMS = sp21.exe
-sp21_exe_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp21
+sp21_SOURCES = init.c task1.c system.h
 
 dist_rtems_tests_DATA = sp21.scn
 dist_rtems_tests_DATA += sp21.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp21_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp21_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp21_exe_OBJECTS) $(sp21_exe_LDADD)
-LINK_LIBS = $(sp21_exe_LDLIBS)
+LINK_OBJS = $(sp21_OBJECTS) $(sp21_LDADD)
+LINK_LIBS = $(sp21_LDLIBS)
 
-sp21.exe$(EXEEXT): $(sp21_exe_OBJECTS) $(sp21_exe_DEPENDENCIES)
-	@rm -f sp21.exe$(EXEEXT)
+sp21$(EXEEXT): $(sp21_OBJECTS) $(sp21_DEPENDENCIES)
+	@rm -f sp21$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp22/Makefile.am b/testsuites/sptests/sp22/Makefile.am
index cc306e925d..bc092b9979 100644
--- a/testsuites/sptests/sp22/Makefile.am
+++ b/testsuites/sptests/sp22/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io timer semaphore clock
 
-rtems_tests_PROGRAMS = sp22.exe
-sp22_exe_SOURCES = init.c prtime.c delay.c task1.c system.h
+rtems_tests_PROGRAMS = sp22
+sp22_SOURCES = init.c prtime.c delay.c task1.c system.h
 
 dist_rtems_tests_DATA = sp22.scn
 dist_rtems_tests_DATA += sp22.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp22_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp22_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp22_exe_OBJECTS) $(sp22_exe_LDADD)
-LINK_LIBS = $(sp22_exe_LDLIBS)
+LINK_OBJS = $(sp22_OBJECTS) $(sp22_LDADD)
+LINK_LIBS = $(sp22_LDLIBS)
 
-sp22.exe$(EXEEXT): $(sp22_exe_OBJECTS) $(sp22_exe_DEPENDENCIES)
-	@rm -f sp22.exe$(EXEEXT)
+sp22$(EXEEXT): $(sp22_OBJECTS) $(sp22_DEPENDENCIES)
+	@rm -f sp22$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp23/Makefile.am b/testsuites/sptests/sp23/Makefile.am
index 500297a176..b95fd671c0 100644
--- a/testsuites/sptests/sp23/Makefile.am
+++ b/testsuites/sptests/sp23/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io dual_ported_memory semaphore clock
 
-rtems_tests_PROGRAMS = sp23.exe
-sp23_exe_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp23
+sp23_SOURCES = init.c task1.c system.h
 
 dist_rtems_tests_DATA = sp23.scn
 dist_rtems_tests_DATA += sp23.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp23_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp23_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp23_exe_OBJECTS) $(sp23_exe_LDADD)
-LINK_LIBS = $(sp23_exe_LDLIBS)
+LINK_OBJS = $(sp23_OBJECTS) $(sp23_LDADD)
+LINK_LIBS = $(sp23_LDLIBS)
 
-sp23.exe$(EXEEXT): $(sp23_exe_OBJECTS) $(sp23_exe_DEPENDENCIES)
-	@rm -f sp23.exe$(EXEEXT)
+sp23$(EXEEXT): $(sp23_OBJECTS) $(sp23_DEPENDENCIES)
+	@rm -f sp23$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp24/Makefile.am b/testsuites/sptests/sp24/Makefile.am
index 9cdb49a787..5081c90672 100644
--- a/testsuites/sptests/sp24/Makefile.am
+++ b/testsuites/sptests/sp24/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io event timer semaphore clock
 
-rtems_tests_PROGRAMS = sp24.exe
-sp24_exe_SOURCES = init.c resume.c task1.c system.h
+rtems_tests_PROGRAMS = sp24
+sp24_SOURCES = init.c resume.c task1.c system.h
 
 dist_rtems_tests_DATA = sp24.scn
 dist_rtems_tests_DATA += sp24.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp24_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp24_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp24_exe_OBJECTS) $(sp24_exe_LDADD)
-LINK_LIBS = $(sp24_exe_LDLIBS)
+LINK_OBJS = $(sp24_OBJECTS) $(sp24_LDADD)
+LINK_LIBS = $(sp24_LDLIBS)
 
-sp24.exe$(EXEEXT): $(sp24_exe_OBJECTS) $(sp24_exe_DEPENDENCIES)
-	@rm -f sp24.exe$(EXEEXT)
+sp24$(EXEEXT): $(sp24_OBJECTS) $(sp24_DEPENDENCIES)
+	@rm -f sp24$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp25/Makefile.am b/testsuites/sptests/sp25/Makefile.am
index e68cd3509e..1c5491d104 100644
--- a/testsuites/sptests/sp25/Makefile.am
+++ b/testsuites/sptests/sp25/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore clock region
 
-rtems_tests_PROGRAMS = sp25.exe
-sp25_exe_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp25
+sp25_SOURCES = init.c task1.c system.h
 
 dist_rtems_tests_DATA = sp25.scn
 dist_rtems_tests_DATA += sp25.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp25_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp25_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp25_exe_OBJECTS) $(sp25_exe_LDADD)
-LINK_LIBS = $(sp25_exe_LDLIBS)
+LINK_OBJS = $(sp25_OBJECTS) $(sp25_LDADD)
+LINK_LIBS = $(sp25_LDLIBS)
 
-sp25.exe$(EXEEXT): $(sp25_exe_OBJECTS) $(sp25_exe_DEPENDENCIES)
-	@rm -f sp25.exe$(EXEEXT)
+sp25$(EXEEXT): $(sp25_OBJECTS) $(sp25_DEPENDENCIES)
+	@rm -f sp25$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp26/Makefile.am b/testsuites/sptests/sp26/Makefile.am
index 79cdf94ff6..e13d051265 100644
--- a/testsuites/sptests/sp26/Makefile.am
+++ b/testsuites/sptests/sp26/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io event semaphore clock
 
-rtems_tests_PROGRAMS = sp26.exe
-sp26_exe_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = sp26
+sp26_SOURCES = init.c task1.c system.h
 
 dist_rtems_tests_DATA = sp26.scn
 dist_rtems_tests_DATA += sp26.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp26_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp26_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp26_exe_OBJECTS) $(sp26_exe_LDADD)
-LINK_LIBS = $(sp26_exe_LDLIBS)
+LINK_OBJS = $(sp26_OBJECTS) $(sp26_LDADD)
+LINK_LIBS = $(sp26_LDLIBS)
 
-sp26.exe$(EXEEXT): $(sp26_exe_OBJECTS) $(sp26_exe_DEPENDENCIES)
-	@rm -f sp26.exe$(EXEEXT)
+sp26$(EXEEXT): $(sp26_OBJECTS) $(sp26_DEPENDENCIES)
+	@rm -f sp26$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp27/Makefile.am b/testsuites/sptests/sp27/Makefile.am
index bd706176b6..b9a2d124a4 100644
--- a/testsuites/sptests/sp27/Makefile.am
+++ b/testsuites/sptests/sp27/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp27.exe
-sp27_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = sp27
+sp27_SOURCES = init.c
 
 dist_rtems_tests_DATA = sp27.scn
 dist_rtems_tests_DATA += sp27.doc
@@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp27_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp27_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(sp27_exe_OBJECTS) $(sp27_exe_LDADD)
-LINK_LIBS = $(sp27_exe_LDLIBS)
+LINK_OBJS = $(sp27_OBJECTS) $(sp27_LDADD)
+LINK_LIBS = $(sp27_LDLIBS)
 
-sp27.exe$(EXEEXT): $(sp27_exe_OBJECTS) $(sp27_exe_DEPENDENCIES)
-	@rm -f sp27.exe$(EXEEXT)
+sp27$(EXEEXT): $(sp27_OBJECTS) $(sp27_DEPENDENCIES)
+	@rm -f sp27$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp28/Makefile.am b/testsuites/sptests/sp28/Makefile.am
index a57f54c082..56ade106c5 100644
--- a/testsuites/sptests/sp28/Makefile.am
+++ b/testsuites/sptests/sp28/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp28.exe
-sp28_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = sp28
+sp28_SOURCES = init.c
 
 dist_rtems_tests_DATA = sp28.scn
 dist_rtems_tests_DATA += sp28.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp28_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp28_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp28_exe_OBJECTS) $(sp28_exe_LDADD)
-LINK_LIBS = $(sp28_exe_LDLIBS)
+LINK_OBJS = $(sp28_OBJECTS) $(sp28_LDADD)
+LINK_LIBS = $(sp28_LDLIBS)
 
-sp28.exe$(EXEEXT): $(sp28_exe_OBJECTS) $(sp28_exe_DEPENDENCIES)
-	@rm -f sp28.exe$(EXEEXT)
+sp28$(EXEEXT): $(sp28_OBJECTS) $(sp28_DEPENDENCIES)
+	@rm -f sp28$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp29/Makefile.am b/testsuites/sptests/sp29/Makefile.am
index 51f7ee5fbe..9b62bd4929 100644
--- a/testsuites/sptests/sp29/Makefile.am
+++ b/testsuites/sptests/sp29/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp29.exe
-sp29_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = sp29
+sp29_SOURCES = init.c
 
 dist_rtems_tests_DATA = sp29.scn
 dist_rtems_tests_DATA += sp29.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp29_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp29_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp29_exe_OBJECTS) $(sp29_exe_LDADD)
-LINK_LIBS = $(sp29_exe_LDLIBS)
+LINK_OBJS = $(sp29_OBJECTS) $(sp29_LDADD)
+LINK_LIBS = $(sp29_LDLIBS)
 
-sp29.exe$(EXEEXT): $(sp29_exe_OBJECTS) $(sp29_exe_DEPENDENCIES)
-	@rm -f sp29.exe$(EXEEXT)
+sp29$(EXEEXT): $(sp29_OBJECTS) $(sp29_DEPENDENCIES)
+	@rm -f sp29$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp30/Makefile.am b/testsuites/sptests/sp30/Makefile.am
index 28831d00f1..fc55537859 100644
--- a/testsuites/sptests/sp30/Makefile.am
+++ b/testsuites/sptests/sp30/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp30.exe
-sp30_exe_SOURCES = init.c resume.c task1.c system.h
+rtems_tests_PROGRAMS = sp30
+sp30_SOURCES = init.c resume.c task1.c system.h
 
 dist_rtems_tests_DATA = sp30.scn
 dist_rtems_tests_DATA += sp30.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp30_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp30_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp30_exe_OBJECTS) $(sp30_exe_LDADD)
-LINK_LIBS = $(sp30_exe_LDLIBS)
+LINK_OBJS = $(sp30_OBJECTS) $(sp30_LDADD)
+LINK_LIBS = $(sp30_LDLIBS)
 
-sp30.exe$(EXEEXT): $(sp30_exe_OBJECTS) $(sp30_exe_DEPENDENCIES)
-	@rm -f sp30.exe$(EXEEXT)
+sp30$(EXEEXT): $(sp30_OBJECTS) $(sp30_DEPENDENCIES)
+	@rm -f sp30$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp31/Makefile.am b/testsuites/sptests/sp31/Makefile.am
index a01e116fcb..b534796bd2 100644
--- a/testsuites/sptests/sp31/Makefile.am
+++ b/testsuites/sptests/sp31/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp31.exe
-sp31_exe_SOURCES = delay.c init.c prtime.c task1.c system.h
+rtems_tests_PROGRAMS = sp31
+sp31_SOURCES = delay.c init.c prtime.c task1.c system.h
 
 dist_rtems_tests_DATA = sp31.scn
 dist_rtems_tests_DATA += sp31.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp31_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp31_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp31_exe_OBJECTS) $(sp31_exe_LDADD)
-LINK_LIBS = $(sp31_exe_LDLIBS)
+LINK_OBJS = $(sp31_OBJECTS) $(sp31_LDADD)
+LINK_LIBS = $(sp31_LDLIBS)
 
-sp31.exe$(EXEEXT): $(sp31_exe_OBJECTS) $(sp31_exe_DEPENDENCIES)
-	@rm -f sp31.exe$(EXEEXT)
+sp31$(EXEEXT): $(sp31_OBJECTS) $(sp31_DEPENDENCIES)
+	@rm -f sp31$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp32/Makefile.am b/testsuites/sptests/sp32/Makefile.am
index 9ddc632646..bda909fd47 100644
--- a/testsuites/sptests/sp32/Makefile.am
+++ b/testsuites/sptests/sp32/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io rate_monotonic semaphore clock
 
-rtems_tests_PROGRAMS = sp32.exe
-sp32_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = sp32
+sp32_SOURCES = init.c
 
 dist_rtems_tests_DATA = sp32.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp32_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp32_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp32_exe_OBJECTS) $(sp32_exe_LDADD)
-LINK_LIBS = $(sp32_exe_LDLIBS)
+LINK_OBJS = $(sp32_OBJECTS) $(sp32_LDADD)
+LINK_LIBS = $(sp32_LDLIBS)
 
-sp32.exe$(EXEEXT): $(sp32_exe_OBJECTS) $(sp32_exe_DEPENDENCIES)
-	@rm -f sp32.exe$(EXEEXT)
+sp32$(EXEEXT): $(sp32_OBJECTS) $(sp32_DEPENDENCIES)
+	@rm -f sp32$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp33/Makefile.am b/testsuites/sptests/sp33/Makefile.am
index e26fcc5ea0..f2ea9c23e4 100644
--- a/testsuites/sptests/sp33/Makefile.am
+++ b/testsuites/sptests/sp33/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io barrier semaphore clock
 
-rtems_tests_PROGRAMS = sp33.exe
-sp33_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = sp33
+sp33_SOURCES = init.c
 
 scndir = $(rtems_testsdir)
 dist_scn_DATA = sp33.scn
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp33_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp33_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp33_exe_OBJECTS) $(sp33_exe_LDADD)
-LINK_LIBS = $(sp33_exe_LDLIBS)
+LINK_OBJS = $(sp33_OBJECTS) $(sp33_LDADD)
+LINK_LIBS = $(sp33_LDLIBS)
 
-sp33.exe$(EXEEXT): $(sp33_exe_OBJECTS) $(sp33_exe_DEPENDENCIES)
-	@rm -f sp33.exe$(EXEEXT)
+sp33$(EXEEXT): $(sp33_OBJECTS) $(sp33_DEPENDENCIES)
+	@rm -f sp33$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp34/Makefile.am b/testsuites/sptests/sp34/Makefile.am
index b5308beff1..6f92af5306 100644
--- a/testsuites/sptests/sp34/Makefile.am
+++ b/testsuites/sptests/sp34/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp34.exe
-sp34_exe_SOURCES = changepri.c
+rtems_tests_PROGRAMS = sp34
+sp34_SOURCES = changepri.c
 
 dist_rtems_tests_DATA = sp34.scn
 dist_rtems_tests_DATA += sp34.doc
@@ -16,11 +16,11 @@ include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp34_exe_OBJECTS) $(sp34_exe_LDADD)
-LINK_LIBS = $(sp34_exe_LDLIBS)
+LINK_OBJS = $(sp34_OBJECTS) $(sp34_LDADD)
+LINK_LIBS = $(sp34_LDLIBS)
 
-sp34.exe$(EXEEXT): $(sp34_exe_OBJECTS) $(sp34_exe_DEPENDENCIES)
-	@rm -f sp34.exe$(EXEEXT)
+sp34$(EXEEXT): $(sp34_OBJECTS) $(sp34_DEPENDENCIES)
+	@rm -f sp34$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp35/Makefile.am b/testsuites/sptests/sp35/Makefile.am
index 30cc258fb6..b1ea5cc420 100644
--- a/testsuites/sptests/sp35/Makefile.am
+++ b/testsuites/sptests/sp35/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp35.exe
-sp35_exe_SOURCES = priinv.c
+rtems_tests_PROGRAMS = sp35
+sp35_SOURCES = priinv.c
 
 dist_rtems_tests_DATA = sp35.scn
 dist_rtems_tests_DATA += sp35.doc
@@ -16,11 +16,11 @@ include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp35_exe_OBJECTS) $(sp35_exe_LDADD)
-LINK_LIBS = $(sp35_exe_LDLIBS)
+LINK_OBJS = $(sp35_OBJECTS) $(sp35_LDADD)
+LINK_LIBS = $(sp35_LDLIBS)
 
-sp35.exe$(EXEEXT): $(sp35_exe_OBJECTS) $(sp35_exe_DEPENDENCIES)
-	@rm -f sp35.exe$(EXEEXT)
+sp35$(EXEEXT): $(sp35_OBJECTS) $(sp35_DEPENDENCIES)
+	@rm -f sp35$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp36/Makefile.am b/testsuites/sptests/sp36/Makefile.am
index 6e837e83e0..447436bb5c 100644
--- a/testsuites/sptests/sp36/Makefile.am
+++ b/testsuites/sptests/sp36/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp36.exe
-sp36_exe_SOURCES = strict_order_mut.c
+rtems_tests_PROGRAMS = sp36
+sp36_SOURCES = strict_order_mut.c
 
 dist_rtems_tests_DATA = sp36.scn
 dist_rtems_tests_DATA += sp36.doc
@@ -16,11 +16,11 @@ include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp36_exe_OBJECTS) $(sp36_exe_LDADD)
-LINK_LIBS = $(sp36_exe_LDLIBS)
+LINK_OBJS = $(sp36_OBJECTS) $(sp36_LDADD)
+LINK_LIBS = $(sp36_LDLIBS)
 
-sp36.exe$(EXEEXT): $(sp36_exe_OBJECTS) $(sp36_exe_DEPENDENCIES)
-	@rm -f sp36.exe$(EXEEXT)
+sp36$(EXEEXT): $(sp36_OBJECTS) $(sp36_DEPENDENCIES)
+	@rm -f sp36$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp37/Makefile.am b/testsuites/sptests/sp37/Makefile.am
index 00c14fa497..9180e7d7d7 100644
--- a/testsuites/sptests/sp37/Makefile.am
+++ b/testsuites/sptests/sp37/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp37.exe
-sp37_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = sp37
+sp37_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = sp37.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp37_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp37_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp37_exe_OBJECTS) $(sp37_exe_LDADD)
-LINK_LIBS = $(sp37_exe_LDLIBS)
+LINK_OBJS = $(sp37_OBJECTS) $(sp37_LDADD)
+LINK_LIBS = $(sp37_LDLIBS)
 
-sp37.exe$(EXEEXT): $(sp37_exe_OBJECTS) $(sp37_exe_DEPENDENCIES)
-	@rm -f sp37.exe$(EXEEXT)
+sp37$(EXEEXT): $(sp37_OBJECTS) $(sp37_DEPENDENCIES)
+	@rm -f sp37$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp38/Makefile.am b/testsuites/sptests/sp38/Makefile.am
index 6cf4f24e27..b8e5c7bf75 100644
--- a/testsuites/sptests/sp38/Makefile.am
+++ b/testsuites/sptests/sp38/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp38.exe
-sp38_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = sp38
+sp38_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = sp38.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp38_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp38_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp38_exe_OBJECTS) $(sp38_exe_LDADD)
-LINK_LIBS = $(sp38_exe_LDLIBS)
+LINK_OBJS = $(sp38_OBJECTS) $(sp38_LDADD)
+LINK_LIBS = $(sp38_LDLIBS)
 
-sp38.exe$(EXEEXT): $(sp38_exe_OBJECTS) $(sp38_exe_DEPENDENCIES)
-	@rm -f sp38.exe$(EXEEXT)
+sp38$(EXEEXT): $(sp38_OBJECTS) $(sp38_DEPENDENCIES)
+	@rm -f sp38$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp39/Makefile.am b/testsuites/sptests/sp39/Makefile.am
index ea19315aa9..1e348d3da5 100644
--- a/testsuites/sptests/sp39/Makefile.am
+++ b/testsuites/sptests/sp39/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp39.exe
-sp39_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = sp39
+sp39_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = sp39.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp39_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp39_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp39_exe_OBJECTS) $(sp39_exe_LDADD)
-LINK_LIBS = $(sp39_exe_LDLIBS)
+LINK_OBJS = $(sp39_OBJECTS) $(sp39_LDADD)
+LINK_LIBS = $(sp39_LDLIBS)
 
-sp39.exe$(EXEEXT): $(sp39_exe_OBJECTS) $(sp39_exe_DEPENDENCIES)
-	@rm -f sp39.exe$(EXEEXT)
+sp39$(EXEEXT): $(sp39_OBJECTS) $(sp39_DEPENDENCIES)
+	@rm -f sp39$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp40/Makefile.am b/testsuites/sptests/sp40/Makefile.am
index ef692123ac..fa19deffea 100644
--- a/testsuites/sptests/sp40/Makefile.am
+++ b/testsuites/sptests/sp40/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp40.exe
-sp40_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = sp40
+sp40_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = sp40.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp40_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp40_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp40_exe_OBJECTS) $(sp40_exe_LDADD)
-LINK_LIBS = $(sp40_exe_LDLIBS)
+LINK_OBJS = $(sp40_OBJECTS) $(sp40_LDADD)
+LINK_LIBS = $(sp40_LDLIBS)
 
-sp40.exe$(EXEEXT): $(sp40_exe_OBJECTS) $(sp40_exe_DEPENDENCIES)
-	@rm -f sp40.exe$(EXEEXT)
+sp40$(EXEEXT): $(sp40_OBJECTS) $(sp40_DEPENDENCIES)
+	@rm -f sp40$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp41/Makefile.am b/testsuites/sptests/sp41/Makefile.am
index 5e4bf34da4..204b41354b 100644
--- a/testsuites/sptests/sp41/Makefile.am
+++ b/testsuites/sptests/sp41/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp41.exe
-sp41_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = sp41
+sp41_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = sp41.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp41_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp41_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp41_exe_OBJECTS) $(sp41_exe_LDADD)
-LINK_LIBS = $(sp41_exe_LDLIBS)
+LINK_OBJS = $(sp41_OBJECTS) $(sp41_LDADD)
+LINK_LIBS = $(sp41_LDLIBS)
 
-sp41.exe$(EXEEXT): $(sp41_exe_OBJECTS) $(sp41_exe_DEPENDENCIES)
-	@rm -f sp41.exe$(EXEEXT)
+sp41$(EXEEXT): $(sp41_OBJECTS) $(sp41_DEPENDENCIES)
+	@rm -f sp41$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp42/Makefile.am b/testsuites/sptests/sp42/Makefile.am
index 100e33427a..efcb6f3e76 100644
--- a/testsuites/sptests/sp42/Makefile.am
+++ b/testsuites/sptests/sp42/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp42.exe
-sp42_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = sp42
+sp42_SOURCES = init.c
 
 dist_rtems_tests_DATA = sp42.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp42_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp42_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp42_exe_OBJECTS) $(sp42_exe_LDADD)
-LINK_LIBS = $(sp42_exe_LDLIBS)
+LINK_OBJS = $(sp42_OBJECTS) $(sp42_LDADD)
+LINK_LIBS = $(sp42_LDLIBS)
 
-sp42.exe$(EXEEXT): $(sp42_exe_OBJECTS) $(sp42_exe_DEPENDENCIES)
-	@rm -f sp42.exe$(EXEEXT)
+sp42$(EXEEXT): $(sp42_OBJECTS) $(sp42_DEPENDENCIES)
+	@rm -f sp42$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp43/Makefile.am b/testsuites/sptests/sp43/Makefile.am
index 4b6245ca51..8e77d8aafc 100644
--- a/testsuites/sptests/sp43/Makefile.am
+++ b/testsuites/sptests/sp43/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp43.exe
-sp43_exe_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = sp43
+sp43_SOURCES = init.c system.h
 
 dist_rtems_tests_DATA = sp43.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp43_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp43_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp43_exe_OBJECTS) $(sp43_exe_LDADD)
-LINK_LIBS = $(sp43_exe_LDLIBS)
+LINK_OBJS = $(sp43_OBJECTS) $(sp43_LDADD)
+LINK_LIBS = $(sp43_LDLIBS)
 
-sp43.exe$(EXEEXT): $(sp43_exe_OBJECTS) $(sp43_exe_DEPENDENCIES)
-	@rm -f sp43.exe$(EXEEXT)
+sp43$(EXEEXT): $(sp43_OBJECTS) $(sp43_DEPENDENCIES)
+	@rm -f sp43$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp44/Makefile.am b/testsuites/sptests/sp44/Makefile.am
index 7b1b5e4b36..b497ac8320 100644
--- a/testsuites/sptests/sp44/Makefile.am
+++ b/testsuites/sptests/sp44/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp44.exe
-sp44_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = sp44
+sp44_SOURCES = init.c
 
 dist_rtems_tests_DATA = sp44.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp44_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp44_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp44_exe_OBJECTS) $(sp44_exe_LDADD)
-LINK_LIBS = $(sp44_exe_LDLIBS)
+LINK_OBJS = $(sp44_OBJECTS) $(sp44_LDADD)
+LINK_LIBS = $(sp44_LDLIBS)
 
-sp44.exe$(EXEEXT): $(sp44_exe_OBJECTS) $(sp44_exe_DEPENDENCIES)
-	@rm -f sp44.exe$(EXEEXT)
+sp44$(EXEEXT): $(sp44_OBJECTS) $(sp44_DEPENDENCIES)
+	@rm -f sp44$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp45/Makefile.am b/testsuites/sptests/sp45/Makefile.am
index a1618b3100..63bb6f5fa5 100644
--- a/testsuites/sptests/sp45/Makefile.am
+++ b/testsuites/sptests/sp45/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp45.exe
-sp45_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = sp45
+sp45_SOURCES = init.c
 
 dist_rtems_tests_DATA = sp45.scn
 dist_rtems_tests_DATA += sp45.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp45_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp45_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp45_exe_OBJECTS) $(sp45_exe_LDADD)
-LINK_LIBS = $(sp45_exe_LDLIBS)
+LINK_OBJS = $(sp45_OBJECTS) $(sp45_LDADD)
+LINK_LIBS = $(sp45_LDLIBS)
 
-sp45.exe$(EXEEXT): $(sp45_exe_OBJECTS) $(sp45_exe_DEPENDENCIES)
-	@rm -f sp45.exe$(EXEEXT)
+sp45$(EXEEXT): $(sp45_OBJECTS) $(sp45_DEPENDENCIES)
+	@rm -f sp45$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp46/Makefile.am b/testsuites/sptests/sp46/Makefile.am
index d90ebff661..38eb928823 100644
--- a/testsuites/sptests/sp46/Makefile.am
+++ b/testsuites/sptests/sp46/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp46.exe
-sp46_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = sp46
+sp46_SOURCES = init.c
 
 dist_rtems_tests_DATA = sp46.scn
 dist_rtems_tests_DATA += sp46.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp46_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp46_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp46_exe_OBJECTS) $(sp46_exe_LDADD)
-LINK_LIBS = $(sp46_exe_LDLIBS)
+LINK_OBJS = $(sp46_OBJECTS) $(sp46_LDADD)
+LINK_LIBS = $(sp46_LDLIBS)
 
-sp46.exe$(EXEEXT): $(sp46_exe_OBJECTS) $(sp46_exe_DEPENDENCIES)
-	@rm -f sp46.exe$(EXEEXT)
+sp46$(EXEEXT): $(sp46_OBJECTS) $(sp46_DEPENDENCIES)
+	@rm -f sp46$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp47/Makefile.am b/testsuites/sptests/sp47/Makefile.am
index c0a1f04335..c974c28546 100644
--- a/testsuites/sptests/sp47/Makefile.am
+++ b/testsuites/sptests/sp47/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp47.exe
-sp47_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = sp47
+sp47_SOURCES = init.c
 
 dist_rtems_tests_DATA = sp47.scn
 dist_rtems_tests_DATA += sp47.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp47_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp47_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp47_exe_OBJECTS) $(sp47_exe_LDADD)
-LINK_LIBS = $(sp47_exe_LDLIBS)
+LINK_OBJS = $(sp47_OBJECTS) $(sp47_LDADD)
+LINK_LIBS = $(sp47_LDLIBS)
 
-sp47.exe$(EXEEXT): $(sp47_exe_OBJECTS) $(sp47_exe_DEPENDENCIES)
-	@rm -f sp47.exe$(EXEEXT)
+sp47$(EXEEXT): $(sp47_OBJECTS) $(sp47_DEPENDENCIES)
+	@rm -f sp47$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp48/Makefile.am b/testsuites/sptests/sp48/Makefile.am
index 5c705d4d16..7f809f7cd5 100644
--- a/testsuites/sptests/sp48/Makefile.am
+++ b/testsuites/sptests/sp48/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = sp48.exe
-sp48_exe_SOURCES = init.c
+rtems_tests_PROGRAMS = sp48
+sp48_SOURCES = init.c
 
 dist_rtems_tests_DATA = sp48.scn
 dist_rtems_tests_DATA += sp48.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-sp48_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+sp48_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(sp48_exe_OBJECTS) $(sp48_exe_LDADD)
-LINK_LIBS = $(sp48_exe_LDLIBS)
+LINK_OBJS = $(sp48_OBJECTS) $(sp48_LDADD)
+LINK_LIBS = $(sp48_LDLIBS)
 
-sp48.exe$(EXEEXT): $(sp48_exe_OBJECTS) $(sp48_exe_DEPENDENCIES)
-	@rm -f sp48.exe$(EXEEXT)
+sp48$(EXEEXT): $(sp48_OBJECTS) $(sp48_DEPENDENCIES)
+	@rm -f sp48$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spfatal/Makefile.am b/testsuites/sptests/spfatal/Makefile.am
index 559b760ee8..111323c88d 100644
--- a/testsuites/sptests/spfatal/Makefile.am
+++ b/testsuites/sptests/spfatal/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = spfatal.exe
-spfatal_exe_SOURCES = init.c puterr.c fatal.c task1.c system.h
+rtems_tests_PROGRAMS = spfatal
+spfatal_SOURCES = init.c puterr.c fatal.c task1.c system.h
 
 dist_rtems_tests_DATA = spfatal.scn
 dist_rtems_tests_DATA += spfatal.doc
@@ -14,15 +14,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-spfatal_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+spfatal_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(spfatal_exe_OBJECTS) $(spfatal_exe_LDADD)
-LINK_LIBS = $(spfatal_exe_LDLIBS)
+LINK_OBJS = $(spfatal_OBJECTS) $(spfatal_LDADD)
+LINK_LIBS = $(spfatal_LDLIBS)
 
-spfatal.exe$(EXEEXT): $(spfatal_exe_OBJECTS) $(spfatal_exe_DEPENDENCIES)
-	@rm -f spfatal.exe$(EXEEXT)
+spfatal$(EXEEXT): $(spfatal_OBJECTS) $(spfatal_DEPENDENCIES)
+	@rm -f spfatal$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spfatal01/Makefile.am b/testsuites/sptests/spfatal01/Makefile.am
index fca4a4cdb2..4480c07f84 100644
--- a/testsuites/sptests/spfatal01/Makefile.am
+++ b/testsuites/sptests/spfatal01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = spfatal01.exe
-spfatal01_exe_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
+rtems_tests_PROGRAMS = spfatal01
+spfatal01_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
 
 dist_rtems_tests_DATA = spfatal01.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-spfatal01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+spfatal01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(spfatal01_exe_OBJECTS) $(spfatal01_exe_LDADD)
-LINK_LIBS = $(spfatal01_exe_LDLIBS)
+LINK_OBJS = $(spfatal01_OBJECTS) $(spfatal01_LDADD)
+LINK_LIBS = $(spfatal01_LDLIBS)
 
-spfatal01.exe$(EXEEXT): $(spfatal01_exe_OBJECTS) $(spfatal01_exe_DEPENDENCIES)
-	@rm -f spfatal01.exe$(EXEEXT)
+spfatal01$(EXEEXT): $(spfatal01_OBJECTS) $(spfatal01_DEPENDENCIES)
+	@rm -f spfatal01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spfatal02/Makefile.am b/testsuites/sptests/spfatal02/Makefile.am
index e4bb6d9cee..11e63162b4 100644
--- a/testsuites/sptests/spfatal02/Makefile.am
+++ b/testsuites/sptests/spfatal02/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = spfatal02.exe
-spfatal02_exe_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
+rtems_tests_PROGRAMS = spfatal02
+spfatal02_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
 
 dist_rtems_tests_DATA = spfatal02.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-spfatal02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+spfatal02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(spfatal02_exe_OBJECTS) $(spfatal02_exe_LDADD)
-LINK_LIBS = $(spfatal02_exe_LDLIBS)
+LINK_OBJS = $(spfatal02_OBJECTS) $(spfatal02_LDADD)
+LINK_LIBS = $(spfatal02_LDLIBS)
 
-spfatal02.exe$(EXEEXT): $(spfatal02_exe_OBJECTS) $(spfatal02_exe_DEPENDENCIES)
-	@rm -f spfatal02.exe$(EXEEXT)
+spfatal02$(EXEEXT): $(spfatal02_OBJECTS) $(spfatal02_DEPENDENCIES)
+	@rm -f spfatal02$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spfatal03/Makefile.am b/testsuites/sptests/spfatal03/Makefile.am
index e901208f14..d7c3ad2894 100644
--- a/testsuites/sptests/spfatal03/Makefile.am
+++ b/testsuites/sptests/spfatal03/Makefile.am
@@ -4,23 +4,23 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = spfatal03.exe
-spfatal03_exe_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
+rtems_tests_PROGRAMS = spfatal03
+spfatal03_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
 dist_rtems_tests_DATA = spfatal03.scn
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-spfatal03_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+spfatal03_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(spfatal03_exe_OBJECTS) $(spfatal03_exe_LDADD)
-LINK_LIBS = $(spfatal03_exe_LDLIBS)
+LINK_OBJS = $(spfatal03_OBJECTS) $(spfatal03_LDADD)
+LINK_LIBS = $(spfatal03_LDLIBS)
 
-spfatal03.exe$(EXEEXT): $(spfatal03_exe_OBJECTS) $(spfatal03_exe_DEPENDENCIES)
-	@rm -f spfatal03.exe$(EXEEXT)
+spfatal03$(EXEEXT): $(spfatal03_OBJECTS) $(spfatal03_DEPENDENCIES)
+	@rm -f spfatal03$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spfatal04/Makefile.am b/testsuites/sptests/spfatal04/Makefile.am
index 6f1bf8d73a..dbf56dcd8e 100644
--- a/testsuites/sptests/spfatal04/Makefile.am
+++ b/testsuites/sptests/spfatal04/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = spfatal04.exe
-spfatal04_exe_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
+rtems_tests_PROGRAMS = spfatal04
+spfatal04_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
 
 dist_rtems_tests_DATA = spfatal04.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-spfatal04_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+spfatal04_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(spfatal04_exe_OBJECTS) $(spfatal04_exe_LDADD)
-LINK_LIBS = $(spfatal04_exe_LDLIBS)
+LINK_OBJS = $(spfatal04_OBJECTS) $(spfatal04_LDADD)
+LINK_LIBS = $(spfatal04_LDLIBS)
 
-spfatal04.exe$(EXEEXT): $(spfatal04_exe_OBJECTS) $(spfatal04_exe_DEPENDENCIES)
-	@rm -f spfatal04.exe$(EXEEXT)
+spfatal04$(EXEEXT): $(spfatal04_OBJECTS) $(spfatal04_DEPENDENCIES)
+	@rm -f spfatal04$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spfatal05/Makefile.am b/testsuites/sptests/spfatal05/Makefile.am
index 6495aa9fbd..bdfe18851c 100644
--- a/testsuites/sptests/spfatal05/Makefile.am
+++ b/testsuites/sptests/spfatal05/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = spfatal05.exe
-spfatal05_exe_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
+rtems_tests_PROGRAMS = spfatal05
+spfatal05_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
 
 dist_rtems_tests_DATA = spfatal05.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-spfatal05_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+spfatal05_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(spfatal05_exe_OBJECTS) $(spfatal05_exe_LDADD)
-LINK_LIBS = $(spfatal05_exe_LDLIBS)
+LINK_OBJS = $(spfatal05_OBJECTS) $(spfatal05_LDADD)
+LINK_LIBS = $(spfatal05_LDLIBS)
 
-spfatal05.exe$(EXEEXT): $(spfatal05_exe_OBJECTS) $(spfatal05_exe_DEPENDENCIES)
-	@rm -f spfatal05.exe$(EXEEXT)
+spfatal05$(EXEEXT): $(spfatal05_OBJECTS) $(spfatal05_DEPENDENCIES)
+	@rm -f spfatal05$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spfatal06/Makefile.am b/testsuites/sptests/spfatal06/Makefile.am
index 5ba835b3c5..9c8793fe31 100644
--- a/testsuites/sptests/spfatal06/Makefile.am
+++ b/testsuites/sptests/spfatal06/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = spfatal06.exe
-spfatal06_exe_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
+rtems_tests_PROGRAMS = spfatal06
+spfatal06_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
 
 dist_rtems_tests_DATA = spfatal06.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-spfatal06_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+spfatal06_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(spfatal06_exe_OBJECTS) $(spfatal06_exe_LDADD)
-LINK_LIBS = $(spfatal06_exe_LDLIBS)
+LINK_OBJS = $(spfatal06_OBJECTS) $(spfatal06_LDADD)
+LINK_LIBS = $(spfatal06_LDLIBS)
 
-spfatal06.exe$(EXEEXT): $(spfatal06_exe_OBJECTS) $(spfatal06_exe_DEPENDENCIES)
-	@rm -f spfatal06.exe$(EXEEXT)
+spfatal06$(EXEEXT): $(spfatal06_OBJECTS) $(spfatal06_DEPENDENCIES)
+	@rm -f spfatal06$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spfatal07/Makefile.am b/testsuites/sptests/spfatal07/Makefile.am
index e1fc6e130c..c9999edc88 100644
--- a/testsuites/sptests/spfatal07/Makefile.am
+++ b/testsuites/sptests/spfatal07/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = spfatal07.exe
-spfatal07_exe_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
+rtems_tests_PROGRAMS = spfatal07
+spfatal07_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
 
 dist_rtems_tests_DATA = spfatal07.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-spfatal07_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+spfatal07_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(spfatal07_exe_OBJECTS) $(spfatal07_exe_LDADD)
-LINK_LIBS = $(spfatal07_exe_LDLIBS)
+LINK_OBJS = $(spfatal07_OBJECTS) $(spfatal07_LDADD)
+LINK_LIBS = $(spfatal07_LDLIBS)
 
-spfatal07.exe$(EXEEXT): $(spfatal07_exe_OBJECTS) $(spfatal07_exe_DEPENDENCIES)
-	@rm -f spfatal07.exe$(EXEEXT)
+spfatal07$(EXEEXT): $(spfatal07_OBJECTS) $(spfatal07_DEPENDENCIES)
+	@rm -f spfatal07$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spfatal08/Makefile.am b/testsuites/sptests/spfatal08/Makefile.am
index eccdb31b5c..816ce72db7 100644
--- a/testsuites/sptests/spfatal08/Makefile.am
+++ b/testsuites/sptests/spfatal08/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = spfatal08.exe
-spfatal08_exe_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
+rtems_tests_PROGRAMS = spfatal08
+spfatal08_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
 
 dist_rtems_tests_DATA = spfatal08.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-spfatal08_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+spfatal08_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(spfatal08_exe_OBJECTS) $(spfatal08_exe_LDADD)
-LINK_LIBS = $(spfatal08_exe_LDLIBS)
+LINK_OBJS = $(spfatal08_OBJECTS) $(spfatal08_LDADD)
+LINK_LIBS = $(spfatal08_LDLIBS)
 
-spfatal08.exe$(EXEEXT): $(spfatal08_exe_OBJECTS) $(spfatal08_exe_DEPENDENCIES)
-	@rm -f spfatal08.exe$(EXEEXT)
+spfatal08$(EXEEXT): $(spfatal08_OBJECTS) $(spfatal08_DEPENDENCIES)
+	@rm -f spfatal08$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spfatal09/Makefile.am b/testsuites/sptests/spfatal09/Makefile.am
index cd976dc9f4..1bacf8c239 100644
--- a/testsuites/sptests/spfatal09/Makefile.am
+++ b/testsuites/sptests/spfatal09/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = spfatal09.exe
-spfatal09_exe_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
+rtems_tests_PROGRAMS = spfatal09
+spfatal09_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
 
 dist_rtems_tests_DATA = spfatal09.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-spfatal09_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+spfatal09_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(spfatal09_exe_OBJECTS) $(spfatal09_exe_LDADD)
-LINK_LIBS = $(spfatal09_exe_LDLIBS)
+LINK_OBJS = $(spfatal09_OBJECTS) $(spfatal09_LDADD)
+LINK_LIBS = $(spfatal09_LDLIBS)
 
-spfatal09.exe$(EXEEXT): $(spfatal09_exe_OBJECTS) $(spfatal09_exe_DEPENDENCIES)
-	@rm -f spfatal09.exe$(EXEEXT)
+spfatal09$(EXEEXT): $(spfatal09_OBJECTS) $(spfatal09_DEPENDENCIES)
+	@rm -f spfatal09$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spsize/Makefile.am b/testsuites/sptests/spsize/Makefile.am
index c1bba3cf5a..919a4d83d6 100644
--- a/testsuites/sptests/spsize/Makefile.am
+++ b/testsuites/sptests/spsize/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = spsize.exe
-spsize_exe_SOURCES = init.c getint.c size.c system.h
+rtems_tests_PROGRAMS = spsize
+spsize_SOURCES = init.c getint.c size.c system.h
 
 dist_rtems_tests_DATA = spsize.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-spsize_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+spsize_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(spsize_exe_OBJECTS) $(spsize_exe_LDADD)
-LINK_LIBS = $(spsize_exe_LDLIBS)
+LINK_OBJS = $(spsize_OBJECTS) $(spsize_LDADD)
+LINK_LIBS = $(spsize_LDLIBS)
 
-spsize.exe$(EXEEXT): $(spsize_exe_OBJECTS) $(spsize_exe_DEPENDENCIES)
-	@rm -f spsize.exe$(EXEEXT)
+spsize$(EXEEXT): $(spsize_OBJECTS) $(spsize_DEPENDENCIES)
+	@rm -f spsize$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spwatchdog/Makefile.am b/testsuites/sptests/spwatchdog/Makefile.am
index ca389bc7c8..82be2b6060 100644
--- a/testsuites/sptests/spwatchdog/Makefile.am
+++ b/testsuites/sptests/spwatchdog/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = spwatchdog.exe
-spwatchdog_exe_SOURCES = init.c task1.c system.h prtime.c delay.c
+rtems_tests_PROGRAMS = spwatchdog
+spwatchdog_SOURCES = init.c task1.c system.h prtime.c delay.c
 
 dist_rtems_tests_DATA = spwatchdog.scn
 
@@ -13,15 +13,15 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-spwatchdog_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+spwatchdog_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(spwatchdog_exe_OBJECTS) $(spwatchdog_exe_LDADD)
-LINK_LIBS = $(spwatchdog_exe_LDLIBS)
+LINK_OBJS = $(spwatchdog_OBJECTS) $(spwatchdog_LDADD)
+LINK_LIBS = $(spwatchdog_LDLIBS)
 
-spwatchdog.exe$(EXEEXT): $(spwatchdog_exe_OBJECTS) $(spwatchdog_exe_DEPENDENCIES)
-	@rm -f spwatchdog.exe$(EXEEXT)
+spwatchdog$(EXEEXT): $(spwatchdog_OBJECTS) $(spwatchdog_DEPENDENCIES)
+	@rm -f spwatchdog$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmitrontests/tmitronsem01/Makefile.am b/testsuites/tmitrontests/tmitronsem01/Makefile.am
index b6403cac95..6ed227ee8a 100644
--- a/testsuites/tmitrontests/tmitronsem01/Makefile.am
+++ b/testsuites/tmitrontests/tmitronsem01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = all
 
-rtems_tests_PROGRAMS = tmitronsem01.exe
-tmitronsem01_exe_SOURCES = init.c system.h \
+rtems_tests_PROGRAMS = tmitronsem01
+tmitronsem01_SOURCES = init.c system.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tmitronsem01.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
 
-tmitronsem01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tmitronsem01_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
 
-LINK_OBJS = $(tmitronsem01_exe_OBJECTS) $(tmitronsem01_exe_LDADD)
-LINK_LIBS = $(tmitronsem01_exe_LDLIBS)
+LINK_OBJS = $(tmitronsem01_OBJECTS) $(tmitronsem01_LDADD)
+LINK_LIBS = $(tmitronsem01_LDLIBS)
 
-tmitronsem01.exe$(EXEEXT): $(tmitronsem01_exe_OBJECTS) $(tmitronsem01_exe_DEPENDENCIES)
-	@rm -f tmitronsem01.exe$(EXEEXT)
+tmitronsem01$(EXEEXT): $(tmitronsem01_OBJECTS) $(tmitronsem01_DEPENDENCIES)
+	@rm -f tmitronsem01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm01/Makefile.am b/testsuites/tmtests/tm01/Makefile.am
index c60232a077..c15892de41 100644
--- a/testsuites/tmtests/tm01/Makefile.am
+++ b/testsuites/tmtests/tm01/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = tm01.exe
-tm01_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm01
+tm01_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm01.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
 
-tm01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm01_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
 
-LINK_OBJS = $(tm01_exe_OBJECTS) $(tm01_exe_LDADD)
-LINK_LIBS = $(tm01_exe_LDLIBS)
+LINK_OBJS = $(tm01_OBJECTS) $(tm01_LDADD)
+LINK_LIBS = $(tm01_LDLIBS)
 
-tm01.exe$(EXEEXT): $(tm01_exe_OBJECTS) $(tm01_exe_DEPENDENCIES)
-	@rm -f tm01.exe$(EXEEXT)
+tm01$(EXEEXT): $(tm01_OBJECTS) $(tm01_DEPENDENCIES)
+	@rm -f tm01$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm02/Makefile.am b/testsuites/tmtests/tm02/Makefile.am
index b849babdb5..5d3488b5a6 100644
--- a/testsuites/tmtests/tm02/Makefile.am
+++ b/testsuites/tmtests/tm02/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = tm02.exe
-tm02_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm02
+tm02_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm02.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
 
-tm02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm02_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
 
-LINK_OBJS = $(tm02_exe_OBJECTS) $(tm02_exe_LDADD)
-LINK_LIBS = $(tm02_exe_LDLIBS)
+LINK_OBJS = $(tm02_OBJECTS) $(tm02_LDADD)
+LINK_LIBS = $(tm02_LDLIBS)
 
-tm02.exe$(EXEEXT): $(tm02_exe_OBJECTS) $(tm02_exe_DEPENDENCIES)
-	@rm -f tm02.exe$(EXEEXT)
+tm02$(EXEEXT): $(tm02_OBJECTS) $(tm02_DEPENDENCIES)
+	@rm -f tm02$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm03/Makefile.am b/testsuites/tmtests/tm03/Makefile.am
index 388473ddde..97542514bf 100644
--- a/testsuites/tmtests/tm03/Makefile.am
+++ b/testsuites/tmtests/tm03/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = tm03.exe
-tm03_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm03
+tm03_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm03.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
 
-tm03_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm03_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
 
-LINK_OBJS = $(tm03_exe_OBJECTS) $(tm03_exe_LDADD)
-LINK_LIBS = $(tm03_exe_LDLIBS)
+LINK_OBJS = $(tm03_OBJECTS) $(tm03_LDADD)
+LINK_LIBS = $(tm03_LDLIBS)
 
-tm03.exe$(EXEEXT): $(tm03_exe_OBJECTS) $(tm03_exe_DEPENDENCIES)
-	@rm -f tm03.exe$(EXEEXT)
+tm03$(EXEEXT): $(tm03_OBJECTS) $(tm03_DEPENDENCIES)
+	@rm -f tm03$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm04/Makefile.am b/testsuites/tmtests/tm04/Makefile.am
index 347ff1c114..260ed87f64 100644
--- a/testsuites/tmtests/tm04/Makefile.am
+++ b/testsuites/tmtests/tm04/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = tm04.exe
-tm04_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm04
+tm04_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm04.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
 
-tm04_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm04_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
 
-LINK_OBJS = $(tm04_exe_OBJECTS) $(tm04_exe_LDADD)
-LINK_LIBS = $(tm04_exe_LDLIBS)
+LINK_OBJS = $(tm04_OBJECTS) $(tm04_LDADD)
+LINK_LIBS = $(tm04_LDLIBS)
 
-tm04.exe$(EXEEXT): $(tm04_exe_OBJECTS) $(tm04_exe_DEPENDENCIES)
-	@rm -f tm04.exe$(EXEEXT)
+tm04$(EXEEXT): $(tm04_OBJECTS) $(tm04_DEPENDENCIES)
+	@rm -f tm04$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm05/Makefile.am b/testsuites/tmtests/tm05/Makefile.am
index f864e19bbb..79e1d8ef67 100644
--- a/testsuites/tmtests/tm05/Makefile.am
+++ b/testsuites/tmtests/tm05/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = tm05.exe
-tm05_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm05
+tm05_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm05.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
 
-tm05_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm05_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
 
-LINK_OBJS = $(tm05_exe_OBJECTS) $(tm05_exe_LDADD)
-LINK_LIBS = $(tm05_exe_LDLIBS)
+LINK_OBJS = $(tm05_OBJECTS) $(tm05_LDADD)
+LINK_LIBS = $(tm05_LDLIBS)
 
-tm05.exe$(EXEEXT): $(tm05_exe_OBJECTS) $(tm05_exe_DEPENDENCIES)
-	@rm -f tm05.exe$(EXEEXT)
+tm05$(EXEEXT): $(tm05_OBJECTS) $(tm05_DEPENDENCIES)
+	@rm -f tm05$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm06/Makefile.am b/testsuites/tmtests/tm06/Makefile.am
index 6a6e0db6fa..32c4160d88 100644
--- a/testsuites/tmtests/tm06/Makefile.am
+++ b/testsuites/tmtests/tm06/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = tm06.exe
-tm06_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm06
+tm06_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm06.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
 
-tm06_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm06_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
 
-LINK_OBJS = $(tm06_exe_OBJECTS) $(tm06_exe_LDADD)
-LINK_LIBS = $(tm06_exe_LDLIBS)
+LINK_OBJS = $(tm06_OBJECTS) $(tm06_LDADD)
+LINK_LIBS = $(tm06_LDLIBS)
 
-tm06.exe$(EXEEXT): $(tm06_exe_OBJECTS) $(tm06_exe_DEPENDENCIES)
-	@rm -f tm06.exe$(EXEEXT)
+tm06$(EXEEXT): $(tm06_OBJECTS) $(tm06_DEPENDENCIES)
+	@rm -f tm06$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm07/Makefile.am b/testsuites/tmtests/tm07/Makefile.am
index 5e92732660..2897065e19 100644
--- a/testsuites/tmtests/tm07/Makefile.am
+++ b/testsuites/tmtests/tm07/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = tm07.exe
-tm07_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm07
+tm07_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm07.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
 
-tm07_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm07_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
 
-LINK_OBJS = $(tm07_exe_OBJECTS) $(tm07_exe_LDADD)
-LINK_LIBS = $(tm07_exe_LDLIBS)
+LINK_OBJS = $(tm07_OBJECTS) $(tm07_LDADD)
+LINK_LIBS = $(tm07_LDLIBS)
 
-tm07.exe$(EXEEXT): $(tm07_exe_OBJECTS) $(tm07_exe_DEPENDENCIES)
-	@rm -f tm07.exe$(EXEEXT)
+tm07$(EXEEXT): $(tm07_OBJECTS) $(tm07_DEPENDENCIES)
+	@rm -f tm07$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm08/Makefile.am b/testsuites/tmtests/tm08/Makefile.am
index bf0876714c..541439e5ae 100644
--- a/testsuites/tmtests/tm08/Makefile.am
+++ b/testsuites/tmtests/tm08/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = tm08.exe
-tm08_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm08
+tm08_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm08.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
 
-tm08_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm08_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
 
-LINK_OBJS = $(tm08_exe_OBJECTS) $(tm08_exe_LDADD)
-LINK_LIBS = $(tm08_exe_LDLIBS)
+LINK_OBJS = $(tm08_OBJECTS) $(tm08_LDADD)
+LINK_LIBS = $(tm08_LDLIBS)
 
-tm08.exe$(EXEEXT): $(tm08_exe_OBJECTS) $(tm08_exe_DEPENDENCIES)
-	@rm -f tm08.exe$(EXEEXT)
+tm08$(EXEEXT): $(tm08_OBJECTS) $(tm08_DEPENDENCIES)
+	@rm -f tm08$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm09/Makefile.am b/testsuites/tmtests/tm09/Makefile.am
index f5950bedf6..648922ba15 100644
--- a/testsuites/tmtests/tm09/Makefile.am
+++ b/testsuites/tmtests/tm09/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io message semaphore
 
-rtems_tests_PROGRAMS = tm09.exe
-tm09_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm09
+tm09_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm09.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
 
-tm09_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm09_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
 
-LINK_OBJS = $(tm09_exe_OBJECTS) $(tm09_exe_LDADD)
-LINK_LIBS = $(tm09_exe_LDLIBS)
+LINK_OBJS = $(tm09_OBJECTS) $(tm09_LDADD)
+LINK_LIBS = $(tm09_LDLIBS)
 
-tm09.exe$(EXEEXT): $(tm09_exe_OBJECTS) $(tm09_exe_DEPENDENCIES)
-	@rm -f tm09.exe$(EXEEXT)
+tm09$(EXEEXT): $(tm09_OBJECTS) $(tm09_DEPENDENCIES)
+	@rm -f tm09$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm10/Makefile.am b/testsuites/tmtests/tm10/Makefile.am
index 18bac3de99..240b34437d 100644
--- a/testsuites/tmtests/tm10/Makefile.am
+++ b/testsuites/tmtests/tm10/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io message semaphore
 
-rtems_tests_PROGRAMS = tm10.exe
-tm10_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm10
+tm10_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm10.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
 
-tm10_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm10_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
 
-LINK_OBJS = $(tm10_exe_OBJECTS) $(tm10_exe_LDADD)
-LINK_LIBS = $(tm10_exe_LDLIBS)
+LINK_OBJS = $(tm10_OBJECTS) $(tm10_LDADD)
+LINK_LIBS = $(tm10_LDLIBS)
 
-tm10.exe$(EXEEXT): $(tm10_exe_OBJECTS) $(tm10_exe_DEPENDENCIES)
-	@rm -f tm10.exe$(EXEEXT)
+tm10$(EXEEXT): $(tm10_OBJECTS) $(tm10_DEPENDENCIES)
+	@rm -f tm10$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm11/Makefile.am b/testsuites/tmtests/tm11/Makefile.am
index 29442b3375..73f5c9678d 100644
--- a/testsuites/tmtests/tm11/Makefile.am
+++ b/testsuites/tmtests/tm11/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io message semaphore
 
-rtems_tests_PROGRAMS = tm11.exe
-tm11_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm11
+tm11_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm11.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
 
-tm11_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm11_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
 
-LINK_OBJS = $(tm11_exe_OBJECTS) $(tm11_exe_LDADD)
-LINK_LIBS = $(tm11_exe_LDLIBS)
+LINK_OBJS = $(tm11_OBJECTS) $(tm11_LDADD)
+LINK_LIBS = $(tm11_LDLIBS)
 
-tm11.exe$(EXEEXT): $(tm11_exe_OBJECTS) $(tm11_exe_DEPENDENCIES)
-	@rm -f tm11.exe$(EXEEXT)
+tm11$(EXEEXT): $(tm11_OBJECTS) $(tm11_DEPENDENCIES)
+	@rm -f tm11$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm12/Makefile.am b/testsuites/tmtests/tm12/Makefile.am
index 6ee4cec98a..5916cbca85 100644
--- a/testsuites/tmtests/tm12/Makefile.am
+++ b/testsuites/tmtests/tm12/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io message semaphore
 
-rtems_tests_PROGRAMS = tm12.exe
-tm12_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm12
+tm12_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm12.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
 
-tm12_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm12_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
 
-LINK_OBJS = $(tm12_exe_OBJECTS) $(tm12_exe_LDADD)
-LINK_LIBS = $(tm12_exe_LDLIBS)
+LINK_OBJS = $(tm12_OBJECTS) $(tm12_LDADD)
+LINK_LIBS = $(tm12_LDLIBS)
 
-tm12.exe$(EXEEXT): $(tm12_exe_OBJECTS) $(tm12_exe_DEPENDENCIES)
-	@rm -f tm12.exe$(EXEEXT)
+tm12$(EXEEXT): $(tm12_OBJECTS) $(tm12_DEPENDENCIES)
+	@rm -f tm12$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm13/Makefile.am b/testsuites/tmtests/tm13/Makefile.am
index 6b97895c9e..16e48a3fbc 100644
--- a/testsuites/tmtests/tm13/Makefile.am
+++ b/testsuites/tmtests/tm13/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io message semaphore
 
-rtems_tests_PROGRAMS = tm13.exe
-tm13_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm13
+tm13_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm13.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
 
-tm13_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm13_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
 
-LINK_OBJS = $(tm13_exe_OBJECTS) $(tm13_exe_LDADD)
-LINK_LIBS = $(tm13_exe_LDLIBS)
+LINK_OBJS = $(tm13_OBJECTS) $(tm13_LDADD)
+LINK_LIBS = $(tm13_LDLIBS)
 
-tm13.exe$(EXEEXT): $(tm13_exe_OBJECTS) $(tm13_exe_DEPENDENCIES)
-	@rm -f tm13.exe$(EXEEXT)
+tm13$(EXEEXT): $(tm13_OBJECTS) $(tm13_DEPENDENCIES)
+	@rm -f tm13$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm14/Makefile.am b/testsuites/tmtests/tm14/Makefile.am
index 9b9e0fb5be..048c9f7e28 100644
--- a/testsuites/tmtests/tm14/Makefile.am
+++ b/testsuites/tmtests/tm14/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io message semaphore
 
-rtems_tests_PROGRAMS = tm14.exe
-tm14_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm14
+tm14_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm14.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
 
-tm14_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm14_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
 
-LINK_OBJS = $(tm14_exe_OBJECTS) $(tm14_exe_LDADD)
-LINK_LIBS = $(tm14_exe_LDLIBS)
+LINK_OBJS = $(tm14_OBJECTS) $(tm14_LDADD)
+LINK_LIBS = $(tm14_LDLIBS)
 
-tm14.exe$(EXEEXT): $(tm14_exe_OBJECTS) $(tm14_exe_DEPENDENCIES)
-	@rm -f tm14.exe$(EXEEXT)
+tm14$(EXEEXT): $(tm14_OBJECTS) $(tm14_DEPENDENCIES)
+	@rm -f tm14$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm15/Makefile.am b/testsuites/tmtests/tm15/Makefile.am
index 84e1063b73..cdff1d8cc1 100644
--- a/testsuites/tmtests/tm15/Makefile.am
+++ b/testsuites/tmtests/tm15/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io event semaphore
 
-rtems_tests_PROGRAMS = tm15.exe
-tm15_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm15
+tm15_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm15.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
 
-tm15_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm15_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
 
-LINK_OBJS = $(tm15_exe_OBJECTS) $(tm15_exe_LDADD)
-LINK_LIBS = $(tm15_exe_LDLIBS)
+LINK_OBJS = $(tm15_OBJECTS) $(tm15_LDADD)
+LINK_LIBS = $(tm15_LDLIBS)
 
-tm15.exe$(EXEEXT): $(tm15_exe_OBJECTS) $(tm15_exe_DEPENDENCIES)
-	@rm -f tm15.exe$(EXEEXT)
+tm15$(EXEEXT): $(tm15_OBJECTS) $(tm15_DEPENDENCIES)
+	@rm -f tm15$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm16/Makefile.am b/testsuites/tmtests/tm16/Makefile.am
index 8cbb6f6217..f17eda1def 100644
--- a/testsuites/tmtests/tm16/Makefile.am
+++ b/testsuites/tmtests/tm16/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io event semaphore
 
-rtems_tests_PROGRAMS = tm16.exe
-tm16_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm16
+tm16_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm16.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
 
-tm16_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm16_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
 
-LINK_OBJS = $(tm16_exe_OBJECTS) $(tm16_exe_LDADD)
-LINK_LIBS = $(tm16_exe_LDLIBS)
+LINK_OBJS = $(tm16_OBJECTS) $(tm16_LDADD)
+LINK_LIBS = $(tm16_LDLIBS)
 
-tm16.exe$(EXEEXT): $(tm16_exe_OBJECTS) $(tm16_exe_DEPENDENCIES)
-	@rm -f tm16.exe$(EXEEXT)
+tm16$(EXEEXT): $(tm16_OBJECTS) $(tm16_DEPENDENCIES)
+	@rm -f tm16$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm17/Makefile.am b/testsuites/tmtests/tm17/Makefile.am
index 556665ebb9..5c32fc0072 100644
--- a/testsuites/tmtests/tm17/Makefile.am
+++ b/testsuites/tmtests/tm17/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = tm17.exe
-tm17_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm17
+tm17_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm17.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
 
-tm17_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm17_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
 
-LINK_OBJS = $(tm17_exe_OBJECTS) $(tm17_exe_LDADD)
-LINK_LIBS = $(tm17_exe_LDLIBS)
+LINK_OBJS = $(tm17_OBJECTS) $(tm17_LDADD)
+LINK_LIBS = $(tm17_LDLIBS)
 
-tm17.exe$(EXEEXT): $(tm17_exe_OBJECTS) $(tm17_exe_DEPENDENCIES)
-	@rm -f tm17.exe$(EXEEXT)
+tm17$(EXEEXT): $(tm17_OBJECTS) $(tm17_DEPENDENCIES)
+	@rm -f tm17$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm18/Makefile.am b/testsuites/tmtests/tm18/Makefile.am
index 9fbaba5997..3cb12fc5bc 100644
--- a/testsuites/tmtests/tm18/Makefile.am
+++ b/testsuites/tmtests/tm18/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = tm18.exe
-tm18_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm18
+tm18_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm18.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
 
-tm18_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm18_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
 
-LINK_OBJS = $(tm18_exe_OBJECTS) $(tm18_exe_LDADD)
-LINK_LIBS = $(tm18_exe_LDLIBS)
+LINK_OBJS = $(tm18_OBJECTS) $(tm18_LDADD)
+LINK_LIBS = $(tm18_LDLIBS)
 
-tm18.exe$(EXEEXT): $(tm18_exe_OBJECTS) $(tm18_exe_DEPENDENCIES)
-	@rm -f tm18.exe$(EXEEXT)
+tm18$(EXEEXT): $(tm18_OBJECTS) $(tm18_DEPENDENCIES)
+	@rm -f tm18$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm19/Makefile.am b/testsuites/tmtests/tm19/Makefile.am
index 4ca4bccdde..2abc876ab5 100644
--- a/testsuites/tmtests/tm19/Makefile.am
+++ b/testsuites/tmtests/tm19/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io signal semaphore
 
-rtems_tests_PROGRAMS = tm19.exe
-tm19_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm19
+tm19_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm19.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
 
-tm19_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm19_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
 
-LINK_OBJS = $(tm19_exe_OBJECTS) $(tm19_exe_LDADD)
-LINK_LIBS = $(tm19_exe_LDLIBS)
+LINK_OBJS = $(tm19_OBJECTS) $(tm19_LDADD)
+LINK_LIBS = $(tm19_LDLIBS)
 
-tm19.exe$(EXEEXT): $(tm19_exe_OBJECTS) $(tm19_exe_DEPENDENCIES)
-	@rm -f tm19.exe$(EXEEXT)
+tm19$(EXEEXT): $(tm19_OBJECTS) $(tm19_DEPENDENCIES)
+	@rm -f tm19$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm20/Makefile.am b/testsuites/tmtests/tm20/Makefile.am
index f49dbd0194..7427527f12 100644
--- a/testsuites/tmtests/tm20/Makefile.am
+++ b/testsuites/tmtests/tm20/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io partition region semaphore
 
-rtems_tests_PROGRAMS = tm20.exe
-tm20_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm20
+tm20_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm20.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
 
-tm20_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm20_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
 
-LINK_OBJS = $(tm20_exe_OBJECTS) $(tm20_exe_LDADD)
-LINK_LIBS = $(tm20_exe_LDLIBS)
+LINK_OBJS = $(tm20_OBJECTS) $(tm20_LDADD)
+LINK_LIBS = $(tm20_LDLIBS)
 
-tm20.exe$(EXEEXT): $(tm20_exe_OBJECTS) $(tm20_exe_DEPENDENCIES)
-	@rm -f tm20.exe$(EXEEXT)
+tm20$(EXEEXT): $(tm20_OBJECTS) $(tm20_DEPENDENCIES)
+	@rm -f tm20$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm21/Makefile.am b/testsuites/tmtests/tm21/Makefile.am
index e9d2f25c94..c197341d7d 100644
--- a/testsuites/tmtests/tm21/Makefile.am
+++ b/testsuites/tmtests/tm21/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io dpmem message partition region semaphore rate_monotonic timer
 
-rtems_tests_PROGRAMS = tm21.exe
-tm21_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm21
+tm21_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm21.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
 
-tm21_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm21_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
 
-LINK_OBJS = $(tm21_exe_OBJECTS) $(tm21_exe_LDADD)
-LINK_LIBS = $(tm21_exe_LDLIBS)
+LINK_OBJS = $(tm21_OBJECTS) $(tm21_LDADD)
+LINK_LIBS = $(tm21_LDLIBS)
 
-tm21.exe$(EXEEXT): $(tm21_exe_OBJECTS) $(tm21_exe_DEPENDENCIES)
-	@rm -f tm21.exe$(EXEEXT)
+tm21$(EXEEXT): $(tm21_OBJECTS) $(tm21_DEPENDENCIES)
+	@rm -f tm21$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm22/Makefile.am b/testsuites/tmtests/tm22/Makefile.am
index 0ba01482bb..a6197221ab 100644
--- a/testsuites/tmtests/tm22/Makefile.am
+++ b/testsuites/tmtests/tm22/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io message semaphore
 
-rtems_tests_PROGRAMS = tm22.exe
-tm22_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm22
+tm22_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm22.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
 
-tm22_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm22_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
 
-LINK_OBJS = $(tm22_exe_OBJECTS) $(tm22_exe_LDADD)
-LINK_LIBS = $(tm22_exe_LDLIBS)
+LINK_OBJS = $(tm22_OBJECTS) $(tm22_LDADD)
+LINK_LIBS = $(tm22_LDLIBS)
 
-tm22.exe$(EXEEXT): $(tm22_exe_OBJECTS) $(tm22_exe_DEPENDENCIES)
-	@rm -f tm22.exe$(EXEEXT)
+tm22$(EXEEXT): $(tm22_OBJECTS) $(tm22_DEPENDENCIES)
+	@rm -f tm22$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm23/Makefile.am b/testsuites/tmtests/tm23/Makefile.am
index 368379f268..dfdb9755ba 100644
--- a/testsuites/tmtests/tm23/Makefile.am
+++ b/testsuites/tmtests/tm23/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io event timer semaphore
 
-rtems_tests_PROGRAMS = tm23.exe
-tm23_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm23
+tm23_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm23.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
 
-tm23_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm23_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
 
-LINK_OBJS = $(tm23_exe_OBJECTS) $(tm23_exe_LDADD)
-LINK_LIBS = $(tm23_exe_LDLIBS)
+LINK_OBJS = $(tm23_OBJECTS) $(tm23_LDADD)
+LINK_LIBS = $(tm23_LDLIBS)
 
-tm23.exe$(EXEEXT): $(tm23_exe_OBJECTS) $(tm23_exe_DEPENDENCIES)
-	@rm -f tm23.exe$(EXEEXT)
+tm23$(EXEEXT): $(tm23_OBJECTS) $(tm23_DEPENDENCIES)
+	@rm -f tm23$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm24/Makefile.am b/testsuites/tmtests/tm24/Makefile.am
index 448b593ae9..150ee9eb61 100644
--- a/testsuites/tmtests/tm24/Makefile.am
+++ b/testsuites/tmtests/tm24/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io message semaphore
 
-rtems_tests_PROGRAMS = tm24.exe
-tm24_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm24
+tm24_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm24.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
 
-tm24_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm24_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
 
-LINK_OBJS = $(tm24_exe_OBJECTS) $(tm24_exe_LDADD)
-LINK_LIBS = $(tm24_exe_LDLIBS)
+LINK_OBJS = $(tm24_OBJECTS) $(tm24_LDADD)
+LINK_LIBS = $(tm24_LDLIBS)
 
-tm24.exe$(EXEEXT): $(tm24_exe_OBJECTS) $(tm24_exe_DEPENDENCIES)
-	@rm -f tm24.exe$(EXEEXT)
+tm24$(EXEEXT): $(tm24_OBJECTS) $(tm24_DEPENDENCIES)
+	@rm -f tm24$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm25/Makefile.am b/testsuites/tmtests/tm25/Makefile.am
index fae3c03c1e..672db6e770 100644
--- a/testsuites/tmtests/tm25/Makefile.am
+++ b/testsuites/tmtests/tm25/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore semaphore
 
-rtems_tests_PROGRAMS = tm25.exe
-tm25_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm25
+tm25_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm25.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
 
-tm25_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm25_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
 
-LINK_OBJS = $(tm25_exe_OBJECTS) $(tm25_exe_LDADD)
-LINK_LIBS = $(tm25_exe_LDLIBS)
+LINK_OBJS = $(tm25_OBJECTS) $(tm25_LDADD)
+LINK_LIBS = $(tm25_LDLIBS)
 
-tm25.exe$(EXEEXT): $(tm25_exe_OBJECTS) $(tm25_exe_DEPENDENCIES)
-	@rm -f tm25.exe$(EXEEXT)
+tm25$(EXEEXT): $(tm25_OBJECTS) $(tm25_DEPENDENCIES)
+	@rm -f tm25$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm26/Makefile.am b/testsuites/tmtests/tm26/Makefile.am
index 75870b5179..9c6e6d9d7d 100644
--- a/testsuites/tmtests/tm26/Makefile.am
+++ b/testsuites/tmtests/tm26/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore semaphore
 
-rtems_tests_PROGRAMS = tm26.exe
-tm26_exe_SOURCES = task1.c system.h fptest.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm26
+tm26_SOURCES = task1.c system.h fptest.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm26.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
 
-tm26_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm26_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
 
-LINK_OBJS = $(tm26_exe_OBJECTS) $(tm26_exe_LDADD)
-LINK_LIBS = $(tm26_exe_LDLIBS)
+LINK_OBJS = $(tm26_OBJECTS) $(tm26_LDADD)
+LINK_LIBS = $(tm26_LDLIBS)
 
-tm26.exe$(EXEEXT): $(tm26_exe_OBJECTS) $(tm26_exe_DEPENDENCIES)
-	@rm -f tm26.exe$(EXEEXT)
+tm26$(EXEEXT): $(tm26_OBJECTS) $(tm26_DEPENDENCIES)
+	@rm -f tm26$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm27/Makefile.am b/testsuites/tmtests/tm27/Makefile.am
index a15122633d..67ee7cfac2 100644
--- a/testsuites/tmtests/tm27/Makefile.am
+++ b/testsuites/tmtests/tm27/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = tm27.exe
-tm27_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm27
+tm27_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm27.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
 
-tm27_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm27_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
 
-LINK_OBJS = $(tm27_exe_OBJECTS) $(tm27_exe_LDADD)
-LINK_LIBS = $(tm27_exe_LDLIBS)
+LINK_OBJS = $(tm27_OBJECTS) $(tm27_LDADD)
+LINK_LIBS = $(tm27_LDLIBS)
 
-tm27.exe$(EXEEXT): $(tm27_exe_OBJECTS) $(tm27_exe_DEPENDENCIES)
-	@rm -f tm27.exe$(EXEEXT)
+tm27$(EXEEXT): $(tm27_OBJECTS) $(tm27_DEPENDENCIES)
+	@rm -f tm27$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm28/Makefile.am b/testsuites/tmtests/tm28/Makefile.am
index 1edb9fdfc3..8322d9408d 100644
--- a/testsuites/tmtests/tm28/Makefile.am
+++ b/testsuites/tmtests/tm28/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io dpmem semaphore
 
-rtems_tests_PROGRAMS = tm28.exe
-tm28_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm28
+tm28_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm28.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
 
-tm28_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm28_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
 
-LINK_OBJS = $(tm28_exe_OBJECTS) $(tm28_exe_LDADD)
-LINK_LIBS = $(tm28_exe_LDLIBS)
+LINK_OBJS = $(tm28_OBJECTS) $(tm28_LDADD)
+LINK_LIBS = $(tm28_LDLIBS)
 
-tm28.exe$(EXEEXT): $(tm28_exe_OBJECTS) $(tm28_exe_DEPENDENCIES)
-	@rm -f tm28.exe$(EXEEXT)
+tm28$(EXEEXT): $(tm28_OBJECTS) $(tm28_DEPENDENCIES)
+	@rm -f tm28$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tm29/Makefile.am b/testsuites/tmtests/tm29/Makefile.am
index 94ca4d4ce8..155d8db076 100644
--- a/testsuites/tmtests/tm29/Makefile.am
+++ b/testsuites/tmtests/tm29/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io rate_monotonic semaphore
 
-rtems_tests_PROGRAMS = tm29.exe
-tm29_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tm29
+tm29_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm29.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
 
-tm29_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tm29_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
 
-LINK_OBJS = $(tm29_exe_OBJECTS) $(tm29_exe_LDADD)
-LINK_LIBS = $(tm29_exe_LDLIBS)
+LINK_OBJS = $(tm29_OBJECTS) $(tm29_LDADD)
+LINK_LIBS = $(tm29_LDLIBS)
 
-tm29.exe$(EXEEXT): $(tm29_exe_OBJECTS) $(tm29_exe_DEPENDENCIES)
-	@rm -f tm29.exe$(EXEEXT)
+tm29$(EXEEXT): $(tm29_OBJECTS) $(tm29_DEPENDENCIES)
+	@rm -f tm29$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tmck/Makefile.am b/testsuites/tmtests/tmck/Makefile.am
index ffbb9d0f35..2e52f24a71 100644
--- a/testsuites/tmtests/tmck/Makefile.am
+++ b/testsuites/tmtests/tmck/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = tmck.exe
-tmck_exe_SOURCES = task1.c system.h ../include/timesys.h \
+rtems_tests_PROGRAMS = tmck
+tmck_SOURCES = task1.c system.h ../include/timesys.h \
     ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tmck.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
 
-tmck_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tmck_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
 
-LINK_OBJS = $(tmck_exe_OBJECTS) $(tmck_exe_LDADD)
-LINK_LIBS = $(tmck_exe_LDLIBS)
+LINK_OBJS = $(tmck_OBJECTS) $(tmck_LDADD)
+LINK_LIBS = $(tmck_LDLIBS)
 
-tmck.exe$(EXEEXT): $(tmck_exe_OBJECTS) $(tmck_exe_DEPENDENCIES)
-	@rm -f tmck.exe$(EXEEXT)
+tmck$(EXEEXT): $(tmck_OBJECTS) $(tmck_DEPENDENCIES)
+	@rm -f tmck$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/tmoverhd/Makefile.am b/testsuites/tmtests/tmoverhd/Makefile.am
index cad1e97d38..1180e071ca 100644
--- a/testsuites/tmtests/tmoverhd/Makefile.am
+++ b/testsuites/tmtests/tmoverhd/Makefile.am
@@ -4,8 +4,8 @@
 
 MANAGERS = io semaphore
 
-rtems_tests_PROGRAMS = tmoverhd.exe
-tmoverhd_exe_SOURCES = testtask.c empty.c system.h dumrtems.h \
+rtems_tests_PROGRAMS = tmoverhd
+tmoverhd_SOURCES = testtask.c empty.c system.h dumrtems.h \
     ../include/timesys.h ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tmoverhd.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
 
-tmoverhd_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+tmoverhd_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
 
-LINK_OBJS = $(tmoverhd_exe_OBJECTS) $(tmoverhd_exe_LDADD)
-LINK_LIBS = $(tmoverhd_exe_LDLIBS)
+LINK_OBJS = $(tmoverhd_OBJECTS) $(tmoverhd_LDADD)
+LINK_LIBS = $(tmoverhd_LDLIBS)
 
-tmoverhd.exe$(EXEEXT): $(tmoverhd_exe_OBJECTS) $(tmoverhd_exe_DEPENDENCIES)
-	@rm -f tmoverhd.exe$(EXEEXT)
+tmoverhd$(EXEEXT): $(tmoverhd_OBJECTS) $(tmoverhd_DEPENDENCIES)
+	@rm -f tmoverhd$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
author	Ralf Corsepius <ralf.corsepius@rtems.org>	2009-04-03 12:55:13 +0000
committer	Ralf Corsepius <ralf.corsepius@rtems.org>	2009-04-03 12:55:13 +0000
commit	3d5483771c21619e164e5a5cc308802027785dcc (patch)
tree	e5517f30599b1c7b69c80a159ccae6851146508e /testsuites
parent	2009-04-03 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
download	rtems-3d5483771c21619e164e5a5cc308802027785dcc.tar.bz2