Cleanups after the update to Autoconf 2.64, Automake 1.11.

/:
	* configure.ac: Remove --with-datarootdir, --with-docdir,
	--with-pdfdir, --with-htmldir switches.
	* configure: Regenerate.

gcc/:
	* configure.ac: Remove --with-datarootdir, --with-docdir,
	--with-htmldir switches.  No need to call AC_SUBST for
	datarootdir, docdir, htmldir any more.
	* configure: Regenerate.
	* doc/install.texi (Configuration): Document --datarootdir,
	--docdir, --htmldir, --pdfdir; update documentation for
	--infodir, --mandir.
	(Prerequisites): Bump Autoconf version to 2.64, Automake to
	1.11, M4 to 1.4.6.

libgfortran/:
	* Makefile.am (install-html, install-pdf): Remove.
	* Makefile.in: Regenerate.

libjava/classpath/:
	* doc/cp-hacking.texinfo (Needed Tools and Libraries): Bump
	Autoconf version to 2.64, Automake to 1.11, M4 to 1.4.6.

libjava/:
	* HACKING: Use aclocal-1.11 and autoconf-2.64 in example.
	* Makefile.am (install-html, install-pdf): Remove.
	* Makefile.in: Regenerate.

libstdc++-v3/:
	* doc/xml/manual/build_hacking.xml: Use tools from Autoconf
	2.64 and Automake 1.11 in examples; update link to Autoconf
	manual page about quadrigraphs.
	* Makefile.am (install-html, install-pdf): Remove.
	* Makefile.in: Regenerate.

libssp/:
	* Makefile.am (install-html, install-pdf): Remove.
	* Makefile.in: Regenerate.

boehm-gc/:
	* Makefile.am (install-html, install-pdf): Remove.
	* Makefile.in: Regenerate.

libmudflap/:
	* Makefile.am (install-html, install-pdf): Remove.
	* Makefile.in: Regenerate.

zlib/:
	* Makefile.am (install-html, install-pdf, html): Remove.
	* Makefile.in: Regenerate.

libffi/:
	* Makefile.am (install-html, install-pdf): Remove.
	* Makefile.in: Regenerate.

libgomp/:
	* Makefile.am (install-html, install-pdf): Remove.
	* Makefile.in: Regenerate.

From-SVN: r151015
This commit is contained in:
Ralf Wildenhues 2009-08-22 13:41:50 +00:00 committed by Ralf Wildenhues
parent 5213506e24
commit 70fa0efaf4
38 changed files with 140 additions and 292 deletions

View File

@ -1,5 +1,9 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure.ac: Remove --with-datarootdir, --with-docdir,
--with-pdfdir, --with-htmldir switches.
* configure: Regenerate.
* configure: Regenerate.
* compile: Sync from Automake 1.11.

View File

@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.am (install-html, install-pdf): Remove.
* Makefile.in: Regenerate.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.

View File

@ -115,9 +115,3 @@ AM_MAKEFLAGS = \
CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
MAKEOVERRIDES=
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf:

View File

