makemake.tcl (emit_bc_rule): Do not skip gnu-java-awt-peer-qt.lo.
authorThomas Fitzsimmons <fitzsim@redhat.com>
Wed, 7 Jun 2006 21:46:24 +0000 (21:46 +0000)
committerThomas Fitzsimmons <fitzsim@gcc.gnu.org>
Wed, 7 Jun 2006 21:46:24 +0000 (21:46 +0000)
commitade710a51ffc2b4657fb33e94de5025ef513fe05
tree3059efcfea3de62c60cdca8f76c6d16830f5258a
parentdd286892c4b4a6135ed6550ae8b710891f1806da
makemake.tcl (emit_bc_rule): Do not skip gnu-java-awt-peer-qt.lo.

2006-06-07  Thomas Fitzsimmons  <fitzsim@redhat.com>

* scripts/makemake.tcl (emit_bc_rule): Do not skip
gnu-java-awt-peer-qt.lo.
* configure.ac (QT_AWT): Remove conditional.
Do not add gnu/java/awt/peer/qt to standard.omit.
* classpath/native/jni/qt-peer/Makefile.am: Install libqtpeer.so
in GCJ's versioned library directory.
* classpath/gnu/java/awt/peer/qt/QtToolkit.java (initToolkit):
Load libqtpeer.so unconditionally.
* gij.cc (main): Do not re-exec gij.
* Makefile.am: Remove lib-gnu-java-awt-peer-qt.lo build logic.
(gij_LDFLAGS): Point -rpath at GCJ's versioned library directory
when linking gij.

From-SVN: r114473
15 files changed:
libjava/ChangeLog
libjava/Makefile.am
libjava/Makefile.in
libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java
libjava/classpath/native/jawt/Makefile.in
libjava/classpath/native/jni/qt-peer/Makefile.am
libjava/classpath/native/jni/qt-peer/Makefile.in
libjava/configure
libjava/configure.ac
libjava/gcj/Makefile.in
libjava/gij.cc
libjava/include/Makefile.in
libjava/scripts/makemake.tcl
libjava/sources.am
libjava/testsuite/Makefile.in