This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[patch] rename libjawt.so
- From: Thomas Fitzsimmons <fitzsim at redhat dot com>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 12 May 2005 20:48:45 -0400
- Subject: [patch] rename libjawt.so
Hi,
I committed this patch to mainline. It renames libjawt.so to
libgcjawt.so. libjawt.so is the name given to proprietary
implementations of the AWT Native Interface. Since our implementation
is installed in the default library directory it may silently override a
proprietary implementation, causing strange results. Tested with "make
bootstrap".
Tom
2005-05-12 Thomas Fitzsimmons <fitzsim@redhat.com>
* Makefile.am (cond_gtk_gcjawt_ltlibrary): Rename libjawt.la
libgcjawt.la.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.485
diff -u -r1.485 Makefile.am
--- Makefile.am 12 May 2005 01:26:55 -0000 1.485
+++ Makefile.am 12 May 2005 23:44:38 -0000
@@ -105,14 +105,14 @@
if GTK_AWT
cond_gtk_ltlibrary = lib-gnu-java-awt-peer-gtk.la
-cond_gtk_jawt_ltlibrary = libjawt.la
+cond_gtk_gcjawt_ltlibrary = libgcjawt.la
else
cond_gtk_ltlibrary =
-cond_gtk_jawt_ltlibrary =
+cond_gtk_gcjawt_ltlibrary =
endif
toolexeclib_LTLIBRARIES = libgcj.la libgij.la \
- $(cond_gtk_ltlibrary) $(cond_gtk_jawt_ltlibrary) $(cond_xlib_ltlibrary)
+ $(cond_gtk_ltlibrary) $(cond_gtk_gcjawt_ltlibrary) $(cond_xlib_ltlibrary)
toolexecmainlib_DATA = libgcj.spec
pkgconfigdir = $(libdir)/pkgconfig
@@ -501,14 +501,14 @@
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) $(X_LIBS) -lXtst
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)
+libgcjawt_la_SOURCES = jawt.c
+libgcjawt_la_CFLAGS = -I$(srcdir)/jni/classpath $(PEDANTIC_CFLAGS) $(X_CFLAGS)
## See jv_convert_LDADD.
-libjawt_la_LIBADD = -L$(here)/.libs lib-gnu-java-awt-peer-gtk.la
-libjawt_la_LDFLAGS = \
+libgcjawt_la_LIBADD = -L$(here)/.libs lib-gnu-java-awt-peer-gtk.la
+libgcjawt_la_LDFLAGS = \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` \
$(LIBGCJ_LD_SYMBOLIC)
-libjawt_la_LINK = $(LIBLINK)
+libgcjawt_la_LINK = $(LIBLINK)
lib_gnu_awt_xlib_la_SOURCES = \
$(xlib_java_source_files) \