2007-10-25 Joel Sherrill <joel.sherrill@oarcorp.com>

	* mptests/mp01/node1/Makefile.am, mptests/mp01/node2/Makefile.am,
	mptests/mp02/node1/Makefile.am, mptests/mp02/node2/Makefile.am,
	mptests/mp03/node1/Makefile.am, mptests/mp03/node2/Makefile.am,
	mptests/mp04/node1/Makefile.am, mptests/mp04/node2/Makefile.am,
	mptests/mp05/node1/Makefile.am, mptests/mp05/node2/Makefile.am,
	mptests/mp06/node1/Makefile.am, mptests/mp06/node2/Makefile.am,
	mptests/mp07/node1/Makefile.am, mptests/mp07/node2/Makefile.am,
	mptests/mp08/node1/Makefile.am, mptests/mp08/node2/Makefile.am,
	mptests/mp09/node1/Makefile.am, mptests/mp09/node2/Makefile.am,
	mptests/mp10/node1/Makefile.am, mptests/mp10/node2/Makefile.am,
	mptests/mp11/node1/Makefile.am, mptests/mp11/node2/Makefile.am,
	mptests/mp12/node1/Makefile.am, mptests/mp12/node2/Makefile.am,
	mptests/mp13/node1/Makefile.am, mptests/mp13/node2/Makefile.am,
	mptests/mp14/node1/Makefile.am, mptests/mp14/node2/Makefile.am,
	samples/base_mp/Makefile.am, samples/base_mp/node1/Makefile.am,
	samples/base_mp/node2/Makefile.am, samples/base_sp/Makefile.am,
	samples/hello/Makefile.am, samples/nsecs/Makefile.am,
	samples/ticker/Makefile.am, sptests/sp01/Makefile.am,
	sptests/sp02/Makefile.am, sptests/sp03/Makefile.am,
	sptests/sp04/Makefile.am, sptests/sp05/Makefile.am,
	sptests/sp06/Makefile.am, sptests/sp07/Makefile.am,
	sptests/sp08/Makefile.am, sptests/sp09/Makefile.am,
	sptests/sp11/Makefile.am, sptests/sp12/Makefile.am,
	sptests/sp13/Makefile.am, sptests/sp14/Makefile.am,
	sptests/sp15/Makefile.am, sptests/sp16/Makefile.am,
	sptests/sp17/Makefile.am, sptests/sp19/Makefile.am,
	sptests/sp20/Makefile.am, sptests/sp22/Makefile.am,
	sptests/sp23/Makefile.am, sptests/sp24/Makefile.am,
	sptests/sp25/Makefile.am, tmtests/tm01/Makefile.am,
	tmtests/tm02/Makefile.am, tmtests/tm03/Makefile.am,
	tmtests/tm04/Makefile.am, tmtests/tm05/Makefile.am,
	tmtests/tm06/Makefile.am, tmtests/tm07/Makefile.am,
	tmtests/tm08/Makefile.am, tmtests/tm09/Makefile.am,
	tmtests/tm10/Makefile.am, tmtests/tm11/Makefile.am,
	tmtests/tm12/Makefile.am, tmtests/tm13/Makefile.am,
	tmtests/tm14/Makefile.am, tmtests/tm15/Makefile.am,
	tmtests/tm16/Makefile.am, tmtests/tm17/Makefile.am,
	tmtests/tm18/Makefile.am, tmtests/tm19/Makefile.am,
	tmtests/tm20/Makefile.am, tmtests/tm21/Makefile.am,
	tmtests/tm22/Makefile.am, tmtests/tm23/Makefile.am,
	tmtests/tm24/Makefile.am, tmtests/tm25/Makefile.am,
	tmtests/tm28/Makefile.am, tmtests/tm29/Makefile.am,
	tmtests/tmck/Makefile.am, tmtests/tmoverhd/Makefile.am: Executables
	should end in .exe just like their C counterparts.

87 files changed, 382 insertions, 335 deletions

diff --git a/c/src/ada-tests/ChangeLog b/c/src/ada-tests/ChangeLog
index 79871fe914..1b04eb7416 100644
--- a/c/src/ada-tests/ChangeLog
+++ b/c/src/ada-tests/ChangeLog
@@ -1,3 +1,50 @@
+2007-10-25	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* mptests/mp01/node1/Makefile.am, mptests/mp01/node2/Makefile.am,
+	mptests/mp02/node1/Makefile.am, mptests/mp02/node2/Makefile.am,
+	mptests/mp03/node1/Makefile.am, mptests/mp03/node2/Makefile.am,
+	mptests/mp04/node1/Makefile.am, mptests/mp04/node2/Makefile.am,
+	mptests/mp05/node1/Makefile.am, mptests/mp05/node2/Makefile.am,
+	mptests/mp06/node1/Makefile.am, mptests/mp06/node2/Makefile.am,
+	mptests/mp07/node1/Makefile.am, mptests/mp07/node2/Makefile.am,
+	mptests/mp08/node1/Makefile.am, mptests/mp08/node2/Makefile.am,
+	mptests/mp09/node1/Makefile.am, mptests/mp09/node2/Makefile.am,
+	mptests/mp10/node1/Makefile.am, mptests/mp10/node2/Makefile.am,
+	mptests/mp11/node1/Makefile.am, mptests/mp11/node2/Makefile.am,
+	mptests/mp12/node1/Makefile.am, mptests/mp12/node2/Makefile.am,
+	mptests/mp13/node1/Makefile.am, mptests/mp13/node2/Makefile.am,
+	mptests/mp14/node1/Makefile.am, mptests/mp14/node2/Makefile.am,
+	samples/base_mp/Makefile.am, samples/base_mp/node1/Makefile.am,
+	samples/base_mp/node2/Makefile.am, samples/base_sp/Makefile.am,
+	samples/hello/Makefile.am, samples/nsecs/Makefile.am,
+	samples/ticker/Makefile.am, sptests/sp01/Makefile.am,
+	sptests/sp02/Makefile.am, sptests/sp03/Makefile.am,
+	sptests/sp04/Makefile.am, sptests/sp05/Makefile.am,
+	sptests/sp06/Makefile.am, sptests/sp07/Makefile.am,
+	sptests/sp08/Makefile.am, sptests/sp09/Makefile.am,
+	sptests/sp11/Makefile.am, sptests/sp12/Makefile.am,
+	sptests/sp13/Makefile.am, sptests/sp14/Makefile.am,
+	sptests/sp15/Makefile.am, sptests/sp16/Makefile.am,
+	sptests/sp17/Makefile.am, sptests/sp19/Makefile.am,
+	sptests/sp20/Makefile.am, sptests/sp22/Makefile.am,
+	sptests/sp23/Makefile.am, sptests/sp24/Makefile.am,
+	sptests/sp25/Makefile.am, tmtests/tm01/Makefile.am,
+	tmtests/tm02/Makefile.am, tmtests/tm03/Makefile.am,
+	tmtests/tm04/Makefile.am, tmtests/tm05/Makefile.am,
+	tmtests/tm06/Makefile.am, tmtests/tm07/Makefile.am,
+	tmtests/tm08/Makefile.am, tmtests/tm09/Makefile.am,
+	tmtests/tm10/Makefile.am, tmtests/tm11/Makefile.am,
+	tmtests/tm12/Makefile.am, tmtests/tm13/Makefile.am,
+	tmtests/tm14/Makefile.am, tmtests/tm15/Makefile.am,
+	tmtests/tm16/Makefile.am, tmtests/tm17/Makefile.am,
+	tmtests/tm18/Makefile.am, tmtests/tm19/Makefile.am,
+	tmtests/tm20/Makefile.am, tmtests/tm21/Makefile.am,
+	tmtests/tm22/Makefile.am, tmtests/tm23/Makefile.am,
+	tmtests/tm24/Makefile.am, tmtests/tm25/Makefile.am,
+	tmtests/tm28/Makefile.am, tmtests/tm29/Makefile.am,
+	tmtests/tmck/Makefile.am, tmtests/tmoverhd/Makefile.am: Executables
+	should end in .exe just like their C counterparts.
+
 2007-10-25	Glenn Humphrey <glenn.humphrey@OARcorp.com>
 
 	* configure.ac, samples/Makefile.am: Added a test for Clock_Get_Uptime
