Eliminate _exe_/.exe.

58 files changed, 403 insertions, 403 deletions

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