* Makefile.in: Rebuilt.

	* Makefile.am (jv_convert_DEPENDENCIES): Include libgcj.spec.
	* libgcj.spec.in: Don't use `+'.  Instead, put old lib spec after
	our libraries.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26889 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6613033..f07a5c6 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,6 +1,11 @@
 1999-05-11  Tom Tromey  <tromey@cygnus.com>
 
        * Makefile.in: Rebuilt.
+       * Makefile.am (jv_convert_DEPENDENCIES): Include libgcj.spec.
+       * libgcj.spec.in: Don't use `+'.  Instead, put old lib spec after
+       our libraries.
+
+       * Makefile.in: Rebuilt.
        * Makefile.am (jv_convert_LDADD): Removed `-L.'; it is not needed
        and it causes problems with libtool.
 

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 616f375..4a01079 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -270,8 +270,10 @@ jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) \
 ## system libraries we need (via the specs file).
 jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \
        $(GCLIBS) $(THREADLIBS) $(ZLIBS)
+## 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) \
-       $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la
+       $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
 
 # The Unicode consortium does not permit re-distributing the file JIS0201.TXT.
 # You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/.

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 09aabc5..760fbc3 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -202,7 +202,7 @@ jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \
        $(GCLIBS) $(THREADLIBS) $(ZLIBS)
 
 jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
-       $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la
+       $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
 
 
 gen_from_JIS_SOURCES = 

diff --git a/libjava/libgcj.spec.in b/libjava/libgcj.spec.in
index fae8a6a..24ee578 100644 (file)
--- a/libjava/libgcj.spec.in
+++ b/libjava/libgcj.spec.in
@@ -3,5 +3,5 @@
 # It is used to specify the standard libraries we need in order
 # to link with libgcj.
 #
-# We need a space after the `+' to placate gcc.
-*lib: + -lgcj -lm @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@
+%rename lib liborig
+*lib: -lgcj -lm @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(liborig)