summaryrefslogtreecommitdiffstats
path: root/cpukit/score/cpu
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-06-17 09:22:48 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-06-17 09:22:48 +0000
commit2f6261d731b86fa6839c0ffa4ae5b03d0fcd4234 (patch)
treef3f40d23a01c3759c2ef91a82f4e4d313a419ea8 /cpukit/score/cpu
parent2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-2f6261d731b86fa6839c0ffa4ae5b03d0fcd4234.tar.bz2
2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Include $(top_srcdir)/../../../automake/*.am. Use ../../../aclocal.
Diffstat (limited to 'cpukit/score/cpu')
-rw-r--r--cpukit/score/cpu/a29k/ChangeLog5
-rw-r--r--cpukit/score/cpu/a29k/Makefile.am10
-rw-r--r--cpukit/score/cpu/arm/ChangeLog5
-rw-r--r--cpukit/score/cpu/arm/Makefile.am10
-rw-r--r--cpukit/score/cpu/c4x/ChangeLog5
-rw-r--r--cpukit/score/cpu/c4x/Makefile.am10
-rw-r--r--cpukit/score/cpu/h8300/ChangeLog5
-rw-r--r--cpukit/score/cpu/h8300/Makefile.am10
-rw-r--r--cpukit/score/cpu/hppa1.1/ChangeLog5
-rw-r--r--cpukit/score/cpu/hppa1.1/Makefile.am10
-rw-r--r--cpukit/score/cpu/i386/ChangeLog5
-rw-r--r--cpukit/score/cpu/i386/Makefile.am10
-rw-r--r--cpukit/score/cpu/i960/ChangeLog10
-rw-r--r--cpukit/score/cpu/i960/Makefile.am10
-rw-r--r--cpukit/score/cpu/m68k/ChangeLog5
-rw-r--r--cpukit/score/cpu/m68k/Makefile.am10
-rw-r--r--cpukit/score/cpu/mips/ChangeLog5
-rw-r--r--cpukit/score/cpu/mips/Makefile.am10
-rw-r--r--cpukit/score/cpu/mips64orion/ChangeLog5
-rw-r--r--cpukit/score/cpu/mips64orion/Makefile.am10
-rw-r--r--cpukit/score/cpu/no_cpu/ChangeLog5
-rw-r--r--cpukit/score/cpu/no_cpu/Makefile.am10
-rw-r--r--cpukit/score/cpu/or16/ChangeLog5
-rw-r--r--cpukit/score/cpu/or16/Makefile.am10
-rw-r--r--cpukit/score/cpu/or32/ChangeLog5
-rw-r--r--cpukit/score/cpu/or32/Makefile.am10
-rw-r--r--cpukit/score/cpu/powerpc/ChangeLog5
-rw-r--r--cpukit/score/cpu/powerpc/Makefile.am10
-rw-r--r--cpukit/score/cpu/sh/ChangeLog5
-rw-r--r--cpukit/score/cpu/sh/Makefile.am10
-rw-r--r--cpukit/score/cpu/sparc/ChangeLog5
-rw-r--r--cpukit/score/cpu/sparc/Makefile.am10
-rw-r--r--cpukit/score/cpu/unix/ChangeLog5
-rw-r--r--cpukit/score/cpu/unix/Makefile.am10
34 files changed, 175 insertions, 85 deletions
diff --git a/cpukit/score/cpu/a29k/ChangeLog b/cpukit/score/cpu/a29k/ChangeLog
index b38d4f285d..42ba77a3a4 100644
--- a/cpukit/score/cpu/a29k/ChangeLog
+++ b/cpukit/score/cpu/a29k/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* asm.h: Use cpuopts.h instead of targopts.h.
diff --git a/cpukit/score/cpu/a29k/Makefile.am b/cpukit/score/cpu/a29k/Makefile.am
index 37292013b8..869747f8b9 100644
--- a/cpukit/score/cpu/a29k/Makefile.am
+++ b/cpukit/score/cpu/a29k/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -57,4 +57,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c cpu_asm.S rtems.c sig.S
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog
index 5714cdc740..c44400631e 100644
--- a/cpukit/score/cpu/arm/ChangeLog
+++ b/cpukit/score/cpu/arm/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2002-04-18 Jay Monkman <jtm@smoothsmoothie.com>
* rtems/score/cpu.h (CPU_ISR_Disable and CPU_ISR_Enable): Correct them
diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am
index 972edd942b..87eacd23b8 100644
--- a/cpukit/score/cpu/arm/Makefile.am
+++ b/cpukit/score/cpu/arm/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -56,4 +56,4 @@ all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c cpu_asm.S
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/c4x/ChangeLog b/cpukit/score/cpu/c4x/ChangeLog
index b21becb750..06f233289e 100644
--- a/cpukit/score/cpu/c4x/ChangeLog
+++ b/cpukit/score/cpu/c4x/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2001-04-03 Joel Sherrill <joel@OARcorp.com>
* Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
diff --git a/cpukit/score/cpu/c4x/Makefile.am b/cpukit/score/cpu/c4x/Makefile.am
index 13ef79d403..d4709f7473 100644
--- a/cpukit/score/cpu/c4x/Makefile.am
+++ b/cpukit/score/cpu/c4x/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -57,4 +57,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c irq.c cpu_asm.S rtems.c
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/h8300/ChangeLog b/cpukit/score/cpu/h8300/ChangeLog
index 66755d135e..7b18b5fc7c 100644
--- a/cpukit/score/cpu/h8300/ChangeLog
+++ b/cpukit/score/cpu/h8300/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2001-04-03 Joel Sherrill <joel@OARcorp.com>
* Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
diff --git a/cpukit/score/cpu/h8300/Makefile.am b/cpukit/score/cpu/h8300/Makefile.am
index a0c44b5aed..729bd8588d 100644
--- a/cpukit/score/cpu/h8300/Makefile.am
+++ b/cpukit/score/cpu/h8300/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -56,4 +56,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c cpu_asm.S rtems.c
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/hppa1.1/ChangeLog b/cpukit/score/cpu/hppa1.1/ChangeLog
index 54a4e47460..62154c674d 100644
--- a/cpukit/score/cpu/hppa1.1/ChangeLog
+++ b/cpukit/score/cpu/hppa1.1/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems/score/hppa.h: Remove rtems/score/targopts.h.
diff --git a/cpukit/score/cpu/hppa1.1/Makefile.am b/cpukit/score/cpu/hppa1.1/Makefile.am
index 9160aae99d..df96d5d269 100644
--- a/cpukit/score/cpu/hppa1.1/Makefile.am
+++ b/cpukit/score/cpu/hppa1.1/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -65,4 +65,4 @@ rtems/score/offsets.h: $(GENOFFSETS) cpu.h
$(GENOFFSETS) > $@
CLEANFILES = rtems/score/offsets.h
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/i386/ChangeLog b/cpukit/score/cpu/i386/ChangeLog
index 980a97e8f3..7158aa71b7 100644
--- a/cpukit/score/cpu/i386/ChangeLog
+++ b/cpukit/score/cpu/i386/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2002-03-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems/score/idtr.h: New file, extracted from libcpu/cpu.h.
diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am
index 20fca0d9f9..cb6b57ce34 100644
--- a/cpukit/score/cpu/i386/Makefile.am
+++ b/cpukit/score/cpu/i386/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -60,4 +60,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c cpu_asm.S rtems.S
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/i960/ChangeLog b/cpukit/score/cpu/i960/ChangeLog
index 81e89396a4..49cf8117c3 100644
--- a/cpukit/score/cpu/i960/ChangeLog
+++ b/cpukit/score/cpu/i960/ChangeLog
@@ -1,3 +1,13 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2001-04-03 Joel Sherrill <joel@OARcorp.com>
* Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
diff --git a/cpukit/score/cpu/i960/Makefile.am b/cpukit/score/cpu/i960/Makefile.am
index f164202c0c..75697ae607 100644
--- a/cpukit/score/cpu/i960/Makefile.am
+++ b/cpukit/score/cpu/i960/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -56,4 +56,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c cpu_asm.S i960RP.h rtems.S
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog
index 3e74719ad5..87ca2d2adc 100644
--- a/cpukit/score/cpu/m68k/ChangeLog
+++ b/cpukit/score/cpu/m68k/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2002-05-28 Chris Johns <ccj@acm.org>
* rtems/score/m68k.h: Per PR227, mc68060 does not require FPSP
diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am
index 8572a41a85..975e268200 100644
--- a/cpukit/score/cpu/m68k/Makefile.am
+++ b/cpukit/score/cpu/m68k/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -56,4 +56,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c cpu_asm.S memcpy.c rtems.S
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog
index 25d87c372a..7d724394d9 100644
--- a/cpukit/score/cpu/mips/ChangeLog
+++ b/cpukit/score/cpu/mips/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2001-04-03 Joel Sherrill <joel@OARcorp.com>
* Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am
index ad139cce44..700825271e 100644
--- a/cpukit/score/cpu/mips/Makefile.am
+++ b/cpukit/score/cpu/mips/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -56,4 +56,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c cpu_asm.S rtems.c
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/mips64orion/ChangeLog b/cpukit/score/cpu/mips64orion/ChangeLog
index 9649e7b8d9..497164fcc3 100644
--- a/cpukit/score/cpu/mips64orion/ChangeLog
+++ b/cpukit/score/cpu/mips64orion/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* asm.h: Use cpuopts.h instead of targopts.h.
diff --git a/cpukit/score/cpu/mips64orion/Makefile.am b/cpukit/score/cpu/mips64orion/Makefile.am
index a67be091d0..43b21c1209 100644
--- a/cpukit/score/cpu/mips64orion/Makefile.am
+++ b/cpukit/score/cpu/mips64orion/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -56,4 +56,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c cpu_asm.S rtems.c
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/no_cpu/ChangeLog b/cpukit/score/cpu/no_cpu/ChangeLog
index 6fdb2d45d2..07fd24aefe 100644
--- a/cpukit/score/cpu/no_cpu/ChangeLog
+++ b/cpukit/score/cpu/no_cpu/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2001-04-03 Joel Sherrill <joel@OARcorp.com>
* Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am
index eade933b7d..fac9fe12df 100644
--- a/cpukit/score/cpu/no_cpu/Makefile.am
+++ b/cpukit/score/cpu/no_cpu/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -54,4 +54,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c cpu_asm.c rtems.c
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/or16/ChangeLog b/cpukit/score/cpu/or16/ChangeLog
index 1bacf47413..6566f1d512 100644
--- a/cpukit/score/cpu/or16/ChangeLog
+++ b/cpukit/score/cpu/or16/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2001-04-03 Joel Sherrill <joel@OARcorp.com>
* Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
diff --git a/cpukit/score/cpu/or16/Makefile.am b/cpukit/score/cpu/or16/Makefile.am
index 6775f67956..40b601d399 100644
--- a/cpukit/score/cpu/or16/Makefile.am
+++ b/cpukit/score/cpu/or16/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -54,4 +54,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c cpu_asm.c rtems.c
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/or32/ChangeLog b/cpukit/score/cpu/or32/ChangeLog
index 130febf6a6..4bc3394b5b 100644
--- a/cpukit/score/cpu/or32/ChangeLog
+++ b/cpukit/score/cpu/or32/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2001-04-03 Joel Sherrill <joel@OARcorp.com>
* Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
diff --git a/cpukit/score/cpu/or32/Makefile.am b/cpukit/score/cpu/or32/Makefile.am
index d975cd39c1..c67792b5d2 100644
--- a/cpukit/score/cpu/or32/Makefile.am
+++ b/cpukit/score/cpu/or32/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -54,4 +54,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c cpu_asm.c rtems.c
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog
index c8a96812b0..435b2953db 100644
--- a/cpukit/score/cpu/powerpc/ChangeLog
+++ b/cpukit/score/cpu/powerpc/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2002-05-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems/score/ppc.h: Remove PPC_DEBUG_MODEL.
diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am
index d19d12eeca..4c7146f274 100644
--- a/cpukit/score/cpu/powerpc/Makefile.am
+++ b/cpukit/score/cpu/powerpc/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -73,4 +73,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc \
all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
$(TMPINSTALL_FILES)
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog
index c1d183a394..e60342239c 100644
--- a/cpukit/score/cpu/sh/ChangeLog
+++ b/cpukit/score/cpu/sh/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2002-04-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems.c: Adaptation to gcc-3.0.x.
diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am
index 04ac682768..041a5b96c1 100644
--- a/cpukit/score/cpu/sh/Makefile.am
+++ b/cpukit/score/cpu/sh/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -54,4 +54,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c rtems.c
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog
index 34501eda31..6d698d9a32 100644
--- a/cpukit/score/cpu/sparc/ChangeLog
+++ b/cpukit/score/cpu/sparc/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2002-04-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* cpu.c: Remove call to sparc_init_tbr/NO_TABLE_MOVE.
diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am
index 62b3b8bbc5..b6222466f5 100644
--- a/cpukit/score/cpu/sparc/Makefile.am
+++ b/cpukit/score/cpu/sparc/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
@@ -56,4 +56,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
EXTRA_DIST = cpu.c cpu_asm.S rtems.S
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/unix/ChangeLog b/cpukit/score/cpu/unix/ChangeLog
index 1510ea7078..0bb8de1bf6 100644
--- a/cpukit/score/cpu/unix/ChangeLog
+++ b/cpukit/score/cpu/unix/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include $(top_srcdir)/../../../automake/*.am.
+ Use ../../../aclocal.
+
2001-04-03 Joel Sherrill <joel@OARcorp.com>
* Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
diff --git a/cpukit/score/cpu/unix/Makefile.am b/cpukit/score/cpu/unix/Makefile.am
index 1f3916fd8d..3d100423aa 100644
--- a/cpukit/score/cpu/unix/Makefile.am
+++ b/cpukit/score/cpu/unix/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../aclocal
-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
AM_CPPFLAGS += -DCPU_SYNC_IO $(LIBC_DEFINES)
@@ -47,4 +47,4 @@ all-local: $(ARCH) $(rtems_cpu_rel_OBJECTS) $(REL)
EXTRA_DIST = cpu.c
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am