2002-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* configure.ac: Require autoconf-2.57 + automake-1.7.2. * Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
author: Ralf Corsepius <ralf.corsepius@rtems.org> 2002-12-11 17:08:38 +0000
committer: Ralf Corsepius <ralf.corsepius@rtems.org> 2002-12-11 17:08:38 +0000
commit: 53021d4abb385455ec445fd53744427c095dd7c5 (patch)
tree: 0b6cee839acaff783748574f2f6ed814ac939786 /cpukit
parent: 2002-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
download: rtems-53021d4abb385455ec445fd53744427c095dd7c5.tar.bz2
48 files changed, 158 insertions, 110 deletions
diff --git a/cpukit/score/cpu/a29k/ChangeLog b/cpukit/score/cpu/a29k/ChangeLog
index 38e5b72147..508c40b0a6 100644
--- a/cpukit/score/cpu/a29k/ChangeLog
+++ b/cpukit/score/cpu/a29k/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/a29k/Makefile.am b/cpukit/score/cpu/a29k/Makefile.am
index e3e8ac3979..32ed3d2a90 100644
--- a/cpukit/score/cpu/a29k/Makefile.am
+++ b/cpukit/score/cpu/a29k/Makefile.am
@@ -33,16 +33,14 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = cpu_asm.S sig.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES) $(S_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/a29k/configure.ac b/cpukit/score/cpu/a29k/configure.ac
index 46fa4844a2..2ba4073b41 100644
--- a/cpukit/score/cpu/a29k/configure.ac
+++ b/cpukit/score/cpu/a29k/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-a29k],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu_asm.S])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog
index f375fce6c7..85cb79e851 100644
--- a/cpukit/score/cpu/arm/ChangeLog
+++ b/cpukit/score/cpu/arm/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am
index 31bfcbf4fe..47a609d13e 100644
--- a/cpukit/score/cpu/arm/Makefile.am
+++ b/cpukit/score/cpu/arm/Makefile.am
@@ -33,19 +33,17 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES) $(S_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
-all: $(ARCH) $(PREINSTALL_FILES) $(libscorecpu_a_OBJECTS) $(LIB) \
+all: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
     $(TMPINSTALL_FILES)
 
 EXTRA_DIST = cpu.c cpu_asm.S
diff --git a/cpukit/score/cpu/arm/configure.ac b/cpukit/score/cpu/arm/configure.ac
index 1e5f40d56e..d60a19052a 100644
--- a/cpukit/score/cpu/arm/configure.ac
+++ b/cpukit/score/cpu/arm/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-arm],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu_asm.S])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/c4x/ChangeLog b/cpukit/score/cpu/c4x/ChangeLog
index a1e75f6baa..0a3b7d947a 100644
--- a/cpukit/score/cpu/c4x/ChangeLog
+++ b/cpukit/score/cpu/c4x/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/c4x/Makefile.am b/cpukit/score/cpu/c4x/Makefile.am
index 59dbb6b34b..aa4d738df2 100644
--- a/cpukit/score/cpu/c4x/Makefile.am
+++ b/cpukit/score/cpu/c4x/Makefile.am
@@ -33,16 +33,14 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c irq.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES) $(S_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/c4x/configure.ac b/cpukit/score/cpu/c4x/configure.ac
index 3a27df8dbc..20acef65c1 100644
--- a/cpukit/score/cpu/c4x/configure.ac
+++ b/cpukit/score/cpu/c4x/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-c4x],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu_asm.S])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/h8300/ChangeLog b/cpukit/score/cpu/h8300/ChangeLog
index 5bce2892f8..53b3e7aed3 100644
--- a/cpukit/score/cpu/h8300/ChangeLog
+++ b/cpukit/score/cpu/h8300/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/h8300/Makefile.am b/cpukit/score/cpu/h8300/Makefile.am
index 1cc419c26b..221b211011 100644
--- a/cpukit/score/cpu/h8300/Makefile.am
+++ b/cpukit/score/cpu/h8300/Makefile.am
@@ -32,16 +32,14 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES) $(S_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/h8300/configure.ac b/cpukit/score/cpu/h8300/configure.ac
index 970845b75e..b9a9f2a1ed 100644
--- a/cpukit/score/cpu/h8300/configure.ac
+++ b/cpukit/score/cpu/h8300/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-h8300],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu_asm.S])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/hppa1.1/ChangeLog b/cpukit/score/cpu/hppa1.1/ChangeLog
index 2eb543b948..ee1c58a6a2 100644
--- a/cpukit/score/cpu/hppa1.1/ChangeLog
+++ b/cpukit/score/cpu/hppa1.1/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/hppa1.1/Makefile.am b/cpukit/score/cpu/hppa1.1/Makefile.am
index 0fb83b04d0..920e5501e0 100644
--- a/cpukit/score/cpu/hppa1.1/Makefile.am
+++ b/cpukit/score/cpu/hppa1.1/Makefile.am
@@ -34,16 +34,14 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES) $(S_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) rtems/score/offsets.h $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/hppa1.1/configure.ac b/cpukit/score/cpu/hppa1.1/configure.ac
index fe30d120cf..8d95f73c71 100644
--- a/cpukit/score/cpu/hppa1.1/configure.ac
+++ b/cpukit/score/cpu/hppa1.1/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-hppa1.1],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu_asm.S])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/i386/ChangeLog b/cpukit/score/cpu/i386/ChangeLog
index 6f5f286653..0fcd00b84a 100644
--- a/cpukit/score/cpu/i386/ChangeLog
+++ b/cpukit/score/cpu/i386/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am
index 4d4baa60cb..8364de60a8 100644
--- a/cpukit/score/cpu/i386/Makefile.am
+++ b/cpukit/score/cpu/i386/Makefile.am
@@ -38,14 +38,12 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
 LIB = $(ARCH)/libscorecpu.a
 
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
-libscorecpu_a_OBJECTS = $(C_O_FILES) $(S_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/i386/configure.ac b/cpukit/score/cpu/i386/configure.ac
index 1fe6a00b48..77b7ad5006 100644
--- a/cpukit/score/cpu/i386/configure.ac
+++ b/cpukit/score/cpu/i386/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-i386],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu_asm.S])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/i960/ChangeLog b/cpukit/score/cpu/i960/ChangeLog
index 567928eb27..df9e186e12 100644
--- a/cpukit/score/cpu/i960/ChangeLog
+++ b/cpukit/score/cpu/i960/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/i960/Makefile.am b/cpukit/score/cpu/i960/Makefile.am
index b812f260f9..c0376aea65 100644
--- a/cpukit/score/cpu/i960/Makefile.am
+++ b/cpukit/score/cpu/i960/Makefile.am
@@ -32,16 +32,14 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES) $(S_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/i960/configure.ac b/cpukit/score/cpu/i960/configure.ac
index 0408f75bfb..067e6964cc 100644
--- a/cpukit/score/cpu/i960/configure.ac
+++ b/cpukit/score/cpu/i960/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-i960],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu_asm.S])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog
index cb48e99e6a..206a31cc3a 100644
--- a/cpukit/score/cpu/m68k/ChangeLog
+++ b/cpukit/score/cpu/m68k/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am
index a733306bcd..8dc021be85 100644
--- a/cpukit/score/cpu/m68k/Makefile.am
+++ b/cpukit/score/cpu/m68k/Makefile.am
@@ -32,16 +32,14 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES) $(S_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/m68k/configure.ac b/cpukit/score/cpu/m68k/configure.ac
index 89f7fe8abc..ee57c640ff 100644
--- a/cpukit/score/cpu/m68k/configure.ac
+++ b/cpukit/score/cpu/m68k/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-m68k],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu_asm.S])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog
index cd1bd99e0f..13d5377691 100644
--- a/cpukit/score/cpu/mips/ChangeLog
+++ b/cpukit/score/cpu/mips/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am
index 07908e0dea..ef6d7324f7 100644
--- a/cpukit/score/cpu/mips/Makefile.am
+++ b/cpukit/score/cpu/mips/Makefile.am
@@ -32,16 +32,14 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES) $(S_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/mips/configure.ac b/cpukit/score/cpu/mips/configure.ac
index b0093745ba..9f652414c5 100644
--- a/cpukit/score/cpu/mips/configure.ac
+++ b/cpukit/score/cpu/mips/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-mips],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu_asm.S])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/mips64orion/ChangeLog b/cpukit/score/cpu/mips64orion/ChangeLog
index 88d0901aa1..2437fa190b 100644
--- a/cpukit/score/cpu/mips64orion/ChangeLog
+++ b/cpukit/score/cpu/mips64orion/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/mips64orion/Makefile.am b/cpukit/score/cpu/mips64orion/Makefile.am
index 06cfe95603..ccdab2bda9 100644
--- a/cpukit/score/cpu/mips64orion/Makefile.am
+++ b/cpukit/score/cpu/mips64orion/Makefile.am
@@ -32,16 +32,14 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES) $(S_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/mips64orion/configure.ac b/cpukit/score/cpu/mips64orion/configure.ac
index 46fdf4737d..f0990ececc 100644
--- a/cpukit/score/cpu/mips64orion/configure.ac
+++ b/cpukit/score/cpu/mips64orion/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-mips64orion],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu_asm.S])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/no_cpu/ChangeLog b/cpukit/score/cpu/no_cpu/ChangeLog
index c7ef83fd13..1924dd58d6 100644
--- a/cpukit/score/cpu/no_cpu/ChangeLog
+++ b/cpukit/score/cpu/no_cpu/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am
index 6b95728dec..35c5a9fe70 100644
--- a/cpukit/score/cpu/no_cpu/Makefile.am
+++ b/cpukit/score/cpu/no_cpu/Makefile.am
@@ -33,13 +33,11 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c cpu_asm.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/no_cpu/configure.ac b/cpukit/score/cpu/no_cpu/configure.ac
index b5ecf99265..052ea482ba 100644
--- a/cpukit/score/cpu/no_cpu/configure.ac
+++ b/cpukit/score/cpu/no_cpu/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-no_cpu],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu_asm.c])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/or32/ChangeLog b/cpukit/score/cpu/or32/ChangeLog
index afd340ecbe..3dbdca096e 100644
--- a/cpukit/score/cpu/or32/ChangeLog
+++ b/cpukit/score/cpu/or32/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/or32/Makefile.am b/cpukit/score/cpu/or32/Makefile.am
index d3e793ebce..092928184d 100644
--- a/cpukit/score/cpu/or32/Makefile.am
+++ b/cpukit/score/cpu/or32/Makefile.am
@@ -33,13 +33,11 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c cpu_asm.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/or32/configure.ac b/cpukit/score/cpu/or32/configure.ac
index 6259c6545f..e46b492728 100644
--- a/cpukit/score/cpu/or32/configure.ac
+++ b/cpukit/score/cpu/or32/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-or32],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu_asm.c])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog
index 228e974f1c..583852d153 100644
--- a/cpukit/score/cpu/powerpc/ChangeLog
+++ b/cpukit/score/cpu/powerpc/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am
index b69bac7395..e77b61d4d6 100644
--- a/cpukit/score/cpu/powerpc/Makefile.am
+++ b/cpukit/score/cpu/powerpc/Makefile.am
@@ -61,14 +61,12 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc \
     $(include_rtems_powerpc_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = # cpu.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = # cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
-libscorecpu_a_OBJECTS = $(C_O_FILES) $(S_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/powerpc/configure.ac b/cpukit/score/cpu/powerpc/configure.ac
index 2593514205..f9b352b662 100644
--- a/cpukit/score/cpu/powerpc/configure.ac
+++ b/cpukit/score/cpu/powerpc/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-powerpc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([asm.h])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog
index 1300484dac..1c0687a5ef 100644
--- a/cpukit/score/cpu/sh/ChangeLog
+++ b/cpukit/score/cpu/sh/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am
index a07e63a793..fb0b6ec416 100644
--- a/cpukit/score/cpu/sh/Makefile.am
+++ b/cpukit/score/cpu/sh/Makefile.am
@@ -33,13 +33,11 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/sh/configure.ac b/cpukit/score/cpu/sh/configure.ac
index 7456686f15..295fd69518 100644
--- a/cpukit/score/cpu/sh/configure.ac
+++ b/cpukit/score/cpu/sh/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-sh],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([asm.h])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog
index 9577cb03b4..d29cd0ae03 100644
--- a/cpukit/score/cpu/sparc/ChangeLog
+++ b/cpukit/score/cpu/sparc/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am
index 118f675f37..3a7c07ca91 100644
--- a/cpukit/score/cpu/sparc/Makefile.am
+++ b/cpukit/score/cpu/sparc/Makefile.am
@@ -32,16 +32,14 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES) $(S_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
diff --git a/cpukit/score/cpu/sparc/configure.ac b/cpukit/score/cpu/sparc/configure.ac
index e0bedb8667..d3f7348014 100644
--- a/cpukit/score/cpu/sparc/configure.ac
+++ b/cpukit/score/cpu/sparc/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-sparc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu_asm.S])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
diff --git a/cpukit/score/cpu/unix/ChangeLog b/cpukit/score/cpu/unix/ChangeLog
index 3b8af74447..d38531a8d1 100644
--- a/cpukit/score/cpu/unix/ChangeLog
+++ b/cpukit/score/cpu/unix/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
+	* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
+
 2002-11-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Fix package name.
