sources.am, [...]: Rebuilt.

* sources.am, Makefile.in: Rebuilt.
	* Makefile.am (all_xlib_lo_files): Removed.
	(all_libgcj_lo_files): Likewise.
	(lib_gnu_awt_xlib_la_LIBADD): List correct .lo files.
	(xlib_java_source_files): Removed.
	(xlib_nat_headers): Updated.
	* configure: Rebuilt.
	* configure.ac: Create standard.omit.
	* standard.omit.in: New file.
	* standard.omit: Removed.
	* scripts/makemake.tcl (gnu/gcj/xlib, gnu/awt/xlib): Now
	'package'.
	(emit_package_rule): Special case xlib peers.
	(emit_source_var): Likewise.
	Read standard.omit.in.
	* gnu/awt/xlib/XToolkit.java (createEmbeddedWindow): New method.

From-SVN: r102211
This commit is contained in:
Tom Tromey 2005-07-20 23:39:44 +00:00 committed by Tom Tromey
parent 5d0317fccc
commit 9365047aba
9 changed files with 200 additions and 117 deletions

View file

@ -56,8 +56,8 @@ set package_map(java/lang/Object.java) ignore
# More special cases. These end up in their own library.
# Note that if we BC-compile AWT we must update these as well.
set package_map(gnu/gcj/xlib) ignore
set package_map(gnu/awt/xlib) ignore
set package_map(gnu/gcj/xlib) package
set package_map(gnu/awt/xlib) package
# Some BC ABI packages have classes which must not be compiled BC.
# This maps such packages to a grep expression for excluding such
@ -253,7 +253,9 @@ proc emit_package_rule {package} {
puts ""
puts ""
lappend package_files $lname
if {$pkgname != "gnu/gcj/xlib" && $pkgname != "gnu/awt/xlib"} {
lappend package_files $lname
}
}
# Emit a source file variable for a package, and corresponding header
@ -301,8 +303,10 @@ proc emit_source_var {package} {
}
puts "${uname}_header_files = $result"
lappend header_vars "${uname}_header_files"
puts ""
if {$pkgname != "gnu/gcj/xlib" && $pkgname != "gnu/awt/xlib"} {
lappend header_vars "${uname}_header_files"
}
}
}
@ -318,7 +322,7 @@ proc pp_var {name valueList {pre ""} {post ""}} {
}
# Read the proper .omit files.
read_omit_file standard.omit
read_omit_file standard.omit.in
read_omit_file classpath/lib/standard.omit
# Scan classpath first.