diff options
Diffstat (limited to 'libjava')
-rw-r--r-- | libjava/ChangeLog | 4 | ||||
-rw-r--r-- | libjava/HACKING | 6 | ||||
-rw-r--r-- | libjava/Makefile.am | 5 | ||||
-rw-r--r-- | libjava/Makefile.in | 9 | ||||
-rw-r--r-- | libjava/classpath/ChangeLog | 3 | ||||
-rw-r--r-- | libjava/classpath/doc/cp-hacking.texinfo | 6 |
6 files changed, 17 insertions, 16 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 85568f02d3c..a13ddf6e02f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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. diff --git a/libjava/HACKING b/libjava/HACKING index ba85b697be2..fa38027db3e 100644 --- a/libjava/HACKING +++ b/libjava/HACKING @@ -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* . diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 352951afced..13b25ac7ea6 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -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 = diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 44962f05cc0..9608e7941df 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -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 diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 1cbeda168ff..85ef11f2c25 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -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. diff --git a/libjava/classpath/doc/cp-hacking.texinfo b/libjava/classpath/doc/cp-hacking.texinfo index 829b0e40e81..a424b56ec76 100644 --- a/libjava/classpath/doc/cp-hacking.texinfo +++ b/libjava/classpath/doc/cp-hacking.texinfo @@ -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 |