* Makefile.in: Rebuilt.

	* Makefile.am (LIBLINK): New macro.
	(libgcj_la_LINK): Use it.
	(libgcjawt_la_LINK): Likewise.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a458b4d..0f6a736 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2000-05-07  Tom Tromey  <tromey@cygnus.com>
+
+       * Makefile.in: Rebuilt.
+       * Makefile.am (LIBLINK): New macro.
+       (libgcj_la_LINK): Use it.
+       (libgcjawt_la_LINK): Likewise.
+
 2000-05-06  Tom Tromey  <tromey@cygnus.com>
 
        * Makefile.in: Rebuilt.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 614f870..d7b98c2 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -73,6 +73,7 @@ endif # CANADIAN
 
 GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -L$(here) $(JC1FLAGS) -c
 GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
+LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
 
 JAVAC = $(GCJ) -C
 
@@ -132,7 +133,8 @@ libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \
 libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \
 ## The mysterious backslash is consumed by make.
        -version-info `grep -v '^\#' $(srcdir)/libtool-version`
-libgcj_la_LINK = $(GCJLINK)
+libgcj_la_LINK = $(LIBLINK)
+
 
 libgcjawt_la_SOURCES = ## Nothing
 EXTRA_libgcjawt_la_SOURCES = $(awt_java_source_files)
@@ -141,7 +143,7 @@ libgcjawt_la_LIBADD = $(awto_files)
 libgcjawt_la_LDFLAGS = -rpath $(toolexeclibdir) \
 ## The mysterious backslash is consumed by make.
        -version-info `grep -v '^\#' $(srcdir)/libtool-version`
-libgcjawt_la_LINK = $(GCJLINK)
+libgcjawt_la_LINK = $(LIBLINK)
 
 ## Make the .class files depend on the .zip file.  This seems
 ## backwards, but is right.  This doesn't catch all the .class files,

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 027af04..7038e2e 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -159,6 +159,7 @@ data_DATA = libgcj.zip
 
 GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -L$(here) $(JC1FLAGS) -c
 GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
+LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
 
 JAVAC = $(GCJ) -C
 
@@ -208,7 +209,7 @@ libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \
 libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \
        -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 
-libgcj_la_LINK = $(GCJLINK)
+libgcj_la_LINK = $(LIBLINK)
 
 libgcjawt_la_SOURCES = ## Nothing
 EXTRA_libgcjawt_la_SOURCES = $(awt_java_source_files)
@@ -217,7 +218,7 @@ libgcjawt_la_LIBADD = $(awto_files)
 libgcjawt_la_LDFLAGS = -rpath $(toolexeclibdir) \
        -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 
-libgcjawt_la_LINK = $(GCJLINK)
+libgcjawt_la_LINK = $(LIBLINK)
 
 MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) \
        $(awto_files)