From fed6210d431edb3466cde96c46ebd5cd5277c313 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 17 Jun 2002 09:27:44 +0000
Subject: 2002-06-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Include $(top_srcdir)/automake/*.am.
---
 c/src/exec/include/Makefile.am       | 2 +-
 c/src/exec/rtems/Makefile.am         | 4 ++--
 c/src/exec/rtems/include/Makefile.am | 2 +-
 c/src/exec/rtems/inline/Makefile.am  | 2 +-
 c/src/exec/rtems/macros/Makefile.am  | 2 +-
 c/src/exec/rtems/src/Makefile.am     | 8 ++++----
 c/src/exec/sapi/Makefile.am          | 4 ++--
 c/src/exec/sapi/include/Makefile.am  | 2 +-
 c/src/exec/sapi/inline/Makefile.am   | 2 +-
 c/src/exec/sapi/macros/Makefile.am   | 2 +-
 c/src/exec/sapi/src/Makefile.am      | 8 ++++----
 c/src/exec/score/Makefile.am         | 4 ++--
 c/src/exec/score/cpu/Makefile.am     | 4 ++--
 c/src/exec/score/include/Makefile.am | 2 +-
 c/src/exec/score/inline/Makefile.am  | 2 +-
 c/src/exec/score/macros/Makefile.am  | 2 +-
 c/src/exec/score/src/Makefile.am     | 8 ++++----
 c/src/exec/wrapup/Makefile.am        | 8 ++++----
 cpukit/include/Makefile.am           | 2 +-
 cpukit/rtems/Makefile.am             | 4 ++--
 cpukit/rtems/include/Makefile.am     | 2 +-
 cpukit/rtems/inline/Makefile.am      | 2 +-
 cpukit/rtems/macros/Makefile.am      | 2 +-
 cpukit/rtems/src/Makefile.am         | 8 ++++----
 cpukit/sapi/Makefile.am              | 4 ++--
 cpukit/sapi/include/Makefile.am      | 2 +-
 cpukit/sapi/inline/Makefile.am       | 2 +-
 cpukit/sapi/macros/Makefile.am       | 2 +-
 cpukit/sapi/src/Makefile.am          | 8 ++++----
 cpukit/score/Makefile.am             | 4 ++--
 cpukit/score/cpu/Makefile.am         | 4 ++--
 cpukit/score/include/Makefile.am     | 2 +-
 cpukit/score/inline/Makefile.am      | 2 +-
 cpukit/score/macros/Makefile.am      | 2 +-
 cpukit/score/src/Makefile.am         | 8 ++++----
 cpukit/wrapup/Makefile.am            | 8 ++++----
 36 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/c/src/exec/include/Makefile.am b/c/src/exec/include/Makefile.am
index 1efc82b2ed..c47b90bfa3 100644
--- a/c/src/exec/include/Makefile.am
+++ b/c/src/exec/include/Makefile.am
@@ -23,4 +23,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/exec/rtems/Makefile.am b/c/src/exec/rtems/Makefile.am
index c13d1d51df..30e4cd2773 100644
--- a/c/src/exec/rtems/Makefile.am
+++ b/c/src/exec/rtems/Makefile.am
@@ -5,5 +5,5 @@
 
 SUBDIRS = include inline macros src
 
-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/exec/rtems/include/Makefile.am b/c/src/exec/rtems/include/Makefile.am
index 673d005fbc..bd4d70360c 100644
--- a/c/src/exec/rtems/include/Makefile.am
+++ b/c/src/exec/rtems/include/Makefile.am
@@ -44,4 +44,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems \
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/exec/rtems/inline/Makefile.am b/c/src/exec/rtems/inline/Makefile.am
index b261cbd7c9..3600fbb532 100644
--- a/c/src/exec/rtems/inline/Makefile.am
+++ b/c/src/exec/rtems/inline/Makefile.am
@@ -24,4 +24,4 @@ endif
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/exec/rtems/macros/Makefile.am b/c/src/exec/rtems/macros/Makefile.am
index 2dceb032cc..9137dd8a56 100644
--- a/c/src/exec/rtems/macros/Makefile.am
+++ b/c/src/exec/rtems/macros/Makefile.am
@@ -24,4 +24,4 @@ endif
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/exec/rtems/src/Makefile.am b/c/src/exec/rtems/src/Makefile.am
index 9336c4b4c2..7b5f53b757 100644
--- a/c/src/exec/rtems/src/Makefile.am
+++ b/c/src/exec/rtems/src/Makefile.am
@@ -3,9 +3,9 @@
 ##
 
 
-include $(top_srcdir)/../../../automake/multilib.am
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/automake/multilib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
 
 # We only build multiprocessing related files if HAS_MP was defined
 MP_C_FILES = eventmp.c mp.c msgmp.c partmp.c regionmp.c semmp.c signalmp.c \
@@ -76,4 +76,4 @@ all-local: ${ARCH} ${OBJS}
 
 EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/exec/sapi/Makefile.am b/c/src/exec/sapi/Makefile.am
index c13d1d51df..30e4cd2773 100644
--- a/c/src/exec/sapi/Makefile.am
+++ b/c/src/exec/sapi/Makefile.am
@@ -5,5 +5,5 @@
 
 SUBDIRS = include inline macros src
 
-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/exec/sapi/include/Makefile.am b/c/src/exec/sapi/include/Makefile.am
index 94f394bb14..00eb710cea 100644
--- a/c/src/exec/sapi/include/Makefile.am
+++ b/c/src/exec/sapi/include/Makefile.am
@@ -31,4 +31,4 @@ rtems/sptables.h: $(top_builddir)/config.status $(top_srcdir)/sapi/include/rtems
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/exec/sapi/inline/Makefile.am b/c/src/exec/sapi/inline/Makefile.am
index 7bca44de88..860ea46bc6 100644
--- a/c/src/exec/sapi/inline/Makefile.am
+++ b/c/src/exec/sapi/inline/Makefile.am
@@ -19,4 +19,4 @@ endif
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/exec/sapi/macros/Makefile.am b/c/src/exec/sapi/macros/Makefile.am
index a7b3296b98..ba9fe74460 100644
--- a/c/src/exec/sapi/macros/Makefile.am
+++ b/c/src/exec/sapi/macros/Makefile.am
@@ -19,4 +19,4 @@ endif
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/exec/sapi/src/Makefile.am b/c/src/exec/sapi/src/Makefile.am
index d7876864f5..f3dc578524 100644
--- a/c/src/exec/sapi/src/Makefile.am
+++ b/c/src/exec/sapi/src/Makefile.am
@@ -11,9 +11,9 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/multilib.am
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/automake/multilib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
 
 #
 # Add local stuff here using +=
@@ -25,4 +25,4 @@ 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/exec/score/Makefile.am b/c/src/exec/score/Makefile.am
index 4f3391f8df..96648a10e7 100644
--- a/c/src/exec/score/Makefile.am
+++ b/c/src/exec/score/Makefile.am
@@ -5,5 +5,5 @@
 
 SUBDIRS = include inline macros cpu src
 
-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/exec/score/cpu/Makefile.am b/c/src/exec/score/cpu/Makefile.am
index 3ade9d1639..3e84557494 100644
--- a/c/src/exec/score/cpu/Makefile.am
+++ b/c/src/exec/score/cpu/Makefile.am
@@ -9,5 +9,5 @@ SUBDIRS = $(RTEMS_CPU)
 ## DIST_SUBDIRS = \
 ## a29k hppa1.1 i386 i960 m68k mips64orion no_cpu powerpc sh sparc unix
 
-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/exec/score/include/Makefile.am b/c/src/exec/score/include/Makefile.am
index 1d5175340c..c9c3c730bd 100644
--- a/c/src/exec/score/include/Makefile.am
+++ b/c/src/exec/score/include/Makefile.am
@@ -61,4 +61,4 @@ rtems/score/cpuopts.h: rtems/score/cpuopts-tmp.h
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/exec/score/inline/Makefile.am b/c/src/exec/score/inline/Makefile.am
index 09d815c465..392c18d4b0 100644
--- a/c/src/exec/score/inline/Makefile.am
+++ b/c/src/exec/score/inline/Makefile.am
@@ -40,4 +40,4 @@ all-local: $(PREINSTALL_FILES)
 
 EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/exec/score/macros/Makefile.am b/c/src/exec/score/macros/Makefile.am
index 5abd88b5d0..2cefac6a56 100644
--- a/c/src/exec/score/macros/Makefile.am
+++ b/c/src/exec/score/macros/Makefile.am
@@ -40,4 +40,4 @@ all-local: $(PREINSTALL_FILES)
 
 EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES) README
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/exec/score/src/Makefile.am b/c/src/exec/score/src/Makefile.am
index 249c05e57c..407f9f51fb 100644
--- a/c/src/exec/score/src/Makefile.am
+++ b/c/src/exec/score/src/Makefile.am
@@ -3,9 +3,9 @@
 ##
 
 
-include $(top_srcdir)/../../../automake/multilib.am
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/automake/multilib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
 
 # We only build multiprocessing related files if HAS_MP was defined
 MP_C_FILES = mpci.c objectmp.c threadmp.c
@@ -77,4 +77,4 @@ all-local: ${ARCH} ${OBJS}
 
 EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES) Unlimited.txt
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/exec/wrapup/Makefile.am b/c/src/exec/wrapup/Makefile.am
index 66f9360ed1..a7c352b7c8 100644
--- a/c/src/exec/wrapup/Makefile.am
+++ b/c/src/exec/wrapup/Makefile.am
@@ -6,9 +6,9 @@
 LIBNAME = librtemscpu
 LIB = $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
 
-include $(top_srcdir)/../../../automake/multilib.am
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/automake/multilib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
 
 CPU_OBJS = $(wildcard ../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.rel)
 CORE_OBJS = $(wildcard ../score/src/$(ARCH)/*.o)
@@ -83,4 +83,4 @@ install-hook: $(LIB)
 
 all-local: ${ARCH} $(TMPINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/include/Makefile.am b/cpukit/include/Makefile.am
index 1efc82b2ed..c47b90bfa3 100644
--- a/cpukit/include/Makefile.am
+++ b/cpukit/include/Makefile.am
@@ -23,4 +23,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am
index c13d1d51df..30e4cd2773 100644
--- a/cpukit/rtems/Makefile.am
+++ b/cpukit/rtems/Makefile.am
@@ -5,5 +5,5 @@
 
 SUBDIRS = include inline macros src
 
-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/cpukit/rtems/include/Makefile.am b/cpukit/rtems/include/Makefile.am
index 673d005fbc..bd4d70360c 100644
--- a/cpukit/rtems/include/Makefile.am
+++ b/cpukit/rtems/include/Makefile.am
@@ -44,4 +44,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems \
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/rtems/inline/Makefile.am b/cpukit/rtems/inline/Makefile.am
index b261cbd7c9..3600fbb532 100644
--- a/cpukit/rtems/inline/Makefile.am
+++ b/cpukit/rtems/inline/Makefile.am
@@ -24,4 +24,4 @@ endif
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/rtems/macros/Makefile.am b/cpukit/rtems/macros/Makefile.am
index 2dceb032cc..9137dd8a56 100644
--- a/cpukit/rtems/macros/Makefile.am
+++ b/cpukit/rtems/macros/Makefile.am
@@ -24,4 +24,4 @@ endif
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/rtems/src/Makefile.am b/cpukit/rtems/src/Makefile.am
index 9336c4b4c2..7b5f53b757 100644
--- a/cpukit/rtems/src/Makefile.am
+++ b/cpukit/rtems/src/Makefile.am
@@ -3,9 +3,9 @@
 ##
 
 
-include $(top_srcdir)/../../../automake/multilib.am
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/automake/multilib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
 
 # We only build multiprocessing related files if HAS_MP was defined
 MP_C_FILES = eventmp.c mp.c msgmp.c partmp.c regionmp.c semmp.c signalmp.c \
@@ -76,4 +76,4 @@ all-local: ${ARCH} ${OBJS}
 
 EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index c13d1d51df..30e4cd2773 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -5,5 +5,5 @@
 
 SUBDIRS = include inline macros src
 
-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/cpukit/sapi/include/Makefile.am b/cpukit/sapi/include/Makefile.am
index 94f394bb14..00eb710cea 100644
--- a/cpukit/sapi/include/Makefile.am
+++ b/cpukit/sapi/include/Makefile.am
@@ -31,4 +31,4 @@ rtems/sptables.h: $(top_builddir)/config.status $(top_srcdir)/sapi/include/rtems
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/sapi/inline/Makefile.am b/cpukit/sapi/inline/Makefile.am
index 7bca44de88..860ea46bc6 100644
--- a/cpukit/sapi/inline/Makefile.am
+++ b/cpukit/sapi/inline/Makefile.am
@@ -19,4 +19,4 @@ endif
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/sapi/macros/Makefile.am b/cpukit/sapi/macros/Makefile.am
index a7b3296b98..ba9fe74460 100644
--- a/cpukit/sapi/macros/Makefile.am
+++ b/cpukit/sapi/macros/Makefile.am
@@ -19,4 +19,4 @@ endif
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/sapi/src/Makefile.am b/cpukit/sapi/src/Makefile.am
index d7876864f5..f3dc578524 100644
--- a/cpukit/sapi/src/Makefile.am
+++ b/cpukit/sapi/src/Makefile.am
@@ -11,9 +11,9 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/multilib.am
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/automake/multilib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
 
 #
 # Add local stuff here using +=
@@ -25,4 +25,4 @@ all-local: ${ARCH} ${OBJS}
 
 EXTRA_DIST = $(C_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index 4f3391f8df..96648a10e7 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -5,5 +5,5 @@
 
 SUBDIRS = include inline macros cpu src
 
-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/cpukit/score/cpu/Makefile.am b/cpukit/score/cpu/Makefile.am
index 3ade9d1639..3e84557494 100644
--- a/cpukit/score/cpu/Makefile.am
+++ b/cpukit/score/cpu/Makefile.am
@@ -9,5 +9,5 @@ SUBDIRS = $(RTEMS_CPU)
 ## DIST_SUBDIRS = \
 ## a29k hppa1.1 i386 i960 m68k mips64orion no_cpu powerpc sh sparc unix
 
-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/cpukit/score/include/Makefile.am b/cpukit/score/include/Makefile.am
index 1d5175340c..c9c3c730bd 100644
--- a/cpukit/score/include/Makefile.am
+++ b/cpukit/score/include/Makefile.am
@@ -61,4 +61,4 @@ rtems/score/cpuopts.h: rtems/score/cpuopts-tmp.h
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/score/inline/Makefile.am b/cpukit/score/inline/Makefile.am
index 09d815c465..392c18d4b0 100644
--- a/cpukit/score/inline/Makefile.am
+++ b/cpukit/score/inline/Makefile.am
@@ -40,4 +40,4 @@ all-local: $(PREINSTALL_FILES)
 
 EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/score/macros/Makefile.am b/cpukit/score/macros/Makefile.am
index 5abd88b5d0..2cefac6a56 100644
--- a/cpukit/score/macros/Makefile.am
+++ b/cpukit/score/macros/Makefile.am
@@ -40,4 +40,4 @@ all-local: $(PREINSTALL_FILES)
 
 EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES) README
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/score/src/Makefile.am b/cpukit/score/src/Makefile.am
index 249c05e57c..407f9f51fb 100644
--- a/cpukit/score/src/Makefile.am
+++ b/cpukit/score/src/Makefile.am
@@ -3,9 +3,9 @@
 ##
 
 
-include $(top_srcdir)/../../../automake/multilib.am
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/automake/multilib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
 
 # We only build multiprocessing related files if HAS_MP was defined
 MP_C_FILES = mpci.c objectmp.c threadmp.c
@@ -77,4 +77,4 @@ all-local: ${ARCH} ${OBJS}
 
 EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES) Unlimited.txt
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 66f9360ed1..a7c352b7c8 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -6,9 +6,9 @@
 LIBNAME = librtemscpu
 LIB = $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
 
-include $(top_srcdir)/../../../automake/multilib.am
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/automake/multilib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
 
 CPU_OBJS = $(wildcard ../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.rel)
 CORE_OBJS = $(wildcard ../score/src/$(ARCH)/*.o)
@@ -83,4 +83,4 @@ install-hook: $(LIB)
 
 all-local: ${ARCH} $(TMPINSTALL_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
-- 
cgit v1.2.3