diff --git a/c/src/ada-tests/mptests/mp01/node1/Makefile.am b/c/src/ada-tests/mptests/mp01/node1/Makefile.am
index ebb7e2de78..9a0baf526c 100644
--- a/c/src/ada-tests/mptests/mp01/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp01_node1
-mp01_node1_SOURCES = mp01_node1.adb ../mptest.adb config.h ../mptest.ads
-mp01_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp01_node1.exe
+mp01_node1_exe_SOURCES = mp01_node1.adb ../mptest.adb config.h ../mptest.ads
+mp01_node1_exe_SOURCES += ../../../support/init.c
 
-mp01_node1$(EXEEXT): mp01_node1.adb ../mptest.adb init.$(OBJEXT)
+mp01_node1.exe: mp01_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp01/node2/Makefile.am b/c/src/ada-tests/mptests/mp01/node2/Makefile.am
index b4e01fc33d..94a28d69c2 100644
--- a/c/src/ada-tests/mptests/mp01/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp01_node2
-mp01_node2_SOURCES = mp01_node2.adb ../mptest.adb config.h ../mptest.ads
-mp01_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp01_node2.exe
+mp01_node2_exe_SOURCES = mp01_node2.adb ../mptest.adb config.h ../mptest.ads
+mp01_node2_exe_SOURCES += ../../../support/init.c
 
-mp01_node2$(EXEEXT): mp01_node2.adb ../mptest.adb init.$(OBJEXT)
+mp01_node2.exe: mp01_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp02/node1/Makefile.am b/c/src/ada-tests/mptests/mp02/node1/Makefile.am
index 594b07a7e3..d789a7302b 100644
--- a/c/src/ada-tests/mptests/mp02/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp02/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp02_node1
-mp02_node1_SOURCES = mp02_node1.adb ../mptest.adb config.h ../mptest.ads
-mp02_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp02_node1.exe
+mp02_node1_exe_SOURCES = mp02_node1.adb ../mptest.adb config.h ../mptest.ads
+mp02_node1_exe_SOURCES += ../../../support/init.c
 
-mp02_node1$(EXEEXT): mp02_node1.adb ../mptest.adb init.$(OBJEXT)
+mp02_node1.exe: mp02_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp02/node2/Makefile.am b/c/src/ada-tests/mptests/mp02/node2/Makefile.am
index b4ddec3acc..2bb1fcc2ac 100644
--- a/c/src/ada-tests/mptests/mp02/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp02/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp02_node2
-mp02_node2_SOURCES = mp02_node2.adb ../mptest.adb config.h ../mptest.ads
-mp02_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp02_node2.exe
+mp02_node2_exe_SOURCES = mp02_node2.adb ../mptest.adb config.h ../mptest.ads
+mp02_node2_exe_SOURCES += ../../../support/init.c
 
-mp02_node2$(EXEEXT): mp02_node2.adb ../mptest.adb init.$(OBJEXT)
+mp02_node2.exe: mp02_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp03/node1/Makefile.am b/c/src/ada-tests/mptests/mp03/node1/Makefile.am
index 016b50fdd9..55a2f5ba56 100644
--- a/c/src/ada-tests/mptests/mp03/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp03/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp03_node1
-mp03_node1_SOURCES = mp03_node1.adb ../mptest.adb config.h ../mptest.ads
-mp03_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp03_node1.exe
+mp03_node1_exe_SOURCES = mp03_node1.adb ../mptest.adb config.h ../mptest.ads
+mp03_node1_exe_SOURCES += ../../../support/init.c
 
-mp03_node1$(EXEEXT): mp03_node1.adb ../mptest.adb init.$(OBJEXT)
+mp03_node1.exe: mp03_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp03/node2/Makefile.am b/c/src/ada-tests/mptests/mp03/node2/Makefile.am
index e0217a751d..bd7f0bb454 100644
--- a/c/src/ada-tests/mptests/mp03/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp03/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp03_node2
-mp03_node2_SOURCES = mp03_node2.adb ../mptest.adb config.h ../mptest.ads
-mp03_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp03_node2.exe
+mp03_node2_exe_SOURCES = mp03_node2.adb ../mptest.adb config.h ../mptest.ads
+mp03_node2_exe_SOURCES += ../../../support/init.c
 
-mp03_node2$(EXEEXT): mp03_node2.adb ../mptest.adb init.$(OBJEXT)
+mp03_node2.exe: mp03_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp04/node1/Makefile.am b/c/src/ada-tests/mptests/mp04/node1/Makefile.am
index 463430620a..1b6ce682a9 100644
--- a/c/src/ada-tests/mptests/mp04/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp04/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp04_node1
-mp04_node1_SOURCES = mp04_node1.adb ../mptest.adb config.h ../mptest.ads
-mp04_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp04_node1.exe
+mp04_node1_exe_SOURCES = mp04_node1.adb ../mptest.adb config.h ../mptest.ads
+mp04_node1_exe_SOURCES += ../../../support/init.c
 
-mp04_node1$(EXEEXT): mp04_node1.adb ../mptest.adb init.$(OBJEXT)
+mp04_node1.exe: mp04_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp04/node2/Makefile.am b/c/src/ada-tests/mptests/mp04/node2/Makefile.am
index 4be92574ff..77c1464fab 100644
--- a/c/src/ada-tests/mptests/mp04/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp04/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp04_node2
-mp04_node2_SOURCES = mp04_node2.adb ../mptest.adb config.h ../mptest.ads
-mp04_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp04_node2.exe
+mp04_node2_exe_SOURCES = mp04_node2.adb ../mptest.adb config.h ../mptest.ads
+mp04_node2_exe_SOURCES += ../../../support/init.c
 
-mp04_node2$(EXEEXT): mp04_node2.adb ../mptest.adb init.$(OBJEXT)
+mp04_node2.exe: mp04_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp05/node1/Makefile.am b/c/src/ada-tests/mptests/mp05/node1/Makefile.am
index 99f27be6d0..fcf501ae0a 100644
--- a/c/src/ada-tests/mptests/mp05/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp05/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp05_node1
-mp05_node1_SOURCES = mp05_node1.adb ../mptest.adb config.h ../mptest.ads
-mp05_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp05_node1.exe
+mp05_node1_exe_SOURCES = mp05_node1.adb ../mptest.adb config.h ../mptest.ads
+mp05_node1_exe_SOURCES += ../../../support/init.c
 
-mp05_node1$(EXEEXT): mp05_node1.adb ../mptest.adb init.$(OBJEXT)
+mp05_node1.exe: mp05_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp05/node2/Makefile.am b/c/src/ada-tests/mptests/mp05/node2/Makefile.am
index 032932fc07..a01750c7b4 100644
--- a/c/src/ada-tests/mptests/mp05/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp05/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp05_node2
-mp05_node2_SOURCES = mp05_node2.adb ../mptest.adb config.h ../mptest.ads
-mp05_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp05_node2.exe
+mp05_node2_exe_SOURCES = mp05_node2.adb ../mptest.adb config.h ../mptest.ads
+mp05_node2_exe_SOURCES += ../../../support/init.c
 
-mp05_node2$(EXEEXT): mp05_node2.adb ../mptest.adb init.$(OBJEXT)
+mp05_node2.exe: mp05_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp06/node1/Makefile.am b/c/src/ada-tests/mptests/mp06/node1/Makefile.am
index 8b9dfd160d..01272824b0 100644
--- a/c/src/ada-tests/mptests/mp06/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp06/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp06_node1
-mp06_node1_SOURCES = mp06_node1.adb ../mptest.adb config.h ../mptest.ads
-mp06_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp06_node1.exe
+mp06_node1_exe_SOURCES = mp06_node1.adb ../mptest.adb config.h ../mptest.ads
+mp06_node1_exe_SOURCES += ../../../support/init.c
 
-mp06_node1$(EXEEXT): mp06_node1.adb ../mptest.adb init.$(OBJEXT)
+mp06_node1.exe: mp06_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp06/node2/Makefile.am b/c/src/ada-tests/mptests/mp06/node2/Makefile.am
index 8f59995bcf..70f52d27b5 100644
--- a/c/src/ada-tests/mptests/mp06/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp06/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp06_node2
-mp06_node2_SOURCES = mp06_node2.adb ../mptest.adb config.h ../mptest.ads
-mp06_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp06_node2.exe
+mp06_node2_exe_SOURCES = mp06_node2.adb ../mptest.adb config.h ../mptest.ads
+mp06_node2_exe_SOURCES += ../../../support/init.c
 
