summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-03-28 00:55:02 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-03-28 00:55:02 +0000
commit579f14cc7e93dc3d81151e694043aa0e56383e5a (patch)
treef7e14fadd362333bf661a97728a88bd4c43bdd9a
parent7273b6e1665c106548084aafc586448025dceb7c (diff)
downloadrtems-579f14cc7e93dc3d81151e694043aa0e56383e5a.tar.bz2
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]). * Makefile.am: Remove AUTOMAKE_OPTIONS. * tools/Makefile.am: Remove AUTOMAKE_OPTIONS.
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac4
-rw-r--r--tools/Makefile.am1
4 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index faf797843d..da4595efc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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]).
+ * Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * tools/Makefile.am: Remove AUTOMAKE_OPTIONS.
+
2002-03-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/env-rtemscpu.m4: automake-1.6 preparations:
diff --git a/Makefile.am b/Makefile.am
index 9dd552e761..d6e89eec74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.5
ACLOCAL_AMFLAGS = -I aclocal
SUBDIRS = tools make $(BUILD_SUBDIRS) $(HOST_SUBDIRS) $(TARGET_SUBDIRS)
diff --git a/configure.ac b/configure.ac
index fe31dda1cb..344491a7fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
## $Id$
AC_PREREQ(2.52)
-AC_INIT
+AC_INIT([rtems],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([c])
RTEMS_TOP([.])
@@ -16,7 +16,7 @@ if test -f VERSION; then
fi
AC_CANONICAL_TARGET([])
-AM_INIT_AUTOMAKE(rtems,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE([no-define foreign 1.6])
AM_MAINTAINER_MODE
## These option are only in here to let --help report all supported
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c11ffb82eb..93a684c99e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,5 @@
## $Id$
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = update