Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (jv_convert_LDFLAGS): Added -nodefaultlibs.
	(jv_convert_LDADD): Explicltly add -lm -lc.

From-SVN: r26653

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a0507e5f635c2dde38fa025a1daa4b68feeec86c..b320d0ce5512247336e9b481e3e2c320978964e7 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+1999-04-26  Tom Tromey  <tromey@cygnus.com>
+
+       * Makefile.in: Rebuilt.
+       * Makefile.am (jv_convert_LDFLAGS): Added -nodefaultlibs.
+       (jv_convert_LDADD): Explicltly add -lm -lc.
+
 1999-04-26  Tom Tromey  <tromey@cygnus.com>
 
        * configure, Makefile.in: Rebuilt.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 02a7c7b015066c4998135aecdfbca7d675fb9192..3e88f1973c04242eb0f685e74ac65ae8163ee100 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -251,10 +251,15 @@ CONVERT_DIR = gnu/gcj/convert
 
 jv_convert_SOURCES =
 EXTRA_jv_convert_SOURCES = $(convert_source_files)
-jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert -rpath $(toolexeclibdir)
-jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) -o jv-convert
+## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'.  We
+## need this because we are explicitly using libtool to link using the
+## `.la' file.
+jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert -nodefaultlibs \
+       -rpath $(toolexeclibdir)
+jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) \
+       -o jv-convert
 jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \
-       $(GCLIBS) $(THREADLIBS)
+       $(GCLIBS) $(THREADLIBS) -lm -lc
 jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
        $(GCDEPS) $(THREADDEPS) libgcj.la
 

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 4dd65b6c12e78ff58d92527b218241d584baa8bc..6fb9cffba98f7590519b6892f24dd9c0b6fa7f07 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -182,10 +182,14 @@ CONVERT_DIR = gnu/gcj/convert
 
 jv_convert_SOURCES = 
 EXTRA_jv_convert_SOURCES = $(convert_source_files)
-jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert -rpath $(toolexeclibdir)
-jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) -o jv-convert
+jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert -nodefaultlibs \
+       -rpath $(toolexeclibdir)
+
+jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) \
+       -o jv-convert
+
 jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \
-       $(GCLIBS) $(THREADLIBS)
+       $(GCLIBS) $(THREADLIBS) -lm -lc
 
 jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
        $(GCDEPS) $(THREADDEPS) libgcj.la