OSDN Git Service

2006-05-30 Thomas Fitzsimmons <fitzsim@redhat.com>
authorfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 30 May 2006 21:38:51 +0000 (21:38 +0000)
committerfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 30 May 2006 21:38:51 +0000 (21:38 +0000)
commit03b8eaaddec1ba9a586be7987111526fa7ea088d
tree541f5e5b869d78007d2f185daf6d91235889cc93
parent5f4f36179fad688358074cd9dd9cd0461168334a
2006-05-30  Thomas Fitzsimmons  <fitzsim@redhat.com>

* scripts/makemake.tcl (emit_bc_rule): Do not skip
gnu-java-awt-peer-gtk.lo.
Include gnu/java/awt/peer/gtk Java objects in libgcj.so.  Use C++
ABI for gnu/java/awt/peer/gtk package.
* gnu/classpath/natSystemProperties.cc (PrependVersionedLibdir):
New function.
(insertSystemProperties): Only set java.ext.dirs if it is not
already defined.  Prepend GCJ_VERSIONED_LIBDIR to module search
path where necessary.
* configure.ac (GTK_AWT): Remove automake conditional.
* include/jvm.h (_Jv_PrependVersionedLibdir): New function
declaration.
* gij.cc (main): Prepend LD_LIBRARY_PATH with GCJ_VERSIONED_LIBDIR
and re-exec self.
* Makefile.am (AM_CXXFLAGS): Define GCJ_VERSIONED_LIBDIR,
GIJ_EXECUTABLE and PATH_SEPARATOR macros.
Remove lib-gnu-java-awt-peer-gtk.la and libgcjawt.la build logic.
* prims.cc (_Jv_PrependVersionedLibdir): New function.

2006-05-30  Thomas Fitzsimmons  <fitzsim@redhat.com>

* native/jni/gtk-peer/Makefile.am (gcc_version): New variable.
(gcjversionedlibdir): Likewise.
(libgtkpeer_la_LDFLAGS): Likewise.
Install libgtkpeer.so in GCJ versioned library directory.
* native/jawt/Makefile.am (gcc_version): New variable.
(gcjversionedlibdir): Likewise.
(libjawt_la_LDFLAGS): Likewise.
Rename libjawtgnu.so libjawt.so.  Install libjawt.so in GCJ
versioned library directory.
* gnu/java/awt/peer/gtk/GdkFontPeer.java (static): Call
System.loadLibrary unconditionally.
* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Likewise.
* gnu/java/awt/peer/gtk/GdkGraphics2D.java: Likewise.
* gnu/java/awt/peer/gtk/GdkGraphics.java: Likewise.
* gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise.
* gnu/java/awt/peer/gtk/GdkTextLayout.java: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114247 138bc75d-0d04-0410-961f-82ee72b054a4
58 files changed:
libjava/ChangeLog
libjava/Makefile.am
libjava/Makefile.in
libjava/classpath/ChangeLog.gcj
libjava/classpath/Makefile.in
libjava/classpath/aclocal.m4
libjava/classpath/configure
libjava/classpath/doc/Makefile.in
libjava/classpath/doc/api/Makefile.in
libjava/classpath/examples/Makefile.in
libjava/classpath/external/Makefile.in
libjava/classpath/external/relaxngDatatype/Makefile.in
libjava/classpath/external/sax/Makefile.in
libjava/classpath/external/w3c_dom/Makefile.in
libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java
libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphics.java
libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java
libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
libjava/classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java
libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java
libjava/classpath/include/Makefile.in
libjava/classpath/include/config.h.in
libjava/classpath/lib/Makefile.in
libjava/classpath/native/Makefile.in
libjava/classpath/native/fdlibm/Makefile.in
libjava/classpath/native/jawt/Makefile.am
libjava/classpath/native/jawt/Makefile.in
libjava/classpath/native/jni/Makefile.in
libjava/classpath/native/jni/classpath/Makefile.in
libjava/classpath/native/jni/gtk-peer/Makefile.am
libjava/classpath/native/jni/gtk-peer/Makefile.in
libjava/classpath/native/jni/java-io/Makefile.in
libjava/classpath/native/jni/java-lang/Makefile.in
libjava/classpath/native/jni/java-net/Makefile.in
libjava/classpath/native/jni/java-nio/Makefile.in
libjava/classpath/native/jni/java-util/Makefile.in
libjava/classpath/native/jni/midi-alsa/Makefile.in
libjava/classpath/native/jni/midi-dssi/Makefile.in
libjava/classpath/native/jni/qt-peer/Makefile.in
libjava/classpath/native/jni/xmlj/Makefile.in
libjava/classpath/native/target/Linux/Makefile.in
libjava/classpath/native/target/Makefile.in
libjava/classpath/native/target/generic/Makefile.in
libjava/classpath/resource/Makefile.in
libjava/classpath/scripts/Makefile.in
libjava/classpath/tools/Makefile.in
libjava/configure
libjava/configure.ac
libjava/gcj/Makefile.in
libjava/gij.cc
libjava/gnu/classpath/natSystemProperties.cc
libjava/include/Makefile.in
libjava/include/jvm.h
libjava/prims.cc
libjava/scripts/makemake.tcl
libjava/sources.am
libjava/standard.omit.in
libjava/testsuite/Makefile.in