-mp06_node2$(EXEEXT): mp06_node2.adb ../mptest.adb init.$(OBJEXT)
+mp06_node2.exe: mp06_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp07/node1/Makefile.am b/c/src/ada-tests/mptests/mp07/node1/Makefile.am
index 9be7992ed7..b666a47704 100644
--- a/c/src/ada-tests/mptests/mp07/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp07/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp07_node1
-mp07_node1_SOURCES = mp07_node1.adb ../mptest.adb config.h ../mptest.ads
-mp07_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp07_node1.exe
+mp07_node1_exe_SOURCES = mp07_node1.adb ../mptest.adb config.h ../mptest.ads
+mp07_node1_exe_SOURCES += ../../../support/init.c
 
-mp07_node1$(EXEEXT): mp07_node1.adb ../mptest.adb init.$(OBJEXT)
+mp07_node1.exe: mp07_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp07/node2/Makefile.am b/c/src/ada-tests/mptests/mp07/node2/Makefile.am
index da151bcfbe..5c7e0d6355 100644
--- a/c/src/ada-tests/mptests/mp07/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp07/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp07_node2
-mp07_node2_SOURCES = mp07_node2.adb ../mptest.adb config.h ../mptest.ads
-mp07_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp07_node2.exe
+mp07_node2_exe_SOURCES = mp07_node2.adb ../mptest.adb config.h ../mptest.ads
+mp07_node2_exe_SOURCES += ../../../support/init.c
 
-mp07_node2$(EXEEXT): mp07_node2.adb ../mptest.adb init.$(OBJEXT)
+mp07_node2.exe: mp07_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp08/node1/Makefile.am b/c/src/ada-tests/mptests/mp08/node1/Makefile.am
index 1a11403eaa..adb615c478 100644
--- a/c/src/ada-tests/mptests/mp08/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp08/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp08_node1
-mp08_node1_SOURCES = mp08_node1.adb ../mptest.adb config.h ../mptest.ads
-mp08_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp08_node1.exe
+mp08_node1_exe_SOURCES = mp08_node1.adb ../mptest.adb config.h ../mptest.ads
+mp08_node1_exe_SOURCES += ../../../support/init.c
 
-mp08_node1$(EXEEXT): mp08_node1.adb ../mptest.adb init.$(OBJEXT)
+mp08_node1.exe: mp08_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp08/node2/Makefile.am b/c/src/ada-tests/mptests/mp08/node2/Makefile.am
index 9e5e70197c..716950cd56 100644
--- a/c/src/ada-tests/mptests/mp08/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp08/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp08_node2
-mp08_node2_SOURCES = mp08_node2.adb ../mptest.adb config.h ../mptest.ads
-mp08_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp08_node2.exe
+mp08_node2_exe_SOURCES = mp08_node2.adb ../mptest.adb config.h ../mptest.ads
+mp08_node2_exe_SOURCES += ../../../support/init.c
 
-mp08_node2$(EXEEXT): mp08_node2.adb ../mptest.adb init.$(OBJEXT)
+mp08_node2.exe: mp08_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp09/node1/Makefile.am b/c/src/ada-tests/mptests/mp09/node1/Makefile.am
index 51228758a7..20e85a89d7 100644
--- a/c/src/ada-tests/mptests/mp09/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp09/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp09_node1
-mp09_node1_SOURCES = mp09_node1.adb ../mptest.adb config.h ../mptest.ads
-mp09_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp09_node1.exe
+mp09_node1_exe_SOURCES = mp09_node1.adb ../mptest.adb config.h ../mptest.ads
+mp09_node1_exe_SOURCES += ../../../support/init.c
 
-mp09_node1$(EXEEXT): mp09_node1.adb ../mptest.adb init.$(OBJEXT)
+mp09_node1.exe: mp09_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp09/node2/Makefile.am b/c/src/ada-tests/mptests/mp09/node2/Makefile.am
index df15fabe78..b1066a082b 100644
--- a/c/src/ada-tests/mptests/mp09/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp09/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp09_node2
-mp09_node2_SOURCES = mp09_node2.adb ../mptest.adb config.h ../mptest.ads
-mp09_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp09_node2.exe
+mp09_node2_exe_SOURCES = mp09_node2.adb ../mptest.adb config.h ../mptest.ads
+mp09_node2_exe_SOURCES += ../../../support/init.c
 
-mp09_node2$(EXEEXT): mp09_node2.adb ../mptest.adb init.$(OBJEXT)
+mp09_node2.exe: mp09_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp10/node1/Makefile.am b/c/src/ada-tests/mptests/mp10/node1/Makefile.am
index 8211201a22..ed89c9a1d8 100644
--- a/c/src/ada-tests/mptests/mp10/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp10/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp10_node1
-mp10_node1_SOURCES = mp10_node1.adb ../mptest.adb config.h ../mptest.ads
-mp10_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp10_node1.exe
+mp10_node1_exe_SOURCES = mp10_node1.adb ../mptest.adb config.h ../mptest.ads
+mp10_node1_exe_SOURCES += ../../../support/init.c
 
-mp10_node1$(EXEEXT): mp10_node1.adb ../mptest.adb init.$(OBJEXT)
+mp10_node1.exe: mp10_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp10/node2/Makefile.am b/c/src/ada-tests/mptests/mp10/node2/Makefile.am
index 8399b9eb30..91f8f166b9 100644
--- a/c/src/ada-tests/mptests/mp10/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp10/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp10_node2
-mp10_node2_SOURCES = mp10_node2.adb ../mptest.adb config.h ../mptest.ads
-mp10_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp10_node2.exe
+mp10_node2_exe_SOURCES = mp10_node2.adb ../mptest.adb config.h ../mptest.ads
+mp10_node2_exe_SOURCES += ../../../support/init.c
 
-mp10_node2$(EXEEXT): mp10_node2.adb ../mptest.adb init.$(OBJEXT)
+mp10_node2.exe: mp10_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp11/node1/Makefile.am b/c/src/ada-tests/mptests/mp11/node1/Makefile.am
index 84c3b69b4b..3ed4d91d55 100644
--- a/c/src/ada-tests/mptests/mp11/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp11/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp11_node1
-mp11_node1_SOURCES = mp11_node1.adb ../mptest.adb config.h ../mptest.ads
-mp11_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp11_node1.exe
+mp11_node1_exe_SOURCES = mp11_node1.adb ../mptest.adb config.h ../mptest.ads
+mp11_node1_exe_SOURCES += ../../../support/init.c
 
-mp11_node1$(EXEEXT): mp11_node1.adb ../mptest.adb init.$(OBJEXT)
+mp11_node1.exe: mp11_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp11/node2/Makefile.am b/c/src/ada-tests/mptests/mp11/node2/Makefile.am
index c2651d384e..44bbd7dc58 100644
--- a/c/src/ada-tests/mptests/mp11/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp11/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp11_node2
-mp11_node2_SOURCES = mp11_node2.adb ../mptest.adb config.h ../mptest.ads
-mp11_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp11_node2.exe
+mp11_node2_exe_SOURCES = mp11_node2.adb ../mptest.adb config.h ../mptest.ads
+mp11_node2_exe_SOURCES += ../../../support/init.c
 
-mp11_node2$(EXEEXT): mp11_node2.adb ../mptest.adb init.$(OBJEXT)
+mp11_node2.exe: mp11_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp12/node1/Makefile.am b/c/src/ada-tests/mptests/mp12/node1/Makefile.am
index ab996d28ee..0411f007e5 100644
--- a/c/src/ada-tests/mptests/mp12/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp12/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp12_node1
-mp12_node1_SOURCES = mp12_node1.adb ../mptest.adb config.h ../mptest.ads
-mp12_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp12_node1.exe
+mp12_node1_exe_SOURCES = mp12_node1.adb ../mptest.adb config.h ../mptest.ads
+mp12_node1_exe_SOURCES += ../../../support/init.c
 
-mp12_node1$(EXEEXT): mp12_node1.adb ../mptest.adb init.$(OBJEXT)
+mp12_node1.exe: mp12_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp12/node2/Makefile.am b/c/src/ada-tests/mptests/mp12/node2/Makefile.am
index cc5e06f7b4..2c526e02ad 100644
--- a/c/src/ada-tests/mptests/mp12/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp12/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp12_node2
-mp12_node2_SOURCES = mp12_node2.adb ../mptest.adb config.h ../mptest.ads
-mp12_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp12_node2.exe
+mp12_node2_exe_SOURCES = mp12_node2.adb ../mptest.adb config.h ../mptest.ads
+mp12_node2_exe_SOURCES += ../../../support/init.c
 
