Makefile.in: Rebuilt.

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

From-SVN: r26653

libjava/ChangeLog

 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.
 	* configure.in: Added AM_PROG_LIBTOOL.
 	(GCOBJS): Use `.lo' form of files.

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
 

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