28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
|
2007-10-16 Jakub Jelinek <jakub@redhat.com>
|
||
|
|
|
||
|
|
* Makefile.am (libgcj_tools_la_LIBADD): Add.
|
||
|
|
* Makefile.in: Regenerated.
|
||
|
|
|
||
|
|
--- libjava/Makefile.am.jj 2009-05-06 08:14:50.000000000 +0200
|
||
|
|
+++ libjava/Makefile.am 2009-05-06 10:26:43.000000000 +0200
|
||
|
|
@@ -510,7 +510,7 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS
|
||
|
|
libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
|
||
|
|
-version-info `grep -v '^\#' $(srcdir)/libtool-version` \
|
||
|
|
$(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF)
|
||
|
|
-libgcj_tools_la_LIBADD = libgcj.la -lm
|
||
|
|
+libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la -lm
|
||
|
|
libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
|
||
|
|
if BUILD_SUBLIBS
|
||
|
|
libgcj_tools_la_DEPENDENCIES += libgcj-noncore.la
|
||
|
|
--- libjava/Makefile.in.jj 2009-05-06 08:14:49.000000000 +0200
|
||
|
|
+++ libjava/Makefile.in 2009-05-06 10:27:18.000000000 +0200
|
||
|
|
@@ -1190,7 +1190,7 @@ libgcj_tools_la_LDFLAGS = -rpath $(toole
|
||
|
|
-version-info `grep -v '^\#' $(srcdir)/libtool-version` \
|
||
|
|
$(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF)
|
||
|
|
|
||
|
|
-libgcj_tools_la_LIBADD = libgcj.la -lm
|
||
|
|
+libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la -lm
|
||
|
|
libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_22)
|
||
|
|
libgcj_tools_la_LINK = $(LIBLINK) $(libgcj_tools_la_LDFLAGS)
|
||
|
|
libjvm_la_SOURCES = jni-libjvm.cc
|