summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-08-16 16:27:24 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-08-16 16:27:24 +0000
commitd549d0a6659001388d3b3d1800b9dd0c2c4c493a (patch)
tree4abf36ae1cb2f338fd9163a6e81646ba9cfd209c
parente76fd739d435f1b452e9212ba15df42a33b3c875 (diff)
downloadrtems-d549d0a6659001388d3b3d1800b9dd0c2c4c493a.tar.bz2
2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
Makefile.am: Reflect having moved automake. include/Makefile.am: Reflect having moved automake. psx01/Makefile.am: Reflect having moved automake. psx02/Makefile.am: Reflect having moved automake. psx03/Makefile.am: Reflect having moved automake. psx04/Makefile.am: Reflect having moved automake. psx05/Makefile.am: Reflect having moved automake. psx06/Makefile.am: Reflect having moved automake. psx07/Makefile.am: Reflect having moved automake. psx08/Makefile.am: Reflect having moved automake. psx09/Makefile.am: Reflect having moved automake. psx10/Makefile.am: Reflect having moved automake. psx11/Makefile.am: Reflect having moved automake. psx12/Makefile.am: Reflect having moved automake. psx13/Makefile.am: Reflect having moved automake. psxcancel/Makefile.am: Reflect having moved automake. psxchroot01/Makefile.am: Reflect having moved automake. psxfile01/Makefile.am: Reflect having moved automake. psxhdrs/Makefile.am: Reflect having moved automake. psxmount/Makefile.am: Reflect having moved automake. psxmsgq01/Makefile.am: Reflect having moved automake. psxreaddir/Makefile.am: Reflect having moved automake. psxsem01/Makefile.am: Reflect having moved automake. psxstat/Makefile.am: Reflect having moved automake. psxtime/Makefile.am: Reflect having moved automake. psxtimer/Makefile.am: Reflect having moved automake.
Diffstat (limited to '')
-rw-r--r--c/src/tests/psxtests/ChangeLog29
-rw-r--r--c/src/tests/psxtests/Makefile.am4
-rw-r--r--c/src/tests/psxtests/include/Makefile.am2
-rw-r--r--c/src/tests/psxtests/psx01/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psx02/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psx03/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psx04/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psx05/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psx06/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psx07/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psx08/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psx09/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psx10/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psx11/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psx12/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psx13/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psxcancel/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psxchroot01/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psxfile01/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psxhdrs/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psxmount/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psxmsgq01/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psxreaddir/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psxsem01/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psxstat/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psxtime/Makefile.am6
-rw-r--r--c/src/tests/psxtests/psxtimer/Makefile.am6
-rw-r--r--testsuites/psxtests/ChangeLog29
-rw-r--r--testsuites/psxtests/Makefile.am4
-rw-r--r--testsuites/psxtests/include/Makefile.am2
-rw-r--r--testsuites/psxtests/psx01/Makefile.am6
-rw-r--r--testsuites/psxtests/psx02/Makefile.am6
-rw-r--r--testsuites/psxtests/psx03/Makefile.am6
-rw-r--r--testsuites/psxtests/psx04/Makefile.am6
-rw-r--r--testsuites/psxtests/psx05/Makefile.am6
-rw-r--r--testsuites/psxtests/psx06/Makefile.am6
-rw-r--r--testsuites/psxtests/psx07/Makefile.am6
-rw-r--r--testsuites/psxtests/psx08/Makefile.am6
-rw-r--r--testsuites/psxtests/psx09/Makefile.am6
-rw-r--r--testsuites/psxtests/psx10/Makefile.am6
-rw-r--r--testsuites/psxtests/psx11/Makefile.am6
-rw-r--r--testsuites/psxtests/psx12/Makefile.am6
-rw-r--r--testsuites/psxtests/psx13/Makefile.am6
-rw-r--r--testsuites/psxtests/psxcancel/Makefile.am6
-rw-r--r--testsuites/psxtests/psxchroot01/Makefile.am6
-rw-r--r--testsuites/psxtests/psxfile01/Makefile.am6
-rw-r--r--testsuites/psxtests/psxhdrs/Makefile.am6
-rw-r--r--testsuites/psxtests/psxmount/Makefile.am6
-rw-r--r--testsuites/psxtests/psxmsgq01/Makefile.am6
-rw-r--r--testsuites/psxtests/psxreaddir/Makefile.am6
-rw-r--r--testsuites/psxtests/psxsem01/Makefile.am6
-rw-r--r--testsuites/psxtests/psxstat/Makefile.am6
-rw-r--r--testsuites/psxtests/psxtime/Makefile.am6
-rw-r--r--testsuites/psxtests/psxtimer/Makefile.am6
54 files changed, 208 insertions, 150 deletions
diff --git a/c/src/tests/psxtests/ChangeLog b/c/src/tests/psxtests/ChangeLog
index e193c1436e..c20754c84b 100644
--- a/c/src/tests/psxtests/ChangeLog
+++ b/c/src/tests/psxtests/ChangeLog
@@ -1,3 +1,32 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ Makefile.am: Reflect having moved automake.
+ include/Makefile.am: Reflect having moved automake.
+ psx01/Makefile.am: Reflect having moved automake.
+ psx02/Makefile.am: Reflect having moved automake.
+ psx03/Makefile.am: Reflect having moved automake.
+ psx04/Makefile.am: Reflect having moved automake.
+ psx05/Makefile.am: Reflect having moved automake.
+ psx06/Makefile.am: Reflect having moved automake.
+ psx07/Makefile.am: Reflect having moved automake.
+ psx08/Makefile.am: Reflect having moved automake.
+ psx09/Makefile.am: Reflect having moved automake.
+ psx10/Makefile.am: Reflect having moved automake.
+ psx11/Makefile.am: Reflect having moved automake.
+ psx12/Makefile.am: Reflect having moved automake.
+ psx13/Makefile.am: Reflect having moved automake.
+ psxcancel/Makefile.am: Reflect having moved automake.
+ psxchroot01/Makefile.am: Reflect having moved automake.
+ psxfile01/Makefile.am: Reflect having moved automake.
+ psxhdrs/Makefile.am: Reflect having moved automake.
+ psxmount/Makefile.am: Reflect having moved automake.
+ psxmsgq01/Makefile.am: Reflect having moved automake.
+ psxreaddir/Makefile.am: Reflect having moved automake.
+ psxsem01/Makefile.am: Reflect having moved automake.
+ psxstat/Makefile.am: Reflect having moved automake.
+ psxtime/Makefile.am: Reflect having moved automake.
+ psxtimer/Makefile.am: Reflect having moved automake.
+
2003-08-14 Joel Sherrill <joel@OARcorp.com>
PR 408/filesystem
diff --git a/c/src/tests/psxtests/Makefile.am b/c/src/tests/psxtests/Makefile.am
index 50763cacbb..f326b013dc 100644
--- a/c/src/tests/psxtests/Makefile.am
+++ b/c/src/tests/psxtests/Makefile.am
@@ -17,5 +17,5 @@ SUBDIRS = $(SHARED_DIRS) $(POSIX_DIRS) $(POSIX_FILES_DIRS) $(UNUSED_DIRS)
EXTRA_DIST = psxtests.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/psxtests/include/Makefile.am b/c/src/tests/psxtests/include/Makefile.am
index cb6f48b060..a838fddb15 100644
--- a/c/src/tests/psxtests/include/Makefile.am
+++ b/c/src/tests/psxtests/include/Makefile.am
@@ -5,4 +5,4 @@
noinst_HEADERS = pmacros.h
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/psxtests/psx01/Makefile.am b/c/src/tests/psxtests/psx01/Makefile.am
index 2462265c1e..acac58e29a 100644
--- a/c/src/tests/psxtests/psx01/Makefile.am
+++ b/c/src/tests/psxtests/psx01/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psx02/Makefile.am b/c/src/tests/psxtests/psx02/Makefile.am
index fcbe5f1f16..d97dcfb121 100644
--- a/c/src/tests/psxtests/psx02/Makefile.am
+++ b/c/src/tests/psxtests/psx02/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psx03/Makefile.am b/c/src/tests/psxtests/psx03/Makefile.am
index 2d411447de..7627df2071 100644
--- a/c/src/tests/psxtests/psx03/Makefile.am
+++ b/c/src/tests/psxtests/psx03/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psx04/Makefile.am b/c/src/tests/psxtests/psx04/Makefile.am
index 1f4ee8a0a6..fa4d5a87c3 100644
--- a/c/src/tests/psxtests/psx04/Makefile.am
+++ b/c/src/tests/psxtests/psx04/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psx05/Makefile.am b/c/src/tests/psxtests/psx05/Makefile.am
index df33acdc01..d659871673 100644
--- a/c/src/tests/psxtests/psx05/Makefile.am
+++ b/c/src/tests/psxtests/psx05/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psx06/Makefile.am b/c/src/tests/psxtests/psx06/Makefile.am
index 68f1f4d05b..a5a9aaee90 100644
--- a/c/src/tests/psxtests/psx06/Makefile.am
+++ b/c/src/tests/psxtests/psx06/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psx07/Makefile.am b/c/src/tests/psxtests/psx07/Makefile.am
index d1b09bea48..89936486c1 100644
--- a/c/src/tests/psxtests/psx07/Makefile.am
+++ b/c/src/tests/psxtests/psx07/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psx08/Makefile.am b/c/src/tests/psxtests/psx08/Makefile.am
index 221c16f184..a4d943dba9 100644
--- a/c/src/tests/psxtests/psx08/Makefile.am
+++ b/c/src/tests/psxtests/psx08/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psx09/Makefile.am b/c/src/tests/psxtests/psx09/Makefile.am
index 0868614d03..e5084cdc74 100644
--- a/c/src/tests/psxtests/psx09/Makefile.am
+++ b/c/src/tests/psxtests/psx09/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psx10/Makefile.am b/c/src/tests/psxtests/psx10/Makefile.am
index 384deae56e..2b5f2e2be6 100644
--- a/c/src/tests/psxtests/psx10/Makefile.am
+++ b/c/src/tests/psxtests/psx10/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psx11/Makefile.am b/c/src/tests/psxtests/psx11/Makefile.am
index d6c25e50cc..2e0d9e99f2 100644
--- a/c/src/tests/psxtests/psx11/Makefile.am
+++ b/c/src/tests/psxtests/psx11/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psx12/Makefile.am b/c/src/tests/psxtests/psx12/Makefile.am
index c10bff0e73..d8c5d599b5 100644
--- a/c/src/tests/psxtests/psx12/Makefile.am
+++ b/c/src/tests/psxtests/psx12/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psx13/Makefile.am b/c/src/tests/psxtests/psx13/Makefile.am
index 3ef5eb2e7a..492c101746 100644
--- a/c/src/tests/psxtests/psx13/Makefile.am
+++ b/c/src/tests/psxtests/psx13/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -38,4 +38,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/psxtests/psxcancel/Makefile.am b/c/src/tests/psxtests/psxcancel/Makefile.am
index 095c2a1ba7..ec6783c7be 100644
--- a/c/src/tests/psxtests/psxcancel/Makefile.am
+++ b/c/src/tests/psxtests/psxcancel/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psxchroot01/Makefile.am b/c/src/tests/psxtests/psxchroot01/Makefile.am
index 496a61afa7..0d52362ea4 100644
--- a/c/src/tests/psxtests/psxchroot01/Makefile.am
+++ b/c/src/tests/psxtests/psxchroot01/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -38,4 +38,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/psxtests/psxfile01/Makefile.am b/c/src/tests/psxtests/psxfile01/Makefile.am
index 6245d6c7c5..53f4334303 100644
--- a/c/src/tests/psxtests/psxfile01/Makefile.am
+++ b/c/src/tests/psxtests/psxfile01/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -38,4 +38,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/psxtests/psxhdrs/Makefile.am b/c/src/tests/psxtests/psxhdrs/Makefile.am
index 9271945d1b..ed047140e4 100644
--- a/c/src/tests/psxtests/psxhdrs/Makefile.am
+++ b/c/src/tests/psxtests/psxhdrs/Makefile.am
@@ -30,11 +30,11 @@ SRCS = $(C_FILES)
OBJS = $(C_O_FILES)
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
all-local: ${ARCH} ${OBJS}
EXTRA_DIST = $(C_FILES)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/psxtests/psxmount/Makefile.am b/c/src/tests/psxtests/psxmount/Makefile.am
index 84158cdee7..348025aa7a 100644
--- a/c/src/tests/psxtests/psxmount/Makefile.am
+++ b/c/src/tests/psxtests/psxmount/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -38,4 +38,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/psxtests/psxmsgq01/Makefile.am b/c/src/tests/psxtests/psxmsgq01/Makefile.am
index 9a0707bc0d..ae8e8e247a 100644
--- a/c/src/tests/psxtests/psxmsgq01/Makefile.am
+++ b/c/src/tests/psxtests/psxmsgq01/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psxreaddir/Makefile.am b/c/src/tests/psxtests/psxreaddir/Makefile.am
index 83a54faed2..1145a5960d 100644
--- a/c/src/tests/psxtests/psxreaddir/Makefile.am
+++ b/c/src/tests/psxtests/psxreaddir/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -38,4 +38,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/psxtests/psxsem01/Makefile.am b/c/src/tests/psxtests/psxsem01/Makefile.am
index 6e97638a5b..ca23429e6c 100644
--- a/c/src/tests/psxtests/psxsem01/Makefile.am
+++ b/c/src/tests/psxtests/psxsem01/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)/psxtests.am
#
@@ -41,4 +41,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/psxtests/psxstat/Makefile.am b/c/src/tests/psxtests/psxstat/Makefile.am
index 9823ed9fb3..467ccbdfdc 100644
--- a/c/src/tests/psxtests/psxstat/Makefile.am
+++ b/c/src/tests/psxtests/psxstat/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -38,4 +38,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/psxtests/psxtime/Makefile.am b/c/src/tests/psxtests/psxtime/Makefile.am
index 630b47025f..c30f797296 100644
--- a/c/src/tests/psxtests/psxtime/Makefile.am
+++ b/c/src/tests/psxtests/psxtime/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -36,4 +36,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/psxtests/psxtimer/Makefile.am b/c/src/tests/psxtests/psxtimer/Makefile.am
index e6ddd611fc..041b67ff34 100644
--- a/c/src/tests/psxtests/psxtimer/Makefile.am
+++ b/c/src/tests/psxtests/psxtimer/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog
index e193c1436e..c20754c84b 100644
--- a/testsuites/psxtests/ChangeLog
+++ b/testsuites/psxtests/ChangeLog
@@ -1,3 +1,32 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ Makefile.am: Reflect having moved automake.
+ include/Makefile.am: Reflect having moved automake.
+ psx01/Makefile.am: Reflect having moved automake.
+ psx02/Makefile.am: Reflect having moved automake.
+ psx03/Makefile.am: Reflect having moved automake.
+ psx04/Makefile.am: Reflect having moved automake.
+ psx05/Makefile.am: Reflect having moved automake.
+ psx06/Makefile.am: Reflect having moved automake.
+ psx07/Makefile.am: Reflect having moved automake.
+ psx08/Makefile.am: Reflect having moved automake.
+ psx09/Makefile.am: Reflect having moved automake.
+ psx10/Makefile.am: Reflect having moved automake.
+ psx11/Makefile.am: Reflect having moved automake.
+ psx12/Makefile.am: Reflect having moved automake.
+ psx13/Makefile.am: Reflect having moved automake.
+ psxcancel/Makefile.am: Reflect having moved automake.
+ psxchroot01/Makefile.am: Reflect having moved automake.
+ psxfile01/Makefile.am: Reflect having moved automake.
+ psxhdrs/Makefile.am: Reflect having moved automake.
+ psxmount/Makefile.am: Reflect having moved automake.
+ psxmsgq01/Makefile.am: Reflect having moved automake.
+ psxreaddir/Makefile.am: Reflect having moved automake.
+ psxsem01/Makefile.am: Reflect having moved automake.
+ psxstat/Makefile.am: Reflect having moved automake.
+ psxtime/Makefile.am: Reflect having moved automake.
+ psxtimer/Makefile.am: Reflect having moved automake.
+
2003-08-14 Joel Sherrill <joel@OARcorp.com>
PR 408/filesystem
diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am
index 50763cacbb..f326b013dc 100644
--- a/testsuites/psxtests/Makefile.am
+++ b/testsuites/psxtests/Makefile.am
@@ -17,5 +17,5 @@ SUBDIRS = $(SHARED_DIRS) $(POSIX_DIRS) $(POSIX_FILES_DIRS) $(UNUSED_DIRS)
EXTRA_DIST = psxtests.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/testsuites/psxtests/include/Makefile.am b/testsuites/psxtests/include/Makefile.am
index cb6f48b060..a838fddb15 100644
--- a/testsuites/psxtests/include/Makefile.am
+++ b/testsuites/psxtests/include/Makefile.am
@@ -5,4 +5,4 @@
noinst_HEADERS = pmacros.h
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx01/Makefile.am b/testsuites/psxtests/psx01/Makefile.am
index 2462265c1e..acac58e29a 100644
--- a/testsuites/psxtests/psx01/Makefile.am
+++ b/testsuites/psxtests/psx01/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psx02/Makefile.am b/testsuites/psxtests/psx02/Makefile.am
index fcbe5f1f16..d97dcfb121 100644
--- a/testsuites/psxtests/psx02/Makefile.am
+++ b/testsuites/psxtests/psx02/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psx03/Makefile.am b/testsuites/psxtests/psx03/Makefile.am
index 2d411447de..7627df2071 100644
--- a/testsuites/psxtests/psx03/Makefile.am
+++ b/testsuites/psxtests/psx03/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psx04/Makefile.am b/testsuites/psxtests/psx04/Makefile.am
index 1f4ee8a0a6..fa4d5a87c3 100644
--- a/testsuites/psxtests/psx04/Makefile.am
+++ b/testsuites/psxtests/psx04/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psx05/Makefile.am b/testsuites/psxtests/psx05/Makefile.am
index df33acdc01..d659871673 100644
--- a/testsuites/psxtests/psx05/Makefile.am
+++ b/testsuites/psxtests/psx05/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psx06/Makefile.am b/testsuites/psxtests/psx06/Makefile.am
index 68f1f4d05b..a5a9aaee90 100644
--- a/testsuites/psxtests/psx06/Makefile.am
+++ b/testsuites/psxtests/psx06/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psx07/Makefile.am b/testsuites/psxtests/psx07/Makefile.am
index d1b09bea48..89936486c1 100644
--- a/testsuites/psxtests/psx07/Makefile.am
+++ b/testsuites/psxtests/psx07/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psx08/Makefile.am b/testsuites/psxtests/psx08/Makefile.am
index 221c16f184..a4d943dba9 100644
--- a/testsuites/psxtests/psx08/Makefile.am
+++ b/testsuites/psxtests/psx08/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psx09/Makefile.am b/testsuites/psxtests/psx09/Makefile.am
index 0868614d03..e5084cdc74 100644
--- a/testsuites/psxtests/psx09/Makefile.am
+++ b/testsuites/psxtests/psx09/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psx10/Makefile.am b/testsuites/psxtests/psx10/Makefile.am
index 384deae56e..2b5f2e2be6 100644
--- a/testsuites/psxtests/psx10/Makefile.am
+++ b/testsuites/psxtests/psx10/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psx11/Makefile.am b/testsuites/psxtests/psx11/Makefile.am
index d6c25e50cc..2e0d9e99f2 100644
--- a/testsuites/psxtests/psx11/Makefile.am
+++ b/testsuites/psxtests/psx11/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psx12/Makefile.am b/testsuites/psxtests/psx12/Makefile.am
index c10bff0e73..d8c5d599b5 100644
--- a/testsuites/psxtests/psx12/Makefile.am
+++ b/testsuites/psxtests/psx12/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psx13/Makefile.am b/testsuites/psxtests/psx13/Makefile.am
index 3ef5eb2e7a..492c101746 100644
--- a/testsuites/psxtests/psx13/Makefile.am
+++ b/testsuites/psxtests/psx13/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -38,4 +38,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/testsuites/psxtests/psxcancel/Makefile.am b/testsuites/psxtests/psxcancel/Makefile.am
index 095c2a1ba7..ec6783c7be 100644
--- a/testsuites/psxtests/psxcancel/Makefile.am
+++ b/testsuites/psxtests/psxcancel/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psxchroot01/Makefile.am b/testsuites/psxtests/psxchroot01/Makefile.am
index 496a61afa7..0d52362ea4 100644
--- a/testsuites/psxtests/psxchroot01/Makefile.am
+++ b/testsuites/psxtests/psxchroot01/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -38,4 +38,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/testsuites/psxtests/psxfile01/Makefile.am b/testsuites/psxtests/psxfile01/Makefile.am
index 6245d6c7c5..53f4334303 100644
--- a/testsuites/psxtests/psxfile01/Makefile.am
+++ b/testsuites/psxtests/psxfile01/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -38,4 +38,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/testsuites/psxtests/psxhdrs/Makefile.am b/testsuites/psxtests/psxhdrs/Makefile.am
index 9271945d1b..ed047140e4 100644
--- a/testsuites/psxtests/psxhdrs/Makefile.am
+++ b/testsuites/psxtests/psxhdrs/Makefile.am
@@ -30,11 +30,11 @@ SRCS = $(C_FILES)
OBJS = $(C_O_FILES)
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
all-local: ${ARCH} ${OBJS}
EXTRA_DIST = $(C_FILES)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxmount/Makefile.am b/testsuites/psxtests/psxmount/Makefile.am
index 84158cdee7..348025aa7a 100644
--- a/testsuites/psxtests/psxmount/Makefile.am
+++ b/testsuites/psxtests/psxmount/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -38,4 +38,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/testsuites/psxtests/psxmsgq01/Makefile.am b/testsuites/psxtests/psxmsgq01/Makefile.am
index 9a0707bc0d..ae8e8e247a 100644
--- a/testsuites/psxtests/psxmsgq01/Makefile.am
+++ b/testsuites/psxtests/psxmsgq01/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psxreaddir/Makefile.am b/testsuites/psxtests/psxreaddir/Makefile.am
index 83a54faed2..1145a5960d 100644
--- a/testsuites/psxtests/psxreaddir/Makefile.am
+++ b/testsuites/psxtests/psxreaddir/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -38,4 +38,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/testsuites/psxtests/psxsem01/Makefile.am b/testsuites/psxtests/psxsem01/Makefile.am
index 6e97638a5b..ca23429e6c 100644
--- a/testsuites/psxtests/psxsem01/Makefile.am
+++ b/testsuites/psxtests/psxsem01/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)/psxtests.am
#
@@ -41,4 +41,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/testsuites/psxtests/psxstat/Makefile.am b/testsuites/psxtests/psxstat/Makefile.am
index 9823ed9fb3..467ccbdfdc 100644
--- a/testsuites/psxtests/psxstat/Makefile.am
+++ b/testsuites/psxtests/psxstat/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -38,4 +38,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/testsuites/psxtests/psxtime/Makefile.am b/testsuites/psxtests/psxtime/Makefile.am
index 630b47025f..c30f797296 100644
--- a/testsuites/psxtests/psxtime/Makefile.am
+++ b/testsuites/psxtests/psxtime/Makefile.am
@@ -21,8 +21,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)/psxtests.am
#
@@ -36,4 +36,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/testsuites/psxtests/psxtimer/Makefile.am b/testsuites/psxtests/psxtimer/Makefile.am
index e6ddd611fc..041b67ff34 100644
--- a/testsuites/psxtests/psxtimer/Makefile.am
+++ b/testsuites/psxtests/psxtimer/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)/psxtests.am
#
@@ -41,4 +41,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am