From 115d57c573871ce5eaf54d3fca7ef99b5628b630 Mon Sep 17 00:00:00 2001 From: rwild Date: Sat, 22 Aug 2009 13:41:50 +0000 Subject: 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151015 138bc75d-0d04-0410-961f-82ee72b054a4 --- zlib/ChangeLog.gcj | 3 +++ zlib/Makefile.am | 9 --------- zlib/Makefile.in | 14 ++++++-------- 3 files changed, 9 insertions(+), 17 deletions(-) (limited to 'zlib') diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index 266f04ab35f..ffc3b6f205b 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,5 +1,8 @@ 2009-08-22 Ralf Wildenhues + * Makefile.am (install-html, install-pdf, html): Remove. + * Makefile.in: Regenerate. + * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 749a13c7fda..55418e497a9 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -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: - diff --git a/zlib/Makefile.in b/zlib/Makefile.in index 393427fce1d..b9067c3c8fa 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -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: -- cgit v1.2.3