Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (jv_convert_LDADD): Removed convert_source_files.

From-SVN: r48663

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a5e7fa75f6255bb13c80438a0098b1a88accd707..7fb1e54d508315c0edd4de414b6f4c31ea737d7e 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-08  Tom Tromey  <tromey@redhat.com>
+
+       * Makefile.in: Rebuilt.
+       * Makefile.am (jv_convert_LDADD): Removed convert_source_files.
+
 2002-01-08  Nic Ferrier  <nferrier@tf1.tapsellferrier.co.uk> 
 
        * java/net/natPlainSocketImpl.cc: Added timeout handling for

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index f5121e382103372fbb2cee03c887de34ec2084a1..a2575edf3b254e192fce9a5368a4319ea22ebf43 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -424,8 +424,7 @@ jv_convert_LINK = $(GCJLINK)
 ## system libraries we need (via the specs file).
 ## We need the -L so that gcj can find libgcj with `-lgcj'.
 ## FIXME: should be _libs on some systems.
-jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \
-       $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
+jv_convert_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
 ## Depend on the spec file to make sure it is up to date before
 ## linking this program.
 jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 058ee1d61d4ecf4825d47653bc910ade73153d2b..75bc6ad12b2b4d8413cf7d5eec5ed9a31cecc7ae 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -263,9 +263,7 @@ jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \
        -rpath $(toolexeclibdir) -shared-libgcc
 
 jv_convert_LINK = $(GCJLINK)
-jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \
-       $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
-
+jv_convert_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
 jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
        $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec