From 579f14cc7e93dc3d81151e694043aa0e56383e5a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 28 Mar 2002 00:55:02 +0000 Subject: [PATCH] 2002-03-27 Ralf Corsepius * 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. --- ChangeLog | 8 ++++++++ Makefile.am | 1 - configure.ac | 4 ++-- tools/Makefile.am | 1 - 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 + + * 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 * 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