@ -758,6 +758,8 @@ install-dvi-am:
install-exec-am: install-multi
install-html: install-html-recursive
install-html-am:
install-info: install-info-recursive
@ -766,6 +768,8 @@ install-info-am:
install-man:
install-pdf: install-pdf-recursive
install-pdf-am:
install-ps: install-ps-recursive
@ -823,11 +827,6 @@ uninstall-am:
.S.lo:
$(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

50
configure vendored
View File

@ -770,10 +770,6 @@ with_build_time_tools
enable_maintainer_mode
enable_stage1_checking
enable_werror
with_datarootdir
with_docdir
with_pdfdir
with_htmldir
'
ac_precious_vars='build_alias
host_alias
@ -1500,10 +1496,6 @@ Optional Packages:
map A to B, C to D ... in debug information
--with-build-time-tools=PATH
use given path to find target tools during the build
--with-datarootdir use datarootdir as the data root directory.
--with-docdir install documentation in this directory.
--with-pdfdir install pdf in this directory.
--with-htmldir install html in this directory.
Some influential environment variables:
CC C compiler command
@ -13187,48 +13179,6 @@ case ${enable_werror} in
esac
# Flags needed to enable html installing and building
# Check whether --with-datarootdir was given.
if test "${with_datarootdir+set}" = set; then :
withval=$with_datarootdir; datarootdir="\${prefix}/${withval}"
else
datarootdir="\${prefix}/share"
fi
# Check whether --with-docdir was given.
if test "${with_docdir+set}" = set; then :
withval=$with_docdir; docdir="\${prefix}/${withval}"
else
docdir="\${datarootdir}/doc"
fi
# Check whether --with-pdfdir was given.
if test "${with_pdfdir+set}" = set; then :
withval=$with_pdfdir; pdfdir="\${prefix}/${withval}"
else
pdfdir="\${docdir}"
fi
# Check whether --with-htmldir was given.
if test "${with_htmldir+set}" = set; then :
withval=$with_htmldir; htmldir="\${prefix}/${withval}"
else
htmldir="\${docdir}"
fi
# Specify what files to not compare during bootstrap.
compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"

View File

@ -3120,32 +3120,6 @@ case ${enable_werror} in
esac
AC_SUBST(stage2_werror_flag)
# Flags needed to enable html installing and building
AC_ARG_WITH(datarootdir,
[ --with-datarootdir use datarootdir as the data root directory.],
[datarootdir="\${prefix}/${withval}"],
[datarootdir="\${prefix}/share"])
AC_ARG_WITH(docdir,
[ --with-docdir install documentation in this directory.],
[docdir="\${prefix}/${withval}"],
[docdir="\${datarootdir}/doc"])
AC_ARG_WITH(pdfdir,
[ --with-pdfdir install pdf in this directory.],
[pdfdir="\${prefix}/${withval}"],
[pdfdir="\${docdir}"])
AC_ARG_WITH(htmldir,
[ --with-htmldir install html in this directory.],
[htmldir="\${prefix}/${withval}"],
[htmldir="\${docdir}"])
AC_SUBST(datarootdir)
AC_SUBST(docdir)
AC_SUBST(pdfdir)
AC_SUBST(htmldir)
# Specify what files to not compare during bootstrap.
compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"

View File

@ -1,5 +1,15 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure.ac: Remove --with-datarootdir, --with-docdir,
--with-htmldir switches. No need to call AC_SUBST for
datarootdir, docdir, htmldir any more.
* configure: Regenerate.
* doc/install.texi (Configuration): Document --datarootdir,
--docdir, --htmldir, --pdfdir; update documentation for
--infodir, --mandir.
(Prerequisites): Bump Autoconf version to 2.64, Automake to
1.11, M4 to 1.4.6.
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.

81
gcc/configure vendored
View File

@ -1041,9 +1041,6 @@ with_system_zlib
enable_maintainer_mode
enable_version_specific_runtime_libs
with_slibdir
with_datarootdir
with_docdir
with_htmldir
enable_plugin
'
ac_precious_vars='build_alias
@ -1783,9 +1780,6 @@ Optional Packages:
with the compiler
--with-system-zlib use installed libz
--with-slibdir=DIR shared libraries in DIR [LIBDIR]
--with-datarootdir=DIR Use DIR as the data root [PREFIX/share]
--with-docdir=DIR Install documentation in DIR [DATAROOTDIR]
--with-htmldir=DIR html documentation in in DIR [DOCDIR]
Some influential environment variables:
CC C compiler command
@ -6586,11 +6580,6 @@ else
fi
# Used by documentation targets
# Check whether --with-multilib-list was given.
if test "${with_multilib_list+set}" = set; then :
@ -11089,13 +11078,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
(eval echo "\"\$as_me:11092: $ac_compile\"" >&5)
(eval echo "\"\$as_me:11081: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
(eval echo "\"\$as_me:11095: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval echo "\"\$as_me:11084: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
(eval echo "\"\$as_me:11098: output\"" >&5)
(eval echo "\"\$as_me:11087: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@ -12300,7 +12289,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 12303 "configure"' > conftest.$ac_ext
echo '#line 12292 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -13960,11 +13949,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:13963: $lt_compile\"" >&5)
(eval echo "\"\$as_me:13952: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:13967: \$? = $ac_status" >&5
echo "$as_me:13956: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -14299,11 +14288,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14302: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14291: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:14306: \$? = $ac_status" >&5
echo "$as_me:14295: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -14404,11 +14393,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14407: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14396: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:14411: \$? = $ac_status" >&5
echo "$as_me:14400: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -14459,11 +14448,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14462: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14451: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:14466: \$? = $ac_status" >&5
echo "$as_me:14455: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -16841,7 +16830,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 16844 "configure"
#line 16833 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -16937,7 +16926,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 16940 "configure"
#line 16929 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -18893,11 +18882,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:18896: $lt_compile\"" >&5)
(eval echo "\"\$as_me:18885: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:18900: \$? = $ac_status" >&5
echo "$as_me:18889: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -18992,11 +18981,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:18995: $lt_compile\"" >&5)
(eval echo "\"\$as_me:18984: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:18999: \$? = $ac_status" >&5
echo "$as_me:18988: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -19044,11 +19033,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:19047: $lt_compile\"" >&5)
(eval echo "\"\$as_me:19036: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:19051: \$? = $ac_status" >&5
echo "$as_me:19040: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -24234,36 +24223,6 @@ fi
# Check whether --with-datarootdir was given.
if test "${with_datarootdir+set}" = set; then :
withval=$with_datarootdir; datarootdir="\${prefix}/$with_datarootdir"
else
datarootdir='$(prefix)/share'
fi
# Check whether --with-docdir was given.
if test "${with_docdir+set}" = set; then :
withval=$with_docdir; docdir="\${prefix}/$with_docdir"
else
docdir='$(datarootdir)'
fi
# Check whether --with-htmldir was given.
if test "${with_htmldir+set}" = set; then :
withval=$with_htmldir; htmldir="\${prefix}/$with_htmldir"
else
htmldir='$(docdir)'
fi
# Substitute configuration variables

View File

@ -819,11 +819,6 @@ AC_ARG_ENABLE(languages,
esac],
[enable_languages=c])
# Used by documentation targets
AC_SUBST(datarootdir)
AC_SUBST(docdir)
AC_SUBST(htmldir)
AC_ARG_WITH(multilib-list,
[ --with-multilib-list Select multilibs (SH only)],
:,
@ -4024,24 +4019,6 @@ else
fi)
AC_SUBST(slibdir)
AC_ARG_WITH(datarootdir,
[ --with-datarootdir=DIR Use DIR as the data root [[PREFIX/share]]],
datarootdir="\${prefix}/$with_datarootdir",
datarootdir='$(prefix)/share')
AC_SUBST(datarootdir)
AC_ARG_WITH(docdir,
[ --with-docdir=DIR Install documentation in DIR [[DATAROOTDIR]]],
docdir="\${prefix}/$with_docdir",
docdir='$(datarootdir)')
AC_SUBST(docdir)
AC_ARG_WITH(htmldir,
[ --with-htmldir=DIR html documentation in in DIR [[DOCDIR]]],
htmldir="\${prefix}/$with_htmldir",
htmldir='$(docdir)')
AC_SUBST(htmldir)
# Substitute configuration variables
AC_SUBST(subdirs)
AC_SUBST(srcdir)

View File

@ -360,13 +360,13 @@ together with GCC@.
@heading Tools/packages necessary for modifying GCC
@table @asis
@item autoconf version 2.59
@itemx GNU m4 version 1.4 (or later)
@item autoconf version 2.64
@itemx GNU m4 version 1.4.6 (or later)
Necessary when modifying @file{configure.ac}, @file{aclocal.m4}, etc.@:
to regenerate @file{configure} and @file{config.in} files.
@item automake version 1.9.6
@item automake version 1.11
Necessary when modifying a @file{Makefile.am} file to regenerate its
associated @file{Makefile.in}.
@ -377,8 +377,8 @@ file. Specifically this applies to the @file{gcc}, @file{intl},
as any of their subdirectories.
For directories that use automake, GCC requires the latest release in
the 1.9.x series, which is currently 1.9.6. When regenerating a directory
to a newer version, please update all the directories using an older 1.9.x
the 1.11 series, which is currently 1.11. When regenerating a directory
to a newer version, please update all the directories using an older 1.11
to the latest released version.
@item gettext version 0.14.5 (or later)
@ -714,18 +714,34 @@ The default is @file{@var{exec-prefix}/libexec}.
Specify the installation directory for the shared libgcc library. The
default is @file{@var{libdir}}.
@item --datarootdir=@var{dirname}
Specify the root of the directory tree for read-only architecture-independent
data files referenced by GCC@. The default is @file{@var{prefix}/share}.
@item --infodir=@var{dirname}
Specify the installation directory for documentation in info format.
The default is @file{@var{prefix}/info}.
The default is @file{@var{datarootdir}/info}.
@item --datadir=@var{dirname}
Specify the installation directory for some architecture-independent
data files referenced by GCC@. The default is @file{@var{prefix}/share}.
data files referenced by GCC@. The default is @file{@var{datarootdir}}.
@item --docdir=@var{dirname}
Specify the installation directory for documentation files (other
than Info) for GCC@. The default is @file{@var{datarootdir}/doc}.
@item --htmldir=@var{dirname}
Specify the installation directory for HTML documentation files.
The default is @file{@var{docdir}}.
@item --pdfdir=@var{dirname}
Specify the installation directory for PDF documentation files.
The default is @file{@var{docdir}}.
@item --mandir=@var{dirname}
Specify the installation directory for manual pages. The default is
@file{@var{prefix}/man}. (Note that the manual pages are only extracts from
the full GCC manuals, which are provided in Texinfo format. The manpages
@file{@var{datarootdir}/man}. (Note that the manual pages are only extracts
from the full GCC manuals, which are provided in Texinfo format. The manpages
are derived by an automatic conversion process from parts of the full
manual.)

View File

@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.am (install-html, install-pdf): Remove.
* Makefile.in: Regenerate.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.

View File

@ -169,11 +169,6 @@ libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LT
AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
AM_CCASFLAGS = $(AM_CPPFLAGS)
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf:
# Multilib support. Automake should provide these on its own.
all-recursive: all-multi
install-recursive: install-multi

View File

@ -1434,6 +1434,8 @@ install-dvi-am:
install-exec-am: install-multi install-toolexeclibLTLIBRARIES
install-html: install-html-recursive
install-html-am:
install-info: install-info-recursive
@ -1442,6 +1444,8 @@ install-info-am:
install-man:
install-pdf: install-pdf-recursive
install-pdf-am:
install-ps: install-ps-recursive
@ -1499,11 +1503,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
uninstall uninstall-am uninstall-toolexeclibLTLIBRARIES
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf:
# Multilib support. Automake should provide these on its own.
all-recursive: all-multi
install-recursive: install-multi

View File

@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.am (install-html, install-pdf): Remove.
* Makefile.in: Regenerate.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.

View File

@ -722,11 +722,6 @@ $(gfor_misc_specifics) \
intrinsics/dprod_r8.f90 \
intrinsics/f2c_specifics.F90
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf:
# Turn on vectorization and loop unrolling for matmul.
$(patsubst %.c,%.lo,$(notdir $(i_matmul_c))): AM_CFLAGS += -ftree-vectorize -funroll-loops
# Logical matmul doesn't vectorize.

View File

@ -6060,6 +6060,8 @@ install-dvi-am:
install-exec-am: install-multi install-myexeclibLTLIBRARIES \
install-toolexeclibLTLIBRARIES
install-html: install-html-am
install-html-am:
install-info: install-info-am
@ -6068,6 +6070,8 @@ install-info-am:
install-man:
install-pdf: install-pdf-am
install-pdf-am:
install-ps: install-ps-am
@ -6126,11 +6130,6 @@ uninstall-am: uninstall-myexeclibLTLIBRARIES \
uninstall-toolexeclibLTLIBRARIES
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf:
# Turn on vectorization and loop unrolling for matmul.
$(patsubst %.c,%.lo,$(notdir $(i_matmul_c))): AM_CFLAGS += -ftree-vectorize -funroll-loops
# Logical matmul doesn't vectorize.

View File

@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.am (install-html, install-pdf): Remove.
* Makefile.in: Regenerate.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.

View File

@ -56,20 +56,6 @@ env.lo: libgomp_f.h
env.o: libgomp_f.h
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf: $(PDFS)
@$(NORMAL_INSTALL)
test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)"
@list='$(PDFS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
done
# Automake Documentation:
# If your package has Texinfo files in many directories, you can use the
# variable TEXINFO_TEX to tell Automake where to find the canonical

View File

@ -1133,6 +1133,8 @@ install-dvi-am: $(DVIS)
install-exec-am: install-multi install-nodist_toolexeclibHEADERS \
install-toolexeclibLTLIBRARIES
install-html: install-html-recursive
install-html-am: $(HTMLS)
@$(NORMAL_INSTALL)
test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
@ -1189,6 +1191,8 @@ install-info-am: $(INFO_DEPS)
else : ; fi
install-man:
install-pdf: install-pdf-recursive
install-pdf-am: $(PDFS)
@$(NORMAL_INSTALL)
test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
@ -1288,20 +1292,6 @@ fortran.o: libgomp_f.h
env.lo: libgomp_f.h
env.o: libgomp_f.h
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf: $(PDFS)
@$(NORMAL_INSTALL)
test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)"
@list='$(PDFS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
done
all-local: $(STAMP_GENINSRC)
stamp-geninsrc: libgomp.info

View File

@ -1,5 +1,9 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* HACKING: Use aclocal-1.11 and autoconf-2.64 in example.
* Makefile.am (install-html, install-pdf): Remove.
* Makefile.in: Regenerate.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.

View File

@ -41,9 +41,9 @@ this can be done using these commands:
cd libjava &&
rm -f aclocal.m4 &&
ACFLAGS=$(grep "^ACLOCAL_AMFLAGS" Makefile.in | sed -e "s/ACLOCAL_AMFLAGS[ \t ]*=//") &&
aclocal-1.9 $ACFLAGS &&
aclocal-1.11 $ACFLAGS &&
rm -f configure &&
autoconf-2.59 &&
autoconf-2.64 &&
rm -fr autom4te.cache
See the GCC documentation which auto* versions to use.
@ -91,7 +91,7 @@ To import a new release:
in the classpath/ChangeLog.gcj file.
(Don't forget to svn resolved files.)
- Use auto* to create configure, Makefile.in, etc
Make sure you have Automake 1.9.6 installed. Exactly that version!
Make sure you have Automake 1.11 installed. Exactly that version!
You have to make sure to use the gcc libtool.m4 and gcc lt* scripts
cd .../classpath
cp ../../lt* .

View File

@ -1326,11 +1326,6 @@ CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
MAKEOVERRIDES=
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf:
# Multilib support variables.
MULTISRCTOP =
MULTIBUILDTOP =

View File

@ -10535,6 +10535,8 @@ install-exec-am: install-binPROGRAMS install-binSCRIPTS \
install-toolexeclibLTLIBRARIES install-toolexecmainlibDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-recursive
install-html-am:
install-info: install-info-recursive
@ -10543,6 +10545,8 @@ install-info-am:
install-man:
install-pdf: install-pdf-recursive
install-pdf-am:
install-ps: install-ps-recursive
@ -12773,11 +12777,6 @@ $(libgcj_la_OBJECTS) $(gcj_dbtool_OBJECTS) $(xlib_nat_files): headers.stamp
$(libgij_la_OBJECTS): headers.stamp
$(libjvm_la_OBJECTS): headers.stamp
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf:
# Multilib support.
.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
maintainer-clean-multi

View File

@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* doc/cp-hacking.texinfo (Needed Tools and Libraries): Bump
Autoconf version to 2.64, Automake to 1.11, M4 to 1.4.6.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.

View File

@ -351,13 +351,13 @@ Eclipse Compiler for Java 3.1+
@item
CVS 1.11+
@item
automake 1.9+
automake 1.11+
@item
autoconf 2.59+
autoconf 2.64+
@item
libtool 1.5+
@item
GNU m4 1.4
GNU m4 1.4.6
@item
texinfo 4.2+
@end itemize

View File

@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.am (install-html, install-pdf): Remove.
* Makefile.in: Regenerate.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.

View File

@ -94,10 +94,5 @@ AM_MAKEFLAGS = \
MAKEOVERRIDES=
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf:
## ################################################################

View File

@ -965,6 +965,8 @@ install-dvi-am:
install-exec-am: install-multi install-toolexeclibLTLIBRARIES
install-html: install-html-recursive
install-html-am:
install-info: install-info-recursive
@ -973,6 +975,8 @@ install-info-am:
install-man:
install-pdf: install-pdf-recursive
install-pdf-am:
install-ps: install-ps-recursive
@ -1032,11 +1036,6 @@ uninstall-am: uninstall-nobase_libsubincludeHEADERS \
uninstall-toolexeclibLTLIBRARIES
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.am (install-html, install-pdf): Remove.
* Makefile.in: Regenerate.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.

View File

@ -90,10 +90,5 @@ AM_MAKEFLAGS = \
MAKEOVERRIDES=
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf:
## ################################################################

View File

@ -791,6 +791,8 @@ install-dvi-am:
install-exec-am: install-multi install-toolexeclibLTLIBRARIES
install-html: install-html-am
install-html-am:
install-info: install-info-am
@ -799,6 +801,8 @@ install-info-am:
install-man:
install-pdf: install-pdf-am
install-pdf-am:
install-ps: install-ps-am
@ -856,11 +860,6 @@ uninstall-am: uninstall-nobase_libsubincludeHEADERS \
uninstall-toolexeclibLTLIBRARIES
# No install-html or install-pdf support in automake yet
.PHONY: install-html install-pdf
install-html:
install-pdf:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,5 +1,11 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* doc/xml/manual/build_hacking.xml: Use tools from Autoconf
2.64 and Automake 1.11 in examples; update link to Autoconf
manual page about quadrigraphs.
* Makefile.am (install-html, install-pdf): Remove.
* Makefile.in: Regenerate.
* Makefile.in: Regenerate.
* acinclude.m4: Regenerate.
* aclocal.m4: Regenerate.

View File

@ -89,7 +89,3 @@ AM_MAKEFLAGS = \
# Subdir rules rely on $(FLAGS_TO_PASS)
FLAGS_TO_PASS = $(AM_MAKEFLAGS)
.PHONY: install-html install-pdf
install-html:
install-pdf:

View File

@ -795,6 +795,8 @@ install-dvi-am:
install-exec-am: install-multi
install-html: install-html-recursive
install-html-am:
install-info: install-info-recursive
@ -803,6 +805,8 @@ install-info-am:
install-man:
install-pdf: install-pdf-recursive
install-pdf-am:
install-ps: install-ps-recursive
@ -866,10 +870,6 @@ doc-%:
# automake-generated TAGS rule. Make a simple one here.
TAGS: tags-recursive $(LISP)
.PHONY: install-html install-pdf
install-html:
install-pdf:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -58,8 +58,8 @@
Regenerate all generated files by using the command sequence
<code>"autoreconf"</code> at the top level of the libstdc++ source
directory. The following will also work, but is much more complex:
<code>"aclocal-1.7 &amp;&amp; autoconf-2.59 &amp;&amp;
autoheader-2.59 &amp;&amp; automake-1.7"</code> The version
<code>"aclocal-1.11 &amp;&amp; autoconf-2.64 &amp;&amp;
autoheader-2.64 &amp;&amp; automake-1.11"</code> The version
numbers may be absent entirely or otherwise vary depending on
<ulink url="http://gcc.gnu.org/install/prerequisites.html">the
current requirements</ulink> and your vendor's choice of
@ -305,7 +305,7 @@
If you're wondering what that line noise in the last example was,
that's how you embed autoconf special characters in output text.
They're called <ulink
url="http://ftp.gnu.org/pub/old-gnu/Manuals/autoconf-2.57/html_mono/autoconf.html#SEC95"><emphasis>quadrigraphs</emphasis></ulink>
url="http://www.gnu.org/software/autoconf/manual/autoconf.html#Quadrigraphs"><emphasis>quadrigraphs</emphasis></ulink>
and you should use them whenever necessary.
</para>
</listitem>

View File

@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.am (install-html, install-pdf, html): Remove.
* Makefile.in: Regenerate.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.

View File

@ -58,12 +58,3 @@ AM_MAKEFLAGS = \
"PICFLAG=$(PICFLAG)" \
"RANLIB=$(RANLIB)" \
"DESTDIR=$(DESTDIR)"
# No html support.
# No install-html or install-pdf support in automake yet
.PHONY: html install-html install-pdf
html:
install-html:
install-pdf:

View File

@ -593,6 +593,8 @@ dvi: dvi-am
dvi-am:
html: html-am
html-am:
info: info-am
@ -607,6 +609,8 @@ install-dvi-am:
install-exec-am: install-multi install-toolexeclibLIBRARIES
install-html: install-html-am
install-html-am:
install-info: install-info-am
@ -615,6 +619,8 @@ install-info-am:
install-man:
install-pdf: install-pdf-am
install-pdf-am:
install-ps: install-ps-am
@ -665,14 +671,6 @@ uninstall-am: uninstall-toolexeclibLIBRARIES
uninstall-toolexeclibLIBRARIES
# No html support.
# No install-html or install-pdf support in automake yet
.PHONY: html install-html install-pdf
html:
install-html:
install-pdf:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: