2009-12-14 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, sptests/spname01/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: Update so all tests build.

23 files changed, 92 insertions, 94 deletions

diff --git a/c/src/ada-tests/sptests/sp01/Makefile.am b/c/src/ada-tests/sptests/sp01/Makefile.am
index 722d329d19..04640499d3 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 = ada_sp01.exe
-ada_sp01_exe_SOURCES = sp01.adb config.h sptest.adb sptest.ads
-ada_sp01_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp01
+ada_sp01_SOURCES = sp01.adb config.h sptest.adb sptest.ads
+ada_sp01_SOURCES += ../../support/init.c
 
-ada_sp01.exe: sp01.adb init.$(OBJEXT)
+ada_sp01$(EXEEXT): 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 eb3dd486b8..64f675dcd6 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 = ada_sp02.exe
-ada_sp02_exe_SOURCES = sp02.adb config.h sptest.adb sptest.ads
-ada_sp02_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp02
+ada_sp02_SOURCES = sp02.adb config.h sptest.adb sptest.ads
+ada_sp02_SOURCES += ../../support/init.c
 
-ada_sp02.exe: sp02.adb init.$(OBJEXT)
+ada_sp02$(EXEEXT): 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 b74c0cb130..e8a46e66df 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 = ada_sp03.exe
-ada_sp03_exe_SOURCES = sp03.adb config.h sptest.adb sptest.ads
-ada_sp03_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp03
+ada_sp03_SOURCES = sp03.adb config.h sptest.adb sptest.ads
+ada_sp03_SOURCES += ../../support/init.c
 
-ada_sp03.exe: sp03.adb init.$(OBJEXT)
+ada_sp03$(EXEEXT): 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 4a0252cec2..197b8559ca 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 = ada_sp04.exe
-ada_sp04_exe_SOURCES = sp04.adb config.h sptest.adb sptest.ads
-ada_sp04_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp04
+ada_sp04_SOURCES = sp04.adb config.h sptest.adb sptest.ads
+ada_sp04_SOURCES += ../../support/init.c
 
-ada_sp04.exe: sp04.adb init.$(OBJEXT)
+ada_sp04$(EXEEXT): 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 be29c757ea..ad7816e761 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 = ada_sp05.exe
-ada_sp05_exe_SOURCES = sp05.adb config.h sptest.adb sptest.ads
-ada_sp05_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp05
+ada_sp05_SOURCES = sp05.adb config.h sptest.adb sptest.ads
+ada_sp05_SOURCES += ../../support/init.c
 
-ada_sp05.exe: sp05.adb init.$(OBJEXT)
+ada_sp05$(EXEEXT): 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 9975118fe6..220cc7824b 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 = ada_sp06.exe
-ada_sp06_exe_SOURCES = sp06.adb config.h sptest.adb sptest.ads
-ada_sp06_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp06
+ada_sp06_SOURCES = sp06.adb config.h sptest.adb sptest.ads
+ada_sp06_SOURCES += ../../support/init.c
 
-ada_sp06.exe: sp06.adb init.$(OBJEXT)
+ada_sp06$(EXEEXT): 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 97af3671a7..b5079c1fba 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 = ada_sp07.exe
+noinst_PROGRAMS = ada_sp07
 
-ada_sp07_exe_SOURCES = sp07.adb config.h sptest.adb sptest.ads
-ada_sp07_exe_SOURCES += ../../support/init.c
+ada_sp07_SOURCES = sp07.adb config.h sptest.adb sptest.ads
+ada_sp07_SOURCES += ../../support/init.c
 
-ada_sp07.exe: sp07.adb init.$(OBJEXT)
+ada_sp07$(EXEEXT): 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 5c24a9ccb1..2e4ff1de96 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 = ada_sp08.exe
-ada_sp08_exe_SOURCES = sp08.adb config.h sptest.adb sptest.ads
-ada_sp08_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp08
+ada_sp08_SOURCES = sp08.adb config.h sptest.adb sptest.ads
+ada_sp08_SOURCES += ../../support/init.c
 
-ada_sp08.exe: sp08.adb init.$(OBJEXT)
+ada_sp08$(EXEEXT): 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 293cea54f4..4cb5113f82 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 = ada_sp09.exe
+noinst_PROGRAMS = ada_sp09
 
-ada_sp09_exe_SOURCES = sp09.adb config.h sptest.adb sptest.ads
-ada_sp09_exe_SOURCES += ../../support/init.c
+ada_sp09_SOURCES = sp09.adb config.h sptest.adb sptest.ads
+ada_sp09_SOURCES += ../../support/init.c
 
-ada_sp09.exe: sp09.adb init.$(OBJEXT)
+ada_sp09$(EXEEXT): 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 ddea6a06f3..1060ddc619 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 = ada_sp11.exe
-ada_sp11_exe_SOURCES = sp11.adb config.h sptest.adb sptest.ads
-ada_sp11_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp11
+ada_sp11_SOURCES = sp11.adb config.h sptest.adb sptest.ads
+ada_sp11_SOURCES += ../../support/init.c
 
-ada_sp11.exe: sp11.adb init.$(OBJEXT)
+ada_sp11$(EXEEXT): 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 0e4799a382..a86d1fe4e6 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 = ada_sp12.exe
-ada_sp12_exe_SOURCES = sp12.adb config.h sptest.adb sptest.ads
-ada_sp12_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp12
+ada_sp12_SOURCES = sp12.adb config.h sptest.adb sptest.ads
+ada_sp12_SOURCES += ../../support/init.c
 
-ada_sp12.exe: sp12.adb init.$(OBJEXT)
+ada_sp12$(EXEEXT): 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 2661cbeba6..f33e29098b 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 = ada_sp13.exe
-ada_sp13_exe_SOURCES = sp13.adb config.h sptest.adb sptest.ads
-ada_sp13_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp13
+ada_sp13_SOURCES = sp13.adb config.h sptest.adb sptest.ads
+ada_sp13_SOURCES += ../../support/init.c
 
-ada_sp13.exe: sp13.adb init.$(OBJEXT)
+ada_sp13$(EXEEXT): 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 45d6c5bbdb..57f249548f 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 = ada_sp14.exe
-ada_sp14_exe_SOURCES = sp14.adb config.h sptest.adb sptest.ads
-ada_sp14_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp14
+ada_sp14_SOURCES = sp14.adb config.h sptest.adb sptest.ads
+ada_sp14_SOURCES += ../../support/init.c
 
-ada_sp14.exe: sp14.adb init.$(OBJEXT)
+ada_sp14$(EXEEXT): 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 5ce1e0fe7d..2cf45838cc 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 = ada_sp15.exe
-ada_sp15_exe_SOURCES = sp15.adb config.h sptest.adb sptest.ads
-ada_sp15_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp15
+ada_sp15_SOURCES = sp15.adb config.h sptest.adb sptest.ads
+ada_sp15_SOURCES += ../../support/init.c
 
-ada_sp15.exe: sp15.adb init.$(OBJEXT)
+ada_sp15$(EXEEXT): 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 00bef3b0c8..d6d523961f 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 = ada_sp16.exe
-ada_sp16_exe_SOURCES = sp16.adb config.h sptest.adb sptest.ads
-ada_sp16_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp16
+ada_sp16_SOURCES = sp16.adb config.h sptest.adb sptest.ads
+ada_sp16_SOURCES += ../../support/init.c
 
-ada_sp16.exe: sp16.adb init.$(OBJEXT)
+ada_sp16$(EXEEXT): 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 ffd7b275af..ea63db69d0 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 = ada_sp17.exe
-ada_sp17_exe_SOURCES = sp17.adb config.h sptest.adb sptest.ads
-ada_sp17_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp17
+ada_sp17_SOURCES = sp17.adb config.h sptest.adb sptest.ads
+ada_sp17_SOURCES += ../../support/init.c
 
-ada_sp17.exe: sp17.adb init.$(OBJEXT)
+ada_sp17$(EXEEXT): 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 f9a7580467..47e31916ec 100644
--- a/c/src/ada-tests/sptests/sp19/Makefile.am
+++ b/c/src/ada-tests/sptests/sp19/Makefile.am
@@ -7,14 +7,13 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I.
 
-noinst_PROGRAMS = ada_sp19.exe
-
-ada_sp19_exe_SOURCES = sp19.adb sptest.adb config.h sptest.ads
-ada_sp19_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp19
+ada_sp19_SOURCES = sp19.adb sptest.adb config.h sptest.ads
+ada_sp19_SOURCES += ../../support/init.c
 
 CLEANFILES += sptest.adb
 
-ada_sp19.exe: sp19.adb sptest.adb sptest.ads init.$(OBJEXT)
+ada_sp19$(EXEEXT): 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 71aa31ec50..d8cccaa1e9 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 = ada_sp20.exe
-ada_sp20_exe_SOURCES = sp20.adb config.h sptest.adb sptest.ads
-ada_sp20_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp20
+ada_sp20_SOURCES = sp20.adb config.h sptest.adb sptest.ads
+ada_sp20_SOURCES += ../../support/init.c
 
-ada_sp20.exe: sp20.adb init.$(OBJEXT)
+ada_sp20$(EXEEXT): 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 e5081c40a4..790b398b5a 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 = ada_sp22.exe
-ada_sp22_exe_SOURCES = sp22.adb config.h sptest.adb sptest.ads
-ada_sp22_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp22
+ada_sp22_SOURCES = sp22.adb config.h sptest.adb sptest.ads
+ada_sp22_SOURCES += ../../support/init.c
 
-ada_sp22.exe: sp22.adb init.$(OBJEXT)
+ada_sp22$(EXEEXT): 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 d39d6bf89d..fdd80caa2f 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 = ada_sp23.exe
-ada_sp23_exe_SOURCES = sp23.adb config.h sptest.adb sptest.ads
-ada_sp23_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp23
+ada_sp23_SOURCES = sp23.adb config.h sptest.adb sptest.ads
+ada_sp23_SOURCES += ../../support/init.c
 
-ada_sp23.exe: sp23.adb init.$(OBJEXT)
+ada_sp23$(EXEEXT): 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 97a6e7017a..d58120982e 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 = ada_sp24.exe
-ada_sp24_exe_SOURCES = sp24.adb config.h sptest.adb sptest.ads
-ada_sp24_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp24
+ada_sp24_SOURCES = sp24.adb config.h sptest.adb sptest.ads
+ada_sp24_SOURCES += ../../support/init.c
 
-ada_sp24.exe: sp24.adb init.$(OBJEXT)
+ada_sp24$(EXEEXT): 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 bb69453fa7..d2d45e7a6e 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 = ada_sp25.exe
-ada_sp25_exe_SOURCES = sp25.adb config.h sptest.adb sptest.ads
-ada_sp25_exe_SOURCES += ../../support/init.c
+noinst_PROGRAMS = ada_sp25
+ada_sp25_SOURCES = sp25.adb config.h sptest.adb sptest.ads
+ada_sp25_SOURCES += ../../support/init.c
 
-ada_sp25.exe: sp25.adb init.$(OBJEXT)
+ada_sp25$(EXEEXT): sp25.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
diff --git a/c/src/ada-tests/sptests/spname01/Makefile.am b/c/src/ada-tests/sptests/spname01/Makefile.am
index 3ffe4a1450..53a1566e98 100644
--- a/c/src/ada-tests/sptests/spname01/Makefile.am
+++ b/c/src/ada-tests/sptests/spname01/Makefile.am
@@ -5,16 +5,15 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-ada_spname01.exe: spname01.adb init.$(OBJEXT)
+noinst_PROGRAMS = ada_spname01
+ada_spname01_SOURCES = spname01.adb config.h sptest.adb sptest.ads
+
+ada_spname01$(EXEEXT): spname01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
 	$(COMPILE.c) -I$(srcdir) -c $<
 
-noinst_PROGRAMS = ada_spname01.exe
-
-ada_spname01_exe_SOURCES = spname01.adb config.h sptest.adb sptest.ads
-
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_spname01.scn