2006-06-13 Carlos O'Donell <carlos@codesourcery.com>

	* Makefile.am: Add html and install-html stubs.
	* Makefile.in: Regenerate.
	* aclocal.m4: Regenerate.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114624 138bc75d-0d04-0410-961f-82ee72b054a4

zlib/ChangeLog.gcj

@@ -1,3 +1,9 @@
+2006-06-13  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* Makefile.am: Add html and install-html stubs.
+	* Makefile.in: Regenerate.
+	* aclocal.m4: Regenerate.
+
 2005-06-14  Tom Tromey  <tromey@redhat.com>
 
 	* Imported zlib 1.2.3; merged local changes.

zlib/Makefile.am

@@ -56,3 +56,10 @@ AM_MAKEFLAGS = \
 	"PICFLAG=$(PICFLAG)" \
 	"RANLIB=$(RANLIB)" \
 	"DESTDIR=$(DESTDIR)"
+
+# No html, or install-html support.
+.PHONY: html install-html
+
+html:
+install-html:
+

zlib/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +15,6 @@
 @SET_MAKE@
 
 
-SOURCES = $(libz_a_SOURCES) $(libzgcj_convenience_la_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -550,8 +548,6 @@ dvi: dvi-am
 
 dvi-am:
 
-html: html-am
-
 info: info-am
 
 info-am:
@@ -602,6 +598,12 @@ uninstall-am: uninstall-toolexeclibLIBRARIES
 	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
 	uninstall-toolexeclibLIBRARIES
 
+
+# No html, or install-html support.
+.PHONY: html install-html
+
+html:
+install-html:
 # 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: