2003-08-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am,
	mptests/Makefile.am,
	mptests/mp01/Makefile.am, mptests/mp01/node1/Makefile.am,
	mptests/mp01/node2/Makefile.am,
	samples/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/ticker/Makefile.am,
	sptests/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/sp21/Makefile.am, sptests/sp22/Makefile.am,
	sptests/sp23/Makefile.am, sptests/sp24/Makefile.am,
	sptests/sp25/Makefile.am, sptests/spsize/Makefile.am,
	support/Makefile.am,
	tmtests/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:
	Pick up am-fragments from ../tests/automake.

69 files changed, 183 insertions, 141 deletions

diff --git a/c/src/ada-tests/ChangeLog b/c/src/ada-tests/ChangeLog
index db70c5504f..170d26c070 100644
--- a/c/src/ada-tests/ChangeLog
+++ b/c/src/ada-tests/ChangeLog
@@ -1,5 +1,47 @@
 2003-08-20	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* Makefile.am,
+	mptests/Makefile.am,
+	mptests/mp01/Makefile.am, mptests/mp01/node1/Makefile.am,
+	mptests/mp01/node2/Makefile.am,
+	samples/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/ticker/Makefile.am,
+	sptests/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/sp21/Makefile.am, sptests/sp22/Makefile.am,
+	sptests/sp23/Makefile.am, sptests/sp24/Makefile.am,
+	sptests/sp25/Makefile.am, sptests/spsize/Makefile.am,
+	support/Makefile.am,
+	tmtests/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:
+	Pick up am-fragments from ../tests/automake.
+
+2003-08-20	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
 	* aclocal/prog-gnat.m4: New (copied from ../../../aclocal).
 	* Makefile.am: ACLOCAL_AMFLAGS = -I aclocal -I ../tests/aclocal.
 	Don't include */automake/lib.am (Unused).
@@ -11,7 +53,7 @@
 2003-07-09	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* ada.am: Add .adp to SUFFIXES.
-	Remove c-compilation rule. 
+	Remove c-compilation rule.
 	* samples/base_sp/Makefile.am: Add init.$(OBJEXT).
 	* samples/hello/Makefile.am: Add init.$(OBJEXT).
 	* samples/ticker/Makefile.am: Add init.$(OBJEXT).
@@ -177,7 +219,7 @@
 2002-09-14	Joel Sherrill <joel@OARcorp.com>
 
 	* support/init.c: Included <unistd.h> for exit(2).
-	* support/test_support.adb: Eliminated warnings by commenting out 
+	* support/test_support.adb: Eliminated warnings by commenting out
 	unused variables.
 
 2002-09-13	Joel Sherrill <joel@OARcorp.com>
@@ -357,7 +399,7 @@
 	mptests/mp09/mptest.ads, mptests/mp10/mptest.ads,
 	mptests/mp11/mptest.ads, mptests/mp12/mptest.ads,
 	mptests/mp13/mptest.ads, mptests/mp14/mptest.adb,
-	mptests/mp14/mptest.ads: Per PR274, identify the need for the 
+	mptests/mp14/mptest.ads: Per PR274, identify the need for the
 	BSP_MPCI package.  It was a trivial dependency and eliminated.
 
 2002-08-26	Joel Sherrill <joel@OARcorp.com>
diff --git a/c/src/ada-tests/Makefile.am b/c/src/ada-tests/Makefile.am
index 59aba552b8..fd65b769a8 100644
--- a/c/src/ada-tests/Makefile.am
+++ b/c/src/ada-tests/Makefile.am
@@ -3,7 +3,7 @@
 ACLOCAL_AMFLAGS = -I aclocal -I ../tests/aclocal
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 SUBDIRS = support samples sptests tmtests
 
@@ -13,5 +13,5 @@ endif
 
 EXTRA_DIST = ada.am
 
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/subdirs.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/mptests/Makefile.am b/c/src/ada-tests/mptests/Makefile.am
index 7d306a7acf..df79d88aa7 100644
--- a/c/src/ada-tests/mptests/Makefile.am
+++ b/c/src/ada-tests/mptests/Makefile.am
@@ -16,5 +16,5 @@ SUBDIRS += mp01
 #SUBDIRS += mp13
 #SUBDIRS += mp14
 
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/subdirs.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/Makefile.am b/c/src/ada-tests/mptests/mp01/Makefile.am
index b18e7c3e57..9f8aca91b1 100644
--- a/c/src/ada-tests/mptests/mp01/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/Makefile.am
@@ -1,9 +1,9 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/subdirs.am
+include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../tests/automake/subdirs.am
 
 SUBDIRS = node1 node2
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/node1/Makefile.am b/c/src/ada-tests/mptests/mp01/node1/Makefile.am
index 431589134f..72512d632f 100644
--- a/c/src/ada-tests/mptests/mp01/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node1/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -18,4 +18,4 @@ node1_SOURCES = mptest-per_node_configuration.adb
 
 EXTRA_DIST = base_mp.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/node2/Makefile.am b/c/src/ada-tests/mptests/mp01/node2/Makefile.am
