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.

28 files changed, 140 insertions, 112 deletions

diff --git a/c/src/ada-tests/mptests/mp01/node1/Makefile.am b/c/src/ada-tests/mptests/mp01/node1/Makefile.am
index b82a3679e9..b8f6dc00b0 100644
--- a/c/src/ada-tests/mptests/mp01/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp01_ada_mp01_node1.exe
-mp01_ada_mp01_node1_exe_SOURCES = mp01_node1.adb ../mptest.adb config.h ../mptest.ads
-mp01_ada_mp01_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp01_ada_mp01_node1
+mp01_ada_mp01_node1_SOURCES = mp01_node1.adb ../mptest.adb config.h
+mp01_ada_mp01_node1_SOURCES += ../mptest.ads
+mp01_ada_mp01_node1_SOURCES += ../../../support/init.c
 
-mp01_ada_mp01_node1.exe: mp01_node1.adb ../mptest.adb init.$(OBJEXT)
+mp01_ada_mp01_node1$(EXEEXT): 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 f22ecd0563..245a0e19e9 100644
--- a/c/src/ada-tests/mptests/mp01/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp01_ada_mp01_node2.exe
-mp01_ada_mp01_node2_exe_SOURCES = mp01_node2.adb ../mptest.adb config.h ../mptest.ads
-mp01_ada_mp01_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp01_ada_mp01_node2
+mp01_ada_mp01_node2_SOURCES = mp01_node2.adb ../mptest.adb config.h
+mp01_ada_mp01_node2_SOURCES += ../mptest.ads
+mp01_ada_mp01_node2_SOURCES += ../../../support/init.c
 
-mp01_ada_mp01_node2.exe: mp01_node2.adb ../mptest.adb init.$(OBJEXT)
+mp01_ada_mp01_node2$(EXEEXT): 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 bbe41e8839..2017d8a72d 100644
--- a/c/src/ada-tests/mptests/mp02/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp02/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp02_ada_mp02_node1.exe
-mp02_ada_mp02_node1_exe_SOURCES = mp02_node1.adb ../mptest.adb config.h ../mptest.ads
-mp02_ada_mp02_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp02_ada_mp02_node1
+mp02_ada_mp02_node1_SOURCES = mp02_node1.adb ../mptest.adb config.h
+mp02_ada_mp02_node1_SOURCES += ../mptest.ads
+mp02_ada_mp02_node1_SOURCES += ../../../support/init.c
 
-mp02_ada_mp02_node1.exe: mp02_node1.adb ../mptest.adb init.$(OBJEXT)
+mp02_ada_mp02_node1$(EXEEXT): 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 9cc3e697c1..3d74850f2d 100644
--- a/c/src/ada-tests/mptests/mp02/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp02/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp02_ada_mp02_node2.exe
-mp02_ada_mp02_node2_exe_SOURCES = mp02_node2.adb ../mptest.adb config.h ../mptest.ads
-mp02_ada_mp02_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp02_ada_mp02_node2
+mp02_ada_mp02_node2_SOURCES = mp02_node2.adb ../mptest.adb config.h
+mp02_ada_mp02_node2_SOURCES += ../mptest.ads
+mp02_ada_mp02_node2_SOURCES += ../../../support/init.c
 
-mp02_ada_mp02_node2.exe: mp02_node2.adb ../mptest.adb init.$(OBJEXT)
+mp02_ada_mp02_node2$(EXEEXT): 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 d967338e20..b63d8c1540 100644
--- a/c/src/ada-tests/mptests/mp03/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp03/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp03_ada_mp03_node1.exe
-mp03_ada_mp03_node1_exe_SOURCES = mp03_node1.adb ../mptest.adb config.h ../mptest.ads
-mp03_ada_mp03_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp03_ada_mp03_node1
+mp03_ada_mp03_node1_SOURCES = mp03_node1.adb ../mptest.adb config.h
+mp03_ada_mp03_node1_SOURCES += ../mptest.ads
+mp03_ada_mp03_node1_SOURCES += ../../../support/init.c
 
-mp03_ada_mp03_node1.exe: mp03_node1.adb ../mptest.adb init.$(OBJEXT)
+mp03_ada_mp03_node1$(EXEEXT): 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 7120df7424..75736010be 100644
--- a/c/src/ada-tests/mptests/mp03/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp03/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp03_ada_mp03_node2.exe
-mp03_ada_mp03_node2_exe_SOURCES = mp03_node2.adb ../mptest.adb config.h ../mptest.ads
-mp03_ada_mp03_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp03_ada_mp03_node2
+mp03_ada_mp03_node2_SOURCES = mp03_node2.adb ../mptest.adb config.h
+mp03_ada_mp03_node2_SOURCES += ../mptest.ads
+mp03_ada_mp03_node2_SOURCES += ../../../support/init.c
 
-mp03_ada_mp03_node2.exe: mp03_node2.adb ../mptest.adb init.$(OBJEXT)
+mp03_ada_mp03_node2$(EXEEXT): 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 1ab75e16e3..16453ed7e7 100644
--- a/c/src/ada-tests/mptests/mp04/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp04/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp04_ada_mp04_node1.exe
-mp04_ada_mp04_node1_exe_SOURCES = mp04_node1.adb ../mptest.adb config.h ../mptest.ads
-mp04_ada_mp04_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp04_ada_mp04_node1
+mp04_ada_mp04_node1_SOURCES = mp04_node1.adb ../mptest.adb config.h
+mp04_ada_mp04_node1_SOURCES += ../mptest.ads
+mp04_ada_mp04_node1_SOURCES += ../../../support/init.c
 
-mp04_ada_mp04_node1.exe: mp04_node1.adb ../mptest.adb init.$(OBJEXT)
+mp04_ada_mp04_node1$(EXEEXT): 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 4a0a745645..4932243b78 100644
--- a/c/src/ada-tests/mptests/mp04/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp04/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp04_ada_mp04_node2.exe
-mp04_ada_mp04_node2_exe_SOURCES = mp04_node2.adb ../mptest.adb config.h ../mptest.ads
-mp04_ada_mp04_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp04_ada_mp04_node2
+mp04_ada_mp04_node2_SOURCES = mp04_node2.adb ../mptest.adb config.h
+mp04_ada_mp04_node2_SOURCES += ../mptest.ads
+mp04_ada_mp04_node2_SOURCES += ../../../support/init.c
 
-mp04_ada_mp04_node2.exe: mp04_node2.adb ../mptest.adb init.$(OBJEXT)
+mp04_ada_mp04_node2$(EXEEXT): 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 bd9a3e7d0d..51b8b24319 100644
--- a/c/src/ada-tests/mptests/mp05/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp05/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp05_ada_mp05_node1.exe
-mp05_ada_mp05_node1_exe_SOURCES = mp05_node1.adb ../mptest.adb config.h ../mptest.ads
-mp05_ada_mp05_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp05_ada_mp05_node1
+mp05_ada_mp05_node1_SOURCES = mp05_node1.adb ../mptest.adb config.h
+mp05_ada_mp05_node1_SOURCES += ../mptest.ads
+mp05_ada_mp05_node1_SOURCES += ../../../support/init.c
 
-mp05_ada_mp05_node1.exe: mp05_node1.adb ../mptest.adb init.$(OBJEXT)
+mp05_ada_mp05_node1$(EXEEXT): 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 9c19c7a969..8af1f3db8f 100644
--- a/c/src/ada-tests/mptests/mp05/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp05/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp05_ada_mp05_node2.exe
-mp05_ada_mp05_node2_exe_SOURCES = mp05_node2.adb ../mptest.adb config.h ../mptest.ads
-mp05_ada_mp05_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp05_ada_mp05_node2
+mp05_ada_mp05_node2_SOURCES = mp05_node2.adb ../mptest.adb config.h
+mp05_ada_mp05_node2_SOURCES += ../mptest.ads
+mp05_ada_mp05_node2_SOURCES += ../../../support/init.c
 
-mp05_ada_mp05_node2.exe: mp05_node2.adb ../mptest.adb init.$(OBJEXT)
+mp05_ada_mp05_node2$(EXEEXT): 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 48b3e68717..edb9ba4bd9 100644
--- a/c/src/ada-tests/mptests/mp06/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp06/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp06_ada_mp06_node1.exe
-mp06_ada_mp06_node1_exe_SOURCES = mp06_node1.adb ../mptest.adb config.h ../mptest.ads
-mp06_ada_mp06_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp06_ada_mp06_node1
+mp06_ada_mp06_node1_SOURCES = mp06_node1.adb ../mptest.adb config.h
+mp06_ada_mp06_node1_SOURCES += ../mptest.ads
+mp06_ada_mp06_node1_SOURCES += ../../../support/init.c
 
