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

	* Makefile.am: Reflect having moved tests/.
	* mptests/Makefile.am: Reflect having moved tests/.
	* mptests/mp01/Makefile.am: Reflect having moved tests/.
	* mptests/mp01/node1/Makefile.am: Reflect having moved tests/.
	* mptests/mp01/node2/Makefile.am: Reflect having moved tests/.
	* samples/Makefile.am: Reflect having moved tests/.
	* samples/base_mp/Makefile.am: Reflect having moved tests/.
	* samples/base_mp/node1/Makefile.am: Reflect having moved tests/.
	* samples/base_mp/node2/Makefile.am: Reflect having moved tests/.
	* samples/base_sp/Makefile.am: Reflect having moved tests/.
	* samples/hello/Makefile.am: Reflect having moved tests/.
	* samples/ticker/Makefile.am: Reflect having moved tests/.
	* sptests/Makefile.am: Reflect having moved tests/.
	* sptests/sp01/Makefile.am: Reflect having moved tests/.
	* sptests/sp02/Makefile.am: Reflect having moved tests/.
	* sptests/sp03/Makefile.am: Reflect having moved tests/.
	* sptests/sp04/Makefile.am: Reflect having moved tests/.
	* sptests/sp05/Makefile.am: Reflect having moved tests/.
	* sptests/sp06/Makefile.am: Reflect having moved tests/.
	* sptests/sp07/Makefile.am: Reflect having moved tests/.
	* sptests/sp08/Makefile.am: Reflect having moved tests/.
	* sptests/sp09/Makefile.am: Reflect having moved tests/.
	* sptests/sp11/Makefile.am: Reflect having moved tests/.
	* sptests/sp12/Makefile.am: Reflect having moved tests/.
	* sptests/sp13/Makefile.am: Reflect having moved tests/.
	* sptests/sp14/Makefile.am: Reflect having moved tests/.
	* sptests/sp15/Makefile.am: Reflect having moved tests/.
	* sptests/sp16/Makefile.am: Reflect having moved tests/.
	* sptests/sp17/Makefile.am: Reflect having moved tests/.
	* sptests/sp19/Makefile.am: Reflect having moved tests/.
	* sptests/sp20/Makefile.am: Reflect having moved tests/.
	* sptests/sp21/Makefile.am: Reflect having moved tests/.
	* sptests/sp22/Makefile.am: Reflect having moved tests/.
	* sptests/sp23/Makefile.am: Reflect having moved tests/.
	* sptests/sp24/Makefile.am: Reflect having moved tests/.
	* sptests/sp25/Makefile.am: Reflect having moved tests/.
	* sptests/spsize/Makefile.am: Reflect having moved tests/.
	* support/Makefile.am: Reflect having moved tests/.
	* tmtests/Makefile.am: Reflect having moved tests/.
	* tmtests/tm01/Makefile.am: Reflect having moved tests/.
	* tmtests/tm02/Makefile.am: Reflect having moved tests/.
	* tmtests/tm03/Makefile.am: Reflect having moved tests/.
	* tmtests/tm04/Makefile.am: Reflect having moved tests/.
	* tmtests/tm05/Makefile.am: Reflect having moved tests/.
	* tmtests/tm06/Makefile.am: Reflect having moved tests/.
	* tmtests/tm07/Makefile.am: Reflect having moved tests/.
	* tmtests/tm08/Makefile.am: Reflect having moved tests/.
	* tmtests/tm09/Makefile.am: Reflect having moved tests/.
	* tmtests/tm10/Makefile.am: Reflect having moved tests/.
	* tmtests/tm11/Makefile.am: Reflect having moved tests/.
	* tmtests/tm12/Makefile.am: Reflect having moved tests/.
	* tmtests/tm13/Makefile.am: Reflect having moved tests/.
	* tmtests/tm14/Makefile.am: Reflect having moved tests/.
	* tmtests/tm15/Makefile.am: Reflect having moved tests/.
	* tmtests/tm16/Makefile.am: Reflect having moved tests/.
	* tmtests/tm17/Makefile.am: Reflect having moved tests/.
	* tmtests/tm18/Makefile.am: Reflect having moved tests/.
	* tmtests/tm19/Makefile.am: Reflect having moved tests/.
	* tmtests/tm20/Makefile.am: Reflect having moved tests/.
	* tmtests/tm21/Makefile.am: Reflect having moved tests/.
	* tmtests/tm22/Makefile.am: Reflect having moved tests/.
	* tmtests/tm23/Makefile.am: Reflect having moved tests/.
	* tmtests/tm24/Makefile.am: Reflect having moved tests/.
	* tmtests/tm25/Makefile.am: Reflect having moved tests/.
	* tmtests/tm28/Makefile.am: Reflect having moved tests/.
	* tmtests/tm29/Makefile.am: Reflect having moved tests/.
	* tmtests/tmck/Makefile.am: Reflect having moved tests/.
	* tmtests/tmoverhd/Makefile.am: Reflect having moved tests/.

30 files changed, 60 insertions, 60 deletions

diff --git a/c/src/ada-tests/tmtests/Makefile.am b/c/src/ada-tests/tmtests/Makefile.am
index 0c315df299..c83806638a 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)/../tests/automake/subdirs.am
-include $(top_srcdir)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/subdirs.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm01/Makefile.am b/c/src/ada-tests/tmtests/tm01/Makefile.am
index 323bc19986..f76c19dfa5 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm02/Makefile.am b/c/src/ada-tests/tmtests/tm02/Makefile.am
index c0a9d34e5c..f2c483e6b4 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm03/Makefile.am b/c/src/ada-tests/tmtests/tm03/Makefile.am
index dc942cce02..d1df09b344 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm04/Makefile.am b/c/src/ada-tests/tmtests/tm04/Makefile.am
index f1d947e21d..b58cc0c450 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm05/Makefile.am b/c/src/ada-tests/tmtests/tm05/Makefile.am
index 1b1cdacc04..974a43bf62 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm06/Makefile.am b/c/src/ada-tests/tmtests/tm06/Makefile.am
index 94a9b9a960..7f0323068d 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm07/Makefile.am b/c/src/ada-tests/tmtests/tm07/Makefile.am
index 69160bb981..3621a55484 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm08/Makefile.am b/c/src/ada-tests/tmtests/tm08/Makefile.am
index 8b12cb8aa0..6d44730f56 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm09/Makefile.am b/c/src/ada-tests/tmtests/tm09/Makefile.am
index ff25546ff4..5a1b2a6043 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm10/Makefile.am b/c/src/ada-tests/tmtests/tm10/Makefile.am
index 1bbdbfef52..9b61e9f22c 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm11/Makefile.am b/c/src/ada-tests/tmtests/tm11/Makefile.am
index 91427de5f5..df8b468a59 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm12/Makefile.am b/c/src/ada-tests/tmtests/tm12/Makefile.am
index 4b03277e18..f5e1bb9c32 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm13/Makefile.am b/c/src/ada-tests/tmtests/tm13/Makefile.am
index a7213ea80d..3c6dab2a6c 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm14/Makefile.am b/c/src/ada-tests/tmtests/tm14/Makefile.am
index 77d47bf676..2e45d1304b 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm15/Makefile.am b/c/src/ada-tests/tmtests/tm15/Makefile.am
index 92ebfcd39c..a42552d807 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm16/Makefile.am b/c/src/ada-tests/tmtests/tm16/Makefile.am
index adcbb0ab83..30818ca958 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm17/Makefile.am b/c/src/ada-tests/tmtests/tm17/Makefile.am
index 1bca03d067..68880f2659 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm18/Makefile.am b/c/src/ada-tests/tmtests/tm18/Makefile.am
index 3cca33379c..c5ea4c75ba 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm19/Makefile.am b/c/src/ada-tests/tmtests/tm19/Makefile.am
index 9939d0c981..9ee318d61a 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm20/Makefile.am b/c/src/ada-tests/tmtests/tm20/Makefile.am
index f811c365f1..e49f6124d5 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm21/Makefile.am b/c/src/ada-tests/tmtests/tm21/Makefile.am
index 592da7efab..f93867f5c1 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm22/Makefile.am b/c/src/ada-tests/tmtests/tm22/Makefile.am
index bb05370d74..4ffade8352 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm23/Makefile.am b/c/src/ada-tests/tmtests/tm23/Makefile.am
index af53d83be8..bcf6f6bb29 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm24/Makefile.am b/c/src/ada-tests/tmtests/tm24/Makefile.am
index 062607db8b..b8ccda4c1d 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm25/Makefile.am b/c/src/ada-tests/tmtests/tm25/Makefile.am
index d08b1e9a33..6eb7b8393d 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm28/Makefile.am b/c/src/ada-tests/tmtests/tm28/Makefile.am
index 3742610ae9..14b557cf42 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm29/Makefile.am b/c/src/ada-tests/tmtests/tm29/Makefile.am
index a393bb42f1..6879400000 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tmck/Makefile.am b/c/src/ada-tests/tmtests/tmck/Makefile.am
index 60f1be38c6..d5cde4e24d 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/tmtests/tmoverhd/Makefile.am b/c/src/ada-tests/tmtests/tmoverhd/Makefile.am
index 86aa9e32f4..d522442e4a 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)/../tests/automake/compile.am
+include $(top_srcdir)/../../../testsuites/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)/../tests/automake/local.am
+include $(top_srcdir)/../../../testsuites/automake/local.am