diff options
| author | Tom Tromey <tromey@redhat.com> | 2002-01-08 21:34:59 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2002-01-08 21:34:59 +0000 |
| commit | 8a188a02d55208c3a4881f9ba15c35ae50d2f058 (patch) | |
| tree | 93f16464721eddcb8ef7e0c8a2e0212b171cbb61 /libjava | |
| parent | e0ca6489564fe44be0fde6f754fc967606fea9ac (diff) | |
* Makefile.in: Rebuilt.
* Makefile.am (jv_convert_LDADD): Removed convert_source_files.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@48663 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/Makefile.am | 3 | ||||
| -rw-r--r-- | 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 <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 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 |