From ade710a51ffc2b4657fb33e94de5025ef513fe05 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Wed, 7 Jun 2006 21:46:24 +0000 Subject: makemake.tcl (emit_bc_rule): Do not skip gnu-java-awt-peer-qt.lo. 2006-06-07 Thomas Fitzsimmons * 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 --- libjava/scripts/makemake.tcl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'libjava/scripts/makemake.tcl') diff --git a/libjava/scripts/makemake.tcl b/libjava/scripts/makemake.tcl index 5036c1e..f857dd0 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. -- cgit v1.1