diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-01-24 17:33:14 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-01-24 17:33:14 +0000 |
| commit | ca6c4ef0bb9b48629c7ef0ab22e1818e82747d78 (patch) | |
| tree | 64b5e065f799bd09519bdb1a9808b5e2b12d3b19 /libjava | |
| parent | 7be6d0ab835f4b44152c8d7db6173761d1b8636e (diff) | |
| download | ppe42-gcc-ca6c4ef0bb9b48629c7ef0ab22e1818e82747d78.tar.gz ppe42-gcc-ca6c4ef0bb9b48629c7ef0ab22e1818e82747d78.zip | |
* Makefile.am (libgij_la_LIBADD): Add -L$(here)/.libs.
(libgij_la_LDFLAGS): Add.
* Makefile.in: Rebuilt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94165 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -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 86447b92f4c..1638e58232e 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 a6aa9b5ceb7..e212c3be010 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 7c5e3733473..433039ddc81 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) \ |
