This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] Fix libjawt install


On Tue, 2005-03-15 at 11:07 -0500, Jakub Jelinek wrote:
> Hi!
> 
> Without this, there are problems with relinking libjawt.so during
> make install.
> Ok to commit?
> 

Looks good, please commit.

Thanks,
Tom

> 2005-03-15  Jakub Jelinek  <jakub@redhat.com>
> 
> 	* Makefile.am (libjawt_la_LIBADD): Add -L$(here)/.libs.
> 	* Makefile.in: Rebuilt.
> 
> --- libjava/Makefile.am	23 Feb 2005 08:33:21 -0000	1.455
> +++ libjava/Makefile.am	27 Feb 2005 22:42:50 -0000
> @@ -467,7 +467,8 @@ lib_gnu_java_awt_peer_gtk_la_LINK = $(LI
>  
>  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)
> --- libjava/Makefile.in	23 Feb 2005 08:33:26 -0000	1.485
> +++ libjava/Makefile.in	27 Feb 2005 22:42:51 -0000
> @@ -5316,7 +5316,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)
> 
> 	Jakub


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]