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

	Makefile.am: Reflect having moved automake.
	mpc505/Makefile.am: Reflect having moved automake.
	mpc505/ictrl/Makefile.am: Reflect having moved automake.
	mpc505/timer/Makefile.am: Reflect having moved automake.
	mpc505/vectors/Makefile.am: Reflect having moved automake.
	mpc6xx/Makefile.am: Reflect having moved automake.
	mpc6xx/clock/Makefile.am: Reflect having moved automake.
	mpc6xx/exceptions/Makefile.am: Reflect having moved automake.
	mpc6xx/mmu/Makefile.am: Reflect having moved automake.
	mpc6xx/timer/Makefile.am: Reflect having moved automake.
	mpc6xx/wrapup/Makefile.am: Reflect having moved automake.
	mpc8260/Makefile.am: Reflect having moved automake.
	mpc8260/clock/Makefile.am: Reflect having moved automake.
	mpc8260/console-generic/Makefile.am: Reflect having moved automake.
	mpc8260/cpm/Makefile.am: Reflect having moved automake.
	mpc8260/exceptions/Makefile.am: Reflect having moved automake.
	mpc8260/mmu/Makefile.am: Reflect having moved automake.
	mpc8260/timer/Makefile.am: Reflect having moved automake.
	mpc8xx/Makefile.am: Reflect having moved automake.
	mpc8xx/clock/Makefile.am: Reflect having moved automake.
	mpc8xx/console-generic/Makefile.am: Reflect having moved automake.
	mpc8xx/cpm/Makefile.am: Reflect having moved automake.
	mpc8xx/exceptions/Makefile.am: Reflect having moved automake.
	mpc8xx/mmu/Makefile.am: Reflect having moved automake.
	mpc8xx/timer/Makefile.am: Reflect having moved automake.
	ppc403/Makefile.am: Reflect having moved automake.
	ppc403/clock/Makefile.am: Reflect having moved automake.
	ppc403/console/Makefile.am: Reflect having moved automake.
	ppc403/ictrl/Makefile.am: Reflect having moved automake.
	ppc403/timer/Makefile.am: Reflect having moved automake.
	ppc403/tty_drv/Makefile.am: Reflect having moved automake.
	ppc403/vectors/Makefile.am: Reflect having moved automake.
	shared/Makefile.am: Reflect having moved automake.
	shared/include/Makefile.am: Reflect having moved automake.
	shared/src/Makefile.am: Reflect having moved automake.
	wrapup/Makefile.am: Reflect having moved automake.

37 files changed, 140 insertions, 101 deletions

diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index a13d94d3f7..ed144e54c7 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,42 @@
+2003-08-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	Makefile.am: Reflect having moved automake.
+	mpc505/Makefile.am: Reflect having moved automake.
+	mpc505/ictrl/Makefile.am: Reflect having moved automake.
+	mpc505/timer/Makefile.am: Reflect having moved automake.
+	mpc505/vectors/Makefile.am: Reflect having moved automake.
+	mpc6xx/Makefile.am: Reflect having moved automake.
+	mpc6xx/clock/Makefile.am: Reflect having moved automake.
+	mpc6xx/exceptions/Makefile.am: Reflect having moved automake.
+	mpc6xx/mmu/Makefile.am: Reflect having moved automake.
+	mpc6xx/timer/Makefile.am: Reflect having moved automake.
+	mpc6xx/wrapup/Makefile.am: Reflect having moved automake.
+	mpc8260/Makefile.am: Reflect having moved automake.
+	mpc8260/clock/Makefile.am: Reflect having moved automake.
+	mpc8260/console-generic/Makefile.am: Reflect having moved automake.
+	mpc8260/cpm/Makefile.am: Reflect having moved automake.
+	mpc8260/exceptions/Makefile.am: Reflect having moved automake.
+	mpc8260/mmu/Makefile.am: Reflect having moved automake.
+	mpc8260/timer/Makefile.am: Reflect having moved automake.
+	mpc8xx/Makefile.am: Reflect having moved automake.
+	mpc8xx/clock/Makefile.am: Reflect having moved automake.
+	mpc8xx/console-generic/Makefile.am: Reflect having moved automake.
+	mpc8xx/cpm/Makefile.am: Reflect having moved automake.
+	mpc8xx/exceptions/Makefile.am: Reflect having moved automake.
+	mpc8xx/mmu/Makefile.am: Reflect having moved automake.
+	mpc8xx/timer/Makefile.am: Reflect having moved automake.
+	ppc403/Makefile.am: Reflect having moved automake.
+	ppc403/clock/Makefile.am: Reflect having moved automake.
+	ppc403/console/Makefile.am: Reflect having moved automake.
+	ppc403/ictrl/Makefile.am: Reflect having moved automake.
+	ppc403/timer/Makefile.am: Reflect having moved automake.
+	ppc403/tty_drv/Makefile.am: Reflect having moved automake.
+	ppc403/vectors/Makefile.am: Reflect having moved automake.
+	shared/Makefile.am: Reflect having moved automake.
+	shared/include/Makefile.am: Reflect having moved automake.
+	shared/src/Makefile.am: Reflect having moved automake.
+	wrapup/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/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am
index 9c7c4ae72c..294043b35e 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -53,5 +53,5 @@ SUBDIRS = $(SHARED_LIB) $(CPU_SUBDIR) wrapup
 
 all-local: $(TMPINSTALL_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/lib/libcpu/powerpc/mpc505/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/Makefile.am
index 35b4949ae3..bb3c700e9e 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc505/Makefile.am
@@ -5,5 +5,5 @@
 
 SUBDIRS = ictrl vectors timer
 
-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/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am
index 4da78c56ca..47f6f17535 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am
@@ -11,8 +11,8 @@ include_HEADERS = ictrl.h
 
 ictrl_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -35,4 +35,4 @@ all-local: $(ARCH) $(ictrl_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = ictrl.c ictrl.h
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
index c411f1ff83..4babeaccf4 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
@@ -9,8 +9,8 @@ C_FILES = timer.c
 
 timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -25,4 +25,4 @@ all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
 EXTRA_DIST = timer.c
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am
index 14ab802740..8d97d03710 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am
@@ -10,8 +10,8 @@ S_FILES = vectors.S
 
 vectors_rel_OBJECTS = $(S_FILES:%.S=${ARCH}/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -24,4 +24,4 @@ all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = vectors.S
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am
index c315e6a524..230e82d2b6 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am
@@ -5,5 +5,5 @@
 
 SUBDIRS = exceptions mmu clock timer wrapup
 
-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/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
index 905bb09253..65a9a13f17 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
@@ -11,8 +11,8 @@ include_libcpu_HEADERS = c_clock.h
 
 c_clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 $(PROJECT_INCLUDE)/libcpu:
 	$(mkinstalldirs) $@
@@ -30,4 +30,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(c_clock_rel_OBJECTS)
 
 EXTRA_DIST = c_clock.c c_clock.h
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
index 77252f9d46..a18e420e2a 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
@@ -16,8 +16,8 @@ include_libcpu_HEADERS = raw_exception.h
 exceptions_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
     $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 $(PROJECT_INCLUDE)/libcpu:
 	$(mkinstalldirs) $@
@@ -40,4 +40,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM)
 
 EXTRA_DIST = asm_utils.S raw_exception.c raw_exception.h
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
index efb0841856..183fd88c90 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
@@ -15,8 +15,8 @@ include_libcpu_HEADERS = bat.h pte121.h
 
 mmu_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 $(PROJECT_INCLUDE)/libcpu:
 	$(mkinstalldirs) $@
@@ -39,4 +39,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(mmu_rel_OBJECTS) $(PGM)
 
 EXTRA_DIST = bat.c bat.h mmuAsm.S pte121.c pte121.h
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
index c411f1ff83..4babeaccf4 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
@@ -9,8 +9,8 @@ C_FILES = timer.c
 
 timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -25,4 +25,4 @@ all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
 EXTRA_DIST = timer.c
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am
index 83c3f4a327..cfba3ebd2b 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am
@@ -13,8 +13,8 @@ OBJS = \
     $(foreach piece, $(GENERIC_FILES), ../../mpc6xx/$(piece)/$(ARCH)/*.$(OBJEXT))
 LIB = $(ARCH)/libcpuspec.a
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -27,4 +27,4 @@ $(LIB): ${OBJS}
 
 all-local: ${ARCH} $(LIB)
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am
index 3219b48f9b..b3988e579a 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am
@@ -24,5 +24,5 @@ $(PROJECT_INCLUDE)/mpc8260/%.h: include/%.h
 
 all-local: $(PREINSTALL_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/lib/libcpu/powerpc/mpc8260/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/clock/Makefile.am
index 21b324bf9c..e99a32f08a 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/clock/Makefile.am
@@ -10,8 +10,8 @@ C_FILES = clock.c
 
 clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -24,4 +24,4 @@ all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = $(C_FILES)
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/console-generic/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/console-generic/Makefile.am
index ee8e183d22..3f64451004 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/console-generic/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/console-generic/Makefile.am
@@ -10,8 +10,8 @@ C_FILES = console-generic.c
 
 console_generic_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -24,4 +24,4 @@ all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = $(C_FILES)
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/cpm/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/cpm/Makefile.am
index d7de28480c..5a796a81c8 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/cpm/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/cpm/Makefile.am
@@ -10,8 +10,8 @@ C_FILES = cp.c dpram.c brg.c
 
 cpm_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -24,4 +24,4 @@ all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = $(C_FILES)
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am
index 4df1f657ba..1b00b276e7 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am
@@ -15,8 +15,8 @@ include_libcpu_HEADERS = raw_exception.h
 exceptions_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
     $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 $(PROJECT_INCLUDE)/libcpu:
 	$(mkinstalldirs) $@
@@ -39,4 +39,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM)
 
 EXTRA_DIST = asm_utils.S raw_exception.c raw_exception.h
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/mmu/Makefile.am
index ae88dcb573..f62c09a0a6 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/mmu/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/mmu/Makefile.am
@@ -10,8 +10,8 @@ C_FILES = mmu.c
 
 clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -24,4 +24,4 @@ all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = $(C_FILES)
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/timer/Makefile.am
index e86b256607..109bafeac1 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/timer/Makefile.am
@@ -10,8 +10,8 @@ C_FILES = timer.c
 
 timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -24,4 +24,4 @@ all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = $(C_FILES)
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am
index 86fd518c6f..94100985ed 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am
@@ -24,5 +24,5 @@ $(PROJECT_INCLUDE)/mpc8xx/%.h: include/%.h
 
 all-local: $(PREINSTALL_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/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am
index 21b324bf9c..e99a32f08a 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am
@@ -10,8 +10,8 @@ C_FILES = clock.c
 
 clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -24,4 +24,4 @@ all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = $(C_FILES)
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am
index ee8e183d22..3f64451004 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am
@@ -10,8 +10,8 @@ C_FILES = console-generic.c
 
 console_generic_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -24,4 +24,4 @@ all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = $(C_FILES)
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am
index 8cc10f0f70..da26052a5d 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am
@@ -10,8 +10,8 @@ C_FILES = cp.c dpram.c
 
 clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -24,4 +24,4 @@ all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = $(C_FILES)
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am
index 4df1f657ba..1b00b276e7 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am
@@ -15,8 +15,8 @@ include_libcpu_HEADERS = raw_exception.h
 exceptions_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
     $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 $(PROJECT_INCLUDE)/libcpu:
 	$(mkinstalldirs) $@
@@ -39,4 +39,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM)
 
 EXTRA_DIST = asm_utils.S raw_exception.c raw_exception.h
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am
index ae88dcb573..f62c09a0a6 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am
@@ -10,8 +10,8 @@ C_FILES = mmu.c
 
 clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -24,4 +24,4 @@ all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = $(C_FILES)
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am
index e86b256607..109bafeac1 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am
@@ -10,8 +10,8 @@ C_FILES = timer.c
 
 timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -24,4 +24,4 @@ all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = $(C_FILES)
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am
index 4987e5e65f..a1d607dad2 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am
@@ -10,5 +10,5 @@ if ppc405
 SUBDIRS = console tty_drv clock timer vectors ictrl
 endif
 
-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/lib/libcpu/powerpc/ppc403/clock/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
index ea058e0198..8a8c4a8863 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
@@ -9,8 +9,8 @@ C_FILES = clock.c
 
 clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -25,4 +25,4 @@ all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
 EXTRA_DIST = clock.c
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
index 7640d19030..007abbf73e 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
@@ -14,8 +14,8 @@ endif
 
 console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -30,4 +30,4 @@ all-local: $(ARCH) $(console_rel_OBJECTS) $(PGM)
 
 EXTRA_DIST = console.c console.c.polled console405.c
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
index d039e9dfbb..0e2e055466 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
@@ -11,8 +11,8 @@ include_HEADERS = ictrl.h
 
 ictrl_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -35,4 +35,4 @@ all-local: $(ARCH) $(ictrl_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = ictrl.c ictrl.h
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am
index c411f1ff83..4babeaccf4 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am
@@ -9,8 +9,8 @@ C_FILES = timer.c
 
 timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -25,4 +25,4 @@ all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
 EXTRA_DIST = timer.c
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/tty_drv/Makefile.am
index f5086a5211..ae651145c6 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/tty_drv/Makefile.am
@@ -11,8 +11,8 @@ C_FILES = tty_drv.c
 
 tty_drv_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -27,4 +27,4 @@ all-local: $(ARCH) $(tty_drv_rel_OBJECTS) $(PGM)
 
 EXTRA_DIST = tty_drv.c tty_drv.h
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am
index 5c879c0bc7..839bdb3721 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am
@@ -10,8 +10,8 @@ S_FILES = vectors.S align_h.S
 
 vectors_rel_OBJECTS = $(S_FILES:%.S=${ARCH}/%.$(OBJEXT))
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -24,4 +24,4 @@ all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = $(S_FILES) README
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/shared/Makefile.am b/c/src/lib/libcpu/powerpc/shared/Makefile.am
index 32a9f05a24..2eb44aa4de 100644
--- a/c/src/lib/libcpu/powerpc/shared/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/shared/Makefile.am
@@ -5,5 +5,5 @@
 
 SUBDIRS = include 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/lib/libcpu/powerpc/shared/include/Makefile.am b/c/src/lib/libcpu/powerpc/shared/include/Makefile.am
index 9bfa37e804..f06b756d2b 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/shared/include/Makefile.am
@@ -13,8 +13,8 @@ include_libcpu_HEADERS = spr.h io.h mmu.h page.h byteorder.h pgtable.h \
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 LIB = $(ARCH)/libcpuspec.a
 
@@ -40,4 +40,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
 
 EXTRA_DIST = cpuIdent.c
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/shared/src/Makefile.am b/c/src/lib/libcpu/powerpc/shared/src/Makefile.am
index 623a6fad80..ed90307313 100644
--- a/c/src/lib/libcpu/powerpc/shared/src/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/shared/src/Makefile.am
@@ -14,8 +14,8 @@ include_libcpu_HEADERS = cache_.h cache.h stackTrace.h
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 AM_CPPFLAGS += -I$(srcdir)
 
@@ -37,4 +37,4 @@ CLEANFILES = cache.h
 
 EXTRA_DIST = cache.c cache_.h
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am
index 72f7621729..20e1e0b706 100644
--- a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am
@@ -14,8 +14,8 @@ FAMILY_OBJS = \
 
 LIB = $(ARCH)/libcpu.a
 
-include $(top_srcdir)/../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../automake/lib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -33,4 +33,4 @@ $(LIB): $(libcpu_a_OBJECTS)
 
 all-local: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am