Commit 1e7fcb11 by Tom Tromey Committed by Tom Tromey

Makefile.in: Rebuilt.

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

From-SVN: r48663
parent 2b521fa7
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> 2002-01-08 Nic Ferrier <nferrier@tf1.tapsellferrier.co.uk>
* java/net/natPlainSocketImpl.cc: Added timeout handling for * java/net/natPlainSocketImpl.cc: Added timeout handling for
......
...@@ -424,8 +424,7 @@ jv_convert_LINK = $(GCJLINK) ...@@ -424,8 +424,7 @@ jv_convert_LINK = $(GCJLINK)
## system libraries we need (via the specs file). ## system libraries we need (via the specs file).
## We need the -L so that gcj can find libgcj with `-lgcj'. ## We need the -L so that gcj can find libgcj with `-lgcj'.
## FIXME: should be _libs on some systems. ## FIXME: should be _libs on some systems.
jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \ jv_convert_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
$(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
## Depend on the spec file to make sure it is up to date before ## Depend on the spec file to make sure it is up to date before
## linking this program. ## linking this program.
jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \ jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
......
...@@ -263,9 +263,7 @@ jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \ ...@@ -263,9 +263,7 @@ jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \
-rpath $(toolexeclibdir) -shared-libgcc -rpath $(toolexeclibdir) -shared-libgcc
jv_convert_LINK = $(GCJLINK) jv_convert_LINK = $(GCJLINK)
jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \ jv_convert_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
$(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \ jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
$(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment