diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-07 21:46:24 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-07 21:46:24 +0000 |
| commit | 30f7243e608dd7bf809ebd67daf3eaec35b1e669 (patch) | |
| tree | 3059efcfea3de62c60cdca8f76c6d16830f5258a /libjava/scripts | |
| parent | 55f80fd58ba56dcfd984c063540fccaf7e0be2f4 (diff) | |
| download | gcc-30f7243e608dd7bf809ebd67daf3eaec35b1e669.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114473 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/scripts')
| -rwxr-xr-x | libjava/scripts/makemake.tcl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libjava/scripts/makemake.tcl b/libjava/scripts/makemake.tcl index 5036c1e2461..f857dd0669c 100755 --- a/libjava/scripts/makemake.tcl +++ b/libjava/scripts/makemake.tcl @@ -256,11 +256,7 @@ proc emit_bc_rule {package} { puts "\t@rm -f $tname" puts "" - # We skip these because they are built into their own libraries and - # are handled specially in Makefile.am. - if {$loname != "gnu-java-awt-peer-qt.lo"} { - lappend bc_objects $loname - } + lappend bc_objects $loname } # Emit a rule for a 'package' package. |