-mp06_ada_mp06_node1.exe: mp06_node1.adb ../mptest.adb init.$(OBJEXT)
+mp06_ada_mp06_node1$(EXEEXT): 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 e435d02de0..95278aec03 100644
--- a/c/src/ada-tests/mptests/mp06/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp06/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp06_ada_mp06_node2.exe
-mp06_ada_mp06_node2_exe_SOURCES = mp06_node2.adb ../mptest.adb config.h ../mptest.ads
-mp06_ada_mp06_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp06_ada_mp06_node2
+mp06_ada_mp06_node2_SOURCES = mp06_node2.adb ../mptest.adb config.h
+mp06_ada_mp06_node2_SOURCES += ../mptest.ads
+mp06_ada_mp06_node2_SOURCES += ../../../support/init.c
 
-mp06_ada_mp06_node2.exe: mp06_node2.adb ../mptest.adb init.$(OBJEXT)
+mp06_ada_mp06_node2$(EXEEXT): 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 e89099c58e..361df5e9c5 100644
--- a/c/src/ada-tests/mptests/mp07/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp07/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp07_ada_mp07_node1.exe
-mp07_ada_mp07_node1_exe_SOURCES = mp07_node1.adb ../mptest.adb config.h ../mptest.ads
-mp07_ada_mp07_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp07_ada_mp07_node1
+mp07_ada_mp07_node1_SOURCES = mp07_node1.adb ../mptest.adb config.h
+mp07_ada_mp07_node1_SOURCES += ../mptest.ads
+mp07_ada_mp07_node1_SOURCES += ../../../support/init.c
 
-mp07_ada_mp07_node1.exe: mp07_node1.adb ../mptest.adb init.$(OBJEXT)
+mp07_ada_mp07_node1$(EXEEXT): 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 52f75305ae..e3663221ee 100644
--- a/c/src/ada-tests/mptests/mp07/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp07/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp07_ada_mp07_node2.exe
-mp07_ada_mp07_node2_exe_SOURCES = mp07_node2.adb ../mptest.adb config.h ../mptest.ads
-mp07_ada_mp07_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp07_ada_mp07_node2
+mp07_ada_mp07_node2_SOURCES = mp07_node2.adb ../mptest.adb config.h
+mp07_ada_mp07_node2_SOURCES += ../mptest.ads
+mp07_ada_mp07_node2_SOURCES += ../../../support/init.c
 
-mp07_ada_mp07_node2.exe: mp07_node2.adb ../mptest.adb init.$(OBJEXT)
+mp07_ada_mp07_node2$(EXEEXT): 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 67113b0beb..314d14d661 100644
--- a/c/src/ada-tests/mptests/mp08/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp08/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp08_ada_mp08_node1.exe
-mp08_ada_mp08_node1_exe_SOURCES = mp08_node1.adb ../mptest.adb config.h ../mptest.ads
-mp08_ada_mp08_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp08_ada_mp08_node1
+mp08_ada_mp08_node1_SOURCES = mp08_node1.adb ../mptest.adb config.h
+mp08_ada_mp08_node1_SOURCES += ../mptest.ads
+mp08_ada_mp08_node1_SOURCES += ../../../support/init.c
 
-mp08_ada_mp08_node1.exe: mp08_node1.adb ../mptest.adb init.$(OBJEXT)
+mp08_ada_mp08_node1$(EXEEXT): 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 9bf3b8fcc6..a61e89d2d2 100644
--- a/c/src/ada-tests/mptests/mp08/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp08/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp08_ada_mp08_node2.exe
-mp08_ada_mp08_node2_exe_SOURCES = mp08_node2.adb ../mptest.adb config.h ../mptest.ads
-mp08_ada_mp08_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp08_ada_mp08_node2
+mp08_ada_mp08_node2_SOURCES = mp08_node2.adb ../mptest.adb config.h
+mp08_ada_mp08_node2_SOURCES += ../mptest.ads
+mp08_ada_mp08_node2_SOURCES += ../../../support/init.c
 
-mp08_ada_mp08_node2.exe: mp08_node2.adb ../mptest.adb init.$(OBJEXT)
+mp08_ada_mp08_node2$(EXEEXT): 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 eac91690a0..272b640d5b 100644
--- a/c/src/ada-tests/mptests/mp09/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp09/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp09_ada_mp09_node1.exe
-mp09_ada_mp09_node1_exe_SOURCES = mp09_node1.adb ../mptest.adb config.h ../mptest.ads
-mp09_ada_mp09_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp09_ada_mp09_node1
+mp09_ada_mp09_node1_SOURCES = mp09_node1.adb ../mptest.adb config.h
+mp09_ada_mp09_node1_SOURCES += ../mptest.ads
+mp09_ada_mp09_node1_SOURCES += ../../../support/init.c
 
-mp09_ada_mp09_node1.exe: mp09_node1.adb ../mptest.adb init.$(OBJEXT)
+mp09_ada_mp09_node1$(EXEEXT): 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 09eaf4f384..2627859ad3 100644
--- a/c/src/ada-tests/mptests/mp09/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp09/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp09_ada_mp09_node2.exe
-mp09_ada_mp09_node2_exe_SOURCES = mp09_node2.adb ../mptest.adb config.h ../mptest.ads
-mp09_ada_mp09_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp09_ada_mp09_node2
+mp09_ada_mp09_node2_SOURCES = mp09_node2.adb ../mptest.adb config.h
+mp09_ada_mp09_node2_SOURCES += ../mptest.ads
+mp09_ada_mp09_node2_SOURCES += ../../../support/init.c
 
-mp09_ada_mp09_node2.exe: mp09_node2.adb ../mptest.adb init.$(OBJEXT)
+mp09_ada_mp09_node2$(EXEEXT): 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 040d4c469d..eccf99ca3f 100644
--- a/c/src/ada-tests/mptests/mp10/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp10/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp10_ada_mp10_node1.exe
-mp10_ada_mp10_node1_exe_SOURCES = mp10_node1.adb ../mptest.adb config.h ../mptest.ads
-mp10_ada_mp10_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp10_ada_mp10_node1
+mp10_ada_mp10_node1_SOURCES = mp10_node1.adb ../mptest.adb config.h 
+mp10_ada_mp10_node1_SOURCES += ../mptest.ads
+mp10_ada_mp10_node1_SOURCES += ../../../support/init.c
 
-mp10_ada_mp10_node1.exe: mp10_node1.adb ../mptest.adb init.$(OBJEXT)
+mp10_ada_mp10_node1$(EXEEXT): 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 ec6045ef37..dab6337642 100644
--- a/c/src/ada-tests/mptests/mp10/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp10/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp10_ada_mp10_node2.exe
-mp10_ada_mp10_node2_exe_SOURCES = mp10_node2.adb ../mptest.adb config.h ../mptest.ads
-mp10_ada_mp10_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp10_ada_mp10_node2
+mp10_ada_mp10_node2_SOURCES = mp10_node2.adb ../mptest.adb config.h
+mp10_ada_mp10_node2_SOURCES += ../mptest.ads
+mp10_ada_mp10_node2_SOURCES += ../../../support/init.c
 
-mp10_ada_mp10_node2.exe: mp10_node2.adb ../mptest.adb init.$(OBJEXT)
+mp10_ada_mp10_node2$(EXEEXT): 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 c6303458a4..c0c198dda1 100644
--- a/c/src/ada-tests/mptests/mp11/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp11/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp11_ada_mp11_node1.exe
-mp11_ada_mp11_node1_exe_SOURCES = mp11_node1.adb ../mptest.adb config.h ../mptest.ads
-mp11_ada_mp11_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp11_ada_mp11_node1
+mp11_ada_mp11_node1_SOURCES = mp11_node1.adb ../mptest.adb config.h
+mp11_ada_mp11_node1_SOURCES += ../mptest.ads
+mp11_ada_mp11_node1_SOURCES += ../../../support/init.c
 
-mp11_ada_mp11_node1.exe: mp11_node1.adb ../mptest.adb init.$(OBJEXT)
+mp11_ada_mp11_node1$(EXEEXT): 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 04a18553d2..38de152d31 100644
--- a/c/src/ada-tests/mptests/mp11/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp11/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp11_ada_mp11_node2.exe
-mp11_ada_mp11_node2_exe_SOURCES = mp11_node2.adb ../mptest.adb config.h ../mptest.ads
-mp11_ada_mp11_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp11_ada_mp11_node2
+mp11_ada_mp11_node2_SOURCES = mp11_node2.adb ../mptest.adb config.h
+mp11_ada_mp11_node2_SOURCES += ../mptest.ads
+mp11_ada_mp11_node2_SOURCES += ../../../support/init.c
 
-mp11_ada_mp11_node2.exe: mp11_node2.adb ../mptest.adb init.$(OBJEXT)
+mp11_ada_mp11_node2$(EXEEXT): 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 bdc4297386..46d095532a 100644
--- a/c/src/ada-tests/mptests/mp12/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp12/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp12_ada_mp12_node1.exe
-mp12_ada_mp12_node1_exe_SOURCES = mp12_node1.adb ../mptest.adb config.h ../mptest.ads
-mp12_ada_mp12_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp12_ada_mp12_node1
+mp12_ada_mp12_node1_SOURCES = mp12_node1.adb ../mptest.adb config.h
+mp12_ada_mp12_node1_SOURCES += ../mptest.ads
+mp12_ada_mp12_node1_SOURCES += ../../../support/init.c
 
