aboutsummaryrefslogtreecommitdiff
path: root/libjava/Makefile.am
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-03-15 21:55:22 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2005-03-15 21:55:22 +0100
commitcf1665b99c744e4f3608db9432a5dad941894d1c (patch)
tree960df0d55175d167a73caa8f4dc3ca301590f8ec /libjava/Makefile.am
parente2d6b9b9c02c0d50824bdc283a0308ef34a22cab (diff)
downloadgcc-cf1665b99c744e4f3608db9432a5dad941894d1c.tar.gz
gcc-cf1665b99c744e4f3608db9432a5dad941894d1c.tar.bz2
gcc-cf1665b99c744e4f3608db9432a5dad941894d1c.zip
re PR libgcj/20251 (libgcj configured with --enable-gtk-cairo fails on installation)
PR libgcj/20251 * Makefile.am (libjawt_la_LIBADD): Add -L$(here)/.libs. * Makefile.in: Rebuilt. From-SVN: r96533
Diffstat (limited to 'libjava/Makefile.am')
-rw-r--r--libjava/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 2b1314e714d..41a262e1d01 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -488,7 +488,8 @@ lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
libjawt_la_SOURCES = jawt.c
libjawt_la_CFLAGS = -I$(srcdir)/jni/classpath $(PEDANTIC_CFLAGS) $(X_CFLAGS)
-libjawt_la_LIBADD = lib-gnu-java-awt-peer-gtk.la
+## See jv_convert_LDADD.
+libjawt_la_LIBADD = -L$(here)/.libs lib-gnu-java-awt-peer-gtk.la
libjawt_la_LDFLAGS = \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` \
$(LIBGCJ_LD_SYMBOLIC)