summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/tests/samples/ChangeLog17
-rw-r--r--c/src/tests/samples/Makefile.am4
-rw-r--r--c/src/tests/samples/base_mp/Makefile.am4
-rw-r--r--c/src/tests/samples/base_mp/node1/Makefile.am6
-rw-r--r--c/src/tests/samples/base_mp/node2/Makefile.am6
-rw-r--r--c/src/tests/samples/base_sp/Makefile.am6
-rw-r--r--c/src/tests/samples/cdtest/Makefile.am6
-rw-r--r--c/src/tests/samples/fileio/Makefile.am6
-rw-r--r--c/src/tests/samples/hello/Makefile.am6
-rw-r--r--c/src/tests/samples/loopback/Makefile.am6
-rw-r--r--c/src/tests/samples/minimum/Makefile.am6
-rw-r--r--c/src/tests/samples/paranoia/Makefile.am6
-rw-r--r--c/src/tests/samples/pppd/Makefile.am6
-rw-r--r--c/src/tests/samples/ticker/Makefile.am6
-rw-r--r--c/src/tests/samples/unlimited/Makefile.am6
-rw-r--r--testsuites/samples/ChangeLog17
-rw-r--r--testsuites/samples/Makefile.am4
-rw-r--r--testsuites/samples/base_mp/Makefile.am4
-rw-r--r--testsuites/samples/base_mp/node1/Makefile.am6
-rw-r--r--testsuites/samples/base_mp/node2/Makefile.am6
-rw-r--r--testsuites/samples/base_sp/Makefile.am6
-rw-r--r--testsuites/samples/cdtest/Makefile.am6
-rw-r--r--testsuites/samples/fileio/Makefile.am6
-rw-r--r--testsuites/samples/hello/Makefile.am6
-rw-r--r--testsuites/samples/loopback/Makefile.am6
-rw-r--r--testsuites/samples/minimum/Makefile.am6
-rw-r--r--testsuites/samples/paranoia/Makefile.am6
-rw-r--r--testsuites/samples/pppd/Makefile.am6
-rw-r--r--testsuites/samples/ticker/Makefile.am6
-rw-r--r--testsuites/samples/unlimited/Makefile.am6
30 files changed, 114 insertions, 80 deletions
diff --git a/c/src/tests/samples/ChangeLog b/c/src/tests/samples/ChangeLog
index e66cff46dd..9947af8c8b 100644
--- a/c/src/tests/samples/ChangeLog
+++ b/c/src/tests/samples/ChangeLog
@@ -1,3 +1,20 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ Makefile.am: Reflect having moved automake.
+ base_mp/Makefile.am: Reflect having moved automake.
+ base_mp/node1/Makefile.am: Reflect having moved automake.
+ base_mp/node2/Makefile.am: Reflect having moved automake.
+ base_sp/Makefile.am: Reflect having moved automake.
+ cdtest/Makefile.am: Reflect having moved automake.
+ fileio/Makefile.am: Reflect having moved automake.
+ hello/Makefile.am: Reflect having moved automake.
+ loopback/Makefile.am: Reflect having moved automake.
+ minimum/Makefile.am: Reflect having moved automake.
+ paranoia/Makefile.am: Reflect having moved automake.
+ pppd/Makefile.am: Reflect having moved automake.
+ ticker/Makefile.am: Reflect having moved automake.
+ unlimited/Makefile.am: Reflect having moved automake.
+
2003-08-13 Joel Sherrill <joel@OARcorp.com>
* fileio/.cvsignore: New file.
diff --git a/c/src/tests/samples/Makefile.am b/c/src/tests/samples/Makefile.am
index dc1ba1e509..b60442273b 100644
--- a/c/src/tests/samples/Makefile.am
+++ b/c/src/tests/samples/Makefile.am
@@ -22,5 +22,5 @@ AUTOMAKE_FILES = sample.am
EXTRA_DIST = $(AUTOMAKE_FILES)
-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/samples/base_mp/Makefile.am b/c/src/tests/samples/base_mp/Makefile.am
index 77ac7b9fe2..c9d9638c6b 100644
--- a/c/src/tests/samples/base_mp/Makefile.am
+++ b/c/src/tests/samples/base_mp/Makefile.am
@@ -7,5 +7,5 @@ SUBDIRS = node1 node2
EXTRA_DIST = apptask.c init.c system.h
-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/samples/base_mp/node1/Makefile.am b/c/src/tests/samples/base_mp/node1/Makefile.am
index 6e4676ce09..10afb291e4 100644
--- a/c/src/tests/samples/base_mp/node1/Makefile.am
+++ b/c/src/tests/samples/base_mp/node1/Makefile.am
@@ -25,8 +25,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
@@ -47,4 +47,4 @@ endif
EXTRA_DIST = $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/samples/base_mp/node2/Makefile.am b/c/src/tests/samples/base_mp/node2/Makefile.am
index b4931f5fbd..5d912c0680 100644
--- a/c/src/tests/samples/base_mp/node2/Makefile.am
+++ b/c/src/tests/samples/base_mp/node2/Makefile.am
@@ -25,8 +25,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
@@ -47,4 +47,4 @@ endif
EXTRA_DIST = $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/samples/base_sp/Makefile.am b/c/src/tests/samples/base_sp/Makefile.am
index e7f38b6963..0c5b0ac218 100644
--- a/c/src/tests/samples/base_sp/Makefile.am
+++ b/c/src/tests/samples/base_sp/Makefile.am
@@ -23,8 +23,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -38,4 +38,4 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/samples/cdtest/Makefile.am b/c/src/tests/samples/cdtest/Makefile.am
index 45969efbd2..ebe262ac92 100644
--- a/c/src/tests/samples/cdtest/Makefile.am
+++ b/c/src/tests/samples/cdtest/Makefile.am
@@ -26,8 +26,8 @@ OBJS = $(C_O_FILES) $(CC_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -45,4 +45,4 @@ endif
EXTRA_DIST = $(C_FILES) $(CC_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/samples/fileio/Makefile.am b/c/src/tests/samples/fileio/Makefile.am
index 0a65a0bb97..03dfe2a414 100644
--- a/c/src/tests/samples/fileio/Makefile.am
+++ b/c/src/tests/samples/fileio/Makefile.am
@@ -23,8 +23,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -38,5 +38,5 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/samples/hello/Makefile.am b/c/src/tests/samples/hello/Makefile.am
index fe1e1440af..16680298f1 100644
--- a/c/src/tests/samples/hello/Makefile.am
+++ b/c/src/tests/samples/hello/Makefile.am
@@ -23,8 +23,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -38,4 +38,4 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/samples/loopback/Makefile.am b/c/src/tests/samples/loopback/Makefile.am
index ef34244254..dfbfcb32c4 100644
--- a/c/src/tests/samples/loopback/Makefile.am
+++ b/c/src/tests/samples/loopback/Makefile.am
@@ -20,8 +20,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -38,4 +38,4 @@ endif
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/samples/minimum/Makefile.am b/c/src/tests/samples/minimum/Makefile.am
index 7fe380dc9e..a4c68d234e 100644
--- a/c/src/tests/samples/minimum/Makefile.am
+++ b/c/src/tests/samples/minimum/Makefile.am
@@ -20,8 +20,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -36,4 +36,4 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/samples/paranoia/Makefile.am b/c/src/tests/samples/paranoia/Makefile.am
index b3036938c0..0934a517b7 100644
--- a/c/src/tests/samples/paranoia/Makefile.am
+++ b/c/src/tests/samples/paranoia/Makefile.am
@@ -23,8 +23,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -44,4 +44,4 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/samples/pppd/Makefile.am b/c/src/tests/samples/pppd/Makefile.am
index a60e70a9b6..5a0bd43ce8 100644
--- a/c/src/tests/samples/pppd/Makefile.am
+++ b/c/src/tests/samples/pppd/Makefile.am
@@ -19,8 +19,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -37,4 +37,4 @@ endif
EXTRA_DIST = $(C_FILES) $(H_FILES)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/samples/ticker/Makefile.am b/c/src/tests/samples/ticker/Makefile.am
index 27e04b6e1b..7d5d0a4b21 100644
--- a/c/src/tests/samples/ticker/Makefile.am
+++ b/c/src/tests/samples/ticker/Makefile.am
@@ -23,8 +23,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -38,4 +38,4 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/tests/samples/unlimited/Makefile.am b/c/src/tests/samples/unlimited/Makefile.am
index f0bfb27f7d..9041fb4bed 100644
--- a/c/src/tests/samples/unlimited/Makefile.am
+++ b/c/src/tests/samples/unlimited/Makefile.am
@@ -23,8 +23,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -38,4 +38,4 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/ChangeLog b/testsuites/samples/ChangeLog
index e66cff46dd..9947af8c8b 100644
--- a/testsuites/samples/ChangeLog
+++ b/testsuites/samples/ChangeLog
@@ -1,3 +1,20 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ Makefile.am: Reflect having moved automake.
+ base_mp/Makefile.am: Reflect having moved automake.
+ base_mp/node1/Makefile.am: Reflect having moved automake.
+ base_mp/node2/Makefile.am: Reflect having moved automake.
+ base_sp/Makefile.am: Reflect having moved automake.
+ cdtest/Makefile.am: Reflect having moved automake.
+ fileio/Makefile.am: Reflect having moved automake.
+ hello/Makefile.am: Reflect having moved automake.
+ loopback/Makefile.am: Reflect having moved automake.
+ minimum/Makefile.am: Reflect having moved automake.
+ paranoia/Makefile.am: Reflect having moved automake.
+ pppd/Makefile.am: Reflect having moved automake.
+ ticker/Makefile.am: Reflect having moved automake.
+ unlimited/Makefile.am: Reflect having moved automake.
+
2003-08-13 Joel Sherrill <joel@OARcorp.com>
* fileio/.cvsignore: New file.
diff --git a/testsuites/samples/Makefile.am b/testsuites/samples/Makefile.am
index dc1ba1e509..b60442273b 100644
--- a/testsuites/samples/Makefile.am
+++ b/testsuites/samples/Makefile.am
@@ -22,5 +22,5 @@ AUTOMAKE_FILES = sample.am
EXTRA_DIST = $(AUTOMAKE_FILES)
-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/samples/base_mp/Makefile.am b/testsuites/samples/base_mp/Makefile.am
index 77ac7b9fe2..c9d9638c6b 100644
--- a/testsuites/samples/base_mp/Makefile.am
+++ b/testsuites/samples/base_mp/Makefile.am
@@ -7,5 +7,5 @@ SUBDIRS = node1 node2
EXTRA_DIST = apptask.c init.c system.h
-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/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index 6e4676ce09..10afb291e4 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -25,8 +25,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
@@ -47,4 +47,4 @@ endif
EXTRA_DIST = $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index b4931f5fbd..5d912c0680 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -25,8 +25,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
@@ -47,4 +47,4 @@ endif
EXTRA_DIST = $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index e7f38b6963..0c5b0ac218 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -23,8 +23,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -38,4 +38,4 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index 45969efbd2..ebe262ac92 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -26,8 +26,8 @@ OBJS = $(C_O_FILES) $(CC_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -45,4 +45,4 @@ endif
EXTRA_DIST = $(C_FILES) $(CC_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am
index 0a65a0bb97..03dfe2a414 100644
--- a/testsuites/samples/fileio/Makefile.am
+++ b/testsuites/samples/fileio/Makefile.am
@@ -23,8 +23,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -38,5 +38,5 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index fe1e1440af..16680298f1 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -23,8 +23,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -38,4 +38,4 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index ef34244254..dfbfcb32c4 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -20,8 +20,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -38,4 +38,4 @@ endif
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index 7fe380dc9e..a4c68d234e 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -20,8 +20,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -36,4 +36,4 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index b3036938c0..0934a517b7 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -23,8 +23,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -44,4 +44,4 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index a60e70a9b6..5a0bd43ce8 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -19,8 +19,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -37,4 +37,4 @@ endif
EXTRA_DIST = $(C_FILES) $(H_FILES)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index 27e04b6e1b..7d5d0a4b21 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -23,8 +23,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -38,4 +38,4 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index f0bfb27f7d..9041fb4bed 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -23,8 +23,8 @@ OBJS = $(C_O_FILES)
PRINT_SRCS = $(DOCS)
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)/sample.am
#
@@ -38,4 +38,4 @@ ${PGM}: $(OBJS) $(LINK_FILES)
EXTRA_DIST = $(C_FILES) $(DOCS)
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am