index d685165ae8..a2f387bd64 100644
--- a/c/src/ada-tests/mptests/mp01/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node2/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -18,4 +18,4 @@ node2_SOURCES = mptest-per_node_configuration.adb
 
 EXTRA_DIST = base_mp.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/samples/Makefile.am b/c/src/ada-tests/samples/Makefile.am
index 512bf021c0..bf6bcb7a9e 100644
--- a/c/src/ada-tests/samples/Makefile.am
+++ b/c/src/ada-tests/samples/Makefile.am
@@ -7,5 +7,5 @@ SUBDIRS += base_mp
 endif
 
 
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/subdirs.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/Makefile.am b/c/src/ada-tests/samples/base_mp/Makefile.am
index 2349541b6c..80536820a4 100644
--- a/c/src/ada-tests/samples/base_mp/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/Makefile.am
@@ -1,8 +1,8 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/subdirs.am
+include $(top_srcdir)/../tests/automake/compile.am
+include $(top_srcdir)/../tests/automake/subdirs.am
 
 SUBDIRS = node1 node2
 #include $(top_srcdir)/ada.am
@@ -22,4 +22,4 @@ SUBDIRS = node1 node2
 #EXTRA_DIST += node2/base_mp.scn
 #EXTRA_DIST += node2/mptest-per_node_configuration.adb
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
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 6687d4cc5f..bb4968f8f4 100644
--- a/c/src/ada-tests/samples/base_mp/node1/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node1/Makefile.am
@@ -3,7 +3,7 @@
 NODE=1
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -21,4 +21,4 @@ endif
 
 EXTRA_DIST = base_mp.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
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 aa818980d6..af1adff162 100644
--- a/c/src/ada-tests/samples/base_mp/node2/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node2/Makefile.am
@@ -3,7 +3,7 @@
 NODE=2
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -23,4 +23,4 @@ node2_SOURCES = mptest-per_node_configuration.adb
 
 EXTRA_DIST = base_mp.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/samples/base_sp/Makefile.am b/c/src/ada-tests/samples/base_sp/Makefile.am
index a549034d3b..d1c6c85104 100644
--- a/c/src/ada-tests/samples/base_sp/Makefile.am
+++ b/c/src/ada-tests/samples/base_sp/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -18,4 +18,4 @@ config.h sptest.adb sptest.ads
 
 EXTRA_DIST = base_sp.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/samples/hello/Makefile.am b/c/src/ada-tests/samples/hello/Makefile.am
index 466c003289..1aef31614a 100644
--- a/c/src/ada-tests/samples/hello/Makefile.am
+++ b/c/src/ada-tests/samples/hello/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -18,4 +18,4 @@ config.h sptest.adb sptest.ads
 
 EXTRA_DIST = hello.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/samples/ticker/Makefile.am b/c/src/ada-tests/samples/ticker/Makefile.am
index abd5ed4953..061dc6ad49 100644
--- a/c/src/ada-tests/samples/ticker/Makefile.am
+++ b/c/src/ada-tests/samples/ticker/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -18,4 +18,4 @@ config.h sptest.adb sptest.ads
 
 EXTRA_DIST = ticker.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/Makefile.am b/c/src/ada-tests/sptests/Makefile.am
