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

	Makefile.am: Reflect having moved automake.
	include/Makefile.am: Reflect having moved automake.
	tm01/Makefile.am: Reflect having moved automake.
	tm02/Makefile.am: Reflect having moved automake.
	tm03/Makefile.am: Reflect having moved automake.
	tm04/Makefile.am: Reflect having moved automake.
	tm05/Makefile.am: Reflect having moved automake.
	tm06/Makefile.am: Reflect having moved automake.
	tm07/Makefile.am: Reflect having moved automake.
	tm08/Makefile.am: Reflect having moved automake.
	tm09/Makefile.am: Reflect having moved automake.
	tm10/Makefile.am: Reflect having moved automake.
	tm11/Makefile.am: Reflect having moved automake.
	tm12/Makefile.am: Reflect having moved automake.
	tm13/Makefile.am: Reflect having moved automake.
	tm14/Makefile.am: Reflect having moved automake.
	tm15/Makefile.am: Reflect having moved automake.
	tm16/Makefile.am: Reflect having moved automake.
	tm17/Makefile.am: Reflect having moved automake.
	tm18/Makefile.am: Reflect having moved automake.
	tm19/Makefile.am: Reflect having moved automake.
	tm20/Makefile.am: Reflect having moved automake.
	tm21/Makefile.am: Reflect having moved automake.
	tm22/Makefile.am: Reflect having moved automake.
	tm23/Makefile.am: Reflect having moved automake.
	tm24/Makefile.am: Reflect having moved automake.
	tm25/Makefile.am: Reflect having moved automake.
	tm26/Makefile.am: Reflect having moved automake.
	tm27/Makefile.am: Reflect having moved automake.
	tm28/Makefile.am: Reflect having moved automake.
	tm29/Makefile.am: Reflect having moved automake.
	tmck/Makefile.am: Reflect having moved automake.
	tmoverhd/Makefile.am: Reflect having moved automake.

34 files changed, 132 insertions, 96 deletions

diff --git a/c/src/tests/tmtests/ChangeLog b/c/src/tests/tmtests/ChangeLog
index fcc7a70ec1..8bef5af3e6 100644
--- a/c/src/tests/tmtests/ChangeLog
+++ b/c/src/tests/tmtests/ChangeLog
@@ -1,3 +1,39 @@
+2003-08-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	Makefile.am: Reflect having moved automake.
+	include/Makefile.am: Reflect having moved automake.
+	tm01/Makefile.am: Reflect having moved automake.
+	tm02/Makefile.am: Reflect having moved automake.
+	tm03/Makefile.am: Reflect having moved automake.
+	tm04/Makefile.am: Reflect having moved automake.
+	tm05/Makefile.am: Reflect having moved automake.
+	tm06/Makefile.am: Reflect having moved automake.
+	tm07/Makefile.am: Reflect having moved automake.
+	tm08/Makefile.am: Reflect having moved automake.
+	tm09/Makefile.am: Reflect having moved automake.
+	tm10/Makefile.am: Reflect having moved automake.
+	tm11/Makefile.am: Reflect having moved automake.
+	tm12/Makefile.am: Reflect having moved automake.
+	tm13/Makefile.am: Reflect having moved automake.
+	tm14/Makefile.am: Reflect having moved automake.
+	tm15/Makefile.am: Reflect having moved automake.
+	tm16/Makefile.am: Reflect having moved automake.
+	tm17/Makefile.am: Reflect having moved automake.
+	tm18/Makefile.am: Reflect having moved automake.
+	tm19/Makefile.am: Reflect having moved automake.
+	tm20/Makefile.am: Reflect having moved automake.
+	tm21/Makefile.am: Reflect having moved automake.
+	tm22/Makefile.am: Reflect having moved automake.
+	tm23/Makefile.am: Reflect having moved automake.
+	tm24/Makefile.am: Reflect having moved automake.
+	tm25/Makefile.am: Reflect having moved automake.
+	tm26/Makefile.am: Reflect having moved automake.
+	tm27/Makefile.am: Reflect having moved automake.
+	tm28/Makefile.am: Reflect having moved automake.
+	tm29/Makefile.am: Reflect having moved automake.
+	tmck/Makefile.am: Reflect having moved automake.
+	tmoverhd/Makefile.am: Reflect having moved automake.
+
 2003-08-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Use rtems-bugs@rtems.com as bug report email address.
diff --git a/c/src/tests/tmtests/Makefile.am b/c/src/tests/tmtests/Makefile.am
index 4342a8c58c..caee9a6ad8 100644
--- a/c/src/tests/tmtests/Makefile.am
+++ b/c/src/tests/tmtests/Makefile.am
@@ -10,5 +10,5 @@ SUBDIRS = include tmck tmoverhd tm01 tm02 tm03 tm04 tm05 tm06 tm07 tm08 tm09 \
 
 EXTRA_DIST = tmtests.am
 
-include $(top_srcdir)/../../../../automake/subdirs.am
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/include/Makefile.am b/c/src/tests/tmtests/include/Makefile.am
index 107bff9b2d..536b382fc2 100644
--- a/c/src/tests/tmtests/include/Makefile.am
+++ b/c/src/tests/tmtests/include/Makefile.am
@@ -5,4 +5,4 @@
 
 noinst_HEADERS = timesys.h
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm01/Makefile.am b/c/src/tests/tmtests/tm01/Makefile.am
index 04dedac091..5ebf204ef1 100644
--- a/c/src/tests/tmtests/tm01/Makefile.am
+++ b/c/src/tests/tmtests/tm01/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm02/Makefile.am b/c/src/tests/tmtests/tm02/Makefile.am
index 8513519fa5..a8d1effc43 100644
--- a/c/src/tests/tmtests/tm02/Makefile.am
+++ b/c/src/tests/tmtests/tm02/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm03/Makefile.am b/c/src/tests/tmtests/tm03/Makefile.am
index 29f6b54a33..0b14d4bceb 100644
--- a/c/src/tests/tmtests/tm03/Makefile.am
+++ b/c/src/tests/tmtests/tm03/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm04/Makefile.am b/c/src/tests/tmtests/tm04/Makefile.am
index d4313de041..d4c126a553 100644
--- a/c/src/tests/tmtests/tm04/Makefile.am
+++ b/c/src/tests/tmtests/tm04/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm05/Makefile.am b/c/src/tests/tmtests/tm05/Makefile.am
index 6549cf559d..b1aee844cd 100644
--- a/c/src/tests/tmtests/tm05/Makefile.am
+++ b/c/src/tests/tmtests/tm05/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm06/Makefile.am b/c/src/tests/tmtests/tm06/Makefile.am
index be0366717d..87c4eb884f 100644
--- a/c/src/tests/tmtests/tm06/Makefile.am
+++ b/c/src/tests/tmtests/tm06/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm07/Makefile.am b/c/src/tests/tmtests/tm07/Makefile.am
index 4b57c489e8..63333a2f2b 100644
--- a/c/src/tests/tmtests/tm07/Makefile.am
+++ b/c/src/tests/tmtests/tm07/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm08/Makefile.am b/c/src/tests/tmtests/tm08/Makefile.am
index 970e1ec081..6c7b33f99e 100644
--- a/c/src/tests/tmtests/tm08/Makefile.am
+++ b/c/src/tests/tmtests/tm08/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm09/Makefile.am b/c/src/tests/tmtests/tm09/Makefile.am
index 07b3edc320..1f7c102730 100644
--- a/c/src/tests/tmtests/tm09/Makefile.am
+++ b/c/src/tests/tmtests/tm09/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm10/Makefile.am b/c/src/tests/tmtests/tm10/Makefile.am
index c6fd9709de..4aa129732b 100644
--- a/c/src/tests/tmtests/tm10/Makefile.am
+++ b/c/src/tests/tmtests/tm10/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm11/Makefile.am b/c/src/tests/tmtests/tm11/Makefile.am
index 7649ad9c53..bd3e8c046c 100644
--- a/c/src/tests/tmtests/tm11/Makefile.am
+++ b/c/src/tests/tmtests/tm11/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm12/Makefile.am b/c/src/tests/tmtests/tm12/Makefile.am
index cb2348d40f..35969606d0 100644
--- a/c/src/tests/tmtests/tm12/Makefile.am
+++ b/c/src/tests/tmtests/tm12/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm13/Makefile.am b/c/src/tests/tmtests/tm13/Makefile.am
index fd5f9e33c0..07bf3577e2 100644
--- a/c/src/tests/tmtests/tm13/Makefile.am
+++ b/c/src/tests/tmtests/tm13/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm14/Makefile.am b/c/src/tests/tmtests/tm14/Makefile.am
index 533ff4882a..ae33057a7e 100644
--- a/c/src/tests/tmtests/tm14/Makefile.am
+++ b/c/src/tests/tmtests/tm14/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm15/Makefile.am b/c/src/tests/tmtests/tm15/Makefile.am
index aef4cb102b..970dda9770 100644
--- a/c/src/tests/tmtests/tm15/Makefile.am
+++ b/c/src/tests/tmtests/tm15/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm16/Makefile.am b/c/src/tests/tmtests/tm16/Makefile.am
index 8fdf786685..2cfb67f8c1 100644
--- a/c/src/tests/tmtests/tm16/Makefile.am
+++ b/c/src/tests/tmtests/tm16/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm17/Makefile.am b/c/src/tests/tmtests/tm17/Makefile.am
index 1c7e56493f..81035478a5 100644
--- a/c/src/tests/tmtests/tm17/Makefile.am
+++ b/c/src/tests/tmtests/tm17/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm18/Makefile.am b/c/src/tests/tmtests/tm18/Makefile.am
index 2ba5855ec4..a06e798159 100644
--- a/c/src/tests/tmtests/tm18/Makefile.am
+++ b/c/src/tests/tmtests/tm18/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm19/Makefile.am b/c/src/tests/tmtests/tm19/Makefile.am
index 46a96d5043..23c4389b88 100644
--- a/c/src/tests/tmtests/tm19/Makefile.am
+++ b/c/src/tests/tmtests/tm19/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm20/Makefile.am b/c/src/tests/tmtests/tm20/Makefile.am
index 2206a27fda..eb86e2beca 100644
--- a/c/src/tests/tmtests/tm20/Makefile.am
+++ b/c/src/tests/tmtests/tm20/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm21/Makefile.am b/c/src/tests/tmtests/tm21/Makefile.am
index 2a03ddd14c..40453ce674 100644
--- a/c/src/tests/tmtests/tm21/Makefile.am
+++ b/c/src/tests/tmtests/tm21/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm22/Makefile.am b/c/src/tests/tmtests/tm22/Makefile.am
index b79c01627e..2d2ae6605b 100644
--- a/c/src/tests/tmtests/tm22/Makefile.am
+++ b/c/src/tests/tmtests/tm22/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm23/Makefile.am b/c/src/tests/tmtests/tm23/Makefile.am
index fe163d203e..dd19437626 100644
--- a/c/src/tests/tmtests/tm23/Makefile.am
+++ b/c/src/tests/tmtests/tm23/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm24/Makefile.am b/c/src/tests/tmtests/tm24/Makefile.am
index 40e874d3ac..19a385efbf 100644
--- a/c/src/tests/tmtests/tm24/Makefile.am
+++ b/c/src/tests/tmtests/tm24/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm25/Makefile.am b/c/src/tests/tmtests/tm25/Makefile.am
index e825bd1833..36dab9759c 100644
--- a/c/src/tests/tmtests/tm25/Makefile.am
+++ b/c/src/tests/tmtests/tm25/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm26/Makefile.am b/c/src/tests/tmtests/tm26/Makefile.am
index fcc6639183..52c134fdf4 100644
--- a/c/src/tests/tmtests/tm26/Makefile.am
+++ b/c/src/tests/tmtests/tm26/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm27/Makefile.am b/c/src/tests/tmtests/tm27/Makefile.am
index caa63165ad..565aa15e48 100644
--- a/c/src/tests/tmtests/tm27/Makefile.am
+++ b/c/src/tests/tmtests/tm27/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm28/Makefile.am b/c/src/tests/tmtests/tm28/Makefile.am
index 7aeac29ab9..62936ac0c2 100644
--- a/c/src/tests/tmtests/tm28/Makefile.am
+++ b/c/src/tests/tmtests/tm28/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tm29/Makefile.am b/c/src/tests/tmtests/tm29/Makefile.am
index bde99d7ee0..213aec5d4c 100644
--- a/c/src/tests/tmtests/tm29/Makefile.am
+++ b/c/src/tests/tmtests/tm29/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tmck/Makefile.am b/c/src/tests/tmtests/tmck/Makefile.am
index f50fab9f2f..32f78b1e89 100644
--- a/c/src/tests/tmtests/tmck/Makefile.am
+++ b/c/src/tests/tmtests/tmck/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/tmtests/tmoverhd/Makefile.am b/c/src/tests/tmtests/tmoverhd/Makefile.am
index 70c8eb3d0b..b32d22bee9 100644
--- a/c/src/tests/tmtests/tmoverhd/Makefile.am
+++ b/c/src/tests/tmtests/tmoverhd/Makefile.am
@@ -24,8 +24,8 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/tmtests.am
 
 #
@@ -42,4 +42,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES) $(DOCS)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am