Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (ZINCS): Removed.  This is defined in configure.in
	when needed, and must be left empty when not needed.

From-SVN: r29809

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 833a56562795dfbc1f879cea4bbd05e3e85b087c..8c44cf9e17c56dd3cbc7e1381f7bcf7288ca6a18 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+1999-10-04  Tom Tromey  <tromey@cygnus.com>
+
+       * Makefile.in: Rebuilt.
+       * Makefile.am (ZINCS): Removed.  This is defined in configure.in
+       when needed, and must be left empty when not needed.
+
 1999-10-01  Anthony Green  <green@cygnus.com>
 
        * THANKS: Refreshed from htdocs version.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index dc5ff59280fc5f3313c8bd7cd6484e4732667ed1..dc5a034059bb0d26d7b3e438deee9a614bf64787 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -80,7 +80,6 @@ JCFLAGS = -g
 JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@
 
 LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include
-ZINCS = -I$(top_srcdir)/../zlib
 
 INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
        $(GCINCS) $(THREADINCS) \

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 06e0aa89adfaf49cc4bc79702c361b0c656f8f63..6611a087381bb6a6f6dfe9427440355e65fa980b 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -707,8 +707,8 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DATA =  $(data_DATA) $(toolexeclib_DATA)
 
-DIST_COMMON =  COPYING.LIB ChangeLog Makefile.am Makefile.in NEWS THANKS \
-acinclude.m4 aclocal.m4 configure configure.in libgcj.spec.in
+DIST_COMMON =  README COPYING.LIB ChangeLog Makefile.am Makefile.in NEWS \
+THANKS acinclude.m4 aclocal.m4 configure configure.in libgcj.spec.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)