FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makemake.tcl (emit_bc_rule): Do not skip gnu-java-awt-peer-qt.lo.

Browse source 
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
This commit is contained in:
Thomas Fitzsimmons 2006-06-07 21:46:24 +00:00 • committed by Thomas Fitzsimmons
parent dd286892c4
commit ade710a51f
15 changed files with 3960 additions and 4762 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/scripts/makemake.tcl
View file

@ -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.