7 files changed, 13 insertions, 7 deletions
diff --git a/c/src/lib/libcpu/i960/ChangeLog b/c/src/lib/libcpu/i960/ChangeLog
index 64ac245824..f9c4978821 100644
--- a/c/src/lib/libcpu/i960/ChangeLog
+++ b/c/src/lib/libcpu/i960/ChangeLog
@@ -1,3 +1,14 @@
+2002-03-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac:
+	AC_INIT(package,_RTEMS_VERSION,_RTEMS_BUGS).
+	AM_INIT_AUTOMAKE([no-define foreign 1.6]).
+	* i960ca/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* i960ka/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* i960rp/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* include/Makefile.am: Remove AUTOMAKE_OPTIONS.
+
 2001-10-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* .cvsignore: Add autom4te.cache for autoconf > 2.52.
diff --git a/c/src/lib/libcpu/i960/Makefile.am b/c/src/lib/libcpu/i960/Makefile.am
index c466544ea6..542657c03e 100644
--- a/c/src/lib/libcpu/i960/Makefile.am
+++ b/c/src/lib/libcpu/i960/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I ../../../../../aclocal
 
 if i960ca
diff --git a/c/src/lib/libcpu/i960/configure.ac b/c/src/lib/libcpu/i960/configure.ac
index fd04e38159..e19a5f6ad5 100644
--- a/c/src/lib/libcpu/i960/configure.ac
+++ b/c/src/lib/libcpu/i960/configure.ac
@@ -3,14 +3,14 @@
 ## $Id$
 
 AC_PREREQ(2.52)
-AC_INIT
+AC_INIT([rtems-c-src-lib-libcpu-i960],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([i960ca])
 RTEMS_TOP(../../../../..)
 AC_CONFIG_AUX_DIR(../../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-i960,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE([no-define foreign 1.6])
 AM_MAINTAINER_MODE
 
 RTEMS_ENABLE_BARE
diff --git a/c/src/lib/libcpu/i960/i960ca/Makefile.am b/c/src/lib/libcpu/i960/i960ca/Makefile.am
index b0329618e3..448afba639 100644
--- a/c/src/lib/libcpu/i960/i960ca/Makefile.am
+++ b/c/src/lib/libcpu/i960/i960ca/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/compile.am
diff --git a/c/src/lib/libcpu/i960/i960ka/Makefile.am b/c/src/lib/libcpu/i960/i960ka/Makefile.am
index 5660ab89e8..c09d750f12 100644
--- a/c/src/lib/libcpu/i960/i960ka/Makefile.am
+++ b/c/src/lib/libcpu/i960/i960ka/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/compile.am
diff --git a/c/src/lib/libcpu/i960/i960rp/Makefile.am b/c/src/lib/libcpu/i960/i960rp/Makefile.am
index 40bbd93069..26ab3b376c 100644
--- a/c/src/lib/libcpu/i960/i960rp/Makefile.am
+++ b/c/src/lib/libcpu/i960/i960rp/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/compile.am
diff --git a/c/src/lib/libcpu/i960/include/Makefile.am b/c/src/lib/libcpu/i960/include/Makefile.am
index a68225b3be..bd0ff88ebc 100644
--- a/c/src/lib/libcpu/i960/include/Makefile.am
+++ b/c/src/lib/libcpu/i960/include/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 include_libcpudir = $(includedir)/libcpu