From cf1665b99c744e4f3608db9432a5dad941894d1c Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 15 Mar 2005 21:55:22 +0100 Subject: [PATCH] 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 --- libjava/ChangeLog | 6 ++++++ libjava/Makefile.am | 3 ++- libjava/Makefile.in | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 59db600596f..10f1ba4a906 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-03-15 Jakub Jelinek + + PR libgcj/20251 + * Makefile.am (libjawt_la_LIBADD): Add -L$(here)/.libs. + * Makefile.in: Rebuilt. + 2005-03-15 David Daney * gnu/java/net/natPlainSocketImplPosix.cc (read_helper): Handle 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) diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 04d4ad783d4..966e137a846 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -5320,7 +5320,7 @@ lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \ 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 +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) -- 2.30.2