-mp12_node2$(EXEEXT): mp12_node2.adb ../mptest.adb init.$(OBJEXT)
+mp12_node2.exe: mp12_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp13/node1/Makefile.am b/c/src/ada-tests/mptests/mp13/node1/Makefile.am
index 75ec9a4d72..646cd9a4ec 100644
--- a/c/src/ada-tests/mptests/mp13/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp13/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp13_node1
-mp13_node1_SOURCES = mp13_node1.adb ../mptest.adb config.h ../mptest.ads
-mp13_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp13_node1.exe
+mp13_node1_exe_SOURCES = mp13_node1.adb ../mptest.adb config.h ../mptest.ads
+mp13_node1_exe_SOURCES += ../../../support/init.c
 
-mp13_node1$(EXEEXT): mp13_node1.adb ../mptest.adb init.$(OBJEXT)
+mp13_node1.exe: mp13_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp13/node2/Makefile.am b/c/src/ada-tests/mptests/mp13/node2/Makefile.am
index f91d5d20e1..76d2b62cb4 100644
--- a/c/src/ada-tests/mptests/mp13/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp13/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp13_node2
-mp13_node2_SOURCES = mp13_node2.adb ../mptest.adb config.h ../mptest.ads
-mp13_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp13_node2.exe
+mp13_node2_exe_SOURCES = mp13_node2.adb ../mptest.adb config.h ../mptest.ads
+mp13_node2_exe_SOURCES += ../../../support/init.c
 
-mp13_node2$(EXEEXT): mp13_node2.adb ../mptest.adb init.$(OBJEXT)
+mp13_node2.exe: mp13_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp14/node1/Makefile.am b/c/src/ada-tests/mptests/mp14/node1/Makefile.am
index dd72c9c346..8f08dcc234 100644
--- a/c/src/ada-tests/mptests/mp14/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp14/node1/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp14_node1
-mp14_node1_SOURCES = mp14_node1.adb ../mptest.adb config.h ../mptest.ads
-mp14_node1_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp14_node1.exe
+mp14_node1_exe_SOURCES = mp14_node1.adb ../mptest.adb config.h ../mptest.ads
+mp14_node1_exe_SOURCES += ../../../support/init.c
 
-mp14_node1$(EXEEXT): mp14_node1.adb ../mptest.adb init.$(OBJEXT)
+mp14_node1.exe: mp14_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/mptests/mp14/node2/Makefile.am b/c/src/ada-tests/mptests/mp14/node2/Makefile.am
index bc709024a6..b8d0efee4d 100644
--- a/c/src/ada-tests/mptests/mp14/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp14/node2/Makefile.am
@@ -7,11 +7,11 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp14_node2
-mp14_node2_SOURCES = mp14_node2.adb ../mptest.adb config.h ../mptest.ads
-mp14_node2_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp14_node2.exe
+mp14_node2_exe_SOURCES = mp14_node2.adb ../mptest.adb config.h ../mptest.ads
+mp14_node2_exe_SOURCES += ../../../support/init.c
 
-mp14_node2$(EXEEXT): mp14_node2.adb ../mptest.adb init.$(OBJEXT)
+mp14_node2.exe: mp14_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/samples/base_mp/Makefile.am b/c/src/ada-tests/samples/base_mp/Makefile.am
index 5f409f693c..aef73fce4c 100644
--- a/c/src/ada-tests/samples/base_mp/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/Makefile.am
@@ -6,14 +6,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 SUBDIRS = node1 node2
 #include $(top_srcdir)/ada.am
 
-#mptest$(EXEEXT): mptest.adb
+#mptest.exe: mptest.adb
 #	$(GNATCOMPILE) -margs -a $< -o $@
 
 #if EXPADA
 #noinst_PROGRAMS = mptest
 #endif
 
-#mptest_SOURCES = mptest.adb mptest.ads
+#mptest_exe_SOURCES = mptest.adb mptest.ads
 
 #EXTRA_DIST += node1/mptest-per_node_configuration.adb
 
diff --git a/c/src/ada-tests/samples/base_mp/node1/Makefile.am b/c/src/ada-tests/samples/base_mp/node1/Makefile.am
index 272a0f5d8b..8f49755f9d 100644
--- a/c/src/ada-tests/samples/base_mp/node1/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-node1$(EXEEXT): ../mptest.adb init.o
+node1.exe: ../mptest.adb init.o
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.o: ../../../support/init.c
 	$(COMPILE.c) -DNODE_NUMBER=1 -I$(srcdir)/.. -c $<
 
 if EXPADA
-noinst_PROGRAMS = node1
+noinst_PROGRAMS = node1.exe
 endif
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/samples/base_mp/node2/Makefile.am b/c/src/ada-tests/samples/base_mp/node2/Makefile.am
index b95ac6e926..8fde3a6c44 100644
--- a/c/src/ada-tests/samples/base_mp/node2/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node2/Makefile.am
@@ -7,17 +7,17 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-node2$(EXEEXT): ../mptest.adb init.o
+node2.exe: ../mptest.adb init.o
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.o: ../../../support/init.c
 	$(COMPILE.c) -DNODE_NUMBER=2 -I$(srcdir)/.. -c $<
 
 if EXPADA
-noinst_PROGRAMS = node2
+noinst_PROGRAMS = node2.exe
 endif
 
-node2_SOURCES = mptest-per_node_configuration.adb
+node2_exe_SOURCES = mptest-per_node_configuration.adb
 
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = base_mp-node2.scn
diff --git a/c/src/ada-tests/samples/base_sp/Makefile.am b/c/src/ada-tests/samples/base_sp/Makefile.am
index ee856ff192..b44e5fd3bf 100644
--- a/c/src/ada-tests/samples/base_sp/Makefile.am
+++ b/c/src/ada-tests/samples/base_sp/Makefile.am
@@ -5,15 +5,15 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-base_sp$(EXEEXT): base_sp.adb init.$(OBJEXT)
+base_sp.exe: base_sp.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
 	$(COMPILE.c) -I$(srcdir) -c $<
 
-noinst_PROGRAMS = base_sp
+noinst_PROGRAMS = base_sp.exe
 
-base_sp_SOURCES = base_sp.adb config.h sptest.adb sptest.ads
+base_sp_exe_SOURCES = base_sp.adb config.h sptest.adb sptest.ads
 
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = base_sp.scn
diff --git a/c/src/ada-tests/samples/hello/Makefile.am b/c/src/ada-tests/samples/hello/Makefile.am
index 44bff6d932..9ed52dd6b3 100644
--- a/c/src/ada-tests/samples/hello/Makefile.am
+++ b/c/src/ada-tests/samples/hello/Makefile.am
@@ -5,15 +5,15 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-hello$(EXEEXT): hello.adb init.$(OBJEXT)
+hello.exe: hello.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
 	$(COMPILE.c) -I$(srcdir) -c $<
 
-noinst_PROGRAMS = hello
+noinst_PROGRAMS = hello.exe
 
-hello_SOURCES = hello.adb config.h sptest.adb sptest.ads
+hello_exe_SOURCES = hello.adb config.h sptest.adb sptest.ads
 
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = hello.scn
diff --git a/c/src/ada-tests/samples/nsecs/Makefile.am b/c/src/ada-tests/samples/nsecs/Makefile.am
index 0fbd6910dc..0462ffdea8 100644
--- a/c/src/ada-tests/samples/nsecs/Makefile.am
+++ b/c/src/ada-tests/samples/nsecs/Makefile.am
@@ -5,15 +5,15 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-nsecs$(EXEEXT): nsecs.adb init.$(OBJEXT)
+nsecs.exe: nsecs.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
 	$(COMPILE.c) -I$(srcdir) -c $<
 
-noinst_PROGRAMS = nsecs
+noinst_PROGRAMS = nsecs.exe
 
-nsecs_SOURCES = nsecs.adb config.h sptest.adb sptest.ads
+nsecs_exe_SOURCES = nsecs.adb config.h sptest.adb sptest.ads
 
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = nsecs.scn
diff --git a/c/src/ada-tests/samples/ticker/Makefile.am b/c/src/ada-tests/samples/ticker/Makefile.am
index 4c2778a81f..2b026dc99f 100644
--- a/c/src/ada-tests/samples/ticker/Makefile.am
+++ b/c/src/ada-tests/samples/ticker/Makefile.am
@@ -5,15 +5,15 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-ticker$(EXEEXT): ticker.adb init.$(OBJEXT)
+ticker.exe: ticker.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
 	$(COMPILE.c) -I$(srcdir) -c $<
 
-noinst_PROGRAMS = ticker
+noinst_PROGRAMS = ticker.exe
 
-ticker_SOURCES = ticker.adb config.h sptest.adb sptest.ads
+ticker_exe_SOURCES = ticker.adb config.h sptest.adb sptest.ads
 
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ticker.scn
diff --git a/c/src/ada-tests/sptests/sp01/Makefile.am b/c/src/ada-tests/sptests/sp01/Makefile.am
index 94cab660e2..eda526bbee 100644
--- a/c/src/ada-tests/sptests/sp01/Makefile.am
+++ b/c/src/ada-tests/sptests/sp01/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp01
-sp01_SOURCES = sp01.adb config.h sptest.adb sptest.ads
-sp01_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp01.exe
+sp01_exe_SOURCES = sp01.adb config.h sptest.adb sptest.ads
+sp01_exe_SOURCES += ../../support/init.c
 
-sp01$(EXEEXT): sp01.adb init.$(OBJEXT)
+sp01.exe: sp01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp02/Makefile.am b/c/src/ada-tests/sptests/sp02/Makefile.am
index 37b23d553a..b2c33e819e 100644
--- a/c/src/ada-tests/sptests/sp02/Makefile.am
+++ b/c/src/ada-tests/sptests/sp02/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp02
-sp02_SOURCES = sp02.adb config.h sptest.adb sptest.ads
-sp02_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp02.exe
+sp02_exe_SOURCES = sp02.adb config.h sptest.adb sptest.ads
+sp02_exe_SOURCES += ../../support/init.c
 
-sp02$(EXEEXT): sp02.adb init.$(OBJEXT)
+sp02.exe: sp02.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp03/Makefile.am b/c/src/ada-tests/sptests/sp03/Makefile.am
index 7b20bb5337..d6892fbdeb 100644
--- a/c/src/ada-tests/sptests/sp03/Makefile.am
+++ b/c/src/ada-tests/sptests/sp03/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp03
-sp03_SOURCES = sp03.adb config.h sptest.adb sptest.ads
-sp03_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp03.exe
+sp03_exe_SOURCES = sp03.adb config.h sptest.adb sptest.ads
+sp03_exe_SOURCES += ../../support/init.c
 
-sp03$(EXEEXT): sp03.adb init.$(OBJEXT)
+sp03.exe: sp03.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp04/Makefile.am b/c/src/ada-tests/sptests/sp04/Makefile.am
index 155bd67f10..5c991f34bc 100644
--- a/c/src/ada-tests/sptests/sp04/Makefile.am
+++ b/c/src/ada-tests/sptests/sp04/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp04
-sp04_SOURCES = sp04.adb config.h sptest.adb sptest.ads
-sp04_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp04.exe
+sp04_exe_SOURCES = sp04.adb config.h sptest.adb sptest.ads
+sp04_exe_SOURCES += ../../support/init.c
 
-sp04$(EXEEXT): sp04.adb init.$(OBJEXT)
+sp04.exe: sp04.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp05/Makefile.am b/c/src/ada-tests/sptests/sp05/Makefile.am
index 2c7eb69534..82fe91fcb3 100644
--- a/c/src/ada-tests/sptests/sp05/Makefile.am
+++ b/c/src/ada-tests/sptests/sp05/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp05
-sp05_SOURCES = sp05.adb config.h sptest.adb sptest.ads
-sp05_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp05.exe
+sp05_exe_SOURCES = sp05.adb config.h sptest.adb sptest.ads
+sp05_exe_SOURCES += ../../support/init.c
 
-sp05$(EXEEXT): sp05.adb init.$(OBJEXT)
+sp05.exe: sp05.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp06/Makefile.am b/c/src/ada-tests/sptests/sp06/Makefile.am
index 0d9ede8af9..7fa7a54ef6 100644
--- a/c/src/ada-tests/sptests/sp06/Makefile.am
+++ b/c/src/ada-tests/sptests/sp06/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp06
-sp06_SOURCES = sp06.adb config.h sptest.adb sptest.ads
-sp06_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp06.exe
+sp06_exe_SOURCES = sp06.adb config.h sptest.adb sptest.ads
+sp06_exe_SOURCES += ../../support/init.c
 
-sp06$(EXEEXT): sp06.adb init.$(OBJEXT)
+sp06.exe: sp06.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp07/Makefile.am b/c/src/ada-tests/sptests/sp07/Makefile.am
index cd1b51548b..37167d4d97 100644
--- a/c/src/ada-tests/sptests/sp07/Makefile.am
+++ b/c/src/ada-tests/sptests/sp07/Makefile.am
@@ -5,12 +5,12 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp07
+noinst_PROGRAMS = sp07.exe
 
-sp07_SOURCES = sp07.adb config.h sptest.adb sptest.ads
-sp07_SOURCES += ../../support/init.c
+sp07_exe_SOURCES = sp07.adb config.h sptest.adb sptest.ads
+sp07_exe_SOURCES += ../../support/init.c
 
-sp07$(EXEEXT): sp07.adb init.$(OBJEXT)
+sp07.exe: sp07.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp08/Makefile.am b/c/src/ada-tests/sptests/sp08/Makefile.am
index 138e0af943..71f952279e 100644
--- a/c/src/ada-tests/sptests/sp08/Makefile.am
+++ b/c/src/ada-tests/sptests/sp08/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp08
-sp08_SOURCES = sp08.adb config.h sptest.adb sptest.ads
-sp08_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp08.exe
+sp08_exe_SOURCES = sp08.adb config.h sptest.adb sptest.ads
+sp08_exe_SOURCES += ../../support/init.c
 
-sp08$(EXEEXT): sp08.adb init.$(OBJEXT)
+sp08.exe: sp08.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp09/Makefile.am b/c/src/ada-tests/sptests/sp09/Makefile.am
index 68a5b06ce2..9fcd9c1674 100644
--- a/c/src/ada-tests/sptests/sp09/Makefile.am
+++ b/c/src/ada-tests/sptests/sp09/Makefile.am
@@ -9,12 +9,12 @@ include $(top_srcdir)/ada.am
 # handling can be verified in the binding.
 AM_ADAFLAGS += -gnatp
 
-noinst_PROGRAMS = sp09
+noinst_PROGRAMS = sp09.exe
 
-sp09_SOURCES = sp09.adb config.h sptest.adb sptest.ads
-sp09_SOURCES += ../../support/init.c
+sp09_exe_SOURCES = sp09.adb config.h sptest.adb sptest.ads
+sp09_exe_SOURCES += ../../support/init.c
 
-sp09$(EXEEXT): sp09.adb init.$(OBJEXT)
+sp09.exe: sp09.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp11/Makefile.am b/c/src/ada-tests/sptests/sp11/Makefile.am
index 99425a439c..fa5776dc16 100644
--- a/c/src/ada-tests/sptests/sp11/Makefile.am
+++ b/c/src/ada-tests/sptests/sp11/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp11
-sp11_SOURCES = sp11.adb config.h sptest.adb sptest.ads
-sp11_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp11.exe
+sp11_exe_SOURCES = sp11.adb config.h sptest.adb sptest.ads
+sp11_exe_SOURCES += ../../support/init.c
 
-sp11$(EXEEXT): sp11.adb init.$(OBJEXT)
+sp11.exe: sp11.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp12/Makefile.am b/c/src/ada-tests/sptests/sp12/Makefile.am
index 48d473e062..35f9b45fd2 100644
--- a/c/src/ada-tests/sptests/sp12/Makefile.am
+++ b/c/src/ada-tests/sptests/sp12/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp12
-sp12_SOURCES = sp12.adb config.h sptest.adb sptest.ads
-sp12_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp12.exe
+sp12_exe_SOURCES = sp12.adb config.h sptest.adb sptest.ads
+sp12_exe_SOURCES += ../../support/init.c
 
-sp12$(EXEEXT): sp12.adb init.$(OBJEXT)
+sp12.exe: sp12.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp13/Makefile.am b/c/src/ada-tests/sptests/sp13/Makefile.am
index ebcf120493..39f5fa9f0b 100644
--- a/c/src/ada-tests/sptests/sp13/Makefile.am
+++ b/c/src/ada-tests/sptests/sp13/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp13
-sp13_SOURCES = sp13.adb config.h sptest.adb sptest.ads
-sp13_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp13.exe
+sp13_exe_SOURCES = sp13.adb config.h sptest.adb sptest.ads
+sp13_exe_SOURCES += ../../support/init.c
 
