This is the mail archive of the
java@gcc.gnu.org
mailing list for the Java project.
[RFA] automake mass update, 2 of 2
This patch updates automake to 1.8.5 for boehm-gc, zlib, libffi,
libmudflap, and removes useless multilibs code for libstdc++-v3.
Bootstrapped/regtested i686-pc-linux-gnu, enabling multilibs as in
config/i386/t-vxworks:
MULTILIB_OPTIONS = \
march=i486/march=pentium/march=pentiumpro/march=pentium4
MULTILIB_DIRNAMES = \
I80486/PENTIUMgnu/PENTIUM2gnu/PENTIUM4gnu
I attach the diff for non-regenerated files.
Ok for mainline?
Paolo
Index: boehm-gc/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/configure.in,v
retrieving revision 1.63
diff -u -r1.63 configure.in
--- boehm-gc/configure.in 11 Mar 2004 00:27:15 -0000 1.40
+++ boehm-gc/configure.in 14 Jun 2004 09:27:14 -0000
@@ -24,40 +24,11 @@
# exported.
ORIGINAL_LD_FOR_MULTILIBS=$LD
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[ --enable-multilib build many library versions (default)],
-[case "${enableval}" in
- yes) multilib=yes ;;
- no) multilib=no ;;
- *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-dnl I needed to add the -n test to allow configuration in src directory - HB
-if test "[$]{srcdir}" = "."; then
- if test "[$]{with_target_subdir}" != "." -a -n "[$]{with_target_subdir}"; then
- gc_basedir="[$]{srcdir}/[$]{with_multisrctop}../."
- else
- gc_basedir="[$]{srcdir}/[$]{with_multisrctop}."
- fi
-else
- gc_basedir="[$]{srcdir}/."
-fi
-AC_SUBST(gc_basedir)
-AC_CONFIG_AUX_DIR($gc_basedir/..)
-if :; then :; else
- # This overrides the previous occurrence for automake, but not for
- # autoconf, which is exactly what we want.
- AC_CONFIG_AUX_DIR(..)
-fi
+AM_ENABLE_MULTILIB(, ..)
AC_CANONICAL_SYSTEM
# Get the 'noncanonical' system names.
-sinclude(../config/acx.m4)
_GCC_TOPLEV_NONCANONICAL_BUILD
_GCC_TOPLEV_NONCANONICAL_HOST
_GCC_TOPLEV_NONCANONICAL_TARGET
@@ -82,6 +53,8 @@
AC_PROG_CXX
m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
+AM_PROG_CC_C_O
+
AC_SUBST(CFLAGS)
AC_SUBST(CXXFLAGS)
@@ -143,7 +116,7 @@
esac]
)
-INCLUDES="-I`cd $srcdir && ${PWDCMD-pwd}`/include"
+AM_CPPFLAGS="-I`cd $srcdir && ${PWDCMD-pwd}`/include"
THREADLIBS=
case "$THREADS" in
no | none | single)
@@ -182,7 +155,7 @@
*-*-freebsd*)
AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
AC_DEFINE(GC_FREEBSD_THREADS)
- INCLUDES="$INCLUDES -pthread"
+ AM_CPPFLAGS="$AM_CPPFLAGS -pthread"
THREADLIBS=-pthread
;;
*-*-solaris*)
@@ -210,7 +183,7 @@
# May want to enable it in other cases, too.
# Measurements havent yet been done.
fi
- INCLUDES="$INCLUDES -pthread"
+ AM_CPPFLAGS="$AM_CPPFLAGS -pthread"
THREADLIBS="-lpthread -lrt"
;;
esac
@@ -232,7 +205,7 @@
AC_DEFINE(GC_DGUX386_THREADS)
AC_DEFINE(DGUX_THREADS)
# Enable _POSIX4A_DRAFT10_SOURCE with flag -pthread
- INCLUDES="-pthread $INCLUDES"
+ AM_CPPFLAGS="-pthread $AM_CPPFLAGS"
;;
aix)
THREADS=posix
@@ -285,13 +258,12 @@
addlibs=
addincludes=
addtests=
-CXXINCLUDES=
case "$TARGET_ECOS" in
no)
;;
*)
AC_DEFINE(ECOS)
- CXXINCLUDES="-I${TARGET_ECOS}/include"
+ AM_CPPFLAGS="${AM_CPPFLAGS} -I${TARGET_ECOS}/include"
addobjs="$addobjs ecos.lo"
;;
esac
@@ -305,8 +277,7 @@
AC_SUBST(CXX)
-AC_SUBST(INCLUDES)
-AC_SUBST(CXXINCLUDES)
+AC_SUBST(AM_CPPFLAGS)
# Configuration of shared libraries
#
@@ -509,23 +480,10 @@
multilib_arg=
fi
-AC_OUTPUT(Makefile include/Makefile, [
+AC_CONFIG_COMMANDS(boehm-cflags, [
dnl Put all the -I and -D options in a file.
-echo "$INCLUDES $DEFS" > boehm-cflags
-
-if test -n "$CONFIG_FILES"; then
- LD="${ORIGINAL_LD_FOR_MULTILIBS}"
- ac_file=Makefile . ${gc_basedir}/../config-ml.in
-fi],
-srcdir=${srcdir}
-host=${host}
-target=${target}
-with_multisubdir=${with_multisubdir}
-ac_configure_args="${multilib_arg} ${ac_configure_args}"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-gc_basedir=${gc_basedir}
-CC="${CC}"
-ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
+echo "$AM_CPPFLAGS $DEFS" > boehm-cflags], [
DEFS="$DEFS"
-INCLUDES="$INCLUDES"
-)
+AM_CPPFLAGS="$AM_CPPFLAGS"])
+AC_CONFIG_FILES(Makefile include/Makefile)
+AC_OUTPUT
Index: boehm-gc/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/Makefile.am,v
retrieving revision 1.40
diff -u -r1.40 Makefile.am
--- boehm-gc/Makefile.am 26 Feb 2004 23:27:53 -0000 1.40
+++ boehm-gc/Makefile.am 14 Jun 2004 09:34:16 -0000
@@ -4,20 +4,10 @@
## files that should be in the distribution are not mentioned in this
## Makefile.am.
-target_noncanonical=@target_noncanonical@
-
-AUTOMAKE_OPTIONS = cygnus
+AUTOMAKE_OPTIONS = cygnus subdir-objects
SUBDIRS = include
-# Multilib support variables.
-MULTISRCTOP =
-MULTIBUILDTOP =
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la
if POWERPC_DARWIN
@@ -35,15 +25,13 @@
pthread_support.c pthread_stop_world.c darwin_stop_world.c \
$(asm_libgc_sources)
-EXTRA_GC_SOURCES = alpha_mach_dep.S \
+EXTRA_DIST = alpha_mach_dep.S \
mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
libgcjgc_la_SOURCES = $(GC_SOURCES)
libgcjgc_convenience_la_SOURCES = $(GC_SOURCES)
-EXTRA_libgcjgc_la_SOURCES = $(EXTRA_GC_SOURCES)
-EXTRA_libgcjgc_convenience_la_SOURCES = $(EXTRA_GC_SOURCES)
# Include THREADLIBS here to ensure that the correct versions of
# linuxthread semaphore functions get linked:
@@ -58,25 +46,12 @@
AM_CFLAGS = @GC_CFLAGS@
check_PROGRAMS = gctest
-# The following hack produces a warning from automake, but we need it in order
-# to build a file from a subdirectory. FIXME.
-test.o: tests/test.c
- $(COMPILE) -c $(srcdir)/tests/test.c
-# Using $< in the above seems to fail with the HP/UX on Itanium make.
-
-gctest_OBJECTS = test.o
+gctest_SOURCES = tests/test.c
gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
gctest_LDFLAGS = -shared-libgcc
TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
TESTS = gctest
-## FIXME: relies on internal code generated by automake.
-all_objs = @addobjs@ $(libgcjgc_la_OBJECTS)
-$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
-include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
-include/gc_pthread_redirects.h include/gc_config_macros.h \
-include/gc_mark.h @addincludes@
-
## FIXME: we shouldn't have to do this, but automake forces us to.
.s.lo:
## We use -Wp,-P to strip #line directives. Irix `as' chokes on
@@ -85,8 +60,7 @@
## We have our own definition of LTCOMPILE because we want to use our
## CFLAGS, not those passed in from the top level make.
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) \
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS)
LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@
@@ -133,28 +107,4 @@
CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
-# Multilib support.
-.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
- maintainer-clean-multi
-
-all-am: all-multi
-install-am: install-multi
-mostlyclean-am: mostlyclean-multi
-clean-am: clean-multi
-distclean-am: distclean-multi
-maintainer-clean-am: maintainer-clean-multi
-
-all-multi:
- : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
-install-multi:
- $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
-mostlyclean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean
-clean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean
-distclean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean
-maintainer-clean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean
-
MAKEOVERRIDES=
Index: boehm-gc/acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/acinclude.m4,v
retrieving revision 1.24
diff -u -r1.24 acinclude.m4
--- boehm-gc/acinclude.m4 26 Feb 2004 21:39:44 -0000 1.24
+++ boehm-gc/acinclude.m4 14 Jun 2004 09:34:16 -0000
@@ -12,6 +12,7 @@
# Original author: Tom Tromey
sinclude(../libtool.m4)
+sinclude(../config/acx.m4)
dnl The line below arranges for aclocal not to bring a definition of
dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
dnl to add a definition of LIBTOOL to Makefile.in.
Index: contrib/gcc_update
===================================================================
RCS file: /cvs/gcc/gcc/contrib/gcc_update,v
retrieving revision 1.66
diff -u -r1.66 gcc_update
--- contrib/gcc_update 10 Jun 2004 04:50:45 -0000 1.66
+++ contrib/gcc_update 14 Jun 2004 09:34:17 -0000
@@ -83,7 +83,7 @@
fastjar/configure: fastjar/configure.ac fastjar/aclocal.m4
boehm-gc/aclocal.m4: boehm-gc/configure.in boehm-gc/acinclude.m4
boehm-gc/Makefile.in: boehm-gc/Makefile.am boehm-gc/configure.in boehm-gc/aclocal.m4
-boehm-gc/configure: boehm-gc/configure.in boehm-gc/aclocal.m4
+boehm-gc/configure: boehm-gc/configure.ac boehm-gc/aclocal.m4
libada/configure: libada/configure.ac
libffi/aclocal.m4: libffi/configure.ac libffi/acinclude.m4
libffi/Makefile.in: libffi/Makefile.am libffi/configure.ac libffi/aclocal.m4
Index: libffi/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libffi/Makefile.am,v
retrieving revision 1.32
diff -u -r1.32 Makefile.am
--- libffi/Makefile.am 19 Mar 2004 22:34:16 -0000 1.32
+++ libffi/Makefile.am 14 Jun 2004 09:34:22 -0000
@@ -72,14 +72,6 @@
MAKEOVERRIDES=
-# Multilib support variables working around Automake bug.
-MULTISRCTOP =
-MULTIBUILDTOP =
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
toolexeclib_LTLIBRARIES = libffi.la
noinst_LTLIBRARIES = libffi_convenience.la
@@ -147,6 +139,5 @@
libffi_la_LDFLAGS = -release $(VERSION)
-INCLUDES = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
-
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
+AM_CCASFLAGS = $(AM_CPPFLAGS)
Index: libffi/configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/libffi/configure.ac,v
retrieving revision 1.4
diff -u -r1.4 configure.ac
--- libffi/configure.ac 7 Jun 2004 18:39:30 -0000 1.4
+++ libffi/configure.ac 14 Jun 2004 09:34:24 -0000
@@ -6,13 +6,6 @@
AC_CONFIG_HEADERS([fficonfig.h])
AM_ENABLE_MULTILIB(, ..)
-if test a = b; then
- # This is for automake
- AC_CONFIG_AUX_DIR([..])
-else
- # and this is for autoconf
- AC_CONFIG_AUX_DIRS(${multi_basedir})
- fi
AC_CANONICAL_SYSTEM
target_alias=${target_alias-$host_alias}
Index: libmudflap/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libmudflap/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- libmudflap/Makefile.am 4 Jun 2004 20:12:00 -0000 1.5
+++ libmudflap/Makefile.am 14 Jun 2004 09:34:27 -0000
@@ -4,7 +4,7 @@
## Free Software Foundation, Inc.
##
-AUTOMAKE_OPTIONS = 1.3 foreign
+AUTOMAKE_OPTIONS = 1.8 foreign
MAINT_CHARSET = latin1
SUBDIRS = testsuite
@@ -98,38 +98,5 @@
MAKEOVERRIDES=
-# Multilib support variables.
-MULTISRCTOP =
-MULTIBUILDTOP =
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-# Multilib support.
-.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
- maintainer-clean-multi
-
-all-recursive: all-multi
-install-recursive: install-multi
-mostlyclean-recursive: mostlyclean-multi
-clean-recursive: clean-multi
-distclean-recursive: distclean-multi
-maintainer-clean-recursive: maintainer-clean-multi
-
-all-multi:
- : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
-install-multi:
- $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
-mostlyclean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean
-clean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean
-distclean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean
-maintainer-clean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean
-
-
## ################################################################
Index: libstdc++-v3/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/Makefile.am,v
retrieving revision 1.49
diff -u -r1.49 Makefile.am
--- libstdc++-v3/Makefile.am 16 Dec 2003 23:44:53 -0000 1.49
+++ libstdc++-v3/Makefile.am 14 Jun 2004 09:34:28 -0000
@@ -59,38 +59,6 @@
# Multilib support.
MAKEOVERRIDES=
-# Multilib support variables.
-MULTISRCTOP =
-MULTIBUILDTOP =
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-# Multilib support.
-.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
- maintainer-clean-multi
-
-all-recursive: all-multi
-install-recursive: install-multi
-mostlyclean-recursive: mostlyclean-multi
-clean-recursive: clean-multi
-distclean-recursive: distclean-multi
-maintainer-clean-recursive: maintainer-clean-multi
-
-all-multi:
- : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
-install-multi:
- $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
-mostlyclean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean
-clean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean
-distclean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean
-maintainer-clean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean
-
# All the machinations with string instantiations messes up the
# automake-generated TAGS rule. Make a simple one here.
TAGS: tags-recursive $(LISP)
Index: libstdc++-v3/acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.289
diff -u -r1.289 acinclude.m4
--- libstdc++-v3/acinclude.m4 3 May 2004 19:07:48 -0000 1.289
+++ libstdc++-v3/acinclude.m4 14 Jun 2004 09:34:29 -0000
@@ -27,38 +27,6 @@
AC_MSG_NOTICE([OS config directory is $os_include_dir])
])
-
-dnl
-dnl Initialize basic configure bits.
-dnl
-dnl Substs:
-dnl multi_basedir
-dnl
-AC_DEFUN([GLIBCXX_TOPREL_CONFIGURE], [
- # Sets up multi_basedir, which is srcdir/.. plus the usual
- # "multi_source_toprel_bottom_adjust" lunacy as needed.
- AM_ENABLE_MULTILIB(, ..)
-
- # The generated code is exactly the same, except that automake's looks in
- # ".. $srcdir/.." and autoconf's looks in multi_basedir. Apparently other
- # things are triggered on the presence of the two ...AUX_DIR[S], but I don't
- # know what they are or what the other differences might be (and they keep
- # changing anyhow).
- #
- # Looking in multi_basedir seems smarter, so actually execute that branch.
- if false; then
- # this is for automake
- AC_CONFIG_AUX_DIR(..)
- else
- # this is for autoconf
- AC_CONFIG_AUX_DIRS(${multi_basedir})
- fi
-
- dnl XXX Turn this on.
- dnl AC_LANG_CPLUSPLUS
-])
-
-
dnl
dnl Initialize the rest of the library configury. At this point we have
dnl variables like $host.
Index: libstdc++-v3/configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.ac,v
retrieving revision 1.19
diff -u -r1.19 configure.ac
--- libstdc++-v3/configure.ac 31 May 2004 21:19:52 -0000 1.19
+++ libstdc++-v3/configure.ac 14 Jun 2004 09:34:37 -0000
@@ -17,7 +17,7 @@
AC_SUBST(libtool_VERSION)
# Find the rest of the source tree framework.
-GLIBCXX_TOPREL_CONFIGURE
+AM_ENABLE_MULTILIB(, ..)
# Gets build, host, target, *_vendor, *_cpu, *_os, etc.
#
Index: zlib/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/zlib/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- zlib/Makefile.am 12 Apr 2004 11:10:26 -0000 1.12
+++ zlib/Makefile.am 14 Jun 2004 09:34:40 -0000
@@ -1,14 +1,6 @@
## Process this file with automake to create Makefile.in.
-AUTOMAKE_OPTIONS = cygnus
-
-# Multilib support variables.
-MULTISRCTOP =
-MULTIBUILDTOP =
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
+AUTOMAKE_OPTIONS = 1.8 cygnus
ZLIB_SOURCES = adler32.c compress.c crc32.c deflate.c deflate.h \
gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c inffast.h \
@@ -64,27 +56,3 @@
"PICFLAG=$(PICFLAG)" \
"RANLIB=$(RANLIB)" \
"DESTDIR=$(DESTDIR)"
-
-# Multilib support.
-.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
- maintainer-clean-multi
-
-all-am: all-multi
-install-am: install-multi
-mostlyclean-am: mostlyclean-multi
-clean-am: clean-multi
-distclean-am: distclean-multi
-maintainer-clean-am: maintainer-clean-multi
-
-all-multi:
- : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
-install-multi:
- $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
-mostlyclean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean
-clean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean
-distclean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean
-maintainer-clean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean
Index: gcc/doc/install.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/doc/install.texi,v
retrieving revision 1.290
diff -u -r1.290 install.texi
--- gcc/doc/install.texi 15 Jun 2004 07:50:45 -0000 1.290
+++ gcc/doc/install.texi 15 Jun 2004 10:34:54 -0000
@@ -305,7 +305,7 @@
@file{libjava} (but not @file{libjava/libltdl}) still require autoconf
2.13 (exactly) and @file{libmudflap} requires autoconf 2.57 (exactly).
-@item automake versions 1.4-gcj, 1.7.8, 1.7.9 and 1.8.5
+@item automake versions 1.4-gcj and 1.8.5
Necessary when modifying a @file{Makefile.am} file to regenerate its
associated @file{Makefile.in}.
@@ -315,18 +315,11 @@
@file{libiberty}, @file{libobjc} directories as well as any
of their subdirectories.
-The Java directories @file{boehm-gc} and @file{libjava}
-require a modified version of automake 1.4 downloadable from
+The Java directory @file{libjava} requires a modified version of
+automake 1.4 downloadable from
@uref{ftp://gcc.gnu.org/pub/java/automake-gcj-1.4.tar.gz}.
-The @file{libmudflap} directory requires automake 1.7.8.
-
-The @file{libffi} and @file{zlib} directories require
-automake 1.7.9.
-
-The @file{fastjar}, @file{libbanshee}, @file{libcpp},
-@file{libjava/libltdl}, @file{libgfortran} and @file{libstdc++-v3}
-directories require automake 1.8.5.
+Every other directory requires automake 1.8.5.
@item gettext version 0.12 (or later)