* Makefile.in: Rebuilt.
* Makefile.am (LIBLINK): New macro.
(libgcj_la_LINK): Use it.
(libgcjawt_la_LINK): Likewise.
From-SVN: r33760
+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.
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
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)
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,
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
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)
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)