-sp13$(EXEEXT): sp13.adb init.$(OBJEXT)
+sp13.exe: sp13.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp14/Makefile.am b/c/src/ada-tests/sptests/sp14/Makefile.am
index 1b4c5f8210..7584fa2c3b 100644
--- a/c/src/ada-tests/sptests/sp14/Makefile.am
+++ b/c/src/ada-tests/sptests/sp14/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp14
-sp14_SOURCES = sp14.adb config.h sptest.adb sptest.ads
-sp14_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp14.exe
+sp14_exe_SOURCES = sp14.adb config.h sptest.adb sptest.ads
+sp14_exe_SOURCES += ../../support/init.c
 
-sp14$(EXEEXT): sp14.adb init.$(OBJEXT)
+sp14.exe: sp14.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp15/Makefile.am b/c/src/ada-tests/sptests/sp15/Makefile.am
index 2166fc3639..abad1527fc 100644
--- a/c/src/ada-tests/sptests/sp15/Makefile.am
+++ b/c/src/ada-tests/sptests/sp15/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp15
-sp15_SOURCES = sp15.adb config.h sptest.adb sptest.ads
-sp15_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp15.exe
+sp15_exe_SOURCES = sp15.adb config.h sptest.adb sptest.ads
+sp15_exe_SOURCES += ../../support/init.c
 
-sp15$(EXEEXT): sp15.adb init.$(OBJEXT)
+sp15.exe: sp15.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp16/Makefile.am b/c/src/ada-tests/sptests/sp16/Makefile.am
index 92c96facf8..0ec4441cbd 100644
--- a/c/src/ada-tests/sptests/sp16/Makefile.am
+++ b/c/src/ada-tests/sptests/sp16/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp16
-sp16_SOURCES = sp16.adb config.h sptest.adb sptest.ads
-sp16_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp16.exe
+sp16_exe_SOURCES = sp16.adb config.h sptest.adb sptest.ads
+sp16_exe_SOURCES += ../../support/init.c
 
-sp16$(EXEEXT): sp16.adb init.$(OBJEXT)
+sp16.exe: sp16.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp17/Makefile.am b/c/src/ada-tests/sptests/sp17/Makefile.am
index b87e3dd091..d3d992d2e6 100644
--- a/c/src/ada-tests/sptests/sp17/Makefile.am
+++ b/c/src/ada-tests/sptests/sp17/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp17
-sp17_SOURCES = sp17.adb config.h sptest.adb sptest.ads
-sp17_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp17.exe
+sp17_exe_SOURCES = sp17.adb config.h sptest.adb sptest.ads
+sp17_exe_SOURCES += ../../support/init.c
 
-sp17$(EXEEXT): sp17.adb init.$(OBJEXT)
+sp17.exe: sp17.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp19/Makefile.am b/c/src/ada-tests/sptests/sp19/Makefile.am
index 79ce509316..e377870c52 100644
--- a/c/src/ada-tests/sptests/sp19/Makefile.am
+++ b/c/src/ada-tests/sptests/sp19/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I.
 
-noinst_PROGRAMS = sp19
+noinst_PROGRAMS = sp19.exe
 
-sp19_SOURCES = sp19.adb sptest.adb config.h sptest.ads
-sp19_SOURCES += ../../support/init.c
+sp19_exe_SOURCES = sp19.adb sptest.adb config.h sptest.ads
+sp19_exe_SOURCES += ../../support/init.c
 
 CLEANFILES += sptest.adb
 
-sp19$(EXEEXT): sp19.adb sptest.adb sptest.ads init.$(OBJEXT)
+sp19.exe: sp19.adb sptest.adb sptest.ads init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp20/Makefile.am b/c/src/ada-tests/sptests/sp20/Makefile.am
index ac8992e73b..cd1d00c737 100644
--- a/c/src/ada-tests/sptests/sp20/Makefile.am
+++ b/c/src/ada-tests/sptests/sp20/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp20
-sp20_SOURCES = sp20.adb config.h sptest.adb sptest.ads
-sp20_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp20.exe
+sp20_exe_SOURCES = sp20.adb config.h sptest.adb sptest.ads
+sp20_exe_SOURCES += ../../support/init.c
 
-sp20$(EXEEXT): sp20.adb init.$(OBJEXT)
+sp20.exe: sp20.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp22/Makefile.am b/c/src/ada-tests/sptests/sp22/Makefile.am
index 4637323c26..fd56162a28 100644
--- a/c/src/ada-tests/sptests/sp22/Makefile.am
+++ b/c/src/ada-tests/sptests/sp22/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp22
-sp22_SOURCES = sp22.adb config.h sptest.adb sptest.ads
-sp22_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp22.exe
+sp22_exe_SOURCES = sp22.adb config.h sptest.adb sptest.ads
+sp22_exe_SOURCES += ../../support/init.c
 
-sp22$(EXEEXT): sp22.adb init.$(OBJEXT)
+sp22.exe: sp22.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp23/Makefile.am b/c/src/ada-tests/sptests/sp23/Makefile.am
index c2004cea03..f3dee078a4 100644
--- a/c/src/ada-tests/sptests/sp23/Makefile.am
+++ b/c/src/ada-tests/sptests/sp23/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp23
-sp23_SOURCES = sp23.adb config.h sptest.adb sptest.ads
-sp23_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp23.exe
+sp23_exe_SOURCES = sp23.adb config.h sptest.adb sptest.ads
+sp23_exe_SOURCES += ../../support/init.c
 
-sp23$(EXEEXT): sp23.adb init.$(OBJEXT)
+sp23.exe: sp23.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp24/Makefile.am b/c/src/ada-tests/sptests/sp24/Makefile.am
index 7154286b26..09a31e118e 100644
--- a/c/src/ada-tests/sptests/sp24/Makefile.am
+++ b/c/src/ada-tests/sptests/sp24/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp24
-sp24_SOURCES = sp24.adb config.h sptest.adb sptest.ads
-sp24_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp24.exe
+sp24_exe_SOURCES = sp24.adb config.h sptest.adb sptest.ads
+sp24_exe_SOURCES += ../../support/init.c
 
-sp24$(EXEEXT): sp24.adb init.$(OBJEXT)
+sp24.exe: sp24.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/sp25/Makefile.am b/c/src/ada-tests/sptests/sp25/Makefile.am
index cbdd052718..40f2dee699 100644
--- a/c/src/ada-tests/sptests/sp25/Makefile.am
+++ b/c/src/ada-tests/sptests/sp25/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = sp25
-sp25_SOURCES = sp25.adb config.h sptest.adb sptest.ads
-sp25_SOURCES += ../../support/init.c
+noinst_PROGRAMS = sp25.exe
+sp25_exe_SOURCES = sp25.adb config.h sptest.adb sptest.ads
+sp25_exe_SOURCES += ../../support/init.c
 
-sp25$(EXEEXT): sp25.adb init.$(OBJEXT)
+sp25.exe: sp25.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/tmtests/tm01/Makefile.am b/c/src/ada-tests/tmtests/tm01/Makefile.am
index f76c19dfa5..572694b235 100644
--- a/c/src/ada-tests/tmtests/tm01/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm01/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm01
-tm01_SOURCES = tm01.adb config.h tmtest.adb tmtest.ads
-tm01_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm01.exe
+tm01_exe_SOURCES = tm01.adb config.h tmtest.adb tmtest.ads
+tm01_exe_SOURCES += ../../support/init.c
 
-tm01$(EXEEXT): tm01.adb init.$(OBJEXT)
+tm01.exe: tm01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm02/Makefile.am b/c/src/ada-tests/tmtests/tm02/Makefile.am
index f2c483e6b4..f214cd266d 100644
--- a/c/src/ada-tests/tmtests/tm02/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm02/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm02
-tm02_SOURCES = tm02.adb config.h tmtest.adb tmtest.ads
-tm02_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm02.exe
+tm02_exe_SOURCES = tm02.adb config.h tmtest.adb tmtest.ads
+tm02_exe_SOURCES += ../../support/init.c
 
-tm02$(EXEEXT): tm02.adb init.$(OBJEXT)
+tm02.exe: tm02.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm03/Makefile.am b/c/src/ada-tests/tmtests/tm03/Makefile.am
index d1df09b344..a1ce92a0cb 100644
--- a/c/src/ada-tests/tmtests/tm03/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm03/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm03
-tm03_SOURCES = tm03.adb config.h tmtest.adb tmtest.ads
-tm03_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm03.exe
+tm03_exe_SOURCES = tm03.adb config.h tmtest.adb tmtest.ads
+tm03_exe_SOURCES += ../../support/init.c
 
-tm03$(EXEEXT): tm03.adb init.$(OBJEXT)
+tm03.exe: tm03.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm04/Makefile.am b/c/src/ada-tests/tmtests/tm04/Makefile.am
index b58cc0c450..2885e81e83 100644
--- a/c/src/ada-tests/tmtests/tm04/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm04/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm04
-tm04_SOURCES = tm04.adb config.h tmtest.adb tmtest.ads
-tm04_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm04.exe
+tm04_exe_SOURCES = tm04.adb config.h tmtest.adb tmtest.ads
+tm04_exe_SOURCES += ../../support/init.c
 
-tm04$(EXEEXT): tm04.adb init.$(OBJEXT)
+tm04.exe: tm04.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm05/Makefile.am b/c/src/ada-tests/tmtests/tm05/Makefile.am
index 974a43bf62..d408615e80 100644
--- a/c/src/ada-tests/tmtests/tm05/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm05/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm05
-tm05_SOURCES = tm05.adb config.h tmtest.adb tmtest.ads
-tm05_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm05.exe
+tm05_exe_SOURCES = tm05.adb config.h tmtest.adb tmtest.ads
+tm05_exe_SOURCES += ../../support/init.c
 
-tm05$(EXEEXT): tm05.adb init.$(OBJEXT)
+tm05.exe: tm05.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm06/Makefile.am b/c/src/ada-tests/tmtests/tm06/Makefile.am
index 7f0323068d..1acbc6d58d 100644
--- a/c/src/ada-tests/tmtests/tm06/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm06/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm06
-tm06_SOURCES = tm06.adb config.h tmtest.adb tmtest.ads
-tm06_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm06.exe
+tm06_exe_SOURCES = tm06.adb config.h tmtest.adb tmtest.ads
+tm06_exe_SOURCES += ../../support/init.c
 
-tm06$(EXEEXT): tm06.adb init.$(OBJEXT)
+tm06.exe: tm06.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm07/Makefile.am b/c/src/ada-tests/tmtests/tm07/Makefile.am
index 3621a55484..d4e495e639 100644
--- a/c/src/ada-tests/tmtests/tm07/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm07/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm07
-tm07_SOURCES = tm07.adb config.h tmtest.adb tmtest.ads
-tm07_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm07.exe
+tm07_exe_SOURCES = tm07.adb config.h tmtest.adb tmtest.ads
+tm07_exe_SOURCES += ../../support/init.c
 
-tm07$(EXEEXT): tm07.adb init.$(OBJEXT)
+tm07.exe: tm07.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm08/Makefile.am b/c/src/ada-tests/tmtests/tm08/Makefile.am
index 6d44730f56..ce6e2112ce 100644
--- a/c/src/ada-tests/tmtests/tm08/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm08/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm08
-tm08_SOURCES = tm08.adb config.h tmtest.adb tmtest.ads
-tm08_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm08.exe
+tm08_exe_SOURCES = tm08.adb config.h tmtest.adb tmtest.ads
+tm08_exe_SOURCES += ../../support/init.c
 
-tm08$(EXEEXT): tm08.adb init.$(OBJEXT)
+tm08.exe: tm08.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm09/Makefile.am b/c/src/ada-tests/tmtests/tm09/Makefile.am
index 5a1b2a6043..7f5d058895 100644
--- a/c/src/ada-tests/tmtests/tm09/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm09/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm09
-tm09_SOURCES = tm09.adb config.h tmtest.adb tmtest.ads
-tm09_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm09.exe
+tm09_exe_SOURCES = tm09.adb config.h tmtest.adb tmtest.ads
+tm09_exe_SOURCES += ../../support/init.c
 
-tm09$(EXEEXT): tm09.adb init.$(OBJEXT)
+tm09.exe: tm09.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm10/Makefile.am b/c/src/ada-tests/tmtests/tm10/Makefile.am
index 9b61e9f22c..60f1e2a52f 100644
--- a/c/src/ada-tests/tmtests/tm10/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm10/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm10
-tm10_SOURCES = tm10.adb config.h tmtest.adb tmtest.ads
-tm10_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm10.exe
+tm10_exe_SOURCES = tm10.adb config.h tmtest.adb tmtest.ads
+tm10_exe_SOURCES += ../../support/init.c
 
-tm10$(EXEEXT): tm10.adb init.$(OBJEXT)
+tm10.exe: tm10.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm11/Makefile.am b/c/src/ada-tests/tmtests/tm11/Makefile.am
index df8b468a59..6a86eb5050 100644
--- a/c/src/ada-tests/tmtests/tm11/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm11/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm11
-tm11_SOURCES = tm11.adb config.h tmtest.adb tmtest.ads
-tm11_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm11.exe
+tm11_exe_SOURCES = tm11.adb config.h tmtest.adb tmtest.ads
+tm11_exe_SOURCES += ../../support/init.c
 
-tm11$(EXEEXT): tm11.adb init.$(OBJEXT)
+tm11.exe: tm11.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm12/Makefile.am b/c/src/ada-tests/tmtests/tm12/Makefile.am
index f5e1bb9c32..742f37cd01 100644
--- a/c/src/ada-tests/tmtests/tm12/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm12/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm12
-tm12_SOURCES = tm12.adb config.h tmtest.adb tmtest.ads
-tm12_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm12.exe
+tm12_exe_SOURCES = tm12.adb config.h tmtest.adb tmtest.ads
+tm12_exe_SOURCES += ../../support/init.c
 
-tm12$(EXEEXT): tm12.adb init.$(OBJEXT)
+tm12.exe: tm12.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm13/Makefile.am b/c/src/ada-tests/tmtests/tm13/Makefile.am
index 3c6dab2a6c..3facfc0fe0 100644
--- a/c/src/ada-tests/tmtests/tm13/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm13/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm13
-tm13_SOURCES = tm13.adb config.h tmtest.adb tmtest.ads
-tm13_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm13.exe
+tm13_exe_SOURCES = tm13.adb config.h tmtest.adb tmtest.ads
+tm13_exe_SOURCES += ../../support/init.c
 
-tm13$(EXEEXT): tm13.adb init.$(OBJEXT)
+tm13.exe: tm13.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm14/Makefile.am b/c/src/ada-tests/tmtests/tm14/Makefile.am
index 2e45d1304b..4ff1115cb7 100644
--- a/c/src/ada-tests/tmtests/tm14/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm14/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm14
-tm14_SOURCES = tm14.adb config.h tmtest.adb tmtest.ads
-tm14_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm14.exe
+tm14_exe_SOURCES = tm14.adb config.h tmtest.adb tmtest.ads
+tm14_exe_SOURCES += ../../support/init.c
 
-tm14$(EXEEXT): tm14.adb init.$(OBJEXT)
+tm14.exe: tm14.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm15/Makefile.am b/c/src/ada-tests/tmtests/tm15/Makefile.am
index a42552d807..4bf7f1c5bd 100644
--- a/c/src/ada-tests/tmtests/tm15/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm15/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm15
-tm15_SOURCES = tm15.adb config.h tmtest.adb tmtest.ads
-tm15_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm15.exe
+tm15_exe_SOURCES = tm15.adb config.h tmtest.adb tmtest.ads
+tm15_exe_SOURCES += ../../support/init.c
 
-tm15$(EXEEXT): tm15.adb init.$(OBJEXT)
+tm15.exe: tm15.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm16/Makefile.am b/c/src/ada-tests/tmtests/tm16/Makefile.am
index 30818ca958..08f67ca0ff 100644
--- a/c/src/ada-tests/tmtests/tm16/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm16/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm16
-tm16_SOURCES = tm16.adb config.h tmtest.adb tmtest.ads
-tm16_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm16.exe
+tm16_exe_SOURCES = tm16.adb config.h tmtest.adb tmtest.ads
+tm16_exe_SOURCES += ../../support/init.c
 
