git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jakub Jelinek 2005-03-15 21:55:22 +01:00 committed by Jakub Jelinek
parent e2d6b9b9c0
commit cf1665b99c
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2005-03-15 Jakub Jelinek <jakub@redhat.com>
PR libgcj/20251
* Makefile.am (libjawt_la_LIBADD): Add -L$(here)/.libs.
* Makefile.in: Rebuilt.
2005-03-15 David Daney <ddaney@avtrex.com> 2005-03-15 David Daney <ddaney@avtrex.com>
* gnu/java/net/natPlainSocketImplPosix.cc (read_helper): Handle * gnu/java/net/natPlainSocketImplPosix.cc (read_helper): Handle

3
libjava/Makefile.am
View File

@ -488,7 +488,8 @@ lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
libjawt_la_SOURCES = jawt.c libjawt_la_SOURCES = jawt.c
libjawt_la_CFLAGS = -I$(srcdir)/jni/classpath $(PEDANTIC_CFLAGS) $(X_CFLAGS) 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 = \ libjawt_la_LDFLAGS = \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
$(LIBGCJ_LD_SYMBOLIC) $(LIBGCJ_LD_SYMBOLIC)

2
libjava/Makefile.in
View File

@ -5320,7 +5320,7 @@ lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \
lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK) lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
libjawt_la_SOURCES = jawt.c libjawt_la_SOURCES = jawt.c
libjawt_la_CFLAGS = -I$(srcdir)/jni/classpath $(PEDANTIC_CFLAGS) $(X_CFLAGS) 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 = \ libjawt_la_LDFLAGS = \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
$(LIBGCJ_LD_SYMBOLIC) $(LIBGCJ_LD_SYMBOLIC)