Makefile.am (libgij_la_LIBADD): Add -L$(here)/.libs.

	* Makefile.am (libgij_la_LIBADD): Add -L$(here)/.libs.
	(libgij_la_LDFLAGS): Add.
	* Makefile.in: Rebuilt.

From-SVN: r94165

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 86447b92f4c231f5bf5ef33192602dfa5b4c311d..1638e58232e156200dcb0f97e841c063ccf23a01 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-24  Jakub Jelinek  <jakub@redhat.com>
+
+       * Makefile.am (libgij_la_LIBADD): Add -L$(here)/.libs.
+       (libgij_la_LDFLAGS): Add.
+       * Makefile.in: Rebuilt.
+
 2005-01-24  Roger Sayle  <roger@eyesopen.com>
 
        PR java/19295

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index a6aa9b5ceb7090718c044bf7b1604ecdf6a2fa44..e212c3be010c32c8cb58b87a28be29bcc819b3f5 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -203,8 +203,12 @@ AM_CPPFLAGS = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
 ##
 
 libgij_la_SOURCES = gij.cc
-libgij_la_LIBADD = libgcj.la
 libgij_la_DEPENDENCIES = libgcj.la libgcj.spec
+## See jv_convert_LDADD.
+libgij_la_LIBADD = -L$(here)/.libs libgcj.la
+## The mysterious backslash in the grep pattern is consumed by make.
+libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
+        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
 
 libgcj_la_SOURCES = prims.cc jni.cc exception.cc \
        link.cc defineclass.cc interpret.cc verify.cc \

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 7c5e3733473bfee18e6380c25cb86b0249b58601..433039ddc81ca4a83bb084b535ce0399203c88d1 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -4647,8 +4647,10 @@ AM_CPPFLAGS = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
        $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS)
 
 libgij_la_SOURCES = gij.cc
-libgij_la_LIBADD = libgcj.la
 libgij_la_DEPENDENCIES = libgcj.la libgcj.spec
+libgij_la_LIBADD = -L$(here)/.libs libgcj.la
+libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
+        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
 libgcj_la_SOURCES = prims.cc jni.cc exception.cc \
        link.cc defineclass.cc interpret.cc verify.cc \
        $(nat_source_files) $(math_c_source_files) $(java_source_files) \