summaryrefslogtreecommitdiffstats
path: root/zlib
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2009-08-22 13:41:50 +0000
committerRalf Wildenhues <rwild@gcc.gnu.org>2009-08-22 13:41:50 +0000
commit70fa0efaf45ff915bb26641c5fbaa162d25bfa7d (patch)
tree39111a2db2e981d7c6aeda673b9baa036f4f994d /zlib
parentRegenerate tree using Autoconf 2.64 and Automake 1.11. (diff)
downloadgcc-70fa0efaf45ff915bb26641c5fbaa162d25bfa7d.tar.gz
gcc-70fa0efaf45ff915bb26641c5fbaa162d25bfa7d.tar.bz2
gcc-70fa0efaf45ff915bb26641c5fbaa162d25bfa7d.tar.xz
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
Diffstat (limited to 'zlib')
-rw-r--r--zlib/ChangeLog.gcj3
-rw-r--r--zlib/Makefile.am9
-rw-r--r--zlib/Makefile.in14
3 files changed, 9 insertions, 17 deletions
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 @@
12009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 12009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
2 2
3 * Makefile.am (install-html, install-pdf, html): Remove.
4 * Makefile.in: Regenerate.
5
3 * Makefile.in: Regenerate. 6 * Makefile.in: Regenerate.
4 * aclocal.m4: Regenerate. 7 * aclocal.m4: Regenerate.
5 * configure: Regenerate. 8 * 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 = \
58 "PICFLAG=$(PICFLAG)" \ 58 "PICFLAG=$(PICFLAG)" \
59 "RANLIB=$(RANLIB)" \ 59 "RANLIB=$(RANLIB)" \
60 "DESTDIR=$(DESTDIR)" 60 "DESTDIR=$(DESTDIR)"
61
62# No html support.
63# No install-html or install-pdf support in automake yet
64.PHONY: html install-html install-pdf
65
66html:
67install-html:
68install-pdf:
69
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
593 593
594dvi-am: 594dvi-am:
595 595
596html: html-am
597
596html-am: 598html-am:
597 599
598info: info-am 600info: info-am
@@ -607,6 +609,8 @@ install-dvi-am:
607 609
608install-exec-am: install-multi install-toolexeclibLIBRARIES 610install-exec-am: install-multi install-toolexeclibLIBRARIES
609 611
612install-html: install-html-am
613
610install-html-am: 614install-html-am:
611 615
612install-info: install-info-am 616install-info: install-info-am
@@ -615,6 +619,8 @@ install-info-am:
615 619
616install-man: 620install-man:
617 621
622install-pdf: install-pdf-am
623
618install-pdf-am: 624install-pdf-am:
619 625
620install-ps: install-ps-am 626install-ps: install-ps-am
@@ -665,14 +671,6 @@ uninstall-am: uninstall-toolexeclibLIBRARIES
665 uninstall-toolexeclibLIBRARIES 671 uninstall-toolexeclibLIBRARIES
666 672
667 673
668# No html support.
669# No install-html or install-pdf support in automake yet
670.PHONY: html install-html install-pdf
671
672html:
673install-html:
674install-pdf:
675
676# Tell versions [3.59,3.63) of GNU make to not export all variables. 674# Tell versions [3.59,3.63) of GNU make to not export all variables.
677# Otherwise a system limit (for SysV at least) may be exceeded. 675# Otherwise a system limit (for SysV at least) may be exceeded.
678.NOEXPORT: 676.NOEXPORT: