diff options
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 6 | ||||
| -rw-r--r-- | libjava/Makefile.in | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 86447b9..1638e58 100644 --- 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 a6aa9b5c..e212c3b 100644 --- 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 7c5e3733..433039d 100644 --- 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) \ |