diff --git a/cpukit/score/cpu/unix/Makefile.am b/cpukit/score/cpu/unix/Makefile.am
index c3ddc3ce11..a6bf7da4d9 100644
--- a/cpukit/score/cpu/unix/Makefile.am
+++ b/cpukit/score/cpu/unix/Makefile.am
@@ -32,13 +32,11 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 LIB = $(ARCH)/libscorecpu.a
 
-libscorecpu_a_OBJECTS = $(C_O_FILES)
-
-$(LIB): $(libscorecpu_a_OBJECTS)
+$(LIB): $(OBJS)
 	$(make-library)
 
 all-local: $(ARCH) $(LIB)
diff --git a/cpukit/score/cpu/unix/configure.ac b/cpukit/score/cpu/unix/configure.ac
index f214afd19f..2a1c4f45ba 100644
--- a/cpukit/score/cpu/unix/configure.ac
+++ b/cpukit/score/cpu/unix/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-score-cpu-unix],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([cpu.c])
 RTEMS_TOP(../../../..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSCPU
@@ -43,7 +43,7 @@ typedef struct {
 } CPU_CONTEXT;
 ])
 
-AM_CONFIG_HEADER([rtems/score/unixsize-tmp.h],[
+AC_CONFIG_HEADERS([rtems/score/unixsize-tmp.h],[
 echo "/* automatically generated -- DO NOT EDIT!! */" >$tmp/config.h
 echo                                                  >>$tmp/config.h
 echo "#ifndef __rtems_score_unixsize_h"               >>$tmp/config.h
author	Ralf Corsepius <ralf.corsepius@rtems.org>	2002-12-11 17:08:38 +0000
committer	Ralf Corsepius <ralf.corsepius@rtems.org>	2002-12-11 17:08:38 +0000
commit	53021d4abb385455ec445fd53744427c095dd7c5 (patch)
tree	0b6cee839acaff783748574f2f6ed814ac939786 /cpukit
parent	2002-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
download	rtems-53021d4abb385455ec445fd53744427c095dd7c5.tar.bz2