-tm16$(EXEEXT): tm16.adb init.$(OBJEXT)
+tm16.exe: tm16.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm17/Makefile.am b/c/src/ada-tests/tmtests/tm17/Makefile.am
index 68880f2659..55a78a6ebf 100644
--- a/c/src/ada-tests/tmtests/tm17/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm17/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm17
-tm17_SOURCES = tm17.adb config.h tmtest.adb tmtest.ads
-tm17_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm17.exe
+tm17_exe_SOURCES = tm17.adb config.h tmtest.adb tmtest.ads
+tm17_exe_SOURCES += ../../support/init.c
 
-tm17$(EXEEXT): tm17.adb init.$(OBJEXT)
+tm17.exe: tm17.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm18/Makefile.am b/c/src/ada-tests/tmtests/tm18/Makefile.am
index c5ea4c75ba..5db0919f79 100644
--- a/c/src/ada-tests/tmtests/tm18/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm18/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm18
-tm18_SOURCES = tm18.adb config.h tmtest.adb tmtest.ads
-tm18_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm18.exe
+tm18_exe_SOURCES = tm18.adb config.h tmtest.adb tmtest.ads
+tm18_exe_SOURCES += ../../support/init.c
 
-tm18$(EXEEXT): tm18.adb init.$(OBJEXT)
+tm18.exe: tm18.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm19/Makefile.am b/c/src/ada-tests/tmtests/tm19/Makefile.am
index 9ee318d61a..51b40c904d 100644
--- a/c/src/ada-tests/tmtests/tm19/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm19/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm19
-tm19_SOURCES = tm19.adb config.h tmtest.adb tmtest.ads
-tm19_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm19.exe
+tm19_exe_SOURCES = tm19.adb config.h tmtest.adb tmtest.ads
+tm19_exe_SOURCES += ../../support/init.c
 
-tm19$(EXEEXT): tm19.adb init.$(OBJEXT)
+tm19.exe: tm19.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm20/Makefile.am b/c/src/ada-tests/tmtests/tm20/Makefile.am
index e49f6124d5..b0957af703 100644
--- a/c/src/ada-tests/tmtests/tm20/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm20/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm20
-tm20_SOURCES = tm20.adb config.h tmtest.adb tmtest.ads
-tm20_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm20.exe
+tm20_exe_SOURCES = tm20.adb config.h tmtest.adb tmtest.ads
+tm20_exe_SOURCES += ../../support/init.c
 
-tm20$(EXEEXT): tm20.adb init.$(OBJEXT)
+tm20.exe: tm20.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm21/Makefile.am b/c/src/ada-tests/tmtests/tm21/Makefile.am
index f93867f5c1..b3796f6f2c 100644
--- a/c/src/ada-tests/tmtests/tm21/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm21/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm21
-tm21_SOURCES = tm21.adb config.h tmtest.adb tmtest.ads
-tm21_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm21.exe
+tm21_exe_SOURCES = tm21.adb config.h tmtest.adb tmtest.ads
+tm21_exe_SOURCES += ../../support/init.c
 
-tm21$(EXEEXT): tm21.adb init.$(OBJEXT)
+tm21.exe: tm21.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm22/Makefile.am b/c/src/ada-tests/tmtests/tm22/Makefile.am
index 4ffade8352..26c1a66d16 100644
--- a/c/src/ada-tests/tmtests/tm22/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm22/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm22
-tm22_SOURCES = tm22.adb config.h tmtest.adb tmtest.ads
-tm22_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm22.exe
+tm22_exe_SOURCES = tm22.adb config.h tmtest.adb tmtest.ads
+tm22_exe_SOURCES += ../../support/init.c
 
-tm22$(EXEEXT): tm22.adb init.$(OBJEXT)
+tm22.exe: tm22.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm23/Makefile.am b/c/src/ada-tests/tmtests/tm23/Makefile.am
index bcf6f6bb29..fe0c5764ca 100644
--- a/c/src/ada-tests/tmtests/tm23/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm23/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm23
-tm23_SOURCES = tm23.adb config.h tmtest.adb tmtest.ads
-tm23_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm23.exe
+tm23_exe_SOURCES = tm23.adb config.h tmtest.adb tmtest.ads
+tm23_exe_SOURCES += ../../support/init.c
 
-tm23$(EXEEXT): tm23.adb init.$(OBJEXT)
+tm23.exe: tm23.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm24/Makefile.am b/c/src/ada-tests/tmtests/tm24/Makefile.am
index b8ccda4c1d..d9afea0bdf 100644
--- a/c/src/ada-tests/tmtests/tm24/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm24/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm24
-tm24_SOURCES = tm24.adb config.h tmtest.adb tmtest.ads
-tm24_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm24.exe
+tm24_exe_SOURCES = tm24.adb config.h tmtest.adb tmtest.ads
+tm24_exe_SOURCES += ../../support/init.c
 
-tm24$(EXEEXT): tm24.adb init.$(OBJEXT)
+tm24.exe: tm24.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm25/Makefile.am b/c/src/ada-tests/tmtests/tm25/Makefile.am
index 6eb7b8393d..b160ba90c5 100644
--- a/c/src/ada-tests/tmtests/tm25/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm25/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm25
-tm25_SOURCES = tm25.adb config.h tmtest.adb tmtest.ads
-tm25_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm25.exe
+tm25_exe_SOURCES = tm25.adb config.h tmtest.adb tmtest.ads
+tm25_exe_SOURCES += ../../support/init.c
 
-tm25$(EXEEXT): tm25.adb init.$(OBJEXT)
+tm25.exe: tm25.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm28/Makefile.am b/c/src/ada-tests/tmtests/tm28/Makefile.am
index 14b557cf42..b341ecdd6b 100644
--- a/c/src/ada-tests/tmtests/tm28/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm28/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm28
-tm28_SOURCES = tm28.adb config.h tmtest.adb tmtest.ads
-tm28_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm28.exe
+tm28_exe_SOURCES = tm28.adb config.h tmtest.adb tmtest.ads
+tm28_exe_SOURCES += ../../support/init.c
 
-tm28$(EXEEXT): tm28.adb init.$(OBJEXT)
+tm28.exe: tm28.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm29/Makefile.am b/c/src/ada-tests/tmtests/tm29/Makefile.am
index 6879400000..681c5d14c5 100644
--- a/c/src/ada-tests/tmtests/tm29/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm29/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tm29
-tm29_SOURCES = tm29.adb config.h tmtest.adb tmtest.ads
-tm29_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tm29.exe
+tm29_exe_SOURCES = tm29.adb config.h tmtest.adb tmtest.ads
+tm29_exe_SOURCES += ../../support/init.c
 
-tm29$(EXEEXT): tm29.adb init.$(OBJEXT)
+tm29.exe: tm29.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tmck/Makefile.am b/c/src/ada-tests/tmtests/tmck/Makefile.am
index d5cde4e24d..b0ef704e70 100644
--- a/c/src/ada-tests/tmtests/tmck/Makefile.am
+++ b/c/src/ada-tests/tmtests/tmck/Makefile.am
@@ -5,11 +5,11 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tmck
-tmck_SOURCES = tmck.adb config.h tmtest.adb tmtest.ads
-tmck_SOURCES += ../../support/init.c
+noinst_PROGRAMS = tmck.exe
+tmck_exe_SOURCES = tmck.adb config.h tmtest.adb tmtest.ads
+tmck_exe_SOURCES += ../../support/init.c
 
-tmck$(EXEEXT): tmck.adb init.$(OBJEXT)
+tmck.exe: tmck.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tmoverhd/Makefile.am b/c/src/ada-tests/tmtests/tmoverhd/Makefile.am
index 9150a7ea16..c2e9ea41bd 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/Makefile.am
+++ b/c/src/ada-tests/tmtests/tmoverhd/Makefile.am
@@ -5,12 +5,12 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-noinst_PROGRAMS = tmoverhd
-tmoverhd_SOURCES = tmoverhd.adb config.h tmtest.adb tmtest.ads \
+noinst_PROGRAMS = tmoverhd.exe
+tmoverhd_exe_SOURCES = tmoverhd.adb config.h tmtest.adb tmtest.ads \
     dummy_rtems.adb dummy_rtems.ads
-tmoverhd_SOURCES += ../../support/init.c
+tmoverhd_exe_SOURCES += ../../support/init.c
 
-tmoverhd$(EXEEXT): tmoverhd.adb init.$(OBJEXT)
+tmoverhd.exe: tmoverhd.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../testsuites/automake/local.am