index 179d68b2a0..08d7bbb81b 100644
--- a/c/src/ada-tests/sptests/Makefile.am
+++ b/c/src/ada-tests/sptests/Makefile.am
@@ -26,5 +26,5 @@ SUBDIRS += sp24
 SUBDIRS += sp25
 SUBDIRS += spsize
 
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/subdirs.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp01/Makefile.am b/c/src/ada-tests/sptests/sp01/Makefile.am
index 19bccf6d3f..768be60c04 100644
--- a/c/src/ada-tests/sptests/sp01/Makefile.am
+++ b/c/src/ada-tests/sptests/sp01/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp01$(EXEEXT): sp01.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp01.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp02/Makefile.am b/c/src/ada-tests/sptests/sp02/Makefile.am
index 13921eede9..e569612592 100644
--- a/c/src/ada-tests/sptests/sp02/Makefile.am
+++ b/c/src/ada-tests/sptests/sp02/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp02$(EXEEXT): sp02.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp02.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp03/Makefile.am b/c/src/ada-tests/sptests/sp03/Makefile.am
index 92a8a6f7fd..4dcb375ba6 100644
--- a/c/src/ada-tests/sptests/sp03/Makefile.am
+++ b/c/src/ada-tests/sptests/sp03/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp03$(EXEEXT): sp03.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp03.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp04/Makefile.am b/c/src/ada-tests/sptests/sp04/Makefile.am
index ac978ec851..de3ca8e8ad 100644
--- a/c/src/ada-tests/sptests/sp04/Makefile.am
+++ b/c/src/ada-tests/sptests/sp04/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp04$(EXEEXT): sp04.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp04.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp05/Makefile.am b/c/src/ada-tests/sptests/sp05/Makefile.am
index 4c46530fc0..18f9d42093 100644
--- a/c/src/ada-tests/sptests/sp05/Makefile.am
+++ b/c/src/ada-tests/sptests/sp05/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp05$(EXEEXT): sp05.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp05.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp06/Makefile.am b/c/src/ada-tests/sptests/sp06/Makefile.am
index 844431e4fc..95b0f996a9 100644
--- a/c/src/ada-tests/sptests/sp06/Makefile.am
+++ b/c/src/ada-tests/sptests/sp06/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp06$(EXEEXT): sp06.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp06.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp07/Makefile.am b/c/src/ada-tests/sptests/sp07/Makefile.am
index dfe303b3d6..659cea25b8 100644
--- a/c/src/ada-tests/sptests/sp07/Makefile.am
+++ b/c/src/ada-tests/sptests/sp07/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -15,4 +15,4 @@ sp07$(EXEEXT): sp07.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp07.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp08/Makefile.am b/c/src/ada-tests/sptests/sp08/Makefile.am
index 400120de0e..caa2710bf9 100644
--- a/c/src/ada-tests/sptests/sp08/Makefile.am
+++ b/c/src/ada-tests/sptests/sp08/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp08$(EXEEXT): sp08.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp08.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp09/Makefile.am b/c/src/ada-tests/sptests/sp09/Makefile.am
index 176f431679..5c03f0713b 100644
--- a/c/src/ada-tests/sptests/sp09/Makefile.am
+++ b/c/src/ada-tests/sptests/sp09/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -15,4 +15,4 @@ sp09$(EXEEXT): sp09.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp09.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp11/Makefile.am b/c/src/ada-tests/sptests/sp11/Makefile.am
index 112ae065b0..e2b6b4223a 100644
--- a/c/src/ada-tests/sptests/sp11/Makefile.am
+++ b/c/src/ada-tests/sptests/sp11/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp11$(EXEEXT): sp11.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp11.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp12/Makefile.am b/c/src/ada-tests/sptests/sp12/Makefile.am
index d7d31413c1..a74d30a84a 100644
--- a/c/src/ada-tests/sptests/sp12/Makefile.am
+++ b/c/src/ada-tests/sptests/sp12/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp12$(EXEEXT): sp12.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp12.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp13/Makefile.am b/c/src/ada-tests/sptests/sp13/Makefile.am
index 3b848de6cf..657256c1bc 100644
--- a/c/src/ada-tests/sptests/sp13/Makefile.am
+++ b/c/src/ada-tests/sptests/sp13/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp13$(EXEEXT): sp13.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp13.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp14/Makefile.am b/c/src/ada-tests/sptests/sp14/Makefile.am
index 242ba3b2ac..5381331b97 100644
--- a/c/src/ada-tests/sptests/sp14/Makefile.am
+++ b/c/src/ada-tests/sptests/sp14/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp14$(EXEEXT): sp14.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp14.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp15/Makefile.am b/c/src/ada-tests/sptests/sp15/Makefile.am
index e456b1faa6..8d8f4242d7 100644
--- a/c/src/ada-tests/sptests/sp15/Makefile.am
+++ b/c/src/ada-tests/sptests/sp15/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp15$(EXEEXT): sp15.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp15.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp16/Makefile.am b/c/src/ada-tests/sptests/sp16/Makefile.am
index 8fc5eea7e5..52b9a74dc1 100644
--- a/c/src/ada-tests/sptests/sp16/Makefile.am
+++ b/c/src/ada-tests/sptests/sp16/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp16$(EXEEXT): sp16.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp16.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp17/Makefile.am b/c/src/ada-tests/sptests/sp17/Makefile.am
index 6a2d5a006e..95a6e38fea 100644
--- a/c/src/ada-tests/sptests/sp17/Makefile.am
+++ b/c/src/ada-tests/sptests/sp17/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp17$(EXEEXT): sp17.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp17.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp19/Makefile.am b/c/src/ada-tests/sptests/sp19/Makefile.am
index 5e81abe284..8ee1f3a619 100644
--- a/c/src/ada-tests/sptests/sp19/Makefile.am
+++ b/c/src/ada-tests/sptests/sp19/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -19,4 +19,4 @@ sp19$(EXEEXT): sp19.adb sptest.adb sptest.ads init.$(OBJEXT)
 
 EXTRA_DIST = sp19.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp20/Makefile.am b/c/src/ada-tests/sptests/sp20/Makefile.am
index e3f5a5a0f3..ad11793985 100644
--- a/c/src/ada-tests/sptests/sp20/Makefile.am
+++ b/c/src/ada-tests/sptests/sp20/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp20$(EXEEXT): sp20.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp20.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp21/Makefile.am b/c/src/ada-tests/sptests/sp21/Makefile.am
index d017f5ee92..f0e0849092 100644
--- a/c/src/ada-tests/sptests/sp21/Makefile.am
+++ b/c/src/ada-tests/sptests/sp21/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -15,4 +15,4 @@ sp21$(EXEEXT): sp21.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp21.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp22/Makefile.am b/c/src/ada-tests/sptests/sp22/Makefile.am
index 45bc4ba3d9..839596b812 100644
--- a/c/src/ada-tests/sptests/sp22/Makefile.am
+++ b/c/src/ada-tests/sptests/sp22/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp22$(EXEEXT): sp22.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp22.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp23/Makefile.am b/c/src/ada-tests/sptests/sp23/Makefile.am
index 53df7c797d..9ec3f6f4ec 100644
--- a/c/src/ada-tests/sptests/sp23/Makefile.am
+++ b/c/src/ada-tests/sptests/sp23/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp23$(EXEEXT): sp23.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp23.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp24/Makefile.am b/c/src/ada-tests/sptests/sp24/Makefile.am
index ece6c5f4d8..59b8fb7e61 100644
--- a/c/src/ada-tests/sptests/sp24/Makefile.am
+++ b/c/src/ada-tests/sptests/sp24/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp24$(EXEEXT): sp24.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp24.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/sp25/Makefile.am b/c/src/ada-tests/sptests/sp25/Makefile.am
index f8b34b3bc0..f7a169f123 100644
--- a/c/src/ada-tests/sptests/sp25/Makefile.am
+++ b/c/src/ada-tests/sptests/sp25/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ sp25$(EXEEXT): sp25.adb init.$(OBJEXT)
 
 EXTRA_DIST = sp25.scn
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/sptests/spsize/Makefile.am b/c/src/ada-tests/sptests/spsize/Makefile.am
index 2f37017d47..b31de5f70e 100644
--- a/c/src/ada-tests/sptests/spsize/Makefile.am
+++ b/c/src/ada-tests/sptests/spsize/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ spsize_SOURCES = spsize.adb sptest.adb sptest.ads
 spsize$(EXEEXT): spsize.adb
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/support/Makefile.am b/c/src/ada-tests/support/Makefile.am
index 3dca7cb527..6fc6251737 100644
--- a/c/src/ada-tests/support/Makefile.am
+++ b/c/src/ada-tests/support/Makefile.am
@@ -17,5 +17,5 @@ EXTRA_DIST += timer_driver.adb
 EXTRA_DIST += timer_driver.ads
 EXTRA_DIST += unsigned32_io.ads
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
 
diff --git a/c/src/ada-tests/tmtests/Makefile.am b/c/src/ada-tests/tmtests/Makefile.am
index 275c6c1efb..0c315df299 100644
--- a/c/src/ada-tests/tmtests/Makefile.am
+++ b/c/src/ada-tests/tmtests/Makefile.am
@@ -31,5 +31,5 @@ SUBDIRS += tm29
 SUBDIRS += tmck
 SUBDIRS += tmoverhd
 
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/subdirs.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm01/Makefile.am b/c/src/ada-tests/tmtests/tm01/Makefile.am
index b495252810..323bc19986 100644
--- a/c/src/ada-tests/tmtests/tm01/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm01/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm01_SOURCES += ../../support/init.c
 tm01$(EXEEXT): tm01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm02/Makefile.am b/c/src/ada-tests/tmtests/tm02/Makefile.am
index 4b7b47d621..c0a9d34e5c 100644
--- a/c/src/ada-tests/tmtests/tm02/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm02/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm02_SOURCES += ../../support/init.c
 tm02$(EXEEXT): tm02.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm03/Makefile.am b/c/src/ada-tests/tmtests/tm03/Makefile.am
index 7f5a9ed6a2..dc942cce02 100644
--- a/c/src/ada-tests/tmtests/tm03/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm03/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm03_SOURCES += ../../support/init.c
 tm03$(EXEEXT): tm03.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm04/Makefile.am b/c/src/ada-tests/tmtests/tm04/Makefile.am
index 9fc61175aa..f1d947e21d 100644
--- a/c/src/ada-tests/tmtests/tm04/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm04/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm04_SOURCES += ../../support/init.c
 tm04$(EXEEXT): tm04.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm05/Makefile.am b/c/src/ada-tests/tmtests/tm05/Makefile.am
index b727273b18..1b1cdacc04 100644
--- a/c/src/ada-tests/tmtests/tm05/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm05/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm05_SOURCES += ../../support/init.c
 tm05$(EXEEXT): tm05.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm06/Makefile.am b/c/src/ada-tests/tmtests/tm06/Makefile.am
index c3b82ba34a..94a9b9a960 100644
--- a/c/src/ada-tests/tmtests/tm06/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm06/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm06_SOURCES += ../../support/init.c
 tm06$(EXEEXT): tm06.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm07/Makefile.am b/c/src/ada-tests/tmtests/tm07/Makefile.am
index f9312a11b8..69160bb981 100644
--- a/c/src/ada-tests/tmtests/tm07/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm07/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm07_SOURCES += ../../support/init.c
 tm07$(EXEEXT): tm07.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm08/Makefile.am b/c/src/ada-tests/tmtests/tm08/Makefile.am
index 289b0398ab..8b12cb8aa0 100644
--- a/c/src/ada-tests/tmtests/tm08/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm08/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm08_SOURCES += ../../support/init.c
 tm08$(EXEEXT): tm08.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm09/Makefile.am b/c/src/ada-tests/tmtests/tm09/Makefile.am
index a944397db9..ff25546ff4 100644
--- a/c/src/ada-tests/tmtests/tm09/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm09/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm09_SOURCES += ../../support/init.c
 tm09$(EXEEXT): tm09.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm10/Makefile.am b/c/src/ada-tests/tmtests/tm10/Makefile.am
index 1c8ad2859c..1bbdbfef52 100644
--- a/c/src/ada-tests/tmtests/tm10/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm10/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm10_SOURCES += ../../support/init.c
 tm10$(EXEEXT): tm10.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm11/Makefile.am b/c/src/ada-tests/tmtests/tm11/Makefile.am
index a01e092af9..91427de5f5 100644
--- a/c/src/ada-tests/tmtests/tm11/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm11/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm11_SOURCES += ../../support/init.c
 tm11$(EXEEXT): tm11.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm12/Makefile.am b/c/src/ada-tests/tmtests/tm12/Makefile.am
index 5b0ec7f21a..4b03277e18 100644
--- a/c/src/ada-tests/tmtests/tm12/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm12/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm12_SOURCES += ../../support/init.c
 tm12$(EXEEXT): tm12.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm13/Makefile.am b/c/src/ada-tests/tmtests/tm13/Makefile.am
index 87dddb1847..a7213ea80d 100644
--- a/c/src/ada-tests/tmtests/tm13/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm13/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm13_SOURCES += ../../support/init.c
 tm13$(EXEEXT): tm13.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm14/Makefile.am b/c/src/ada-tests/tmtests/tm14/Makefile.am
index e82bfce911..77d47bf676 100644
--- a/c/src/ada-tests/tmtests/tm14/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm14/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm14_SOURCES += ../../support/init.c
 tm14$(EXEEXT): tm14.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm15/Makefile.am b/c/src/ada-tests/tmtests/tm15/Makefile.am
index 5ecd16dc17..92ebfcd39c 100644
--- a/c/src/ada-tests/tmtests/tm15/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm15/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm15_SOURCES += ../../support/init.c
 tm15$(EXEEXT): tm15.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm16/Makefile.am b/c/src/ada-tests/tmtests/tm16/Makefile.am
index 8f7a7c5595..adcbb0ab83 100644
--- a/c/src/ada-tests/tmtests/tm16/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm16/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm16_SOURCES += ../../support/init.c
 tm16$(EXEEXT): tm16.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm17/Makefile.am b/c/src/ada-tests/tmtests/tm17/Makefile.am
index a26989058e..1bca03d067 100644
--- a/c/src/ada-tests/tmtests/tm17/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm17/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm17_SOURCES += ../../support/init.c
 tm17$(EXEEXT): tm17.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm18/Makefile.am b/c/src/ada-tests/tmtests/tm18/Makefile.am
index 402b1b38da..3cca33379c 100644
--- a/c/src/ada-tests/tmtests/tm18/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm18/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm18_SOURCES += ../../support/init.c
 tm18$(EXEEXT): tm18.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm19/Makefile.am b/c/src/ada-tests/tmtests/tm19/Makefile.am
index 7bcc83c621..9939d0c981 100644
--- a/c/src/ada-tests/tmtests/tm19/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm19/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm19_SOURCES += ../../support/init.c
 tm19$(EXEEXT): tm19.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm20/Makefile.am b/c/src/ada-tests/tmtests/tm20/Makefile.am
index 9a6d1a9c02..f811c365f1 100644
--- a/c/src/ada-tests/tmtests/tm20/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm20/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm20_SOURCES += ../../support/init.c
 tm20$(EXEEXT): tm20.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm21/Makefile.am b/c/src/ada-tests/tmtests/tm21/Makefile.am
index fd898e1b9a..592da7efab 100644
--- a/c/src/ada-tests/tmtests/tm21/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm21/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm21_SOURCES += ../../support/init.c
 tm21$(EXEEXT): tm21.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm22/Makefile.am b/c/src/ada-tests/tmtests/tm22/Makefile.am
index 57f7757a19..bb05370d74 100644
--- a/c/src/ada-tests/tmtests/tm22/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm22/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm22_SOURCES += ../../support/init.c
 tm22$(EXEEXT): tm22.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm23/Makefile.am b/c/src/ada-tests/tmtests/tm23/Makefile.am
index a53f866d72..af53d83be8 100644
--- a/c/src/ada-tests/tmtests/tm23/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm23/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm23_SOURCES += ../../support/init.c
 tm23$(EXEEXT): tm23.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm24/Makefile.am b/c/src/ada-tests/tmtests/tm24/Makefile.am
index 18cbbc73b5..062607db8b 100644
--- a/c/src/ada-tests/tmtests/tm24/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm24/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm24_SOURCES += ../../support/init.c
 tm24$(EXEEXT): tm24.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm25/Makefile.am b/c/src/ada-tests/tmtests/tm25/Makefile.am
index 612828cf5d..d08b1e9a33 100644
--- a/c/src/ada-tests/tmtests/tm25/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm25/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm25_SOURCES += ../../support/init.c
 tm25$(EXEEXT): tm25.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm28/Makefile.am b/c/src/ada-tests/tmtests/tm28/Makefile.am
index 2870abc83f..3742610ae9 100644
--- a/c/src/ada-tests/tmtests/tm28/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm28/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm28_SOURCES += ../../support/init.c
 tm28$(EXEEXT): tm28.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm29/Makefile.am b/c/src/ada-tests/tmtests/tm29/Makefile.am
index 95b57d820b..a393bb42f1 100644
--- a/c/src/ada-tests/tmtests/tm29/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm29/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tm29_SOURCES += ../../support/init.c
 tm29$(EXEEXT): tm29.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tmck/Makefile.am b/c/src/ada-tests/tmtests/tmck/Makefile.am
index 679bb594a1..60f1be38c6 100644
--- a/c/src/ada-tests/tmtests/tmck/Makefile.am
+++ b/c/src/ada-tests/tmtests/tmck/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -12,4 +12,4 @@ tmck_SOURCES += ../../support/init.c
 tmck$(EXEEXT): tmck.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tmoverhd/Makefile.am b/c/src/ada-tests/tmtests/tmoverhd/Makefile.am
index d91226cc52..86aa9e32f4 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/Makefile.am
+++ b/c/src/ada-tests/tmtests/tmoverhd/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../tests/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ tmoverhd_SOURCES += ../../support/init.c
 tmoverhd$(EXEEXT): tmoverhd.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../tests/automake/local.am