From 8d48f5b33041f141c110f551fc04d8964cda95bd Mon Sep 17 00:00:00 2001 From: tromey Date: Tue, 8 Jan 2002 21:34:59 +0000 Subject: [PATCH] * Makefile.in: Rebuilt. * Makefile.am (jv_convert_LDADD): Removed convert_source_files. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@48663 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/Makefile.am | 3 +-- libjava/Makefile.in | 4 +--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a5e7fa75f62..7fb1e54d508 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-01-08 Tom Tromey + + * Makefile.in: Rebuilt. + * Makefile.am (jv_convert_LDADD): Removed convert_source_files. + 2002-01-08 Nic Ferrier * java/net/natPlainSocketImpl.cc: Added timeout handling for diff --git a/libjava/Makefile.am b/libjava/Makefile.am index f5121e38210..a2575edf3b2 100644 --- 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 058ee1d61d4..75bc6ad12b2 100644 --- 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 -- 2.11.0