-mp12_ada_mp12_node1.exe: mp12_node1.adb ../mptest.adb init.$(OBJEXT)
+mp12_ada_mp12_node1$(EXEEXT): 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 8e12c7dfe8..63a7021691 100644
--- a/c/src/ada-tests/mptests/mp12/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp12/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp12_ada_mp12_node2.exe
-mp12_ada_mp12_node2_exe_SOURCES = mp12_node2.adb ../mptest.adb config.h ../mptest.ads
-mp12_ada_mp12_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp12_ada_mp12_node2
+mp12_ada_mp12_node2_SOURCES = mp12_node2.adb ../mptest.adb config.h
+mp12_ada_mp12_node2_SOURCES += ../mptest.ads
+mp12_ada_mp12_node2_SOURCES += ../../../support/init.c
 
-mp12_ada_mp12_node2.exe: mp12_node2.adb ../mptest.adb init.$(OBJEXT)
+mp12_ada_mp12_node2$(EXEEXT): 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 deeffff181..d55d4aea4f 100644
--- a/c/src/ada-tests/mptests/mp13/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp13/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp13_ada_mp13_node1.exe
-mp13_ada_mp13_node1_exe_SOURCES = mp13_node1.adb ../mptest.adb config.h ../mptest.ads
-mp13_ada_mp13_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp13_ada_mp13_node1
+mp13_ada_mp13_node1_SOURCES = mp13_node1.adb ../mptest.adb config.h
+mp13_ada_mp13_node1_SOURCES += ../mptest.ads
+mp13_ada_mp13_node1_SOURCES += ../../../support/init.c
 
-mp13_ada_mp13_node1.exe: mp13_node1.adb ../mptest.adb init.$(OBJEXT)
+mp13_ada_mp13_node1$(EXEEXT): 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 0af059bf62..50e7f68257 100644
--- a/c/src/ada-tests/mptests/mp13/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp13/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp13_ada_mp13_node2.exe
-mp13_ada_mp13_node2_exe_SOURCES = mp13_node2.adb ../mptest.adb config.h ../mptest.ads
-mp13_ada_mp13_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp13_ada_mp13_node2
+mp13_ada_mp13_node2_SOURCES = mp13_node2.adb ../mptest.adb config.h
+mp13_ada_mp13_node2_SOURCES += ../mptest.ads
+mp13_ada_mp13_node2_SOURCES += ../../../support/init.c
 
-mp13_ada_mp13_node2.exe: mp13_node2.adb ../mptest.adb init.$(OBJEXT)
+mp13_ada_mp13_node2$(EXEEXT): 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 487c63a159..0236d0cf08 100644
--- a/c/src/ada-tests/mptests/mp14/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp14/node1/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp14_ada_mp14_node1.exe
-mp14_ada_mp14_node1_exe_SOURCES = mp14_node1.adb ../mptest.adb config.h ../mptest.ads
-mp14_ada_mp14_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp14_ada_mp14_node1
+mp14_ada_mp14_node1_SOURCES = mp14_node1.adb ../mptest.adb config.h
+mp14_ada_mp14_node1_SOURCES += ../mptest.ads
+mp14_ada_mp14_node1_SOURCES += ../../../support/init.c
 
-mp14_ada_mp14_node1.exe: mp14_node1.adb ../mptest.adb init.$(OBJEXT)
+mp14_ada_mp14_node1$(EXEEXT): 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 3814206f9d..48f6bcae2a 100644
--- a/c/src/ada-tests/mptests/mp14/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp14/node2/Makefile.am
@@ -7,11 +7,12 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp14_ada_mp14_node2.exe
-mp14_ada_mp14_node2_exe_SOURCES = mp14_node2.adb ../mptest.adb config.h ../mptest.ads
-mp14_ada_mp14_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp14_ada_mp14_node2
+mp14_ada_mp14_node2_SOURCES = mp14_node2.adb ../mptest.adb config.h
+mp14_ada_mp14_node2_SOURCES += ../mptest.ads
+mp14_ada_mp14_node2_SOURCES += ../../../support/init.c
 
-mp14_ada_mp14_node2.exe: mp14_node2.adb ../mptest.adb init.$(OBJEXT)
+mp14_ada_mp14_node2$(EXEEXT): mp14_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)