2006-10-09 Brooks Moses <bmoses@stanford.edu>

[pf3gnuchains/gcc-fork.git] / libjava / Makefile.in

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index f7b2a14..d514fcb 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +17,6 @@
 
 
 
-SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(lib_gnu_java_awt_peer_qt_la_SOURCES) $(libgcj_la_SOURCES) $(libgcjawt_la_SOURCES) $(libgij_la_SOURCES) $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -43,12 +41,13 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 @TESTSUBDIR_TRUE@am__append_1 = testsuite
-@XLIB_AWT_TRUE@am__append_2 = lib-gnu-awt-xlib.la
-@GTK_AWT_TRUE@am__append_3 = lib-gnu-java-awt-peer-gtk.la libgcjawt.la
-@QT_AWT_TRUE@am__append_4 = lib-gnu-java-awt-peer-qt.la
+@USE_LIBGCJ_BC_TRUE@am__append_2 = libgcj_bc.la
+@XLIB_AWT_TRUE@am__append_3 = lib-gnu-awt-xlib.la
 @NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \
 @NATIVE_TRUE@  grmic$(EXEEXT) grmiregistry$(EXEEXT) \
-@NATIVE_TRUE@  gcj-dbtool$(EXEEXT)
+@NATIVE_TRUE@  gcj-dbtool$(EXEEXT) gappletviewer$(EXEEXT) \
+@NATIVE_TRUE@  gjarsigner$(EXEEXT) gkeytool$(EXEEXT)
+@BASH_JAR_TRUE@am__append_4 = scripts/jar
 @USING_GCC_TRUE@am__append_5 = $(WARNINGS)
 @USING_BOEHMGC_TRUE@am__append_6 = boehm.cc
 @USING_NOGC_TRUE@am__append_7 = nogc.cc
@@ -65,8 +64,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
        $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(srcdir)/libgcj-test.spec.in \
        $(srcdir)/libgcj.pc.in $(srcdir)/libgcj.spec.in \
-       $(srcdir)/sources.am $(top_srcdir)/configure COPYING ChangeLog \
-       NEWS THANKS
+       $(srcdir)/sources.am $(top_srcdir)/configure \
+       $(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@noinst_PROGRAMS =  \
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gen-from-JIS$(EXEEXT)
 @XLIB_AWT_TRUE@am__append_14 = $(xlib_nat_headers)
@@ -83,9 +82,11 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
        $(top_srcdir)/../config/lib-link.m4 \
        $(top_srcdir)/../config/lib-prefix.m4 \
        $(top_srcdir)/../config/no-executables.m4 \
-       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../libtool.m4 \
-       $(top_srcdir)/mingwld.m4 $(top_srcdir)/pkg.m4 \
-       $(top_srcdir)/shlibpath.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../config/tls.m4 \
+       $(top_srcdir)/../config/unwind_ipinfo.m4 \
+       $(top_srcdir)/../libtool.m4 $(top_srcdir)/mingwld.m4 \
+       $(top_srcdir)/pkg.m4 $(top_srcdir)/shlibpath.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -93,7 +94,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 CONFIG_HEADER = $(top_builddir)/include/config.h \
        $(top_builddir)/gcj/libgcj-config.h
 CONFIG_CLEAN_FILES = libgcj.pc libgcj.spec libgcj-test.spec \
-       java/io/natFile.cc java/lang/ConcreteProcess.java \
+       scripts/jar java/io/natFile.cc java/lang/ConcreteProcess.java \
        java/lang/natConcreteProcess.cc java/net/natInetAddress.cc \
        java/net/natVMNetworkInterface.cc \
        gnu/java/net/natPlainSocketImpl.cc \
@@ -107,12 +108,14 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" \
+am__installdirs = "$(DESTDIR)$(dbexecdir)" \
+       "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" \
        "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbexecdir)" \
        "$(DESTDIR)$(jardir)" "$(DESTDIR)$(pkgconfigdir)" \
        "$(DESTDIR)$(toolexecmainlibdir)"
+dbexecLTLIBRARIES_INSTALL = $(INSTALL)
 toolexeclibLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
+LTLIBRARIES = $(dbexec_LTLIBRARIES) $(toolexeclib_LTLIBRARIES)
 am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo \
        gnu/gcj/xlib/lib_gnu_awt_xlib_la-natColormap.lo \
@@ -137,18 +140,10 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo \
 am_lib_gnu_awt_xlib_la_OBJECTS = $(am__objects_1)
 lib_gnu_awt_xlib_la_OBJECTS = $(am_lib_gnu_awt_xlib_la_OBJECTS)
 @XLIB_AWT_TRUE@am_lib_gnu_awt_xlib_la_rpath = -rpath $(toolexeclibdir)
-am__DEPENDENCIES_1 =
-am_lib_gnu_java_awt_peer_gtk_la_OBJECTS =
-lib_gnu_java_awt_peer_gtk_la_OBJECTS =  \
-       $(am_lib_gnu_java_awt_peer_gtk_la_OBJECTS)
-@GTK_AWT_TRUE@am_lib_gnu_java_awt_peer_gtk_la_rpath = -rpath \
-@GTK_AWT_TRUE@ $(toolexeclibdir)
-am_lib_gnu_java_awt_peer_qt_la_OBJECTS =
-lib_gnu_java_awt_peer_qt_la_OBJECTS =  \
-       $(am_lib_gnu_java_awt_peer_qt_la_OBJECTS)
-@QT_AWT_TRUE@am_lib_gnu_java_awt_peer_qt_la_rpath = -rpath \
-@QT_AWT_TRUE@  $(toolexeclibdir)
-am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
+libgcj_tools_la_LIBADD =
+am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo
+libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS)
+am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
        gnu/classpath/debug.lo gnu/classpath/jdwp.lo \
        gnu/classpath/jdwp/event.lo \
        gnu/classpath/jdwp/event/filters.lo \
@@ -157,93 +152,122 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
        gnu/classpath/jdwp/transport.lo gnu/classpath/jdwp/util.lo \
        gnu/gcj.lo gnu/gcj/convert.lo gnu/gcj/io.lo gnu/gcj/runtime.lo \
        gnu/gcj/util.lo gnu/java/awt.lo gnu/java/awt/color.lo \
-       gnu/java/awt/image.lo gnu/java/awt/peer.lo gnu/java/io.lo \
-       gnu/java/lang.lo gnu/java/lang/reflect.lo gnu/java/locale.lo \
-       gnu/java/math.lo gnu/java/net.lo gnu/java/net/protocol/file.lo \
-       gnu/java/net/protocol/ftp.lo gnu/java/net/protocol/http.lo \
-       gnu/java/net/protocol/https.lo gnu/java/net/protocol/jar.lo \
-       gnu/java/nio.lo gnu/java/nio/channels.lo \
-       gnu/java/nio/charset.lo gnu/java/rmi.lo gnu/java/rmi/dgc.lo \
-       gnu/java/rmi/registry.lo gnu/java/rmi/server.lo \
-       gnu/java/security.lo gnu/java/security/action.lo \
-       gnu/java/security/ber.lo gnu/java/security/der.lo \
-       gnu/java/security/hash.lo gnu/java/security/jce/hash.lo \
-       gnu/java/security/jce/prng.lo gnu/java/security/jce/sig.lo \
-       gnu/java/security/key.lo gnu/java/security/key/dss.lo \
-       gnu/java/security/key/rsa.lo gnu/java/security/pkcs.lo \
-       gnu/java/security/prng.lo gnu/java/security/provider.lo \
-       gnu/java/security/sig.lo gnu/java/security/sig/dss.lo \
-       gnu/java/security/sig/rsa.lo gnu/java/security/util.lo \
-       gnu/java/security/x509.lo gnu/java/security/x509/ext.lo \
-       gnu/java/text.lo gnu/java/util.lo gnu/java/util/prefs.lo \
-       gnu/javax/crypto.lo gnu/javax/crypto/assembly.lo \
-       gnu/javax/crypto/cipher.lo gnu/javax/crypto/jce.lo \
-       gnu/javax/crypto/jce/cipher.lo gnu/javax/crypto/jce/key.lo \
-       gnu/javax/crypto/jce/keyring.lo gnu/javax/crypto/jce/mac.lo \
-       gnu/javax/crypto/jce/params.lo gnu/javax/crypto/jce/prng.lo \
-       gnu/javax/crypto/jce/sig.lo gnu/javax/crypto/jce/spec.lo \
-       gnu/javax/crypto/key.lo gnu/javax/crypto/key/dh.lo \
-       gnu/javax/crypto/key/srp6.lo gnu/javax/crypto/keyring.lo \
+       gnu/java/awt/dnd.lo gnu/java/awt/font.lo \
+       gnu/java/awt/font/opentype.lo \
+       gnu/java/awt/font/opentype/truetype.lo gnu/java/awt/image.lo \
+       gnu/java/awt/java2d.lo gnu/java/awt/peer.lo \
+       gnu/java/awt/print.lo gnu/java/io.lo gnu/java/lang.lo \
+       gnu/java/lang/management.lo gnu/java/lang/reflect.lo \
+       gnu/java/locale.lo gnu/java/math.lo gnu/java/net.lo \
+       gnu/java/net/loader.lo gnu/java/net/local.lo \
+       gnu/java/net/protocol/core.lo gnu/java/net/protocol/file.lo \
+       gnu/java/net/protocol/ftp.lo gnu/java/net/protocol/gcjlib.lo \
+       gnu/java/net/protocol/http.lo gnu/java/net/protocol/https.lo \
+       gnu/java/net/protocol/jar.lo gnu/java/nio.lo \
+       gnu/java/nio/channels.lo gnu/java/nio/charset.lo \
+       gnu/java/rmi.lo gnu/java/rmi/activation.lo gnu/java/rmi/dgc.lo \
+       gnu/java/rmi/registry.lo gnu/java/rmi/rmic.lo \
+       gnu/java/rmi/server.lo gnu/java/security.lo \
+       gnu/java/security/action.lo gnu/java/security/ber.lo \
+       gnu/java/security/der.lo gnu/java/security/hash.lo \
+       gnu/java/security/jce/hash.lo gnu/java/security/jce/prng.lo \
+       gnu/java/security/jce/sig.lo gnu/java/security/key.lo \
+       gnu/java/security/key/dss.lo gnu/java/security/key/rsa.lo \
+       gnu/java/security/pkcs.lo gnu/java/security/prng.lo \
+       gnu/java/security/provider.lo gnu/java/security/sig.lo \
+       gnu/java/security/sig/dss.lo gnu/java/security/sig/rsa.lo \
+       gnu/java/security/util.lo gnu/java/security/x509.lo \
+       gnu/java/security/x509/ext.lo gnu/java/text.lo \
+       gnu/java/util.lo gnu/java/util/jar.lo gnu/java/util/prefs.lo \
+       gnu/java/util/regex.lo gnu/javax/crypto.lo \
+       gnu/javax/crypto/assembly.lo gnu/javax/crypto/cipher.lo \
+       gnu/javax/crypto/jce.lo gnu/javax/crypto/jce/cipher.lo \
+       gnu/javax/crypto/jce/key.lo gnu/javax/crypto/jce/keyring.lo \
+       gnu/javax/crypto/jce/mac.lo gnu/javax/crypto/jce/params.lo \
+       gnu/javax/crypto/jce/prng.lo gnu/javax/crypto/jce/sig.lo \
+       gnu/javax/crypto/jce/spec.lo gnu/javax/crypto/key.lo \
+       gnu/javax/crypto/key/dh.lo gnu/javax/crypto/key/srp6.lo \
+       gnu/javax/crypto/keyring.lo gnu/javax/crypto/kwa.lo \
        gnu/javax/crypto/mac.lo gnu/javax/crypto/mode.lo \
        gnu/javax/crypto/pad.lo gnu/javax/crypto/prng.lo \
        gnu/javax/crypto/sasl.lo gnu/javax/crypto/sasl/anonymous.lo \
        gnu/javax/crypto/sasl/crammd5.lo \
        gnu/javax/crypto/sasl/plain.lo gnu/javax/crypto/sasl/srp.lo \
-       gnu/javax/imageio/bmp.lo gnu/javax/net/ssl.lo \
-       gnu/javax/net/ssl/provider.lo gnu/javax/security/auth.lo \
-       gnu/javax/security/auth/callback.lo \
-       gnu/javax/security/auth/login.lo \
+       gnu/javax/imageio.lo gnu/javax/imageio/bmp.lo \
+       gnu/javax/imageio/gif.lo gnu/javax/imageio/jpeg.lo \
+       gnu/javax/imageio/png.lo gnu/javax/net/ssl.lo \
+       gnu/javax/net/ssl/provider.lo gnu/javax/print.lo \
+       gnu/javax/print/ipp.lo gnu/javax/print/ipp/attribute.lo \
+       gnu/javax/print/ipp/attribute/defaults.lo \
+       gnu/javax/print/ipp/attribute/job.lo \
+       gnu/javax/print/ipp/attribute/printer.lo \
+       gnu/javax/print/ipp/attribute/supported.lo \
+       gnu/javax/security/auth.lo gnu/javax/security/auth/callback.lo \
+       gnu/javax/security/auth/login.lo gnu/javax/sound/sampled/AU.lo \
+       gnu/javax/sound/sampled/WAV.lo gnu/javax/swing/plaf/gnu.lo \
+       gnu/javax/swing/plaf/metal.lo gnu/javax/swing/text/html.lo \
        gnu/javax/swing/text/html/parser.lo \
        gnu/javax/swing/text/html/parser/models.lo \
        gnu/javax/swing/text/html/parser/support.lo \
-       gnu/javax/swing/text/html/parser/support/low.lo gnu/regexp.lo \
-       java/applet.lo java/awt.lo java/awt/color.lo \
-       java/awt/datatransfer.lo java/awt/dnd.lo java/awt/dnd/peer.lo \
-       java/awt/event.lo java/awt/font.lo java/awt/geom.lo \
-       java/awt/im.lo java/awt/im/spi.lo java/awt/image.lo \
-       java/awt/image/renderable.lo java/awt/peer.lo \
-       java/awt/print.lo java/beans.lo java/beans/beancontext.lo \
-       java/io.lo java/lang.lo java/lang/annotation.lo \
-       java/lang/ref.lo java/lang/reflect.lo java/math.lo java/net.lo \
-       java/nio.lo java/nio/channels.lo java/nio/channels/spi.lo \
-       java/nio/charset.lo java/nio/charset/spi.lo java/rmi.lo \
-       java/rmi/activation.lo java/rmi/dgc.lo java/rmi/registry.lo \
-       java/rmi/server.lo java/security.lo java/security/acl.lo \
-       java/security/cert.lo java/security/interfaces.lo \
-       java/security/spec.lo java/sql.lo java/text.lo java/util.lo \
-       java/util/jar.lo java/util/logging.lo java/util/prefs.lo \
-       java/util/regex.lo java/util/zip.lo javax/accessibility.lo \
-       javax/crypto.lo javax/crypto/interfaces.lo \
-       javax/crypto/spec.lo javax/management.lo javax/naming.lo \
-       javax/naming/directory.lo javax/naming/event.lo \
-       javax/naming/ldap.lo javax/naming/spi.lo javax/net.lo \
-       javax/net/ssl.lo javax/print.lo javax/print/attribute.lo \
-       javax/print/attribute/standard.lo javax/print/event.lo \
-       javax/security/auth.lo javax/security/auth/callback.lo \
-       javax/security/auth/login.lo javax/security/auth/spi.lo \
-       javax/security/auth/x500.lo javax/security/cert.lo \
-       javax/security/sasl.lo javax/sound/midi.lo \
-       javax/sound/midi/spi.lo javax/sound/sampled.lo \
-       javax/sound/sampled/spi.lo javax/sql.lo javax/swing.lo \
-       javax/swing/border.lo javax/swing/colorchooser.lo \
-       javax/swing/event.lo javax/swing/filechooser.lo \
-       javax/swing/plaf.lo javax/swing/plaf/basic.lo \
-       javax/swing/plaf/metal.lo javax/swing/plaf/multi.lo \
-       javax/swing/plaf/synth.lo javax/swing/table.lo \
-       javax/swing/text.lo javax/swing/text/html.lo \
-       javax/swing/text/html/parser.lo javax/swing/text/rtf.lo \
-       javax/swing/tree.lo javax/swing/undo.lo javax/transaction.lo \
+       gnu/javax/swing/text/html/parser/support/low.lo \
+       gnu/javax/swing/tree.lo java/applet.lo java/awt.lo \
+       java/awt/color.lo java/awt/datatransfer.lo java/awt/dnd.lo \
+       java/awt/dnd/peer.lo java/awt/event.lo java/awt/font.lo \
+       java/awt/geom.lo java/awt/im.lo java/awt/im/spi.lo \
+       java/awt/image.lo java/awt/image/renderable.lo \
+       java/awt/peer.lo java/awt/print.lo java/beans.lo \
+       java/beans/beancontext.lo java/io.lo java/lang.lo \
+       java/lang/annotation.lo java/lang/instrument.lo \
+       java/lang/management.lo java/lang/ref.lo java/lang/reflect.lo \
+       java/math.lo java/net.lo java/nio.lo java/nio/channels.lo \
+       java/nio/channels/spi.lo java/nio/charset.lo \
+       java/nio/charset/spi.lo java/rmi.lo java/rmi/activation.lo \
+       java/rmi/dgc.lo java/rmi/registry.lo java/rmi/server.lo \
+       java/security.lo java/security/acl.lo java/security/cert.lo \
+       java/security/interfaces.lo java/security/spec.lo java/sql.lo \
+       java/text.lo java/util.lo java/util/jar.lo \
+       java/util/logging.lo java/util/prefs.lo java/util/regex.lo \
+       java/util/zip.lo javax/accessibility.lo javax/crypto.lo \
+       javax/crypto/interfaces.lo javax/crypto/spec.lo \
+       javax/management.lo javax/management/openmbean.lo \
+       javax/naming.lo javax/naming/directory.lo \
+       javax/naming/event.lo javax/naming/ldap.lo javax/naming/spi.lo \
+       javax/net.lo javax/net/ssl.lo javax/print.lo \
+       javax/print/attribute.lo javax/print/attribute/standard.lo \
+       javax/print/event.lo javax/security/auth.lo \
+       javax/security/auth/callback.lo \
+       javax/security/auth/kerberos.lo javax/security/auth/login.lo \
+       javax/security/auth/spi.lo javax/security/auth/x500.lo \
+       javax/security/cert.lo javax/security/sasl.lo \
+       javax/sound/midi.lo javax/sound/midi/spi.lo \
+       javax/sound/sampled.lo javax/sound/sampled/spi.lo javax/sql.lo \
+       javax/swing.lo javax/swing/border.lo \
+       javax/swing/colorchooser.lo javax/swing/event.lo \
+       javax/swing/filechooser.lo javax/swing/plaf.lo \
+       javax/swing/plaf/basic.lo javax/swing/plaf/metal.lo \
+       javax/swing/plaf/multi.lo javax/swing/plaf/synth.lo \
+       javax/swing/table.lo javax/swing/text.lo \
+       javax/swing/text/html.lo javax/swing/text/html/parser.lo \
+       javax/swing/text/rtf.lo javax/swing/tree.lo \
+       javax/swing/undo.lo javax/transaction.lo \
        javax/transaction/xa.lo org/ietf/jgss.lo
-am__DEPENDENCIES_3 = gnu-CORBA.lo gnu-java-awt-peer-swing.lo \
-       gnu-java-beans.lo gnu-javax-rmi.lo gnu-javax-sound-midi.lo \
-       gnu-xml.lo javax-imageio.lo javax-rmi.lo javax-xml.lo \
-       org-omg.lo org-relaxng.lo org-w3c.lo org-xml.lo
-am__DEPENDENCIES_4 = $(patsubst classpath/resource/%,%,$(addsuffix \
+am__DEPENDENCIES_2 = gnu-CORBA.lo gnu-java-awt-dnd-peer-gtk.lo \
+       gnu-java-awt-peer-gtk.lo gnu-java-awt-peer-qt.lo \
+       gnu-java-awt-peer-swing.lo gnu-java-beans.lo \
+       gnu-java-util-prefs-gconf.lo gnu-javax-rmi.lo \
+       gnu-javax-sound-midi.lo gnu-xml.lo javax-imageio.lo \
+       javax-rmi.lo javax-xml.lo org-omg.lo org-relaxng.lo org-w3c.lo \
+       org-xml.lo
+am__DEPENDENCIES_3 = $(patsubst classpath/resource/%,%,$(addsuffix \
        .lo,$(property_files)))
-am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
+am__DEPENDENCIES_4 =
+am__libgcj_la_SOURCES_DIST = prims.cc jni.cc jvmti.cc exception.cc \
        stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \
        java/lang/Class.java java/lang/Object.java \
-       gnu/classpath/natSystemProperties.cc gnu/gcj/natCore.cc \
+       gnu/classpath/natSystemProperties.cc \
+       gnu/classpath/jdwp/natVMFrame.cc \
+       gnu/classpath/jdwp/natVMMethod.cc \
+       gnu/classpath/jdwp/natVMVirtualMachine.cc gnu/gcj/natCore.cc \
        gnu/gcj/convert/JIS0208_to_Unicode.cc \
        gnu/gcj/convert/JIS0212_to_Unicode.cc \
        gnu/gcj/convert/Unicode_to_JIS.cc gnu/gcj/convert/natIconv.cc \
@@ -254,6 +278,7 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
        gnu/gcj/io/natSimpleSHSStream.cc gnu/gcj/io/shs.cc \
        gnu/gcj/runtime/natFinalizerThread.cc \
        gnu/gcj/runtime/natSharedLibLoader.cc \
+       gnu/gcj/runtime/natSystemClassLoader.cc \
        gnu/gcj/runtime/natStringBuffer.cc gnu/gcj/util/natDebug.cc \
        gnu/java/lang/natMainThread.cc \
        gnu/java/net/natPlainDatagramSocketImpl.cc \
@@ -276,15 +301,21 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
        java/lang/reflect/natConstructor.cc \
        java/lang/reflect/natField.cc java/lang/reflect/natMethod.cc \
        java/net/natVMNetworkInterface.cc java/net/natInetAddress.cc \
-       java/nio/channels/natChannels.cc \
-       java/nio/natDirectByteBufferImpl.cc java/text/natCollator.cc \
-       java/util/natResourceBundle.cc java/util/natVMTimeZone.cc \
-       java/util/logging/natLogger.cc java/util/zip/natDeflater.cc \
-       java/util/zip/natInflater.cc boehm.cc nogc.cc posix.cc \
-       win32.cc darwin.cc posix-threads.cc win32-threads.cc \
-       no-threads.cc
+       java/net/natURLClassLoader.cc \
+       java/nio/channels/natVMChannels.cc \
+       java/nio/natDirectByteBufferImpl.cc \
+       java/security/natVMAccessController.cc \
+       java/security/natVMAccessControlState.cc \
+       java/text/natCollator.cc java/util/natResourceBundle.cc \
+       java/util/natVMTimeZone.cc java/util/logging/natLogger.cc \
+       java/util/zip/natDeflater.cc java/util/zip/natInflater.cc \
+       boehm.cc nogc.cc posix.cc win32.cc darwin.cc posix-threads.cc \
+       win32-threads.cc no-threads.cc
 am__objects_2 = gnu/classpath/natSystemProperties.lo \
-       gnu/gcj/natCore.lo gnu/gcj/convert/JIS0208_to_Unicode.lo \
+       gnu/classpath/jdwp/natVMFrame.lo \
+       gnu/classpath/jdwp/natVMMethod.lo \
+       gnu/classpath/jdwp/natVMVirtualMachine.lo gnu/gcj/natCore.lo \
+       gnu/gcj/convert/JIS0208_to_Unicode.lo \
        gnu/gcj/convert/JIS0212_to_Unicode.lo \
        gnu/gcj/convert/Unicode_to_JIS.lo gnu/gcj/convert/natIconv.lo \
        gnu/gcj/convert/natInput_EUCJIS.lo \
@@ -294,6 +325,7 @@ am__objects_2 = gnu/classpath/natSystemProperties.lo \
        gnu/gcj/io/natSimpleSHSStream.lo gnu/gcj/io/shs.lo \
        gnu/gcj/runtime/natFinalizerThread.lo \
        gnu/gcj/runtime/natSharedLibLoader.lo \
+       gnu/gcj/runtime/natSystemClassLoader.lo \
        gnu/gcj/runtime/natStringBuffer.lo gnu/gcj/util/natDebug.lo \
        gnu/java/lang/natMainThread.lo \
        gnu/java/net/natPlainDatagramSocketImpl.lo \
@@ -316,11 +348,14 @@ am__objects_2 = gnu/classpath/natSystemProperties.lo \
        java/lang/reflect/natConstructor.lo \
        java/lang/reflect/natField.lo java/lang/reflect/natMethod.lo \
        java/net/natVMNetworkInterface.lo java/net/natInetAddress.lo \
-       java/nio/channels/natChannels.lo \
-       java/nio/natDirectByteBufferImpl.lo java/text/natCollator.lo \
-       java/util/natResourceBundle.lo java/util/natVMTimeZone.lo \
-       java/util/logging/natLogger.lo java/util/zip/natDeflater.lo \
-       java/util/zip/natInflater.lo
+       java/net/natURLClassLoader.lo \
+       java/nio/channels/natVMChannels.lo \
+       java/nio/natDirectByteBufferImpl.lo \
+       java/security/natVMAccessController.lo \
+       java/security/natVMAccessControlState.lo \
+       java/text/natCollator.lo java/util/natResourceBundle.lo \
+       java/util/natVMTimeZone.lo java/util/logging/natLogger.lo \
+       java/util/zip/natDeflater.lo java/util/zip/natInflater.lo
 @USING_BOEHMGC_TRUE@am__objects_3 = boehm.lo
 @USING_NOGC_TRUE@am__objects_4 = nogc.lo
 @USING_POSIX_PLATFORM_TRUE@am__objects_5 = posix.lo
@@ -329,21 +364,24 @@ am__objects_2 = gnu/classpath/natSystemProperties.lo \
 @USING_POSIX_THREADS_TRUE@am__objects_8 = posix-threads.lo
 @USING_WIN32_THREADS_TRUE@am__objects_9 = win32-threads.lo
 @USING_NO_THREADS_TRUE@am__objects_10 = no-threads.lo
-am_libgcj_la_OBJECTS = prims.lo jni.lo exception.lo stacktrace.lo \
-       link.lo defineclass.lo interpret.lo verify.lo \
+am_libgcj_la_OBJECTS = prims.lo jni.lo jvmti.lo exception.lo \
+       stacktrace.lo link.lo defineclass.lo interpret.lo verify.lo \
        java/lang/Class.lo java/lang/Object.lo $(am__objects_2) \
        $(am__objects_3) $(am__objects_4) $(am__objects_5) \
        $(am__objects_6) $(am__objects_7) $(am__objects_8) \
        $(am__objects_9) $(am__objects_10)
 libgcj_la_OBJECTS = $(am_libgcj_la_OBJECTS)
-libgcjawt_la_DEPENDENCIES = lib-gnu-java-awt-peer-gtk.la
-am_libgcjawt_la_OBJECTS = classpath/native/jawt/libgcjawt_la-jawt.lo
-libgcjawt_la_OBJECTS = $(am_libgcjawt_la_OBJECTS)
-@GTK_AWT_TRUE@am_libgcjawt_la_rpath = -rpath $(toolexeclibdir)
+am_libgcj_bc_la_OBJECTS = libgcj_bc.lo
+libgcj_bc_la_OBJECTS = $(am_libgcj_bc_la_OBJECTS)
+@USE_LIBGCJ_BC_TRUE@am_libgcj_bc_la_rpath = -rpath $(toolexeclibdir)
 am_libgij_la_OBJECTS = gij.lo
 libgij_la_OBJECTS = $(am_libgij_la_OBJECTS)
+am_libjvm_la_OBJECTS = jni-libjvm.lo
+libjvm_la_OBJECTS = $(am_libjvm_la_OBJECTS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am_gappletviewer_OBJECTS =
+gappletviewer_OBJECTS = $(am_gappletviewer_OBJECTS)
 am_gcj_dbtool_OBJECTS = gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT) \
        gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT)
 gcj_dbtool_OBJECTS = $(am_gcj_dbtool_OBJECTS)
@@ -355,6 +393,10 @@ gen_from_JIS_OBJECTS = $(am_gen_from_JIS_OBJECTS)
 gen_from_JIS_LDADD = $(LDADD)
 am_gij_OBJECTS =
 gij_OBJECTS = $(am_gij_OBJECTS)
+am_gjarsigner_OBJECTS =
+gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS)
+am_gkeytool_OBJECTS =
+gkeytool_OBJECTS = $(am_gkeytool_OBJECTS)
 am_grmic_OBJECTS =
 grmic_OBJECTS = $(am_grmic_OBJECTS)
 am_grmiregistry_OBJECTS =
@@ -386,18 +428,19 @@ GCJCOMPILE = $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)
 LTGCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) $(AM_GCJFLAGS) \
        $(GCJFLAGS)
 GCJLD = $(GCJ)
-SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
-       $(lib_gnu_java_awt_peer_gtk_la_SOURCES) \
-       $(lib_gnu_java_awt_peer_qt_la_SOURCES) $(libgcj_la_SOURCES) \
-       $(libgcjawt_la_SOURCES) $(libgij_la_SOURCES) \
-       $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) \
-       $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
+SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(libgcj_tools_la_SOURCES) \
+       $(libgcj_la_SOURCES) $(libgcj_bc_la_SOURCES) \
+       $(libgij_la_SOURCES) $(libjvm_la_SOURCES) \
+       $(gappletviewer_SOURCES) $(gcj_dbtool_SOURCES) \
+       $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(gjarsigner_SOURCES) \
+       $(gkeytool_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) \
+       $(jv_convert_SOURCES)
 DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
-       $(lib_gnu_java_awt_peer_gtk_la_SOURCES) \
-       $(lib_gnu_java_awt_peer_qt_la_SOURCES) \
-       $(am__libgcj_la_SOURCES_DIST) $(libgcjawt_la_SOURCES) \
-       $(libgij_la_SOURCES) $(gcj_dbtool_SOURCES) \
-       $(am__gen_from_JIS_SOURCES_DIST) $(gij_SOURCES) \
+       $(libgcj_tools_la_SOURCES) $(am__libgcj_la_SOURCES_DIST) \
+       $(libgcj_bc_la_SOURCES) $(libgij_la_SOURCES) \
+       $(libjvm_la_SOURCES) $(gappletviewer_SOURCES) \
+       $(gcj_dbtool_SOURCES) $(am__gen_from_JIS_SOURCES_DIST) \
+       $(gij_SOURCES) $(gjarsigner_SOURCES) $(gkeytool_SOURCES) \
        $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        html-recursive info-recursive install-data-recursive \
@@ -437,8 +480,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BACKTRACESPEC = @BACKTRACESPEC@
-CAIRO_CFLAGS = @CAIRO_CFLAGS@
-CAIRO_LIBS = @CAIRO_LIBS@
+BASH_JAR_FALSE = @BASH_JAR_FALSE@
+BASH_JAR_TRUE = @BASH_JAR_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -474,10 +517,6 @@ GCSPEC = @GCSPEC@
 GCTESTSPEC = @GCTESTSPEC@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
-GTK_AWT_FALSE = @GTK_AWT_FALSE@
-GTK_AWT_TRUE = @GTK_AWT_TRUE@
-GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
-GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
@@ -507,6 +546,7 @@ LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
 LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
 LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
 LIBGCJ_LD_SYMBOLIC = @LIBGCJ_LD_SYMBOLIC@
+LIBGCJ_SPEC = @LIBGCJ_SPEC@
 LIBICONV = @LIBICONV@
 LIBLTDL = @LIBLTDL@
 LIBOBJS = @LIBOBJS@
@@ -530,14 +570,10 @@ PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
-PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@
-PANGOFT2_LIBS = @PANGOFT2_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_INNER_NAT_HDRS = @PLATFORM_INNER_NAT_HDRS@
-QT_AWT_FALSE = @QT_AWT_FALSE@
-QT_AWT_TRUE = @QT_AWT_TRUE@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -553,7 +589,11 @@ THREADINCS = @THREADINCS@
 THREADLDFLAGS = @THREADLDFLAGS@
 THREADLIBS = @THREADLIBS@
 THREADSPEC = @THREADSPEC@
+THREADSTARTFILESPEC = @THREADSTARTFILESPEC@
 TOOLKIT = @TOOLKIT@
+UNZIP = @UNZIP@
+USE_LIBGCJ_BC_FALSE = @USE_LIBGCJ_BC_FALSE@
+USE_LIBGCJ_BC_TRUE = @USE_LIBGCJ_BC_TRUE@
 USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
 USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@
 USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@
@@ -580,6 +620,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 ZINCS = @ZINCS@
+ZIP = @ZIP@
 ZLIBS = @ZLIBS@
 ZLIBSPEC = @ZLIBSPEC@
 ZLIBTESTSPEC = @ZLIBTESTSPEC@
@@ -606,6 +647,7 @@ bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
+build_libsubdir = @build_libsubdir@
 build_os = @build_os@
 build_subdir = @build_subdir@
 build_vendor = @build_vendor@
@@ -669,23 +711,22 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach o
 
 # This is required by TL_AC_GXX_INCLUDE_DIR.
 libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
-toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) \
-       $(am__append_3) $(am__append_4)
+toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la \
+       $(am__append_2) $(am__append_3)
 toolexecmainlib_DATA = libgcj.spec
+dbexec_LTLIBRARIES = libjvm.la
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgcj.pc
 jardir = $(datadir)/java
-jar_DATA = libgcj-$(gcc_version).jar
+jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
 @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
 @JAVA_HOME_SET_TRUE@JAVA_HOME_DIR = $(JAVA_HOME)
-@JAVA_HOME_SET_FALSE@BOOT_CLASS_PATH_DIR = $(jardir)/$(jar_DATA)
+@JAVA_HOME_SET_FALSE@BOOT_CLASS_PATH_DIR = $(jardir)/libgcj-$(gcc_version).jar
 @JAVA_HOME_SET_TRUE@BOOT_CLASS_PATH_DIR = $(JAVA_HOME)/lib/rt.jar
-secdir = $(libdir)/security
-propdir = $(libdir)
 db_name = classmap.db
 db_pathtail = gcj-$(gcc_version)/$(db_name)
 @NATIVE_TRUE@dbexec_DATA = $(db_name)
-bin_SCRIPTS = addr2name.awk
+bin_SCRIPTS = addr2name.awk $(am__append_4)
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
 GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
           $(LDFLAGS) -o $@
@@ -706,14 +747,15 @@ AM_CXXFLAGS = \
        $(WARNINGS) \
        -D_GNU_SOURCE \
        -DPREFIX="\"$(prefix)\"" \
-       -DLIBDIR="\"$(libdir)\"" \
+       -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\"" \
         -DJAVA_HOME="\"$(JAVA_HOME_DIR)\"" \
         -DBOOT_CLASS_PATH="\"$(BOOT_CLASS_PATH_DIR)\"" \
        -DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \
        -DGCJ_ENDORSED_DIRS="\"$(jardir)/gcj-endorsed\"" \
+       -DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
+       -DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
        -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
-       -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \
-       -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\""
+       -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\""
 
 AM_GCJFLAGS = \
        @LIBGCJ_JAVAFLAGS@ \
@@ -734,21 +776,18 @@ AM_CPPFLAGS = -I$(top_srcdir) \
        $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS)
 
 BOOTCLASSPATH = $(here)/classpath/lib
-all_property_files = $(property_files) \
-    java/util/logging/logging.properties
-
 libgij_la_SOURCES = gij.cc
 libgij_la_DEPENDENCIES = libgcj.la libgcj.spec
 libgij_la_LIBADD = -L$(here)/.libs libgcj.la
 libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
         -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
 
-libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \
-       defineclass.cc interpret.cc verify.cc java/lang/Class.java \
-       java/lang/Object.java $(nat_source_files) $(am__append_6) \
-       $(am__append_7) $(am__append_8) $(am__append_9) \
-       $(am__append_10) $(am__append_11) $(am__append_12) \
-       $(am__append_13)
+libgcj_la_SOURCES = prims.cc jni.cc jvmti.cc exception.cc \
+       stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \
+       java/lang/Class.java java/lang/Object.java $(nat_source_files) \
+       $(am__append_6) $(am__append_7) $(am__append_8) \
+       $(am__append_9) $(am__append_10) $(am__append_11) \
+       $(am__append_12) $(am__append_13)
 nat_files = $(nat_source_files:.cc=.lo)
 xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
 
@@ -770,43 +809,17 @@ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
        $(LIBLTDL) $(libgcj_la_LIBADD)
 
 libgcj_la_LINK = $(LIBLINK)
-lib_gnu_java_awt_peer_gtk_la_SOURCES = 
-lib_gnu_java_awt_peer_gtk_la_LIBADD = \
-       gnu-java-awt-peer-gtk.lo \
-       classpath/native/jni/gtk-peer/libgtkpeer.la \
-       $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)
-
-lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gnu-java-awt-peer-gtk.lo \
-       classpath/native/jni/gtk-peer/libgtkpeer.la \
-       libgcj-$(gcc_version).jar libgcj.la libgcj.spec
-
-lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) $(X_LIBS) -lXtst
-
-lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
-libgcjawt_la_SOURCES = classpath/native/jawt/jawt.c
-libgcjawt_la_CFLAGS = -I$(srcdir)/classpath/native/jni/classpath \
-       $(PEDANTIC_CFLAGS) $(X_CFLAGS)
-
-libgcjawt_la_LIBADD = -L$(here)/.libs lib-gnu-java-awt-peer-gtk.la
-libgcjawt_la_LDFLAGS = \
-       -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
-       $(LIBGCJ_LD_SYMBOLIC)
-
-libgcjawt_la_LINK = $(LIBLINK)
-lib_gnu_java_awt_peer_qt_la_SOURCES = 
-lib_gnu_java_awt_peer_qt_la_LIBADD = \
-       gnu-java-awt-peer-qt.lo \
-       classpath/native/jni/qt-peer/libqtpeer.la
-
-lib_gnu_java_awt_peer_qt_la_DEPENDENCIES = gnu-java-awt-peer-qt.lo \
-       classpath/native/jni/qt-peer/libqtpeer.la \
-       libgcj-$(gcc_version).jar libgcj.la libgcj.spec
-
-lib_gnu_java_awt_peer_qt_la_LDFLAGS = \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) $(X_LIBS) -lXtst
-
-lib_gnu_java_awt_peer_qt_la_LINK = $(LIBLINK)
+libgcj_tools_la_SOURCES = classpath/tools/tools.jar
+libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes
+libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
+ -version-info `grep -v '^\#' $(srcdir)/libtool-version`
+
+libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
+libgcj_tools_la_LINK = $(LIBLINK)
+libjvm_la_SOURCES = jni-libjvm.cc
+libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec
+libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
+libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC)
 lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files)
 lib_gnu_awt_xlib_la_LIBADD = gnu/awt/xlib.lo gnu/gcj/xlib.lo
 lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
@@ -825,22 +838,16 @@ lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \
         -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
 
 lib_gnu_awt_xlib_la_LINK = $(LIBLINK)
-property_files = \
-classpath/resource/org/ietf/jgss/MessagesBundle.properties \
-classpath/resource/java/util/iso4217.properties        \
-classpath/resource/gnu/java/awt/peer/gtk/font.properties \
-classpath/resource/gnu/regexp/MessagesBundle_it.properties \
-classpath/resource/gnu/regexp/MessagesBundle_fr.properties \
-classpath/resource/gnu/regexp/MessagesBundle.properties        \
-classpath/resource/META-INF/services/org.xml.sax.driver        \
-classpath/resource/META-INF/services/javax.xml.parsers.SAXParserFactory        \
-classpath/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory \
-classpath/resource/META-INF/services/javax.xml.parsers.TransformerFactory
+libgcj_bc_la_SOURCES = libgcj_bc.c
+libgcj_bc_la_LDFLAGS = -rpath $(toolexeclibdir) -no-static -version-info 1:0:0
+libgcj_bc_la_LIBADD = libgcj.la
+libgcj_bc_la_DEPENDENCIES = libgcj.la
+libgcj_bc_la_LINK = $(LIBLINK)
+libgcj_bc_dummy_LINK = $(CC) -L$(here)/.libs $(CFLAGS) $(LDFLAGS) -shared \
+       -fPIC -nostdlib
 
 propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files)))
-CLEANFILES = libgcj-$(gcc_version).jar \
-       $(all_java_deps_files) $(all_java_filelist_files)
-
+CLEANFILES = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
 DISTCLEANFILES = native.dirs
 SUFFIXES = .class .java .h .properties .list
 gnu_CORBA_source_files = \
@@ -1033,8 +1040,8 @@ gnu/awt/xlib/XToolkit.java
 
 gnu_awt_xlib_header_files = $(patsubst %.java,%.h,$(gnu_awt_xlib_source_files))
 gnu_classpath_source_files = \
-classpath/gnu/classpath/ByteArray.java \
 classpath/gnu/classpath/Configuration.java \
+classpath/gnu/classpath/NotImplementedException.java \
 classpath/gnu/classpath/Pointer.java \
 classpath/gnu/classpath/Pointer32.java \
 classpath/gnu/classpath/Pointer64.java \
@@ -1047,7 +1054,11 @@ gnu_classpath_debug_source_files = \
 classpath/gnu/classpath/debug/Component.java \
 classpath/gnu/classpath/debug/PreciseFilter.java \
 classpath/gnu/classpath/debug/Simple1LineFormatter.java \
-classpath/gnu/classpath/debug/SystemLogger.java
+classpath/gnu/classpath/debug/SystemLogger.java \
+classpath/gnu/classpath/debug/TeeInputStream.java \
+classpath/gnu/classpath/debug/TeeOutputStream.java \
+classpath/gnu/classpath/debug/TeeReader.java \
+classpath/gnu/classpath/debug/TeeWriter.java
 
 gnu_classpath_debug_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_debug_source_files)))
 gnu_classpath_jdwp_source_files = \
@@ -1055,14 +1066,21 @@ classpath/gnu/classpath/jdwp/Jdwp.java \
 classpath/gnu/classpath/jdwp/JdwpConstants.java \
 gnu/classpath/jdwp/VMFrame.java \
 gnu/classpath/jdwp/VMIdManager.java \
+gnu/classpath/jdwp/VMMethod.java \
 gnu/classpath/jdwp/VMVirtualMachine.java
 
 gnu_classpath_jdwp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_source_files)))
 gnu_classpath_jdwp_event_source_files = \
+classpath/gnu/classpath/jdwp/event/BreakpointEvent.java \
 classpath/gnu/classpath/jdwp/event/ClassPrepareEvent.java \
+classpath/gnu/classpath/jdwp/event/ClassUnloadEvent.java \
 classpath/gnu/classpath/jdwp/event/Event.java \
 classpath/gnu/classpath/jdwp/event/EventManager.java \
 classpath/gnu/classpath/jdwp/event/EventRequest.java \
+classpath/gnu/classpath/jdwp/event/ExceptionEvent.java \
+classpath/gnu/classpath/jdwp/event/MethodEntryEvent.java \
+classpath/gnu/classpath/jdwp/event/MethodExitEvent.java \
+classpath/gnu/classpath/jdwp/event/SingleStepEvent.java \
 classpath/gnu/classpath/jdwp/event/ThreadEndEvent.java \
 classpath/gnu/classpath/jdwp/event/ThreadStartEvent.java \
 classpath/gnu/classpath/jdwp/event/VmDeathEvent.java \
@@ -1099,6 +1117,7 @@ classpath/gnu/classpath/jdwp/exception/InvalidThreadGroupException.java \
 classpath/gnu/classpath/jdwp/exception/JdwpException.java \
 classpath/gnu/classpath/jdwp/exception/JdwpIllegalArgumentException.java \
 classpath/gnu/classpath/jdwp/exception/JdwpInternalErrorException.java \
+classpath/gnu/classpath/jdwp/exception/NativeMethodException.java \
 classpath/gnu/classpath/jdwp/exception/NotImplementedException.java \
 classpath/gnu/classpath/jdwp/exception/VmDeadException.java
 
@@ -1270,35 +1289,86 @@ classpath/gnu/java/awt/color/TagEntry.java \
 classpath/gnu/java/awt/color/ToneReproductionCurve.java
 
 gnu_java_awt_color_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_color_source_files)))
+gnu_java_awt_dnd_source_files = \
+classpath/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.java
+
+gnu_java_awt_dnd_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_dnd_source_files)))
+gnu_java_awt_dnd_peer_gtk_source_files = \
+classpath/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java \
+classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java \
+classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.java
+
+gnu_java_awt_font_source_files = \
+classpath/gnu/java/awt/font/FontDelegate.java \
+classpath/gnu/java/awt/font/FontFactory.java \
+classpath/gnu/java/awt/font/GNUGlyphVector.java
+
+gnu_java_awt_font_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_font_source_files)))
+gnu_java_awt_font_opentype_source_files = \
+classpath/gnu/java/awt/font/opentype/CharGlyphMap.java \
+classpath/gnu/java/awt/font/opentype/GlyphNamer.java \
+classpath/gnu/java/awt/font/opentype/MacResourceFork.java \
+classpath/gnu/java/awt/font/opentype/NameDecoder.java \
+classpath/gnu/java/awt/font/opentype/OpenTypeFont.java \
+classpath/gnu/java/awt/font/opentype/OpenTypeFontFactory.java \
+classpath/gnu/java/awt/font/opentype/Scaler.java
+
+gnu_java_awt_font_opentype_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_font_opentype_source_files)))
+gnu_java_awt_font_opentype_truetype_source_files = \
+classpath/gnu/java/awt/font/opentype/truetype/Fixed.java \
+classpath/gnu/java/awt/font/opentype/truetype/GlyphLoader.java \
+classpath/gnu/java/awt/font/opentype/truetype/GlyphLocator.java \
+classpath/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.java \
+classpath/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.java \
+classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java \
+classpath/gnu/java/awt/font/opentype/truetype/Zone.java \
+classpath/gnu/java/awt/font/opentype/truetype/ZonePathIterator.java
+
+gnu_java_awt_font_opentype_truetype_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_font_opentype_truetype_source_files)))
 gnu_java_awt_image_source_files = \
 classpath/gnu/java/awt/image/ImageDecoder.java \
 classpath/gnu/java/awt/image/XBMDecoder.java
 
 gnu_java_awt_image_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_image_source_files)))
+gnu_java_awt_java2d_source_files = \
+classpath/gnu/java/awt/java2d/AbstractGraphics2D.java \
+classpath/gnu/java/awt/java2d/AlphaCompositeContext.java \
+classpath/gnu/java/awt/java2d/CubicSegment.java \
+classpath/gnu/java/awt/java2d/ImagePaint.java \
+classpath/gnu/java/awt/java2d/LineSegment.java \
+classpath/gnu/java/awt/java2d/PolyEdge.java \
+classpath/gnu/java/awt/java2d/PolyEdgeComparator.java \
+classpath/gnu/java/awt/java2d/QuadSegment.java \
+classpath/gnu/java/awt/java2d/RasterGraphics.java \
+classpath/gnu/java/awt/java2d/Segment.java \
+classpath/gnu/java/awt/java2d/TexturePaintContext.java
+
+gnu_java_awt_java2d_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_java2d_source_files)))
 gnu_java_awt_peer_source_files = \
 classpath/gnu/java/awt/peer/ClasspathFontPeer.java \
-classpath/gnu/java/awt/peer/ClasspathTextLayoutPeer.java \
 classpath/gnu/java/awt/peer/EmbeddedWindowPeer.java \
 classpath/gnu/java/awt/peer/GLightweightPeer.java
 
 gnu_java_awt_peer_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_peer_source_files)))
 gnu_java_awt_peer_gtk_source_files = \
+classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java \
+classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java \
+classpath/gnu/java/awt/peer/gtk/CairoSurface.java \
+classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java \
+classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java \
+classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java \
+classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java \
 classpath/gnu/java/awt/peer/gtk/GThreadMutex.java \
 classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java \
 classpath/gnu/java/awt/peer/gtk/GdkFontMetrics.java \
 classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java \
-classpath/gnu/java/awt/peer/gtk/GdkGlyphVector.java \
-classpath/gnu/java/awt/peer/gtk/GdkGraphics.java \
-classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java \
 classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java \
 classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java \
 classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java \
 classpath/gnu/java/awt/peer/gtk/GdkRobotPeer.java \
 classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java \
-classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java \
 classpath/gnu/java/awt/peer/gtk/GtkButtonPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkCanvasPeer.java \
-classpath/gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkChoicePeer.java \
@@ -1306,10 +1376,10 @@ classpath/gnu/java/awt/peer/gtk/GtkClipboard.java \
 classpath/gnu/java/awt/peer/gtk/GtkClipboardNotifier.java \
 classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkContainerPeer.java \
+classpath/gnu/java/awt/peer/gtk/GtkCursor.java \
 classpath/gnu/java/awt/peer/gtk/GtkDialogPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java \
-classpath/gnu/java/awt/peer/gtk/GtkFontPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkFramePeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkGenericPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkImage.java \
@@ -1320,6 +1390,7 @@ classpath/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkMenuPeer.java \
+classpath/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkPanelPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java \
@@ -1329,7 +1400,8 @@ classpath/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkToolkit.java \
 classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java \
-classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java
+classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java \
+classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java
 
 gnu_java_awt_peer_qt_source_files = \
 classpath/gnu/java/awt/peer/qt/MainQtThread.java \
@@ -1392,6 +1464,13 @@ classpath/gnu/java/awt/peer/swing/SwingTextFieldPeer.java \
 classpath/gnu/java/awt/peer/swing/SwingToolkit.java \
 classpath/gnu/java/awt/peer/swing/SwingWindowPeer.java
 
+gnu_java_awt_print_source_files = \
+classpath/gnu/java/awt/print/JavaPrinterGraphics.java \
+classpath/gnu/java/awt/print/JavaPrinterJob.java \
+classpath/gnu/java/awt/print/PostScriptGraphics2D.java \
+classpath/gnu/java/awt/print/SpooledDocument.java
+
+gnu_java_awt_print_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_print_source_files)))
 gnu_java_beans_source_files = \
 classpath/gnu/java/beans/BeanInfoEmbryo.java \
 classpath/gnu/java/beans/DefaultExceptionListener.java \
@@ -1489,10 +1568,38 @@ gnu_java_lang_source_files = \
 classpath/gnu/java/lang/ArrayHelper.java \
 classpath/gnu/java/lang/CharData.java \
 classpath/gnu/java/lang/ClassHelper.java \
-gnu/java/lang/MainThread.java
+classpath/gnu/java/lang/InstrumentationImpl.java \
+gnu/java/lang/MainThread.java \
+gnu/java/lang/VMInstrumentationImpl.java
 
 gnu_java_lang_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_source_files)))
+gnu_java_lang_management_source_files = \
+classpath/gnu/java/lang/management/BeanImpl.java \
+classpath/gnu/java/lang/management/ClassLoadingMXBeanImpl.java \
+classpath/gnu/java/lang/management/CompilationMXBeanImpl.java \
+classpath/gnu/java/lang/management/GarbageCollectorMXBeanImpl.java \
+classpath/gnu/java/lang/management/MemoryMXBeanImpl.java \
+classpath/gnu/java/lang/management/MemoryManagerMXBeanImpl.java \
+classpath/gnu/java/lang/management/MemoryPoolMXBeanImpl.java \
+classpath/gnu/java/lang/management/OperatingSystemMXBeanImpl.java \
+classpath/gnu/java/lang/management/RuntimeMXBeanImpl.java \
+classpath/gnu/java/lang/management/ThreadMXBeanImpl.java \
+gnu/java/lang/management/VMClassLoadingMXBeanImpl.java \
+gnu/java/lang/management/VMCompilationMXBeanImpl.java \
+gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java \
+gnu/java/lang/management/VMMemoryMXBeanImpl.java \
+gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java \
+gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java \
+gnu/java/lang/management/VMRuntimeMXBeanImpl.java \
+gnu/java/lang/management/VMThreadMXBeanImpl.java
+
+gnu_java_lang_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_management_source_files)))
 gnu_java_lang_reflect_source_files = \
+classpath/gnu/java/lang/reflect/ClassSignatureParser.java \
+classpath/gnu/java/lang/reflect/FieldSignatureParser.java \
+classpath/gnu/java/lang/reflect/GenericSignatureParser.java \
+classpath/gnu/java/lang/reflect/MethodSignatureParser.java \
+classpath/gnu/java/lang/reflect/TypeImpl.java \
 classpath/gnu/java/lang/reflect/TypeSignature.java
 
 gnu_java_lang_reflect_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_reflect_source_files)))
@@ -1501,6 +1608,7 @@ gnu/java/locale/Calendar.java \
 gnu/java/locale/Calendar_de.java \
 gnu/java/locale/Calendar_en.java \
 gnu/java/locale/Calendar_nl.java \
+classpath/gnu/java/locale/LocaleData.java \
 classpath/gnu/java/locale/LocaleHelper.java \
 gnu/java/locale/LocaleInformation.java \
 gnu/java/locale/LocaleInformation_af_ZA.java \
@@ -1647,21 +1755,42 @@ gnu_java_net_source_files = \
 classpath/gnu/java/net/BASE64.java \
 classpath/gnu/java/net/CRLFInputStream.java \
 classpath/gnu/java/net/CRLFOutputStream.java \
-gnu/java/net/DefaultContentHandlerFactory.java \
+classpath/gnu/java/net/DefaultContentHandlerFactory.java \
 classpath/gnu/java/net/EmptyX509TrustManager.java \
 classpath/gnu/java/net/GetLocalHostAction.java \
 classpath/gnu/java/net/HeaderFieldHelper.java \
+classpath/gnu/java/net/IndexListParser.java \
 classpath/gnu/java/net/LineInputStream.java \
 gnu/java/net/PlainDatagramSocketImpl.java \
 gnu/java/net/PlainSocketImpl.java \
-classpath/gnu/java/net/URLParseError.java \
+classpath/gnu/java/net/URLParseError.java
+
+gnu_java_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_source_files)))
+gnu_java_net_loader_source_files = \
+classpath/gnu/java/net/loader/FileResource.java \
+classpath/gnu/java/net/loader/FileURLLoader.java \
+classpath/gnu/java/net/loader/JarURLLoader.java \
+classpath/gnu/java/net/loader/JarURLResource.java \
+classpath/gnu/java/net/loader/RemoteResource.java \
+classpath/gnu/java/net/loader/RemoteURLLoader.java \
+classpath/gnu/java/net/loader/Resource.java \
+classpath/gnu/java/net/loader/URLLoader.java \
+classpath/gnu/java/net/loader/URLStreamHandlerCache.java
+
+gnu_java_net_loader_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_loader_source_files)))
+gnu_java_net_local_source_files = \
+classpath/gnu/java/net/local/LocalServerSocket.java \
+classpath/gnu/java/net/local/LocalSocket.java \
+classpath/gnu/java/net/local/LocalSocketAddress.java \
+gnu/java/net/local/LocalSocketImpl.java
+
+gnu_java_net_local_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_local_source_files)))
+gnu_java_net_protocol_core_source_files = \
 gnu/java/net/protocol/core/Connection.java \
 gnu/java/net/protocol/core/CoreInputStream.java \
-gnu/java/net/protocol/core/Handler.java \
-gnu/java/net/protocol/gcjlib/Connection.java \
-gnu/java/net/protocol/gcjlib/Handler.java
+gnu/java/net/protocol/core/Handler.java
 
-gnu_java_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_source_files)))
+gnu_java_net_protocol_core_header_files = $(patsubst %.java,%.h,$(gnu_java_net_protocol_core_source_files))
 gnu_java_net_protocol_file_source_files = \
 classpath/gnu/java/net/protocol/file/Connection.java \
 classpath/gnu/java/net/protocol/file/Handler.java
@@ -1686,6 +1815,11 @@ classpath/gnu/java/net/protocol/ftp/StreamInputStream.java \
 classpath/gnu/java/net/protocol/ftp/StreamOutputStream.java
 
 gnu_java_net_protocol_ftp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_ftp_source_files)))
+gnu_java_net_protocol_gcjlib_source_files = \
+gnu/java/net/protocol/gcjlib/Connection.java \
+gnu/java/net/protocol/gcjlib/Handler.java
+
+gnu_java_net_protocol_gcjlib_header_files = $(patsubst %.java,%.h,$(gnu_java_net_protocol_gcjlib_source_files))
 gnu_java_net_protocol_http_source_files = \
 classpath/gnu/java/net/protocol/http/Authenticator.java \
 classpath/gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.java \
@@ -1711,7 +1845,7 @@ classpath/gnu/java/net/protocol/https/Handler.java
 
 gnu_java_net_protocol_https_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_https_source_files)))
 gnu_java_net_protocol_jar_source_files = \
-gnu/java/net/protocol/jar/Connection.java \
+classpath/gnu/java/net/protocol/jar/Connection.java \
 classpath/gnu/java/net/protocol/jar/Handler.java
 
 gnu_java_net_protocol_jar_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_jar_source_files)))
@@ -1719,6 +1853,7 @@ gnu_java_nio_source_files = \
 classpath/gnu/java/nio/ChannelInputStream.java \
 classpath/gnu/java/nio/ChannelOutputStream.java \
 classpath/gnu/java/nio/ChannelReader.java \
+classpath/gnu/java/nio/ChannelWriter.java \
 gnu/java/nio/DatagramChannelImpl.java \
 gnu/java/nio/DatagramChannelSelectionKey.java \
 classpath/gnu/java/nio/FileLockImpl.java \
@@ -1736,6 +1871,8 @@ gnu/java/nio/ServerSocketChannelImpl.java \
 gnu/java/nio/ServerSocketChannelSelectionKey.java \
 gnu/java/nio/SocketChannelImpl.java \
 gnu/java/nio/SocketChannelSelectionKey.java \
+classpath/gnu/java/nio/SocketChannelSelectionKeyImpl.java \
+gnu/java/nio/VMChannel.java \
 gnu/java/nio/VMPipe.java \
 gnu/java/nio/VMSelector.java
 
@@ -1810,21 +1947,21 @@ classpath/gnu/java/nio/charset/Windows1258.java
 gnu_java_nio_charset_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_nio_charset_source_files)))
 gnu_java_rmi_source_files = \
 classpath/gnu/java/rmi/RMIMarshalledObjectInputStream.java \
-classpath/gnu/java/rmi/RMIMarshalledObjectOutputStream.java \
-gnu/java/rmi/rmic/Compile_gcj.java \
-gnu/java/rmi/rmic/Compile_jikes.java \
-gnu/java/rmi/rmic/Compile_kjc.java \
-gnu/java/rmi/rmic/Compiler.java \
-gnu/java/rmi/rmic/CompilerProcess.java \
-gnu/java/rmi/rmic/RMIC.java \
-gnu/java/rmi/rmic/RMICException.java \
-gnu/java/rmi/rmic/TabbedWriter.java
+classpath/gnu/java/rmi/RMIMarshalledObjectOutputStream.java
 
 gnu_java_rmi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_source_files)))
+gnu_java_rmi_activation_source_files = \
+classpath/gnu/java/rmi/activation/ActivationSystemTransient.java \
+classpath/gnu/java/rmi/activation/BidiTable.java \
+classpath/gnu/java/rmi/activation/DefaultActivationGroup.java \
+classpath/gnu/java/rmi/activation/DefaultActivationSystem.java
+
+gnu_java_rmi_activation_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_activation_source_files)))
 gnu_java_rmi_dgc_source_files = \
 classpath/gnu/java/rmi/dgc/DGCImpl.java \
 classpath/gnu/java/rmi/dgc/DGCImpl_Skel.java \
-classpath/gnu/java/rmi/dgc/DGCImpl_Stub.java
+classpath/gnu/java/rmi/dgc/DGCImpl_Stub.java \
+classpath/gnu/java/rmi/dgc/LeaseRenewingTask.java
 
 gnu_java_rmi_dgc_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_dgc_source_files)))
 gnu_java_rmi_registry_source_files = \
@@ -1833,7 +1970,20 @@ classpath/gnu/java/rmi/registry/RegistryImpl_Skel.java \
 classpath/gnu/java/rmi/registry/RegistryImpl_Stub.java
 
 gnu_java_rmi_registry_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_registry_source_files)))
+gnu_java_rmi_rmic_source_files = \
+gnu/java/rmi/rmic/Compile_gcj.java \
+gnu/java/rmi/rmic/Compile_jikes.java \
+gnu/java/rmi/rmic/Compile_kjc.java \
+gnu/java/rmi/rmic/Compiler.java \
+gnu/java/rmi/rmic/CompilerProcess.java \
+gnu/java/rmi/rmic/RMIC.java \
+gnu/java/rmi/rmic/RMICException.java \
+gnu/java/rmi/rmic/TabbedWriter.java
+
+gnu_java_rmi_rmic_header_files = $(patsubst %.java,%.h,$(gnu_java_rmi_rmic_source_files))
 gnu_java_rmi_server_source_files = \
+classpath/gnu/java/rmi/server/ActivatableRef.java \
+classpath/gnu/java/rmi/server/ActivatableServerRef.java \
 classpath/gnu/java/rmi/server/CombinedClassLoader.java \
 classpath/gnu/java/rmi/server/ConnectionRunnerPool.java \
 classpath/gnu/java/rmi/server/ProtocolConstants.java \
@@ -1854,6 +2004,7 @@ classpath/gnu/java/rmi/server/UnicastServerRef.java
 
 gnu_java_rmi_server_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_server_source_files)))
 gnu_java_security_source_files = \
+classpath/gnu/java/security/Configuration.java \
 classpath/gnu/java/security/Engine.java \
 classpath/gnu/java/security/OID.java \
 classpath/gnu/java/security/PolicyFile.java \
@@ -1983,6 +2134,7 @@ classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
 
 gnu_java_security_key_rsa_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_key_rsa_source_files)))
 gnu_java_security_pkcs_source_files = \
+classpath/gnu/java/security/pkcs/PKCS7Data.java \
 classpath/gnu/java/security/pkcs/PKCS7SignedData.java \
 classpath/gnu/java/security/pkcs/SignerInfo.java
 
@@ -2000,7 +2152,6 @@ classpath/gnu/java/security/prng/RandomEventListener.java
 gnu_java_security_prng_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_prng_source_files)))
 gnu_java_security_provider_source_files = \
 classpath/gnu/java/security/provider/CollectionCertStoreImpl.java \
-classpath/gnu/java/security/provider/DSAParameterGenerator.java \
 classpath/gnu/java/security/provider/DefaultPolicy.java \
 classpath/gnu/java/security/provider/Gnu.java \
 classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java \
@@ -2036,12 +2187,13 @@ classpath/gnu/java/security/sig/rsa/RSASignatureFactory.java
 gnu_java_security_sig_rsa_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_sig_rsa_source_files)))
 gnu_java_security_util_source_files = \
 classpath/gnu/java/security/util/Base64.java \
+classpath/gnu/java/security/util/ByteArray.java \
 classpath/gnu/java/security/util/DerUtil.java \
 classpath/gnu/java/security/util/ExpirableObject.java \
 classpath/gnu/java/security/util/FormatUtil.java \
+classpath/gnu/java/security/util/IntegerUtil.java \
 classpath/gnu/java/security/util/PRNG.java \
 classpath/gnu/java/security/util/Prime.java \
-classpath/gnu/java/security/util/Prime2.java \
 classpath/gnu/java/security/util/Sequence.java \
 classpath/gnu/java/security/util/SimpleList.java \
 classpath/gnu/java/security/util/Util.java
@@ -2096,16 +2248,59 @@ classpath/gnu/java/util/EmptyEnumeration.java \
 classpath/gnu/java/util/WeakIdentityHashMap.java
 
 gnu_java_util_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_source_files)))
+gnu_java_util_jar_source_files = \
+classpath/gnu/java/util/jar/JarUtils.java
+
+gnu_java_util_jar_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_jar_source_files)))
 gnu_java_util_prefs_source_files = \
 classpath/gnu/java/util/prefs/EventDispatcher.java \
 classpath/gnu/java/util/prefs/FileBasedFactory.java \
 classpath/gnu/java/util/prefs/FileBasedPreferences.java \
+classpath/gnu/java/util/prefs/GConfBasedFactory.java \
+classpath/gnu/java/util/prefs/GConfBasedPreferences.java \
 classpath/gnu/java/util/prefs/MemoryBasedFactory.java \
 classpath/gnu/java/util/prefs/MemoryBasedPreferences.java \
 classpath/gnu/java/util/prefs/NodeReader.java \
 classpath/gnu/java/util/prefs/NodeWriter.java
 
 gnu_java_util_prefs_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_prefs_source_files)))
+gnu_java_util_prefs_gconf_source_files = \
+classpath/gnu/java/util/prefs/gconf/GConfNativePeer.java
+
+gnu_java_util_regex_source_files = \
+classpath/gnu/java/util/regex/BacktrackStack.java \
+classpath/gnu/java/util/regex/CharIndexed.java \
+classpath/gnu/java/util/regex/CharIndexedCharArray.java \
+classpath/gnu/java/util/regex/CharIndexedCharSequence.java \
+classpath/gnu/java/util/regex/CharIndexedInputStream.java \
+classpath/gnu/java/util/regex/CharIndexedString.java \
+classpath/gnu/java/util/regex/CharIndexedStringBuffer.java \
+classpath/gnu/java/util/regex/RE.java \
+classpath/gnu/java/util/regex/REException.java \
+classpath/gnu/java/util/regex/REFilterInputStream.java \
+classpath/gnu/java/util/regex/REMatch.java \
+classpath/gnu/java/util/regex/REMatchEnumeration.java \
+classpath/gnu/java/util/regex/RESyntax.java \
+classpath/gnu/java/util/regex/REToken.java \
+classpath/gnu/java/util/regex/RETokenAny.java \
+classpath/gnu/java/util/regex/RETokenBackRef.java \
+classpath/gnu/java/util/regex/RETokenChar.java \
+classpath/gnu/java/util/regex/RETokenEnd.java \
+classpath/gnu/java/util/regex/RETokenEndOfPreviousMatch.java \
+classpath/gnu/java/util/regex/RETokenEndSub.java \
+classpath/gnu/java/util/regex/RETokenIndependent.java \
+classpath/gnu/java/util/regex/RETokenLookAhead.java \
+classpath/gnu/java/util/regex/RETokenLookBehind.java \
+classpath/gnu/java/util/regex/RETokenNamedProperty.java \
+classpath/gnu/java/util/regex/RETokenOneOf.java \
+classpath/gnu/java/util/regex/RETokenPOSIX.java \
+classpath/gnu/java/util/regex/RETokenRange.java \
+classpath/gnu/java/util/regex/RETokenRepeated.java \
+classpath/gnu/java/util/regex/RETokenStart.java \
+classpath/gnu/java/util/regex/RETokenWordBoundary.java \
+classpath/gnu/java/util/regex/UncheckedRE.java
+
+gnu_java_util_regex_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_regex_source_files)))
 gnu_javax_crypto_source_files = \
 classpath/gnu/javax/crypto/RSACipherImpl.java
 
@@ -2153,6 +2348,10 @@ classpath/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java
 
 gnu_javax_crypto_jce_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_jce_source_files)))
 gnu_javax_crypto_jce_cipher_source_files = \
+classpath/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.java \
 classpath/gnu/javax/crypto/jce/cipher/AESSpi.java \
 classpath/gnu/javax/crypto/jce/cipher/ARCFourSpi.java \
 classpath/gnu/javax/crypto/jce/cipher/AnubisSpi.java \
@@ -2160,12 +2359,14 @@ classpath/gnu/javax/crypto/jce/cipher/BlowfishSpi.java \
 classpath/gnu/javax/crypto/jce/cipher/Cast5Spi.java \
 classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java \
 classpath/gnu/javax/crypto/jce/cipher/DESSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java \
 classpath/gnu/javax/crypto/jce/cipher/KhazadSpi.java \
 classpath/gnu/javax/crypto/jce/cipher/NullCipherSpi.java \
 classpath/gnu/javax/crypto/jce/cipher/PBES2.java \
 classpath/gnu/javax/crypto/jce/cipher/RijndaelSpi.java \
 classpath/gnu/javax/crypto/jce/cipher/SerpentSpi.java \
 classpath/gnu/javax/crypto/jce/cipher/SquareSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.java \
 classpath/gnu/javax/crypto/jce/cipher/TripleDESSpi.java \
 classpath/gnu/javax/crypto/jce/cipher/TwofishSpi.java
 
@@ -2327,6 +2528,15 @@ classpath/gnu/javax/crypto/keyring/Properties.java \
 classpath/gnu/javax/crypto/keyring/PublicKeyEntry.java
 
 gnu_javax_crypto_keyring_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_keyring_source_files)))
+gnu_javax_crypto_kwa_source_files = \
+classpath/gnu/javax/crypto/kwa/AESKeyWrap.java \
+classpath/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.java \
+classpath/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.java \
+classpath/gnu/javax/crypto/kwa/KeyUnwrappingException.java \
+classpath/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.java \
+classpath/gnu/javax/crypto/kwa/TripleDESKeyWrap.java
+
+gnu_javax_crypto_kwa_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_kwa_source_files)))
 gnu_javax_crypto_mac_source_files = \
 classpath/gnu/javax/crypto/mac/BaseMac.java \
 classpath/gnu/javax/crypto/mac/HMac.java \
@@ -2358,6 +2568,7 @@ gnu_javax_crypto_mode_header_files = $(patsubst classpath/%,%,$(patsubst %.java,
 gnu_javax_crypto_pad_source_files = \
 classpath/gnu/javax/crypto/pad/BasePad.java \
 classpath/gnu/javax/crypto/pad/IPad.java \
+classpath/gnu/javax/crypto/pad/ISO10126.java \
 classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java \
 classpath/gnu/javax/crypto/pad/PKCS7.java \
 classpath/gnu/javax/crypto/pad/PadFactory.java \
@@ -2440,12 +2651,19 @@ classpath/gnu/javax/crypto/sasl/srp/ServerStore.java \
 classpath/gnu/javax/crypto/sasl/srp/StoreEntry.java
 
 gnu_javax_crypto_sasl_srp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_sasl_srp_source_files)))
+gnu_javax_imageio_source_files = \
+classpath/gnu/javax/imageio/IIOInputStream.java
+
+gnu_javax_imageio_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_imageio_source_files)))
 gnu_javax_imageio_bmp_source_files = \
 classpath/gnu/javax/imageio/bmp/BMPDecoder.java \
+classpath/gnu/javax/imageio/bmp/BMPEncoder.java \
 classpath/gnu/javax/imageio/bmp/BMPException.java \
 classpath/gnu/javax/imageio/bmp/BMPFileHeader.java \
 classpath/gnu/javax/imageio/bmp/BMPImageReader.java \
 classpath/gnu/javax/imageio/bmp/BMPImageReaderSpi.java \
+classpath/gnu/javax/imageio/bmp/BMPImageWriter.java \
+classpath/gnu/javax/imageio/bmp/BMPImageWriterSpi.java \
 classpath/gnu/javax/imageio/bmp/BMPInfoHeader.java \
 classpath/gnu/javax/imageio/bmp/DecodeBF16.java \
 classpath/gnu/javax/imageio/bmp/DecodeBF32.java \
@@ -2454,9 +2672,58 @@ classpath/gnu/javax/imageio/bmp/DecodeRGB24.java \
 classpath/gnu/javax/imageio/bmp/DecodeRGB4.java \
 classpath/gnu/javax/imageio/bmp/DecodeRGB8.java \
 classpath/gnu/javax/imageio/bmp/DecodeRLE4.java \
-classpath/gnu/javax/imageio/bmp/DecodeRLE8.java
+classpath/gnu/javax/imageio/bmp/DecodeRLE8.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB1.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB16.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB24.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB32.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB4.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB8.java \
+classpath/gnu/javax/imageio/bmp/EncodeRLE4.java \
+classpath/gnu/javax/imageio/bmp/EncodeRLE8.java
 
 gnu_javax_imageio_bmp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_imageio_bmp_source_files)))
+gnu_javax_imageio_gif_source_files = \
+classpath/gnu/javax/imageio/gif/GIFFile.java \
+classpath/gnu/javax/imageio/gif/GIFImageReader.java \
+classpath/gnu/javax/imageio/gif/GIFImageReaderSpi.java
+
+gnu_javax_imageio_gif_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_imageio_gif_source_files)))
+gnu_javax_imageio_jpeg_source_files = \
+classpath/gnu/javax/imageio/jpeg/DCT.java \
+classpath/gnu/javax/imageio/jpeg/HuffmanTable.java \
+classpath/gnu/javax/imageio/jpeg/JPEGComponent.java \
+classpath/gnu/javax/imageio/jpeg/JPEGDecoder.java \
+classpath/gnu/javax/imageio/jpeg/JPEGException.java \
+classpath/gnu/javax/imageio/jpeg/JPEGFrame.java \
+classpath/gnu/javax/imageio/jpeg/JPEGImageInputStream.java \
+classpath/gnu/javax/imageio/jpeg/JPEGImageReader.java \
+classpath/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.java \
+classpath/gnu/javax/imageio/jpeg/JPEGMarker.java \
+classpath/gnu/javax/imageio/jpeg/JPEGMarkerFoundException.java \
+classpath/gnu/javax/imageio/jpeg/JPEGScan.java \
+classpath/gnu/javax/imageio/jpeg/YCbCr_ColorSpace.java \
+classpath/gnu/javax/imageio/jpeg/ZigZag.java
+
+gnu_javax_imageio_jpeg_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_imageio_jpeg_source_files)))
+gnu_javax_imageio_png_source_files = \
+classpath/gnu/javax/imageio/png/PNGChunk.java \
+classpath/gnu/javax/imageio/png/PNGData.java \
+classpath/gnu/javax/imageio/png/PNGDecoder.java \
+classpath/gnu/javax/imageio/png/PNGEncoder.java \
+classpath/gnu/javax/imageio/png/PNGException.java \
+classpath/gnu/javax/imageio/png/PNGFile.java \
+classpath/gnu/javax/imageio/png/PNGFilter.java \
+classpath/gnu/javax/imageio/png/PNGGamma.java \
+classpath/gnu/javax/imageio/png/PNGHeader.java \
+classpath/gnu/javax/imageio/png/PNGICCProfile.java \
+classpath/gnu/javax/imageio/png/PNGImageReader.java \
+classpath/gnu/javax/imageio/png/PNGImageReaderSpi.java \
+classpath/gnu/javax/imageio/png/PNGPalette.java \
+classpath/gnu/javax/imageio/png/PNGPhys.java \
+classpath/gnu/javax/imageio/png/PNGTime.java
+
+gnu_javax_imageio_png_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_imageio_png_source_files)))
 gnu_javax_net_ssl_source_files = \
 classpath/gnu/javax/net/ssl/Base64.java \
 classpath/gnu/javax/net/ssl/EntropySource.java \
@@ -2531,6 +2798,105 @@ classpath/gnu/javax/net/ssl/provider/X509TrustManagerFactory.java \
 classpath/gnu/javax/net/ssl/provider/XMLSessionContext.java
 
 gnu_javax_net_ssl_provider_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_net_ssl_provider_source_files)))
+gnu_javax_print_source_files = \
+classpath/gnu/javax/print/CupsIppOperation.java \
+classpath/gnu/javax/print/CupsMediaMapping.java \
+classpath/gnu/javax/print/CupsPrintService.java \
+classpath/gnu/javax/print/CupsPrintServiceLookup.java \
+classpath/gnu/javax/print/CupsServer.java \
+classpath/gnu/javax/print/PrintAttributeException.java \
+classpath/gnu/javax/print/PrintFlavorException.java \
+classpath/gnu/javax/print/PrintUriException.java \
+classpath/gnu/javax/print/PrinterDialog.java
+
+gnu_javax_print_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_source_files)))
+gnu_javax_print_ipp_source_files = \
+classpath/gnu/javax/print/ipp/DocPrintJobImpl.java \
+classpath/gnu/javax/print/ipp/IppDelimiterTag.java \
+classpath/gnu/javax/print/ipp/IppException.java \
+classpath/gnu/javax/print/ipp/IppMultiDocPrintService.java \
+classpath/gnu/javax/print/ipp/IppPrintService.java \
+classpath/gnu/javax/print/ipp/IppRequest.java \
+classpath/gnu/javax/print/ipp/IppResponse.java \
+classpath/gnu/javax/print/ipp/IppStatusCode.java \
+classpath/gnu/javax/print/ipp/IppUtilities.java \
+classpath/gnu/javax/print/ipp/IppValueTag.java \
+classpath/gnu/javax/print/ipp/MultiDocPrintJobImpl.java
+
+gnu_javax_print_ipp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_ipp_source_files)))
+gnu_javax_print_ipp_attribute_source_files = \
+classpath/gnu/javax/print/ipp/attribute/CharsetSyntax.java \
+classpath/gnu/javax/print/ipp/attribute/DefaultValueAttribute.java \
+classpath/gnu/javax/print/ipp/attribute/DetailedStatusMessage.java \
+classpath/gnu/javax/print/ipp/attribute/DocumentAccessError.java \
+classpath/gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.java \
+classpath/gnu/javax/print/ipp/attribute/RequestedAttributes.java \
+classpath/gnu/javax/print/ipp/attribute/StatusMessage.java \
+classpath/gnu/javax/print/ipp/attribute/UnknownAttribute.java
+
+gnu_javax_print_ipp_attribute_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_ipp_attribute_source_files)))
+gnu_javax_print_ipp_attribute_defaults_source_files = \
+classpath/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/MediaDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/SidesDefault.java
+
+gnu_javax_print_ipp_attribute_defaults_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_ipp_attribute_defaults_source_files)))
+gnu_javax_print_ipp_attribute_job_source_files = \
+classpath/gnu/javax/print/ipp/attribute/job/AttributesCharset.java \
+classpath/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobId.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobMoreInfo.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobPrinterUri.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobStateMessage.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobUri.java
+
+gnu_javax_print_ipp_attribute_job_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_ipp_attribute_job_source_files)))
+gnu_javax_print_ipp_attribute_printer_source_files = \
+classpath/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java \
+classpath/gnu/javax/print/ipp/attribute/printer/DocumentFormat.java \
+classpath/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java \
+classpath/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java \
+classpath/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java \
+classpath/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java \
+classpath/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java \
+classpath/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java
+
+gnu_javax_print_ipp_attribute_printer_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_ipp_attribute_printer_source_files)))
+gnu_javax_print_ipp_attribute_supported_source_files = \
+classpath/gnu/javax/print/ipp/attribute/supported/CharsetSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/CompressionSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/MediaSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/OperationsSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/SidesSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.java
+
+gnu_javax_print_ipp_attribute_supported_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_ipp_attribute_supported_source_files)))
 gnu_javax_rmi_source_files = \
 classpath/gnu/javax/rmi/CORBA/CorbaInput.java \
 classpath/gnu/javax/rmi/CORBA/CorbaOutput.java \
@@ -2570,10 +2936,40 @@ classpath/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.java \
 classpath/gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.java \
 classpath/gnu/javax/sound/midi/alsa/AlsaPortDevice.java \
 classpath/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java \
-classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
-
+classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java \
+classpath/gnu/javax/sound/midi/file/ExtendedMidiFileFormat.java \
+classpath/gnu/javax/sound/midi/file/MidiDataInputStream.java \
+classpath/gnu/javax/sound/midi/file/MidiDataOutputStream.java \
+classpath/gnu/javax/sound/midi/file/MidiFileReader.java \
+classpath/gnu/javax/sound/midi/file/MidiFileWriter.java
+
+gnu_javax_sound_sampled_AU_source_files = \
+classpath/gnu/javax/sound/sampled/AU/AUReader.java
+
+gnu_javax_sound_sampled_AU_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_sound_sampled_AU_source_files)))
+gnu_javax_sound_sampled_WAV_source_files = \
+classpath/gnu/javax/sound/sampled/WAV/WAVReader.java
+
+gnu_javax_sound_sampled_WAV_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_sound_sampled_WAV_source_files)))
+gnu_javax_swing_plaf_gnu_source_files = \
+classpath/gnu/javax/swing/plaf/gnu/GNULookAndFeel.java
+
+gnu_javax_swing_plaf_gnu_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_plaf_gnu_source_files)))
+gnu_javax_swing_plaf_metal_source_files = \
+classpath/gnu/javax/swing/plaf/metal/CustomizableTheme.java
+
+gnu_javax_swing_plaf_metal_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_plaf_metal_source_files)))
+gnu_javax_swing_text_html_source_files = \
+classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java \
+classpath/gnu/javax/swing/text/html/CombinedAttributes.java \
+classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java
+
+gnu_javax_swing_text_html_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_text_html_source_files)))
 gnu_javax_swing_text_html_parser_source_files = \
+classpath/gnu/javax/swing/text/html/parser/GnuParserDelegator.java \
 classpath/gnu/javax/swing/text/html/parser/HTML_401F.java \
+classpath/gnu/javax/swing/text/html/parser/HTML_401Swing.java \
+classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java \
 classpath/gnu/javax/swing/text/html/parser/gnuDTD.java \
 classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java \
 classpath/gnu/javax/swing/text/html/parser/htmlValidator.java
@@ -2607,37 +3003,10 @@ classpath/gnu/javax/swing/text/html/parser/support/low/node.java \
 classpath/gnu/javax/swing/text/html/parser/support/low/pattern.java
 
 gnu_javax_swing_text_html_parser_support_low_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_text_html_parser_support_low_source_files)))
-gnu_regexp_source_files = \
-classpath/gnu/regexp/CharIndexed.java \
-classpath/gnu/regexp/CharIndexedCharArray.java \
-classpath/gnu/regexp/CharIndexedInputStream.java \
-classpath/gnu/regexp/CharIndexedString.java \
-classpath/gnu/regexp/CharIndexedStringBuffer.java \
-classpath/gnu/regexp/RE.java \
-classpath/gnu/regexp/REException.java \
-classpath/gnu/regexp/REFilterInputStream.java \
-classpath/gnu/regexp/REMatch.java \
-classpath/gnu/regexp/REMatchEnumeration.java \
-classpath/gnu/regexp/RESyntax.java \
-classpath/gnu/regexp/REToken.java \
-classpath/gnu/regexp/RETokenAny.java \
-classpath/gnu/regexp/RETokenBackRef.java \
-classpath/gnu/regexp/RETokenChar.java \
-classpath/gnu/regexp/RETokenEnd.java \
-classpath/gnu/regexp/RETokenEndSub.java \
-classpath/gnu/regexp/RETokenIndependent.java \
-classpath/gnu/regexp/RETokenLookAhead.java \
-classpath/gnu/regexp/RETokenLookBehind.java \
-classpath/gnu/regexp/RETokenNamedProperty.java \
-classpath/gnu/regexp/RETokenOneOf.java \
-classpath/gnu/regexp/RETokenPOSIX.java \
-classpath/gnu/regexp/RETokenRange.java \
-classpath/gnu/regexp/RETokenRepeated.java \
-classpath/gnu/regexp/RETokenStart.java \
-classpath/gnu/regexp/RETokenWordBoundary.java \
-classpath/gnu/regexp/UncheckedRE.java
-
-gnu_regexp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_regexp_source_files)))
+gnu_javax_swing_tree_source_files = \
+classpath/gnu/javax/swing/tree/GnuPath.java
+
+gnu_javax_swing_tree_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_tree_source_files)))
 gnu_xml_source_files = \
 classpath/gnu/xml/aelfred2/JAXPFactory.java \
 classpath/gnu/xml/aelfred2/SAXDriver.java \
@@ -2692,6 +3061,7 @@ classpath/gnu/xml/dom/html2/DomHTMLDirectoryElement.java \
 classpath/gnu/xml/dom/html2/DomHTMLDivElement.java \
 classpath/gnu/xml/dom/html2/DomHTMLDocument.java \
 classpath/gnu/xml/dom/html2/DomHTMLElement.java \
+classpath/gnu/xml/dom/html2/DomHTMLEmbedElement.java \
 classpath/gnu/xml/dom/html2/DomHTMLFieldSetElement.java \
 classpath/gnu/xml/dom/html2/DomHTMLFontElement.java \
 classpath/gnu/xml/dom/html2/DomHTMLFormElement.java \
@@ -3138,11 +3508,13 @@ classpath/java/awt/MenuComponent.java \
 classpath/java/awt/MenuContainer.java \
 classpath/java/awt/MenuItem.java \
 classpath/java/awt/MenuShortcut.java \
+classpath/java/awt/MouseInfo.java \
 classpath/java/awt/PageAttributes.java \
 classpath/java/awt/Paint.java \
 classpath/java/awt/PaintContext.java \
 classpath/java/awt/Panel.java \
 classpath/java/awt/Point.java \
+classpath/java/awt/PointerInfo.java \
 classpath/java/awt/Polygon.java \
 classpath/java/awt/PopupMenu.java \
 classpath/java/awt/PrintGraphics.java \
@@ -3405,6 +3777,7 @@ classpath/java/awt/peer/MenuBarPeer.java \
 classpath/java/awt/peer/MenuComponentPeer.java \
 classpath/java/awt/peer/MenuItemPeer.java \
 classpath/java/awt/peer/MenuPeer.java \
+classpath/java/awt/peer/MouseInfoPeer.java \
 classpath/java/awt/peer/PanelPeer.java \
 classpath/java/awt/peer/PopupMenuPeer.java \
 classpath/java/awt/peer/RobotPeer.java \
@@ -3512,9 +3885,9 @@ classpath/java/io/Externalizable.java \
 java/io/File.java \
 classpath/java/io/FileDescriptor.java \
 classpath/java/io/FileFilter.java \
-java/io/FileInputStream.java \
+classpath/java/io/FileInputStream.java \
 classpath/java/io/FileNotFoundException.java \
-java/io/FileOutputStream.java \
+classpath/java/io/FileOutputStream.java \
 classpath/java/io/FilePermission.java \
 classpath/java/io/FileReader.java \
 classpath/java/io/FileWriter.java \
@@ -3554,7 +3927,7 @@ java/io/PrintStream.java \
 classpath/java/io/PrintWriter.java \
 classpath/java/io/PushbackInputStream.java \
 classpath/java/io/PushbackReader.java \
-java/io/RandomAccessFile.java \
+classpath/java/io/RandomAccessFile.java \
 classpath/java/io/Reader.java \
 classpath/java/io/SequenceInputStream.java \
 classpath/java/io/Serializable.java \
@@ -3594,6 +3967,7 @@ classpath/java/lang/Comparable.java \
 classpath/java/lang/Compiler.java \
 java/lang/ConcreteProcess.java \
 classpath/java/lang/Double.java \
+classpath/java/lang/Enum.java \
 classpath/java/lang/EnumConstantNotPresentException.java \
 classpath/java/lang/Error.java \
 classpath/java/lang/Exception.java \
@@ -3607,12 +3981,13 @@ classpath/java/lang/IllegalStateException.java \
 classpath/java/lang/IllegalThreadStateException.java \
 classpath/java/lang/IncompatibleClassChangeError.java \
 classpath/java/lang/IndexOutOfBoundsException.java \
-java/lang/InheritableThreadLocal.java \
+classpath/java/lang/InheritableThreadLocal.java \
 classpath/java/lang/InstantiationError.java \
 classpath/java/lang/InstantiationException.java \
 classpath/java/lang/Integer.java \
 classpath/java/lang/InternalError.java \
 classpath/java/lang/InterruptedException.java \
+classpath/java/lang/Iterable.java \
 classpath/java/lang/LinkageError.java \
 classpath/java/lang/Long.java \
 java/lang/Math.java \
@@ -3647,7 +4022,7 @@ java/lang/System.java \
 java/lang/Thread.java \
 classpath/java/lang/ThreadDeath.java \
 classpath/java/lang/ThreadGroup.java \
-java/lang/ThreadLocal.java \
+classpath/java/lang/ThreadLocal.java \
 classpath/java/lang/Throwable.java \
 classpath/java/lang/TypeNotPresentException.java \
 classpath/java/lang/UnknownError.java \
@@ -3666,10 +4041,38 @@ classpath/java/lang/Void.java
 
 java_lang_header_files = $(filter-out java/lang/Object.h java/lang/Class.h,$(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_source_files))))
 java_lang_annotation_source_files = \
+classpath/java/lang/annotation/Annotation.java \
 classpath/java/lang/annotation/AnnotationFormatError.java \
-classpath/java/lang/annotation/AnnotationTypeMismatchException.java
+classpath/java/lang/annotation/AnnotationTypeMismatchException.java \
+classpath/java/lang/annotation/IncompleteAnnotationException.java
 
 java_lang_annotation_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_annotation_source_files)))
+java_lang_instrument_source_files = \
+classpath/java/lang/instrument/ClassDefinition.java \
+classpath/java/lang/instrument/ClassFileTransformer.java \
+classpath/java/lang/instrument/IllegalClassFormatException.java \
+classpath/java/lang/instrument/Instrumentation.java \
+classpath/java/lang/instrument/UnmodifiableClassException.java
+
+java_lang_instrument_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_instrument_source_files)))
+java_lang_management_source_files = \
+classpath/java/lang/management/ClassLoadingMXBean.java \
+classpath/java/lang/management/CompilationMXBean.java \
+classpath/java/lang/management/GarbageCollectorMXBean.java \
+classpath/java/lang/management/ManagementFactory.java \
+classpath/java/lang/management/ManagementPermission.java \
+classpath/java/lang/management/MemoryMXBean.java \
+classpath/java/lang/management/MemoryManagerMXBean.java \
+classpath/java/lang/management/MemoryNotificationInfo.java \
+classpath/java/lang/management/MemoryPoolMXBean.java \
+classpath/java/lang/management/MemoryUsage.java \
+classpath/java/lang/management/OperatingSystemMXBean.java \
+classpath/java/lang/management/RuntimeMXBean.java \
+classpath/java/lang/management/ThreadInfo.java \
+classpath/java/lang/management/ThreadMXBean.java \
+java/lang/management/VMManagementFactory.java
+
+java_lang_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_management_source_files)))
 java_lang_ref_source_files = \
 classpath/java/lang/ref/PhantomReference.java \
 java/lang/ref/Reference.java \
@@ -3680,13 +4083,16 @@ classpath/java/lang/ref/WeakReference.java
 java_lang_ref_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_ref_source_files)))
 java_lang_reflect_source_files = \
 classpath/java/lang/reflect/AccessibleObject.java \
+classpath/java/lang/reflect/AnnotatedElement.java \
 java/lang/reflect/Array.java \
 java/lang/reflect/Constructor.java \
 java/lang/reflect/Field.java \
 classpath/java/lang/reflect/GenericArrayType.java \
+classpath/java/lang/reflect/GenericDeclaration.java \
 classpath/java/lang/reflect/GenericSignatureFormatError.java \
 classpath/java/lang/reflect/InvocationHandler.java \
 classpath/java/lang/reflect/InvocationTargetException.java \
+classpath/java/lang/reflect/MalformedParameterizedTypeException.java \
 classpath/java/lang/reflect/Member.java \
 java/lang/reflect/Method.java \
 java/lang/reflect/Modifier.java \
@@ -3694,6 +4100,7 @@ classpath/java/lang/reflect/ParameterizedType.java \
 classpath/java/lang/reflect/Proxy.java \
 classpath/java/lang/reflect/ReflectPermission.java \
 classpath/java/lang/reflect/Type.java \
+classpath/java/lang/reflect/TypeVariable.java \
 classpath/java/lang/reflect/UndeclaredThrowableException.java \
 java/lang/reflect/VMProxy.java \
 classpath/java/lang/reflect/WildcardType.java
@@ -3701,7 +4108,8 @@ classpath/java/lang/reflect/WildcardType.java
 java_lang_reflect_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_reflect_source_files)))
 java_math_source_files = \
 classpath/java/math/BigDecimal.java \
-classpath/java/math/BigInteger.java
+classpath/java/math/BigInteger.java \
+classpath/java/math/MathContext.java
 
 java_math_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_math_source_files)))
 java_net_source_files = \
@@ -3720,7 +4128,7 @@ classpath/java/net/Inet4Address.java \
 classpath/java/net/Inet6Address.java \
 java/net/InetAddress.java \
 classpath/java/net/InetSocketAddress.java \
-java/net/JarURLConnection.java \
+classpath/java/net/JarURLConnection.java \
 classpath/java/net/MalformedURLException.java \
 classpath/java/net/MimeTypeMapper.java \
 classpath/java/net/MulticastSocket.java \
@@ -3730,6 +4138,7 @@ classpath/java/net/NoRouteToHostException.java \
 classpath/java/net/PasswordAuthentication.java \
 classpath/java/net/PortUnreachableException.java \
 classpath/java/net/ProtocolException.java \
+classpath/java/net/ResolverCache.java \
 classpath/java/net/ServerSocket.java \
 classpath/java/net/Socket.java \
 classpath/java/net/SocketAddress.java \
@@ -3743,14 +4152,16 @@ classpath/java/net/URI.java \
 classpath/java/net/URISyntaxException.java \
 java/net/URL.java \
 java/net/URLClassLoader.java \
-java/net/URLConnection.java \
+classpath/java/net/URLConnection.java \
 classpath/java/net/URLDecoder.java \
 classpath/java/net/URLEncoder.java \
 classpath/java/net/URLStreamHandler.java \
 classpath/java/net/URLStreamHandlerFactory.java \
 classpath/java/net/UnknownHostException.java \
 classpath/java/net/UnknownServiceException.java \
-java/net/VMNetworkInterface.java
+java/net/VMInetAddress.java \
+java/net/VMNetworkInterface.java \
+java/net/VMURLConnection.java
 
 java_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_net_source_files)))
 java_nio_source_files = \
@@ -3793,7 +4204,7 @@ classpath/java/nio/channels/AsynchronousCloseException.java \
 classpath/java/nio/channels/ByteChannel.java \
 classpath/java/nio/channels/CancelledKeyException.java \
 classpath/java/nio/channels/Channel.java \
-java/nio/channels/Channels.java \
+classpath/java/nio/channels/Channels.java \
 classpath/java/nio/channels/ClosedByInterruptException.java \
 classpath/java/nio/channels/ClosedChannelException.java \
 classpath/java/nio/channels/ClosedSelectorException.java \
@@ -3822,6 +4233,7 @@ classpath/java/nio/channels/ServerSocketChannel.java \
 classpath/java/nio/channels/SocketChannel.java \
 classpath/java/nio/channels/UnresolvedAddressException.java \
 classpath/java/nio/channels/UnsupportedAddressTypeException.java \
+java/nio/channels/VMChannels.java \
 classpath/java/nio/channels/WritableByteChannel.java
 
 java_nio_channels_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_channels_source_files)))
@@ -3935,9 +4347,9 @@ classpath/java/rmi/server/Unreferenced.java
 
 java_rmi_server_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_rmi_server_source_files)))
 java_security_source_files = \
-java/security/AccessControlContext.java \
+classpath/java/security/AccessControlContext.java \
 classpath/java/security/AccessControlException.java \
-java/security/AccessController.java \
+classpath/java/security/AccessController.java \
 classpath/java/security/AlgorithmParameterGenerator.java \
 classpath/java/security/AlgorithmParameterGeneratorSpi.java \
 classpath/java/security/AlgorithmParameters.java \
@@ -4001,7 +4413,10 @@ classpath/java/security/SignatureSpi.java \
 classpath/java/security/SignedObject.java \
 classpath/java/security/Signer.java \
 classpath/java/security/UnrecoverableKeyException.java \
-classpath/java/security/UnresolvedPermission.java
+classpath/java/security/UnresolvedPermission.java \
+java/security/VMAccessControlState.java \
+java/security/VMAccessController.java \
+java/security/VMSecureRandom.java
 
 java_security_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_security_source_files)))
 java_security_acl_source_files = \
@@ -4137,7 +4552,7 @@ classpath/java/text/ChoiceFormat.java \
 classpath/java/text/CollationElementIterator.java \
 classpath/java/text/CollationKey.java \
 java/text/Collator.java \
-java/text/DateFormat.java \
+classpath/java/text/DateFormat.java \
 java/text/DateFormatSymbols.java \
 classpath/java/text/DecimalFormat.java \
 java/text/DecimalFormatSymbols.java \
@@ -4169,16 +4584,29 @@ classpath/java/util/ConcurrentModificationException.java \
 java/util/Currency.java \
 classpath/java/util/Date.java \
 classpath/java/util/Dictionary.java \
+classpath/java/util/DuplicateFormatFlagsException.java \
 classpath/java/util/EmptyStackException.java \
 classpath/java/util/Enumeration.java \
 classpath/java/util/EventListener.java \
 classpath/java/util/EventListenerProxy.java \
 classpath/java/util/EventObject.java \
+classpath/java/util/FormatFlagsConversionMismatchException.java \
+classpath/java/util/Formattable.java \
+classpath/java/util/FormattableFlags.java \
+classpath/java/util/Formatter.java \
+classpath/java/util/FormatterClosedException.java \
 java/util/GregorianCalendar.java \
 classpath/java/util/HashMap.java \
 classpath/java/util/HashSet.java \
 classpath/java/util/Hashtable.java \
 classpath/java/util/IdentityHashMap.java \
+classpath/java/util/IllegalFormatCodePointException.java \
+classpath/java/util/IllegalFormatConversionException.java \
+classpath/java/util/IllegalFormatException.java \
+classpath/java/util/IllegalFormatFlagsException.java \
+classpath/java/util/IllegalFormatPrecisionException.java \
+classpath/java/util/IllegalFormatWidthException.java \
+classpath/java/util/InputMismatchException.java \
 classpath/java/util/InvalidPropertiesFormatException.java \
 classpath/java/util/Iterator.java \
 classpath/java/util/LinkedHashMap.java \
@@ -4188,8 +4616,9 @@ classpath/java/util/List.java \
 classpath/java/util/ListIterator.java \
 classpath/java/util/ListResourceBundle.java \
 java/util/Locale.java \
-classpath/java/util/LocaleData.java \
 classpath/java/util/Map.java \
+classpath/java/util/MissingFormatArgumentException.java \
+classpath/java/util/MissingFormatWidthException.java \
 classpath/java/util/MissingResourceException.java \
 classpath/java/util/NoSuchElementException.java \
 classpath/java/util/Observable.java \
@@ -4213,6 +4642,9 @@ classpath/java/util/TimerTask.java \
 classpath/java/util/TooManyListenersException.java \
 classpath/java/util/TreeMap.java \
 classpath/java/util/TreeSet.java \
+classpath/java/util/UUID.java \
+classpath/java/util/UnknownFormatConversionException.java \
+classpath/java/util/UnknownFormatFlagsException.java \
 java/util/VMTimeZone.java \
 classpath/java/util/Vector.java \
 classpath/java/util/WeakHashMap.java
@@ -4239,6 +4671,7 @@ classpath/java/util/logging/Level.java \
 java/util/logging/LogManager.java \
 classpath/java/util/logging/LogRecord.java \
 java/util/logging/Logger.java \
+classpath/java/util/logging/LoggingMXBean.java \
 classpath/java/util/logging/LoggingPermission.java \
 classpath/java/util/logging/MemoryHandler.java \
 classpath/java/util/logging/SimpleFormatter.java \
@@ -4290,12 +4723,14 @@ java_util_zip_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(ja
 javax_accessibility_source_files = \
 classpath/javax/accessibility/Accessible.java \
 classpath/javax/accessibility/AccessibleAction.java \
+classpath/javax/accessibility/AccessibleAttributeSequence.java \
 classpath/javax/accessibility/AccessibleBundle.java \
 classpath/javax/accessibility/AccessibleComponent.java \
 classpath/javax/accessibility/AccessibleContext.java \
 classpath/javax/accessibility/AccessibleEditableText.java \
 classpath/javax/accessibility/AccessibleExtendedComponent.java \
 classpath/javax/accessibility/AccessibleExtendedTable.java \
+classpath/javax/accessibility/AccessibleExtendedText.java \
 classpath/javax/accessibility/AccessibleHyperlink.java \
 classpath/javax/accessibility/AccessibleHypertext.java \
 classpath/javax/accessibility/AccessibleIcon.java \
@@ -4307,9 +4742,11 @@ classpath/javax/accessibility/AccessibleRole.java \
 classpath/javax/accessibility/AccessibleSelection.java \
 classpath/javax/accessibility/AccessibleState.java \
 classpath/javax/accessibility/AccessibleStateSet.java \
+classpath/javax/accessibility/AccessibleStreamable.java \
 classpath/javax/accessibility/AccessibleTable.java \
 classpath/javax/accessibility/AccessibleTableModelChange.java \
 classpath/javax/accessibility/AccessibleText.java \
+classpath/javax/accessibility/AccessibleTextSequence.java \
 classpath/javax/accessibility/AccessibleValue.java
 
 javax_accessibility_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_accessibility_source_files)))
@@ -4386,6 +4823,10 @@ classpath/javax/imageio/metadata/IIOMetadataFormat.java \
 classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java \
 classpath/javax/imageio/metadata/IIOMetadataNode.java \
 classpath/javax/imageio/plugins/bmp/BMPImageWriteParam.java \
+classpath/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java \
+classpath/javax/imageio/plugins/jpeg/JPEGImageReadParam.java \
+classpath/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java \
+classpath/javax/imageio/plugins/jpeg/JPEGQTable.java \
 classpath/javax/imageio/spi/IIORegistry.java \
 classpath/javax/imageio/spi/IIOServiceProvider.java \
 classpath/javax/imageio/spi/ImageInputStreamSpi.java \
@@ -4409,9 +4850,48 @@ classpath/javax/imageio/stream/MemoryCacheImageInputStream.java \
 classpath/javax/imageio/stream/MemoryCacheImageOutputStream.java
 
 javax_management_source_files = \
-classpath/javax/management/Attribute.java
+classpath/javax/management/Attribute.java \
+classpath/javax/management/AttributeList.java \
+classpath/javax/management/AttributeNotFoundException.java \
+classpath/javax/management/DynamicMBean.java \
+classpath/javax/management/IntrospectionException.java \
+classpath/javax/management/InvalidAttributeValueException.java \
+classpath/javax/management/JMException.java \
+classpath/javax/management/JMRuntimeException.java \
+classpath/javax/management/ListenerNotFoundException.java \
+classpath/javax/management/MBeanAttributeInfo.java \
+classpath/javax/management/MBeanConstructorInfo.java \
+classpath/javax/management/MBeanException.java \
+classpath/javax/management/MBeanFeatureInfo.java \
+classpath/javax/management/MBeanInfo.java \
+classpath/javax/management/MBeanNotificationInfo.java \
+classpath/javax/management/MBeanOperationInfo.java \
+classpath/javax/management/MBeanParameterInfo.java \
+classpath/javax/management/NotCompliantMBeanException.java \
+classpath/javax/management/Notification.java \
+classpath/javax/management/NotificationBroadcaster.java \
+classpath/javax/management/NotificationEmitter.java \
+classpath/javax/management/NotificationFilter.java \
+classpath/javax/management/NotificationListener.java \
+classpath/javax/management/OperationsException.java \
+classpath/javax/management/ReflectionException.java \
+classpath/javax/management/RuntimeOperationsException.java \
+classpath/javax/management/StandardMBean.java
 
 javax_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_management_source_files)))
+javax_management_openmbean_source_files = \
+classpath/javax/management/openmbean/ArrayType.java \
+classpath/javax/management/openmbean/CompositeData.java \
+classpath/javax/management/openmbean/CompositeDataSupport.java \
+classpath/javax/management/openmbean/CompositeType.java \
+classpath/javax/management/openmbean/InvalidKeyException.java \
+classpath/javax/management/openmbean/OpenDataException.java \
+classpath/javax/management/openmbean/OpenType.java \
+classpath/javax/management/openmbean/SimpleType.java \
+classpath/javax/management/openmbean/TabularData.java \
+classpath/javax/management/openmbean/TabularType.java
+
+javax_management_openmbean_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_management_openmbean_source_files)))
 javax_naming_source_files = \
 classpath/javax/naming/AuthenticationException.java \
 classpath/javax/naming/AuthenticationNotSupportedException.java \
@@ -4496,6 +4976,8 @@ classpath/javax/naming/ldap/HasControls.java \
 classpath/javax/naming/ldap/InitialLdapContext.java \
 classpath/javax/naming/ldap/LdapContext.java \
 classpath/javax/naming/ldap/LdapReferralException.java \
+classpath/javax/naming/ldap/StartTlsRequest.java \
+classpath/javax/naming/ldap/StartTlsResponse.java \
 classpath/javax/naming/ldap/UnsolicitedNotification.java \
 classpath/javax/naming/ldap/UnsolicitedNotificationEvent.java \
 classpath/javax/naming/ldap/UnsolicitedNotificationListener.java
@@ -4507,7 +4989,7 @@ classpath/javax/naming/spi/DirStateFactory.java \
 classpath/javax/naming/spi/DirectoryManager.java \
 classpath/javax/naming/spi/InitialContextFactory.java \
 classpath/javax/naming/spi/InitialContextFactoryBuilder.java \
-classpath/javax/naming/spi/NamingManager.java \
+javax/naming/spi/NamingManager.java \
 classpath/javax/naming/spi/ObjectFactory.java \
 classpath/javax/naming/spi/ObjectFactoryBuilder.java \
 classpath/javax/naming/spi/ResolveResult.java \
@@ -4568,6 +5050,7 @@ classpath/javax/print/MultiDocPrintService.java \
 classpath/javax/print/PrintException.java \
 classpath/javax/print/PrintService.java \
 classpath/javax/print/PrintServiceLookup.java \
+classpath/javax/print/ServiceUI.java \
 classpath/javax/print/ServiceUIFactory.java \
 classpath/javax/print/SimpleDoc.java \
 classpath/javax/print/StreamPrintService.java \
@@ -4697,7 +5180,9 @@ classpath/javax/rmi/CORBA/Util.java \
 classpath/javax/rmi/CORBA/UtilDelegate.java \
 classpath/javax/rmi/CORBA/ValueHandler.java \
 classpath/javax/rmi/CORBA/ValueHandlerMultiFormat.java \
-classpath/javax/rmi/PortableRemoteObject.java
+classpath/javax/rmi/PortableRemoteObject.java \
+classpath/javax/rmi/ssl/SslRMIClientSocketFactory.java \
+classpath/javax/rmi/ssl/SslRMIServerSocketFactory.java
 
 javax_security_auth_source_files = \
 classpath/javax/security/auth/AuthPermission.java \
@@ -4724,6 +5209,15 @@ classpath/javax/security/auth/callback/TextOutputCallback.java \
 classpath/javax/security/auth/callback/UnsupportedCallbackException.java
 
 javax_security_auth_callback_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_security_auth_callback_source_files)))
+javax_security_auth_kerberos_source_files = \
+classpath/javax/security/auth/kerberos/DelegationPermission.java \
+classpath/javax/security/auth/kerberos/KerberosKey.java \
+classpath/javax/security/auth/kerberos/KerberosPrincipal.java \
+classpath/javax/security/auth/kerberos/KerberosTicket.java \
+classpath/javax/security/auth/kerberos/KeyImpl.java \
+classpath/javax/security/auth/kerberos/ServicePermission.java
+
+javax_security_auth_kerberos_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_security_auth_kerberos_source_files)))
 javax_security_auth_login_source_files = \
 classpath/javax/security/auth/login/AccountException.java \
 classpath/javax/security/auth/login/AccountExpiredException.java \
@@ -4874,6 +5368,7 @@ classpath/javax/swing/CellEditor.java \
 classpath/javax/swing/CellRendererPane.java \
 classpath/javax/swing/ComboBoxEditor.java \
 classpath/javax/swing/ComboBoxModel.java \
+classpath/javax/swing/CompatibilityFocusTraversalPolicy.java \
 classpath/javax/swing/ComponentInputMap.java \
 classpath/javax/swing/DebugGraphics.java \
 classpath/javax/swing/DefaultBoundedRangeModel.java \
@@ -5162,7 +5657,8 @@ classpath/javax/swing/plaf/basic/BasicToolTipUI.java \
 classpath/javax/swing/plaf/basic/BasicTreeUI.java \
 classpath/javax/swing/plaf/basic/BasicViewportUI.java \
 classpath/javax/swing/plaf/basic/ComboPopup.java \
-classpath/javax/swing/plaf/basic/DefaultMenuLayout.java
+classpath/javax/swing/plaf/basic/DefaultMenuLayout.java \
+classpath/javax/swing/plaf/basic/SharedUIDefaults.java
 
 javax_swing_plaf_basic_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_plaf_basic_source_files)))
 javax_swing_plaf_metal_source_files = \
@@ -5289,6 +5785,7 @@ classpath/javax/swing/text/DocumentFilter.java \
 classpath/javax/swing/text/EditorKit.java \
 classpath/javax/swing/text/Element.java \
 classpath/javax/swing/text/ElementIterator.java \
+classpath/javax/swing/text/EmptyAttributeSet.java \
 classpath/javax/swing/text/FieldView.java \
 classpath/javax/swing/text/FlowView.java \
 classpath/javax/swing/text/GapContent.java \
@@ -5331,21 +5828,26 @@ classpath/javax/swing/text/WrappedPlainView.java
 
 javax_swing_text_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_text_source_files)))
 javax_swing_text_html_source_files = \
+classpath/javax/swing/text/html/BRView.java \
 classpath/javax/swing/text/html/BlockView.java \
 classpath/javax/swing/text/html/CSS.java \
 classpath/javax/swing/text/html/CSSParser.java \
 classpath/javax/swing/text/html/FormView.java \
+classpath/javax/swing/text/html/HRuleView.java \
 classpath/javax/swing/text/html/HTML.java \
 classpath/javax/swing/text/html/HTMLDocument.java \
 classpath/javax/swing/text/html/HTMLEditorKit.java \
 classpath/javax/swing/text/html/HTMLFrameHyperlinkEvent.java \
-classpath/javax/swing/text/html/HTMLTableView.java \
+classpath/javax/swing/text/html/ImageView.java \
 classpath/javax/swing/text/html/InlineView.java \
+classpath/javax/swing/text/html/ListView.java \
+classpath/javax/swing/text/html/MinimalHTMLWriter.java \
 classpath/javax/swing/text/html/NullView.java \
 classpath/javax/swing/text/html/ObjectView.java \
 classpath/javax/swing/text/html/Option.java \
 classpath/javax/swing/text/html/ParagraphView.java \
-classpath/javax/swing/text/html/StyleSheet.java
+classpath/javax/swing/text/html/StyleSheet.java \
+classpath/javax/swing/text/html/TableView.java
 
 javax_swing_text_html_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_text_html_source_files)))
 javax_swing_text_html_parser_source_files = \
@@ -5498,6 +6000,7 @@ classpath/javax/xml/transform/stream/StreamResult.java \
 classpath/javax/xml/transform/stream/StreamSource.java \
 classpath/javax/xml/validation/Schema.java \
 classpath/javax/xml/validation/SchemaFactory.java \
+classpath/javax/xml/validation/SchemaFactoryLoader.java \
 classpath/javax/xml/validation/TypeInfoProvider.java \
 classpath/javax/xml/validation/Validator.java \
 classpath/javax/xml/validation/ValidatorHandler.java \
@@ -5955,7 +6458,6 @@ classpath/org/omg/PortableInterceptor/ObjectIdHelper.java \
 classpath/org/omg/PortableInterceptor/ObjectReferenceFactory.java \
 classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java \
 classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java \
-classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryOperations.java \
 classpath/org/omg/PortableInterceptor/ObjectReferenceTemplate.java \
 classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java \
 classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java \
@@ -6278,16 +6780,27 @@ all_packages_source_files = \
   gnu/gcj/util.list \
   gnu/java/awt.list \
   gnu/java/awt/color.list \
+  gnu/java/awt/dnd.list \
+  gnu/java/awt/font.list \
+  gnu/java/awt/font/opentype.list \
+  gnu/java/awt/font/opentype/truetype.list \
   gnu/java/awt/image.list \
+  gnu/java/awt/java2d.list \
   gnu/java/awt/peer.list \
+  gnu/java/awt/print.list \
   gnu/java/io.list \
   gnu/java/lang.list \
+  gnu/java/lang/management.list \
   gnu/java/lang/reflect.list \
   gnu/java/locale.list \
   gnu/java/math.list \
   gnu/java/net.list \
+  gnu/java/net/loader.list \
+  gnu/java/net/local.list \
+  gnu/java/net/protocol/core.list \
   gnu/java/net/protocol/file.list \
   gnu/java/net/protocol/ftp.list \
+  gnu/java/net/protocol/gcjlib.list \
   gnu/java/net/protocol/http.list \
   gnu/java/net/protocol/https.list \
   gnu/java/net/protocol/jar.list \
@@ -6295,8 +6808,10 @@ all_packages_source_files = \
   gnu/java/nio/channels.list \
   gnu/java/nio/charset.list \
   gnu/java/rmi.list \
+  gnu/java/rmi/activation.list \
   gnu/java/rmi/dgc.list \
   gnu/java/rmi/registry.list \
+  gnu/java/rmi/rmic.list \
   gnu/java/rmi/server.list \
   gnu/java/security.list \
   gnu/java/security/action.list \
@@ -6320,7 +6835,9 @@ all_packages_source_files = \
   gnu/java/security/x509/ext.list \
   gnu/java/text.list \
   gnu/java/util.list \
+  gnu/java/util/jar.list \
   gnu/java/util/prefs.list \
+  gnu/java/util/regex.list \
   gnu/javax/crypto.list \
   gnu/javax/crypto/assembly.list \
   gnu/javax/crypto/cipher.list \
@@ -6337,6 +6854,7 @@ all_packages_source_files = \
   gnu/javax/crypto/key/dh.list \
   gnu/javax/crypto/key/srp6.list \
   gnu/javax/crypto/keyring.list \
+  gnu/javax/crypto/kwa.list \
   gnu/javax/crypto/mac.list \
   gnu/javax/crypto/mode.list \
   gnu/javax/crypto/pad.list \
@@ -6346,17 +6864,33 @@ all_packages_source_files = \
   gnu/javax/crypto/sasl/crammd5.list \
   gnu/javax/crypto/sasl/plain.list \
   gnu/javax/crypto/sasl/srp.list \
+  gnu/javax/imageio.list \
   gnu/javax/imageio/bmp.list \
+  gnu/javax/imageio/gif.list \
+  gnu/javax/imageio/jpeg.list \
+  gnu/javax/imageio/png.list \
   gnu/javax/net/ssl.list \
   gnu/javax/net/ssl/provider.list \
+  gnu/javax/print.list \
+  gnu/javax/print/ipp.list \
+  gnu/javax/print/ipp/attribute.list \
+  gnu/javax/print/ipp/attribute/defaults.list \
+  gnu/javax/print/ipp/attribute/job.list \
+  gnu/javax/print/ipp/attribute/printer.list \
+  gnu/javax/print/ipp/attribute/supported.list \
   gnu/javax/security/auth.list \
   gnu/javax/security/auth/callback.list \
   gnu/javax/security/auth/login.list \
+  gnu/javax/sound/sampled/AU.list \
+  gnu/javax/sound/sampled/WAV.list \
+  gnu/javax/swing/plaf/gnu.list \
+  gnu/javax/swing/plaf/metal.list \
+  gnu/javax/swing/text/html.list \
   gnu/javax/swing/text/html/parser.list \
   gnu/javax/swing/text/html/parser/models.list \
   gnu/javax/swing/text/html/parser/support.list \
   gnu/javax/swing/text/html/parser/support/low.list \
-  gnu/regexp.list \
+  gnu/javax/swing/tree.list \
   java/applet.list \
   java/awt.list \
   java/awt/color.list \
@@ -6377,6 +6911,8 @@ all_packages_source_files = \
   java/io.list \
   java/lang.list \
   java/lang/annotation.list \
+  java/lang/instrument.list \
+  java/lang/management.list \
   java/lang/ref.list \
   java/lang/reflect.list \
   java/math.list \
@@ -6409,6 +6945,7 @@ all_packages_source_files = \
   javax/crypto/interfaces.list \
   javax/crypto/spec.list \
   javax/management.list \
+  javax/management/openmbean.list \
   javax/naming.list \
   javax/naming/directory.list \
   javax/naming/event.list \
@@ -6422,6 +6959,7 @@ all_packages_source_files = \
   javax/print/event.list \
   javax/security/auth.list \
   javax/security/auth/callback.list \
+  javax/security/auth/kerberos.list \
   javax/security/auth/login.list \
   javax/security/auth/spi.list \
   javax/security/auth/x500.list \
@@ -6473,16 +7011,27 @@ ordinary_header_files = \
   $(gnu_gcj_util_header_files) \
   $(gnu_java_awt_header_files) \
   $(gnu_java_awt_color_header_files) \
+  $(gnu_java_awt_dnd_header_files) \
+  $(gnu_java_awt_font_header_files) \
+  $(gnu_java_awt_font_opentype_header_files) \
+  $(gnu_java_awt_font_opentype_truetype_header_files) \
   $(gnu_java_awt_image_header_files) \
+  $(gnu_java_awt_java2d_header_files) \
   $(gnu_java_awt_peer_header_files) \
+  $(gnu_java_awt_print_header_files) \
   $(gnu_java_io_header_files) \
   $(gnu_java_lang_header_files) \
+  $(gnu_java_lang_management_header_files) \
   $(gnu_java_lang_reflect_header_files) \
   $(gnu_java_locale_header_files) \
   $(gnu_java_math_header_files) \
   $(gnu_java_net_header_files) \
+  $(gnu_java_net_loader_header_files) \
+  $(gnu_java_net_local_header_files) \
+  $(gnu_java_net_protocol_core_header_files) \
   $(gnu_java_net_protocol_file_header_files) \
   $(gnu_java_net_protocol_ftp_header_files) \
+  $(gnu_java_net_protocol_gcjlib_header_files) \
   $(gnu_java_net_protocol_http_header_files) \
   $(gnu_java_net_protocol_https_header_files) \
   $(gnu_java_net_protocol_jar_header_files) \
@@ -6490,8 +7039,10 @@ ordinary_header_files = \
   $(gnu_java_nio_channels_header_files) \
   $(gnu_java_nio_charset_header_files) \
   $(gnu_java_rmi_header_files) \
+  $(gnu_java_rmi_activation_header_files) \
   $(gnu_java_rmi_dgc_header_files) \
   $(gnu_java_rmi_registry_header_files) \
+  $(gnu_java_rmi_rmic_header_files) \
   $(gnu_java_rmi_server_header_files) \
   $(gnu_java_security_header_files) \
   $(gnu_java_security_action_header_files) \
@@ -6515,7 +7066,9 @@ ordinary_header_files = \
   $(gnu_java_security_x509_ext_header_files) \
   $(gnu_java_text_header_files) \
   $(gnu_java_util_header_files) \
+  $(gnu_java_util_jar_header_files) \
   $(gnu_java_util_prefs_header_files) \
+  $(gnu_java_util_regex_header_files) \
   $(gnu_javax_crypto_header_files) \
   $(gnu_javax_crypto_assembly_header_files) \
   $(gnu_javax_crypto_cipher_header_files) \
@@ -6532,6 +7085,7 @@ ordinary_header_files = \
   $(gnu_javax_crypto_key_dh_header_files) \
   $(gnu_javax_crypto_key_srp6_header_files) \
   $(gnu_javax_crypto_keyring_header_files) \
+  $(gnu_javax_crypto_kwa_header_files) \
   $(gnu_javax_crypto_mac_header_files) \
   $(gnu_javax_crypto_mode_header_files) \
   $(gnu_javax_crypto_pad_header_files) \
@@ -6541,17 +7095,33 @@ ordinary_header_files = \
   $(gnu_javax_crypto_sasl_crammd5_header_files) \
   $(gnu_javax_crypto_sasl_plain_header_files) \
   $(gnu_javax_crypto_sasl_srp_header_files) \
+  $(gnu_javax_imageio_header_files) \
   $(gnu_javax_imageio_bmp_header_files) \
+  $(gnu_javax_imageio_gif_header_files) \
+  $(gnu_javax_imageio_jpeg_header_files) \
+  $(gnu_javax_imageio_png_header_files) \
   $(gnu_javax_net_ssl_header_files) \
   $(gnu_javax_net_ssl_provider_header_files) \
+  $(gnu_javax_print_header_files) \
+  $(gnu_javax_print_ipp_header_files) \
+  $(gnu_javax_print_ipp_attribute_header_files) \
+  $(gnu_javax_print_ipp_attribute_defaults_header_files) \
+  $(gnu_javax_print_ipp_attribute_job_header_files) \
+  $(gnu_javax_print_ipp_attribute_printer_header_files) \
+  $(gnu_javax_print_ipp_attribute_supported_header_files) \
   $(gnu_javax_security_auth_header_files) \
   $(gnu_javax_security_auth_callback_header_files) \
   $(gnu_javax_security_auth_login_header_files) \
+  $(gnu_javax_sound_sampled_AU_header_files) \
+  $(gnu_javax_sound_sampled_WAV_header_files) \
+  $(gnu_javax_swing_plaf_gnu_header_files) \
+  $(gnu_javax_swing_plaf_metal_header_files) \
+  $(gnu_javax_swing_text_html_header_files) \
   $(gnu_javax_swing_text_html_parser_header_files) \
   $(gnu_javax_swing_text_html_parser_models_header_files) \
   $(gnu_javax_swing_text_html_parser_support_header_files) \
   $(gnu_javax_swing_text_html_parser_support_low_header_files) \
-  $(gnu_regexp_header_files) \
+  $(gnu_javax_swing_tree_header_files) \
   $(java_applet_header_files) \
   $(java_awt_header_files) \
   $(java_awt_color_header_files) \
@@ -6572,6 +7142,8 @@ ordinary_header_files = \
   $(java_io_header_files) \
   $(java_lang_header_files) \
   $(java_lang_annotation_header_files) \
+  $(java_lang_instrument_header_files) \
+  $(java_lang_management_header_files) \
   $(java_lang_ref_header_files) \
   $(java_lang_reflect_header_files) \
   $(java_math_header_files) \
@@ -6604,6 +7176,7 @@ ordinary_header_files = \
   $(javax_crypto_interfaces_header_files) \
   $(javax_crypto_spec_header_files) \
   $(javax_management_header_files) \
+  $(javax_management_openmbean_header_files) \
   $(javax_naming_header_files) \
   $(javax_naming_directory_header_files) \
   $(javax_naming_event_header_files) \
@@ -6617,6 +7190,7 @@ ordinary_header_files = \
   $(javax_print_event_header_files) \
   $(javax_security_auth_header_files) \
   $(javax_security_auth_callback_header_files) \
+  $(javax_security_auth_kerberos_header_files) \
   $(javax_security_auth_login_header_files) \
   $(javax_security_auth_spi_header_files) \
   $(javax_security_auth_x500_header_files) \
@@ -6650,8 +7224,12 @@ ordinary_header_files = \
 
 bc_objects = \
   gnu-CORBA.lo \
+  gnu-java-awt-dnd-peer-gtk.lo \
+  gnu-java-awt-peer-gtk.lo \
+  gnu-java-awt-peer-qt.lo \
   gnu-java-awt-peer-swing.lo \
   gnu-java-beans.lo \
+  gnu-java-util-prefs-gconf.lo \
   gnu-javax-rmi.lo \
   gnu-javax-sound-midi.lo \
   gnu-xml.lo \
@@ -6663,6 +7241,38 @@ bc_objects = \
   org-w3c.lo \
   org-xml.lo
 
+property_files = \
+  classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle.properties \
+  classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle_de.properties \
+  classpath/resource/gnu/classpath/tools/getopt/Messages.properties \
+  classpath/resource/gnu/classpath/tools/jar/messages.properties \
+  classpath/resource/gnu/classpath/tools/jarsigner/messages.properties \
+  classpath/resource/gnu/classpath/tools/keytool/messages.properties \
+  classpath/resource/gnu/classpath/tools/native2ascii/messages.properties \
+  classpath/resource/gnu/classpath/tools/serialver/messages.properties \
+  classpath/resource/gnu/java/awt/peer/gtk/font.properties \
+  classpath/resource/gnu/java/awt/peer/x/fonts.properties \
+  classpath/resource/gnu/java/util/regex/MessagesBundle.properties \
+  classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties \
+  classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties \
+  classpath/resource/gnu/javax/print/PrinterDialog.properties \
+  classpath/resource/gnu/javax/print/PrinterDialog_de.properties \
+  classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
+  classpath/resource/java/util/iso4217.properties \
+  classpath/resource/javax/imageio/plugins/jpeg/MessagesBundle.properties \
+  classpath/resource/org/ietf/jgss/MessagesBundle.properties \
+  classpath/resource/META-INF/services/java.util.prefs.PreferencesFactory \
+  classpath/resource/META-INF/services/java.util.prefs.PreferencesFactory.in \
+  classpath/resource/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider \
+  classpath/resource/META-INF/services/javax.sound.midi.spi.MidiFileReader \
+  classpath/resource/META-INF/services/javax.sound.midi.spi.MidiFileWriter \
+  classpath/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader \
+  classpath/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory \
+  classpath/resource/META-INF/services/javax.xml.parsers.SAXParserFactory \
+  classpath/resource/META-INF/services/javax.xml.parsers.TransformerFactory \
+  classpath/resource/META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory \
+  classpath/resource/META-INF/services/org.xml.sax.driver
+
 omitted_headers = java/lang/ClassLoader.h java/lang/Thread.h \
        java/lang/String.h java/lang/reflect/Constructor.h \
        java/lang/reflect/Field.h java/lang/reflect/Method.h \
@@ -6718,7 +7328,9 @@ gcj_dbtool_LINK = $(GCJLINK)
 gcj_dbtool_LDADD = -L$(here)/.libs libgcj.la
 gcj_dbtool_DEPENDENCIES = libgcj.la libgcj.spec
 gij_SOURCES = 
-gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+gij_LDFLAGS = -rpath $(libdir)/gcj-$(gcc_version) -rpath $(toolexeclibdir) \
+       -shared-libgcc $(THREADLDFLAGS)
+
 gij_LINK = $(GCJLINK)
 gij_LDADD = -L$(here)/.libs libgij.la
 gij_DEPENDENCIES = libgij.la
@@ -6736,8 +7348,32 @@ grmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \
 grmiregistry_LINK = $(GCJLINK)
 grmiregistry_LDADD = -L$(here)/.libs libgcj.la
 grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec
+gappletviewer_SOURCES = 
+gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+
+gappletviewer_LINK = $(GCJLINK)
+gappletviewer_LDADD = -L$(here)/.libs libgcj-tools.la
+gappletviewer_DEPENDENCIES = libgcj-tools.la
+gjarsigner_SOURCES = 
+gjarsigner_LDFLAGS = --main=gnu.classpath.tools.jarsigner.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+
+gjarsigner_LINK = $(GCJLINK)
+gjarsigner_LDADD = -L$(here)/.libs libgcj-tools.la
+gjarsigner_DEPENDENCIES = libgcj-tools.la
+gkeytool_SOURCES = 
+gkeytool_LDFLAGS = --main=gnu.classpath.tools.keytool.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+
+gkeytool_LINK = $(GCJLINK)
+gkeytool_LDADD = -L$(here)/.libs libgcj-tools.la
+gkeytool_DEPENDENCIES = libgcj-tools.la
 nat_source_files = \
 gnu/classpath/natSystemProperties.cc \
+gnu/classpath/jdwp/natVMFrame.cc \
+gnu/classpath/jdwp/natVMMethod.cc \
+gnu/classpath/jdwp/natVMVirtualMachine.cc \
 gnu/gcj/natCore.cc \
 gnu/gcj/convert/JIS0208_to_Unicode.cc \
 gnu/gcj/convert/JIS0212_to_Unicode.cc \
@@ -6751,6 +7387,7 @@ gnu/gcj/io/natSimpleSHSStream.cc \
 gnu/gcj/io/shs.cc \
 gnu/gcj/runtime/natFinalizerThread.cc \
 gnu/gcj/runtime/natSharedLibLoader.cc \
+gnu/gcj/runtime/natSystemClassLoader.cc \
 gnu/gcj/runtime/natStringBuffer.cc \
 gnu/gcj/util/natDebug.cc \
 gnu/java/lang/natMainThread.cc \
@@ -6788,8 +7425,11 @@ java/lang/reflect/natField.cc \
 java/lang/reflect/natMethod.cc \
 java/net/natVMNetworkInterface.cc \
 java/net/natInetAddress.cc \
-java/nio/channels/natChannels.cc \
+java/net/natURLClassLoader.cc \
+java/nio/channels/natVMChannels.cc \
 java/nio/natDirectByteBufferImpl.cc \
+java/security/natVMAccessController.cc \
+java/security/natVMAccessControlState.cc \
 java/text/natCollator.cc \
 java/util/natResourceBundle.cc \
 java/util/natVMTimeZone.cc \
@@ -6877,7 +7517,7 @@ MULTICLEAN = true
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .class .java .h .properties .list .c .cc .lo .o .obj
+.SUFFIXES: .class .java .h .properties .list .c .cc .jar .lo .o .obj
 am--refresh:
        @:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/sources.am $(am__configure_deps)
@@ -6917,6 +7557,35 @@ libgcj.spec: $(top_builddir)/config.status $(srcdir)/libgcj.spec.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
 libgcj-test.spec: $(top_builddir)/config.status $(srcdir)/libgcj-test.spec.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
+scripts/jar: $(top_builddir)/config.status $(top_srcdir)/scripts/jar.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+install-dbexecLTLIBRARIES: $(dbexec_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+       test -z "$(dbexecdir)" || $(mkdir_p) "$(DESTDIR)$(dbexecdir)"
+       @list='$(dbexec_LTLIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
+           f=$(am__strip_dir) \
+           echo " $(LIBTOOL) --mode=install $(dbexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(dbexecdir)/$$f'"; \
+           $(LIBTOOL) --mode=install $(dbexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(dbexecdir)/$$f"; \
+         else :; fi; \
+       done
+
+uninstall-dbexecLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @set -x; list='$(dbexec_LTLIBRARIES)'; for p in $$list; do \
+         p=$(am__strip_dir) \
+         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(dbexecdir)/$$p'"; \
+         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(dbexecdir)/$$p"; \
+       done
+
+clean-dbexecLTLIBRARIES:
+       -test -z "$(dbexec_LTLIBRARIES)" || rm -f $(dbexec_LTLIBRARIES)
+       @list='$(dbexec_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
 install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        test -z "$(toolexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexeclibdir)"
@@ -7010,10 +7679,17 @@ gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo:  \
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo:  \
        gnu/gcj/xlib/$(am__dirstamp) \
        gnu/gcj/xlib/$(DEPDIR)/$(am__dirstamp)
-lib-gnu-java-awt-peer-gtk.la: $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES) 
-       $(lib_gnu_java_awt_peer_gtk_la_LINK) $(am_lib_gnu_java_awt_peer_gtk_la_rpath) $(lib_gnu_java_awt_peer_gtk_la_LDFLAGS) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_LIBADD) $(LIBS)
-lib-gnu-java-awt-peer-qt.la: $(lib_gnu_java_awt_peer_qt_la_OBJECTS) $(lib_gnu_java_awt_peer_qt_la_DEPENDENCIES) 
-       $(lib_gnu_java_awt_peer_qt_la_LINK) $(am_lib_gnu_java_awt_peer_qt_la_rpath) $(lib_gnu_java_awt_peer_qt_la_LDFLAGS) $(lib_gnu_java_awt_peer_qt_la_OBJECTS) $(lib_gnu_java_awt_peer_qt_la_LIBADD) $(LIBS)
+classpath/tools/$(am__dirstamp):
+       @$(mkdir_p) classpath/tools
+       @: > classpath/tools/$(am__dirstamp)
+classpath/tools/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) classpath/tools/$(DEPDIR)
+       @: > classpath/tools/$(DEPDIR)/$(am__dirstamp)
+classpath/tools/libgcj_tools_la-tools.lo:  \
+       classpath/tools/$(am__dirstamp) \
+       classpath/tools/$(DEPDIR)/$(am__dirstamp)
+libgcj-tools.la: $(libgcj_tools_la_OBJECTS) $(libgcj_tools_la_DEPENDENCIES) 
+       $(libgcj_tools_la_LINK) -rpath $(toolexeclibdir) $(libgcj_tools_la_LDFLAGS) $(libgcj_tools_la_OBJECTS) $(libgcj_tools_la_LIBADD) $(LIBS)
 java/lang/$(am__dirstamp):
        @$(mkdir_p) java/lang
        @: > java/lang/$(am__dirstamp)
@@ -7032,6 +7708,19 @@ gnu/classpath/$(DEPDIR)/$(am__dirstamp):
        @: > gnu/classpath/$(DEPDIR)/$(am__dirstamp)
 gnu/classpath/natSystemProperties.lo: gnu/classpath/$(am__dirstamp) \
        gnu/classpath/$(DEPDIR)/$(am__dirstamp)
+gnu/classpath/jdwp/$(am__dirstamp):
+       @$(mkdir_p) gnu/classpath/jdwp
+       @: > gnu/classpath/jdwp/$(am__dirstamp)
+gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) gnu/classpath/jdwp/$(DEPDIR)
+       @: > gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp)
+gnu/classpath/jdwp/natVMFrame.lo: gnu/classpath/jdwp/$(am__dirstamp) \
+       gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp)
+gnu/classpath/jdwp/natVMMethod.lo: gnu/classpath/jdwp/$(am__dirstamp) \
+       gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp)
+gnu/classpath/jdwp/natVMVirtualMachine.lo:  \
+       gnu/classpath/jdwp/$(am__dirstamp) \
+       gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/$(am__dirstamp):
        @$(mkdir_p) gnu/gcj
        @: > gnu/gcj/$(am__dirstamp)
@@ -7086,6 +7775,9 @@ gnu/gcj/runtime/natFinalizerThread.lo:  \
 gnu/gcj/runtime/natSharedLibLoader.lo:  \
        gnu/gcj/runtime/$(am__dirstamp) \
        gnu/gcj/runtime/$(DEPDIR)/$(am__dirstamp)
+gnu/gcj/runtime/natSystemClassLoader.lo:  \
+       gnu/gcj/runtime/$(am__dirstamp) \
+       gnu/gcj/runtime/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/runtime/natStringBuffer.lo: gnu/gcj/runtime/$(am__dirstamp) \
        gnu/gcj/runtime/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/util/$(am__dirstamp):
@@ -7224,13 +7916,15 @@ java/net/natVMNetworkInterface.lo: java/net/$(am__dirstamp) \
        java/net/$(DEPDIR)/$(am__dirstamp)
 java/net/natInetAddress.lo: java/net/$(am__dirstamp) \
        java/net/$(DEPDIR)/$(am__dirstamp)
+java/net/natURLClassLoader.lo: java/net/$(am__dirstamp) \
+       java/net/$(DEPDIR)/$(am__dirstamp)
 java/nio/channels/$(am__dirstamp):
        @$(mkdir_p) java/nio/channels
        @: > java/nio/channels/$(am__dirstamp)
 java/nio/channels/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) java/nio/channels/$(DEPDIR)
        @: > java/nio/channels/$(DEPDIR)/$(am__dirstamp)
-java/nio/channels/natChannels.lo: java/nio/channels/$(am__dirstamp) \
+java/nio/channels/natVMChannels.lo: java/nio/channels/$(am__dirstamp) \
        java/nio/channels/$(DEPDIR)/$(am__dirstamp)
 java/nio/$(am__dirstamp):
        @$(mkdir_p) java/nio
@@ -7240,6 +7934,17 @@ java/nio/$(DEPDIR)/$(am__dirstamp):
        @: > java/nio/$(DEPDIR)/$(am__dirstamp)
 java/nio/natDirectByteBufferImpl.lo: java/nio/$(am__dirstamp) \
        java/nio/$(DEPDIR)/$(am__dirstamp)
+java/security/$(am__dirstamp):
+       @$(mkdir_p) java/security
+       @: > java/security/$(am__dirstamp)
+java/security/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) java/security/$(DEPDIR)
+       @: > java/security/$(DEPDIR)/$(am__dirstamp)
+java/security/natVMAccessController.lo: java/security/$(am__dirstamp) \
+       java/security/$(DEPDIR)/$(am__dirstamp)
+java/security/natVMAccessControlState.lo:  \
+       java/security/$(am__dirstamp) \
+       java/security/$(DEPDIR)/$(am__dirstamp)
 java/text/$(am__dirstamp):
        @$(mkdir_p) java/text
        @: > java/text/$(am__dirstamp)
@@ -7278,19 +7983,10 @@ java/util/zip/natInflater.lo: java/util/zip/$(am__dirstamp) \
        java/util/zip/$(DEPDIR)/$(am__dirstamp)
 libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) 
        $(libgcj_la_LINK) -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(libgcj_la_OBJECTS) $(libgcj_la_LIBADD) $(LIBS)
-classpath/native/jawt/$(am__dirstamp):
-       @$(mkdir_p) classpath/native/jawt
-       @: > classpath/native/jawt/$(am__dirstamp)
-classpath/native/jawt/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) classpath/native/jawt/$(DEPDIR)
-       @: > classpath/native/jawt/$(DEPDIR)/$(am__dirstamp)
-classpath/native/jawt/libgcjawt_la-jawt.lo:  \
-       classpath/native/jawt/$(am__dirstamp) \
-       classpath/native/jawt/$(DEPDIR)/$(am__dirstamp)
-libgcjawt.la: $(libgcjawt_la_OBJECTS) $(libgcjawt_la_DEPENDENCIES) 
-       $(libgcjawt_la_LINK) $(am_libgcjawt_la_rpath) $(libgcjawt_la_LDFLAGS) $(libgcjawt_la_OBJECTS) $(libgcjawt_la_LIBADD) $(LIBS)
 libgij.la: $(libgij_la_OBJECTS) $(libgij_la_DEPENDENCIES) 
        $(CXXLINK) -rpath $(toolexeclibdir) $(libgij_la_LDFLAGS) $(libgij_la_OBJECTS) $(libgij_la_LIBADD) $(LIBS)
+libjvm.la: $(libjvm_la_OBJECTS) $(libjvm_la_DEPENDENCIES) 
+       $(CXXLINK) -rpath $(dbexecdir) $(libjvm_la_LDFLAGS) $(libjvm_la_OBJECTS) $(libjvm_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@@ -7326,6 +8022,9 @@ clean-noinstPROGRAMS:
          echo " rm -f $$p $$f"; \
          rm -f $$p $$f ; \
        done
+gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES) 
+       @rm -f gappletviewer$(EXEEXT)
+       $(gappletviewer_LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
 gnu/gcj/tools/gcj_dbtool/$(am__dirstamp):
        @$(mkdir_p) gnu/gcj/tools/gcj_dbtool
        @: > gnu/gcj/tools/gcj_dbtool/$(am__dirstamp)
@@ -7352,6 +8051,12 @@ gen-from-JIS$(EXEEXT): $(gen_from_JIS_OBJECTS) $(gen_from_JIS_DEPENDENCIES)
 gij$(EXEEXT): $(gij_OBJECTS) $(gij_DEPENDENCIES) 
        @rm -f gij$(EXEEXT)
        $(gij_LINK) $(gij_LDFLAGS) $(gij_OBJECTS) $(gij_LDADD) $(LIBS)
+gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsigner_DEPENDENCIES) 
+       @rm -f gjarsigner$(EXEEXT)
+       $(gjarsigner_LINK) $(gjarsigner_LDFLAGS) $(gjarsigner_OBJECTS) $(gjarsigner_LDADD) $(LIBS)
+gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DEPENDENCIES) 
+       @rm -f gkeytool$(EXEEXT)
+       $(gkeytool_LINK) $(gkeytool_LDFLAGS) $(gkeytool_OBJECTS) $(gkeytool_LDADD) $(LIBS)
 grmic$(EXEEXT): $(grmic_OBJECTS) $(grmic_DEPENDENCIES) 
        @rm -f grmic$(EXEEXT)
        $(grmic_LINK) $(grmic_LDFLAGS) $(grmic_OBJECTS) $(grmic_LDADD) $(LIBS)
@@ -7383,8 +8088,14 @@ uninstall-binSCRIPTS:
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f classpath/native/jawt/libgcjawt_la-jawt.$(OBJEXT)
-       -rm -f classpath/native/jawt/libgcjawt_la-jawt.lo
+       -rm -f classpath/tools/libgcj_tools_la-tools.$(OBJEXT)
+       -rm -f classpath/tools/libgcj_tools_la-tools.lo
+       -rm -f gnu/classpath/jdwp/natVMFrame.$(OBJEXT)
+       -rm -f gnu/classpath/jdwp/natVMFrame.lo
+       -rm -f gnu/classpath/jdwp/natVMMethod.$(OBJEXT)
+       -rm -f gnu/classpath/jdwp/natVMMethod.lo
+       -rm -f gnu/classpath/jdwp/natVMVirtualMachine.$(OBJEXT)
+       -rm -f gnu/classpath/jdwp/natVMVirtualMachine.lo
        -rm -f gnu/classpath/natSystemProperties.$(OBJEXT)
        -rm -f gnu/classpath/natSystemProperties.lo
        -rm -f gnu/gcj/convert/JIS0208_to_Unicode.$(OBJEXT)
@@ -7417,6 +8128,8 @@ mostlyclean-compile:
        -rm -f gnu/gcj/runtime/natSharedLibLoader.lo
        -rm -f gnu/gcj/runtime/natStringBuffer.$(OBJEXT)
        -rm -f gnu/gcj/runtime/natStringBuffer.lo
+       -rm -f gnu/gcj/runtime/natSystemClassLoader.$(OBJEXT)
+       -rm -f gnu/gcj/runtime/natSystemClassLoader.lo
        -rm -f gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT)
        -rm -f gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT)
        -rm -f gnu/gcj/util/natDebug.$(OBJEXT)
@@ -7533,12 +8246,18 @@ mostlyclean-compile:
        -rm -f java/lang/reflect/natMethod.lo
        -rm -f java/net/natInetAddress.$(OBJEXT)
        -rm -f java/net/natInetAddress.lo
+       -rm -f java/net/natURLClassLoader.$(OBJEXT)
+       -rm -f java/net/natURLClassLoader.lo
        -rm -f java/net/natVMNetworkInterface.$(OBJEXT)
        -rm -f java/net/natVMNetworkInterface.lo
-       -rm -f java/nio/channels/natChannels.$(OBJEXT)
-       -rm -f java/nio/channels/natChannels.lo
+       -rm -f java/nio/channels/natVMChannels.$(OBJEXT)
+       -rm -f java/nio/channels/natVMChannels.lo
        -rm -f java/nio/natDirectByteBufferImpl.$(OBJEXT)
        -rm -f java/nio/natDirectByteBufferImpl.lo
+       -rm -f java/security/natVMAccessControlState.$(OBJEXT)
+       -rm -f java/security/natVMAccessControlState.lo
+       -rm -f java/security/natVMAccessController.$(OBJEXT)
+       -rm -f java/security/natVMAccessController.lo
        -rm -f java/text/natCollator.$(OBJEXT)
        -rm -f java/text/natCollator.lo
        -rm -f java/util/logging/natLogger.$(OBJEXT)
@@ -7561,7 +8280,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gij.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpret.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jni-libjvm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jni.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jvmti.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgcj_bc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/no-threads.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nogc.Plo@am__quote@
@@ -7572,8 +8294,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verify.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32-threads.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@classpath/native/jawt/$(DEPDIR)/libgcjawt_la-jawt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/$(DEPDIR)/natSystemProperties.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/jdwp/$(DEPDIR)/natVMFrame.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/jdwp/$(DEPDIR)/natVMMethod.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/jdwp/$(DEPDIR)/natVMVirtualMachine.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/$(DEPDIR)/natCore.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/JIS0208_to_Unicode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/JIS0212_to_Unicode.Plo@am__quote@
@@ -7590,6 +8315,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natFinalizerThread.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natSharedLibLoader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natStringBuffer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natSystemClassLoader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/Main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/natMain.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/util/$(DEPDIR)/natDebug.Plo@am__quote@
@@ -7649,9 +8375,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natField.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natMethod.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natInetAddress.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natURLClassLoader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natVMNetworkInterface.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/nio/$(DEPDIR)/natDirectByteBufferImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/nio/channels/$(DEPDIR)/natChannels.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/nio/channels/$(DEPDIR)/natVMChannels.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/security/$(DEPDIR)/natVMAccessControlState.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/security/$(DEPDIR)/natVMAccessController.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/text/$(DEPDIR)/natCollator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/natResourceBundle.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/natVMTimeZone.Plo@am__quote@
@@ -7683,13 +8412,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
-classpath/native/jawt/libgcjawt_la-jawt.lo: classpath/native/jawt/jawt.c
-@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgcjawt_la_CFLAGS) $(CFLAGS) -MT classpath/native/jawt/libgcjawt_la-jawt.lo -MD -MP -MF "classpath/native/jawt/$(DEPDIR)/libgcjawt_la-jawt.Tpo" -c -o classpath/native/jawt/libgcjawt_la-jawt.lo `test -f 'classpath/native/jawt/jawt.c' || echo '$(srcdir)/'`classpath/native/jawt/jawt.c; \
-@am__fastdepCC_TRUE@   then mv -f "classpath/native/jawt/$(DEPDIR)/libgcjawt_la-jawt.Tpo" "classpath/native/jawt/$(DEPDIR)/libgcjawt_la-jawt.Plo"; else rm -f "classpath/native/jawt/$(DEPDIR)/libgcjawt_la-jawt.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='classpath/native/jawt/jawt.c' object='classpath/native/jawt/libgcjawt_la-jawt.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgcjawt_la_CFLAGS) $(CFLAGS) -c -o classpath/native/jawt/libgcjawt_la-jawt.lo `test -f 'classpath/native/jawt/jawt.c' || echo '$(srcdir)/'`classpath/native/jawt/jawt.c
-
 .cc.o:
 @am__fastdepCXX_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
 @am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
@@ -7854,6 +8576,37 @@ gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo: gnu/gcj/xlib/natXUnmapEvent.
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo `test -f 'gnu/gcj/xlib/natXUnmapEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXUnmapEvent.cc
 
+.jar.o:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
+@am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
+@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ $<
+
+.jar.obj:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
+@am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.jar.lo:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
+@am__fastdepGCJ_TRUE@  if $(LTGCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
+@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepGCJ_FALSE@ $(LTGCJCOMPILE) -c -o $@ $<
+
+classpath/tools/libgcj_tools_la-tools.lo: classpath/tools/tools.jar
+@am__fastdepGCJ_TRUE@  if $(LIBTOOL) --mode=compile $(GCJ) $(libgcj_tools_la_GCJFLAGS) $(GCJFLAGS) -MT classpath/tools/libgcj_tools_la-tools.lo -MD -MP -MF "classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Tpo" -c -o classpath/tools/libgcj_tools_la-tools.lo `test -f 'classpath/tools/tools.jar' || echo '$(srcdir)/'`classpath/tools/tools.jar; \
+@am__fastdepGCJ_TRUE@  then mv -f "classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Tpo" "classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Plo"; else rm -f "classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='classpath/tools/tools.jar' object='classpath/tools/libgcj_tools_la-tools.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepGCJ_FALSE@ $(LIBTOOL) --mode=compile $(GCJ) $(libgcj_tools_la_GCJFLAGS) $(GCJFLAGS) -c -o classpath/tools/libgcj_tools_la-tools.lo `test -f 'classpath/tools/tools.jar' || echo '$(srcdir)/'`classpath/tools/tools.jar
+
 .java.o:
 @am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
 @am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
@@ -7883,8 +8636,9 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf classpath/native/jawt/.libs classpath/native/jawt/_libs
+       -rm -rf classpath/tools/.libs classpath/tools/_libs
        -rm -rf gnu/classpath/.libs gnu/classpath/_libs
+       -rm -rf gnu/classpath/jdwp/.libs gnu/classpath/jdwp/_libs
        -rm -rf gnu/gcj/.libs gnu/gcj/_libs
        -rm -rf gnu/gcj/convert/.libs gnu/gcj/convert/_libs
        -rm -rf gnu/gcj/io/.libs gnu/gcj/io/_libs
@@ -7903,6 +8657,7 @@ clean-libtool:
        -rm -rf java/net/.libs java/net/_libs
        -rm -rf java/nio/.libs java/nio/_libs
        -rm -rf java/nio/channels/.libs java/nio/channels/_libs
+       -rm -rf java/security/.libs java/security/_libs
        -rm -rf java/text/.libs java/text/_libs
        -rm -rf java/util/.libs java/util/_libs
        -rm -rf java/util/logging/.libs java/util/logging/_libs
@@ -7987,7 +8742,13 @@ uninstall-toolexecmainlibDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-       @set fnord $$MAKEFLAGS; amf=$$2; \
+       @failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+           *=* | --[!k]*);; \
+           *k*) failcom='fail=yes';; \
+         esac; \
+       done; \
        dot_seen=no; \
        target=`echo $@ | sed s/-recursive//`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -7999,7 +8760,7 @@ $(RECURSIVE_TARGETS):
            local_target="$$target"; \
          fi; \
          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+         || eval $$failcom; \
        done; \
        if test "$$dot_seen" = "no"; then \
          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -8007,7 +8768,13 @@ $(RECURSIVE_TARGETS):
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-       @set fnord $$MAKEFLAGS; amf=$$2; \
+       @failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+           *=* | --[!k]*);; \
+           *k*) failcom='fail=yes';; \
+         esac; \
+       done; \
        dot_seen=no; \
        case "$@" in \
          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -8028,7 +8795,7 @@ maintainer-clean-recursive:
            local_target="$$target"; \
          fi; \
          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+         || eval $$failcom; \
        done && test -z "$$fail"
 tags-recursive:
        list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -8103,7 +8870,7 @@ distclean-tags:
 distdir: $(DISTFILES)
        $(am__remove_distdir)
        mkdir $(distdir)
-       $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../config
+       $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../config $(distdir)/scripts
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \
@@ -8247,7 +9014,7 @@ check: check-recursive
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(jardir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(toolexecmainlibdir)"; do \
+       for dir in "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(jardir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(toolexecmainlibdir)"; do \
          test -z "$$dir" || $(mkdir_p) "$$dir"; \
        done
 install: install-recursive
@@ -8271,10 +9038,12 @@ clean-generic:
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -rm -f classpath/native/jawt/$(DEPDIR)/$(am__dirstamp)
-       -rm -f classpath/native/jawt/$(am__dirstamp)
+       -rm -f classpath/tools/$(DEPDIR)/$(am__dirstamp)
+       -rm -f classpath/tools/$(am__dirstamp)
        -rm -f gnu/classpath/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/classpath/$(am__dirstamp)
+       -rm -f gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/classpath/jdwp/$(am__dirstamp)
        -rm -f gnu/gcj/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/gcj/$(am__dirstamp)
        -rm -f gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp)
@@ -8313,6 +9082,8 @@ distclean-generic:
        -rm -f java/nio/$(am__dirstamp)
        -rm -f java/nio/channels/$(DEPDIR)/$(am__dirstamp)
        -rm -f java/nio/channels/$(am__dirstamp)
+       -rm -f java/security/$(DEPDIR)/$(am__dirstamp)
+       -rm -f java/security/$(am__dirstamp)
        -rm -f java/text/$(DEPDIR)/$(am__dirstamp)
        -rm -f java/text/$(am__dirstamp)
        -rm -f java/util/$(DEPDIR)/$(am__dirstamp)
@@ -8326,15 +9097,16 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
+@USE_LIBGCJ_BC_FALSE@install-exec-hook:
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-generic clean-libtool \
-       clean-noinstPROGRAMS clean-toolexeclibLTLIBRARIES \
-       mostlyclean-am
+clean-am: clean-binPROGRAMS clean-dbexecLTLIBRARIES clean-generic \
+       clean-libtool clean-noinstPROGRAMS \
+       clean-toolexeclibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf ./$(DEPDIR) classpath/native/jawt/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-libtool distclean-local distclean-tags
@@ -8353,8 +9125,10 @@ install-data-am: install-data-local install-jarDATA \
        install-pkgconfigDATA
 
 install-exec-am: install-binPROGRAMS install-binSCRIPTS \
-       install-dbexecDATA install-toolexeclibLTLIBRARIES \
-       install-toolexecmainlibDATA
+       install-dbexecDATA install-dbexecLTLIBRARIES \
+       install-toolexeclibLTLIBRARIES install-toolexecmainlibDATA
+       @$(NORMAL_INSTALL)
+       $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-recursive
 
@@ -8365,7 +9139,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
-       -rm -rf ./$(DEPDIR) classpath/native/jawt/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -8383,24 +9157,25 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-       uninstall-dbexecDATA uninstall-info-am uninstall-jarDATA \
-       uninstall-pkgconfigDATA uninstall-toolexeclibLTLIBRARIES \
-       uninstall-toolexecmainlibDATA
+       uninstall-dbexecDATA uninstall-dbexecLTLIBRARIES \
+       uninstall-info-am uninstall-jarDATA uninstall-pkgconfigDATA \
+       uninstall-toolexeclibLTLIBRARIES uninstall-toolexecmainlibDATA
 
 uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-       check-am clean clean-binPROGRAMS clean-generic clean-libtool \
-       clean-noinstPROGRAMS clean-recursive \
-       clean-toolexeclibLTLIBRARIES ctags ctags-recursive dist \
-       dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
-       distcheck distclean distclean-compile distclean-generic \
-       distclean-libtool distclean-local distclean-recursive \
-       distclean-tags distcleancheck distdir distuninstallcheck dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-binPROGRAMS install-binSCRIPTS install-data \
-       install-data-am install-data-local install-dbexecDATA \
-       install-exec install-exec-am install-info install-info-am \
+       check-am clean clean-binPROGRAMS clean-dbexecLTLIBRARIES \
+       clean-generic clean-libtool clean-noinstPROGRAMS \
+       clean-recursive clean-toolexeclibLTLIBRARIES ctags \
+       ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
+       dist-tarZ dist-zip distcheck distclean distclean-compile \
+       distclean-generic distclean-libtool distclean-local \
+       distclean-recursive distclean-tags distcleancheck distdir \
+       distuninstallcheck dvi dvi-am html html-am info info-am \
+       install install-am install-binPROGRAMS install-binSCRIPTS \
+       install-data install-data-am install-data-local \
+       install-dbexecDATA install-dbexecLTLIBRARIES install-exec \
+       install-exec-am install-exec-hook install-info install-info-am \
        install-jarDATA install-man install-pkgconfigDATA \
        install-strip install-toolexeclibLTLIBRARIES \
        install-toolexecmainlibDATA installcheck installcheck-am \
@@ -8410,16 +9185,24 @@ uninstall-info: uninstall-info-recursive
        mostlyclean-libtool mostlyclean-local mostlyclean-recursive \
        pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
        uninstall-binPROGRAMS uninstall-binSCRIPTS \
-       uninstall-dbexecDATA uninstall-info-am uninstall-jarDATA \
-       uninstall-pkgconfigDATA uninstall-toolexeclibLTLIBRARIES \
-       uninstall-toolexecmainlibDATA
+       uninstall-dbexecDATA uninstall-dbexecLTLIBRARIES \
+       uninstall-info-am uninstall-jarDATA uninstall-pkgconfigDATA \
+       uninstall-toolexeclibLTLIBRARIES uninstall-toolexecmainlibDATA
 
 
 $(db_name): gcj-dbtool$(EXEEXT)
        @rm -f $(db_name)
        ./gcj-dbtool -n $(db_name) || touch $(db_name)
 
-$(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES)
+libgcj_bc.la: $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_DEPENDENCIES)
+       $(libgcj_bc_la_LINK) $(am_libgcj_bc_la_rpath) $(libgcj_bc_la_LDFLAGS) \
+       $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_LIBADD) $(LIBS) || exit; \
+       rm .libs/libgcj_bc.so; \
+       mv .libs/libgcj_bc.so.1.0.0 .libs/libgcj_bc.so; \
+       $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
+       -o .libs/libgcj_bc.so.1.0.0 -lgcj || exit; \
+       rm .libs/libgcj_bc.so.1; \
+       $(LN_S) libgcj_bc.so.1.0.0 .libs/libgcj_bc.so.1
 
 $(propertyo_files): %.lo: classpath/resource/%
        $(mkinstalldirs) `dirname $@`; \
@@ -8429,6 +9212,9 @@ libgcj-$(gcc_version).jar: classpath/lib/compile-classes
        cd classpath/lib; $(JAR) -cfM \
            ../../libgcj-$(gcc_version).jar gnu java javax org
 
+libgcj-tools-$(gcc_version).jar: classpath/tools/tools.jar
+       cp $< $@
+
 mostlyclean-local:
        find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f
 
@@ -8450,7 +9236,7 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND
 
 gnu-CORBA.lo: $(gnu_CORBA_source_files)
        @find classpath/lib/gnu/CORBA -name '*.class' > gnu-CORBA.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-CORBA.lo @gnu-CORBA.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-CORBA.lo @gnu-CORBA.list
        @rm -f gnu-CORBA.list
 
 gnu/awt.list: $(gnu_awt_source_files)
@@ -8663,6 +9449,51 @@ gnu/java/awt/color.list: $(gnu_java_awt_color_source_files)
 
 -include gnu/java/awt/color.deps
 
+gnu/java/awt/dnd.list: $(gnu_java_awt_dnd_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_awt_dnd_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/awt/dnd.list
+
+-include gnu/java/awt/dnd.deps
+
+gnu-java-awt-dnd-peer-gtk.lo: $(gnu_java_awt_dnd_peer_gtk_source_files)
+       @find classpath/lib/gnu/java/awt/dnd/peer/gtk -name '*.class' > gnu-java-awt-dnd-peer-gtk.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-dnd-peer-gtk.lo @gnu-java-awt-dnd-peer-gtk.list
+       @rm -f gnu-java-awt-dnd-peer-gtk.list
+
+gnu/java/awt/font.list: $(gnu_java_awt_font_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_awt_font_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/awt/font.list
+
+-include gnu/java/awt/font.deps
+
+gnu/java/awt/font/opentype.list: $(gnu_java_awt_font_opentype_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_awt_font_opentype_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/awt/font/opentype.list
+
+-include gnu/java/awt/font/opentype.deps
+
+gnu/java/awt/font/opentype/truetype.list: $(gnu_java_awt_font_opentype_truetype_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_awt_font_opentype_truetype_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/awt/font/opentype/truetype.list
+
+-include gnu/java/awt/font/opentype/truetype.deps
+
 gnu/java/awt/image.list: $(gnu_java_awt_image_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_awt_image_source_files); do \
@@ -8673,6 +9504,16 @@ gnu/java/awt/image.list: $(gnu_java_awt_image_source_files)
 
 -include gnu/java/awt/image.deps
 
+gnu/java/awt/java2d.list: $(gnu_java_awt_java2d_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_awt_java2d_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/awt/java2d.list
+
+-include gnu/java/awt/java2d.deps
+
 gnu/java/awt/peer.list: $(gnu_java_awt_peer_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_awt_peer_source_files); do \
@@ -8685,22 +9526,32 @@ gnu/java/awt/peer.list: $(gnu_java_awt_peer_source_files)
 
 gnu-java-awt-peer-gtk.lo: $(gnu_java_awt_peer_gtk_source_files)
        @find classpath/lib/gnu/java/awt/peer/gtk -name '*.class' > gnu-java-awt-peer-gtk.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-java-awt-peer-gtk.lo @gnu-java-awt-peer-gtk.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-gtk.lo @gnu-java-awt-peer-gtk.list
        @rm -f gnu-java-awt-peer-gtk.list
 
 gnu-java-awt-peer-qt.lo: $(gnu_java_awt_peer_qt_source_files)
        @find classpath/lib/gnu/java/awt/peer/qt -name '*.class' > gnu-java-awt-peer-qt.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-java-awt-peer-qt.lo @gnu-java-awt-peer-qt.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-qt.lo @gnu-java-awt-peer-qt.list
        @rm -f gnu-java-awt-peer-qt.list
 
 gnu-java-awt-peer-swing.lo: $(gnu_java_awt_peer_swing_source_files)
        @find classpath/lib/gnu/java/awt/peer/swing -name '*.class' > gnu-java-awt-peer-swing.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-java-awt-peer-swing.lo @gnu-java-awt-peer-swing.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-swing.lo @gnu-java-awt-peer-swing.list
        @rm -f gnu-java-awt-peer-swing.list
 
+gnu/java/awt/print.list: $(gnu_java_awt_print_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_awt_print_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/awt/print.list
+
+-include gnu/java/awt/print.deps
+
 gnu-java-beans.lo: $(gnu_java_beans_source_files)
        @find classpath/lib/gnu/java/beans -name '*.class' > gnu-java-beans.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-java-beans.lo @gnu-java-beans.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-beans.lo @gnu-java-beans.list
        @rm -f gnu-java-beans.list
 
 gnu/java/io.list: $(gnu_java_io_source_files)
@@ -8723,6 +9574,16 @@ gnu/java/lang.list: $(gnu_java_lang_source_files)
 
 -include gnu/java/lang.deps
 
+gnu/java/lang/management.list: $(gnu_java_lang_management_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_lang_management_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/lang/management.list
+
+-include gnu/java/lang/management.deps
+
 gnu/java/lang/reflect.list: $(gnu_java_lang_reflect_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_lang_reflect_source_files); do \
@@ -8763,6 +9624,36 @@ gnu/java/net.list: $(gnu_java_net_source_files)
 
 -include gnu/java/net.deps
 
+gnu/java/net/loader.list: $(gnu_java_net_loader_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_net_loader_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/net/loader.list
+
+-include gnu/java/net/loader.deps
+
+gnu/java/net/local.list: $(gnu_java_net_local_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_net_local_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/net/local.list
+
+-include gnu/java/net/local.deps
+
+gnu/java/net/protocol/core.list: $(gnu_java_net_protocol_core_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_net_protocol_core_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/net/protocol/core.list
+
+-include gnu/java/net/protocol/core.deps
+
 gnu/java/net/protocol/file.list: $(gnu_java_net_protocol_file_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_net_protocol_file_source_files); do \
@@ -8783,6 +9674,16 @@ gnu/java/net/protocol/ftp.list: $(gnu_java_net_protocol_ftp_source_files)
 
 -include gnu/java/net/protocol/ftp.deps
 
+gnu/java/net/protocol/gcjlib.list: $(gnu_java_net_protocol_gcjlib_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_net_protocol_gcjlib_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/net/protocol/gcjlib.list
+
+-include gnu/java/net/protocol/gcjlib.deps
+
 gnu/java/net/protocol/http.list: $(gnu_java_net_protocol_http_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_net_protocol_http_source_files); do \
@@ -8853,6 +9754,16 @@ gnu/java/rmi.list: $(gnu_java_rmi_source_files)
 
 -include gnu/java/rmi.deps
 
+gnu/java/rmi/activation.list: $(gnu_java_rmi_activation_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_rmi_activation_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/rmi/activation.list
+
+-include gnu/java/rmi/activation.deps
+
 gnu/java/rmi/dgc.list: $(gnu_java_rmi_dgc_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_rmi_dgc_source_files); do \
@@ -8873,6 +9784,16 @@ gnu/java/rmi/registry.list: $(gnu_java_rmi_registry_source_files)
 
 -include gnu/java/rmi/registry.deps
 
+gnu/java/rmi/rmic.list: $(gnu_java_rmi_rmic_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_rmi_rmic_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/rmi/rmic.list
+
+-include gnu/java/rmi/rmic.deps
+
 gnu/java/rmi/server.list: $(gnu_java_rmi_server_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_rmi_server_source_files); do \
@@ -9103,6 +10024,16 @@ gnu/java/util.list: $(gnu_java_util_source_files)
 
 -include gnu/java/util.deps
 
+gnu/java/util/jar.list: $(gnu_java_util_jar_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_util_jar_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/util/jar.list
+
+-include gnu/java/util/jar.deps
+
 gnu/java/util/prefs.list: $(gnu_java_util_prefs_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_util_prefs_source_files); do \
@@ -9113,6 +10044,21 @@ gnu/java/util/prefs.list: $(gnu_java_util_prefs_source_files)
 
 -include gnu/java/util/prefs.deps
 
+gnu-java-util-prefs-gconf.lo: $(gnu_java_util_prefs_gconf_source_files)
+       @find classpath/lib/gnu/java/util/prefs/gconf -name '*.class' > gnu-java-util-prefs-gconf.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-util-prefs-gconf.lo @gnu-java-util-prefs-gconf.list
+       @rm -f gnu-java-util-prefs-gconf.list
+
+gnu/java/util/regex.list: $(gnu_java_util_regex_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_util_regex_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/util/regex.list
+
+-include gnu/java/util/regex.deps
+
 gnu/javax/crypto.list: $(gnu_javax_crypto_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_javax_crypto_source_files); do \
@@ -9273,6 +10219,16 @@ gnu/javax/crypto/keyring.list: $(gnu_javax_crypto_keyring_source_files)
 
 -include gnu/javax/crypto/keyring.deps
 
+gnu/javax/crypto/kwa.list: $(gnu_javax_crypto_kwa_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_kwa_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/kwa.list
+
+-include gnu/javax/crypto/kwa.deps
+
 gnu/javax/crypto/mac.list: $(gnu_javax_crypto_mac_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_javax_crypto_mac_source_files); do \
@@ -9363,6 +10319,16 @@ gnu/javax/crypto/sasl/srp.list: $(gnu_javax_crypto_sasl_srp_source_files)
 
 -include gnu/javax/crypto/sasl/srp.deps
 
+gnu/javax/imageio.list: $(gnu_javax_imageio_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_imageio_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/imageio.list
+
+-include gnu/javax/imageio.deps
+
 gnu/javax/imageio/bmp.list: $(gnu_javax_imageio_bmp_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_javax_imageio_bmp_source_files); do \
@@ -9373,6 +10339,36 @@ gnu/javax/imageio/bmp.list: $(gnu_javax_imageio_bmp_source_files)
 
 -include gnu/javax/imageio/bmp.deps
 
+gnu/javax/imageio/gif.list: $(gnu_javax_imageio_gif_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_imageio_gif_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/imageio/gif.list
+
+-include gnu/javax/imageio/gif.deps
+
+gnu/javax/imageio/jpeg.list: $(gnu_javax_imageio_jpeg_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_imageio_jpeg_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/imageio/jpeg.list
+
+-include gnu/javax/imageio/jpeg.deps
+
+gnu/javax/imageio/png.list: $(gnu_javax_imageio_png_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_imageio_png_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/imageio/png.list
+
+-include gnu/javax/imageio/png.deps
+
 gnu/javax/net/ssl.list: $(gnu_javax_net_ssl_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_javax_net_ssl_source_files); do \
@@ -9393,9 +10389,79 @@ gnu/javax/net/ssl/provider.list: $(gnu_javax_net_ssl_provider_source_files)
 
 -include gnu/javax/net/ssl/provider.deps
 
+gnu/javax/print.list: $(gnu_javax_print_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print.list
+
+-include gnu/javax/print.deps
+
+gnu/javax/print/ipp.list: $(gnu_javax_print_ipp_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_ipp_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print/ipp.list
+
+-include gnu/javax/print/ipp.deps
+
+gnu/javax/print/ipp/attribute.list: $(gnu_javax_print_ipp_attribute_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_ipp_attribute_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print/ipp/attribute.list
+
+-include gnu/javax/print/ipp/attribute.deps
+
+gnu/javax/print/ipp/attribute/defaults.list: $(gnu_javax_print_ipp_attribute_defaults_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_ipp_attribute_defaults_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print/ipp/attribute/defaults.list
+
+-include gnu/javax/print/ipp/attribute/defaults.deps
+
+gnu/javax/print/ipp/attribute/job.list: $(gnu_javax_print_ipp_attribute_job_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_ipp_attribute_job_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print/ipp/attribute/job.list
+
+-include gnu/javax/print/ipp/attribute/job.deps
+
+gnu/javax/print/ipp/attribute/printer.list: $(gnu_javax_print_ipp_attribute_printer_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_ipp_attribute_printer_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print/ipp/attribute/printer.list
+
+-include gnu/javax/print/ipp/attribute/printer.deps
+
+gnu/javax/print/ipp/attribute/supported.list: $(gnu_javax_print_ipp_attribute_supported_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_ipp_attribute_supported_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print/ipp/attribute/supported.list
+
+-include gnu/javax/print/ipp/attribute/supported.deps
+
 gnu-javax-rmi.lo: $(gnu_javax_rmi_source_files)
        @find classpath/lib/gnu/javax/rmi -name '*.class' > gnu-javax-rmi.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-javax-rmi.lo @gnu-javax-rmi.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-rmi.lo @gnu-javax-rmi.list
        @rm -f gnu-javax-rmi.list
 
 gnu/javax/security/auth.list: $(gnu_javax_security_auth_source_files)
@@ -9430,9 +10496,59 @@ gnu/javax/security/auth/login.list: $(gnu_javax_security_auth_login_source_files
 
 gnu-javax-sound-midi.lo: $(gnu_javax_sound_midi_source_files)
        @find classpath/lib/gnu/javax/sound/midi -name '*.class' > gnu-javax-sound-midi.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-javax-sound-midi.lo @gnu-javax-sound-midi.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-sound-midi.lo @gnu-javax-sound-midi.list
        @rm -f gnu-javax-sound-midi.list
 
+gnu/javax/sound/sampled/AU.list: $(gnu_javax_sound_sampled_AU_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_sound_sampled_AU_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/sound/sampled/AU.list
+
+-include gnu/javax/sound/sampled/AU.deps
+
+gnu/javax/sound/sampled/WAV.list: $(gnu_javax_sound_sampled_WAV_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_sound_sampled_WAV_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/sound/sampled/WAV.list
+
+-include gnu/javax/sound/sampled/WAV.deps
+
+gnu/javax/swing/plaf/gnu.list: $(gnu_javax_swing_plaf_gnu_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_swing_plaf_gnu_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/swing/plaf/gnu.list
+
+-include gnu/javax/swing/plaf/gnu.deps
+
+gnu/javax/swing/plaf/metal.list: $(gnu_javax_swing_plaf_metal_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_swing_plaf_metal_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/swing/plaf/metal.list
+
+-include gnu/javax/swing/plaf/metal.deps
+
+gnu/javax/swing/text/html.list: $(gnu_javax_swing_text_html_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_swing_text_html_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/swing/text/html.list
+
+-include gnu/javax/swing/text/html.deps
+
 gnu/javax/swing/text/html/parser.list: $(gnu_javax_swing_text_html_parser_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_javax_swing_text_html_parser_source_files); do \
@@ -9473,19 +10589,19 @@ gnu/javax/swing/text/html/parser/support/low.list: $(gnu_javax_swing_text_html_p
 
 -include gnu/javax/swing/text/html/parser/support/low.deps
 
-gnu/regexp.list: $(gnu_regexp_source_files)
+gnu/javax/swing/tree.list: $(gnu_javax_swing_tree_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_regexp_source_files); do \
+       @for file in $(gnu_javax_swing_tree_source_files); do \
          if test -f $(srcdir)/$$file; then \
            echo $(srcdir)/$$file; \
          else echo $$file; fi; \
-       done > gnu/regexp.list
+       done > gnu/javax/swing/tree.list
 
--include gnu/regexp.deps
+-include gnu/javax/swing/tree.deps
 
 gnu-xml.lo: $(gnu_xml_source_files)
        @find classpath/lib/gnu/xml -name '*.class' > gnu-xml.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-xml.lo @gnu-xml.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml.lo @gnu-xml.list
        @rm -f gnu-xml.list
 
 java/applet.list: $(java_applet_source_files)
@@ -9688,6 +10804,26 @@ java/lang/annotation.list: $(java_lang_annotation_source_files)
 
 -include java/lang/annotation.deps
 
+java/lang/instrument.list: $(java_lang_instrument_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(java_lang_instrument_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > java/lang/instrument.list
+
+-include java/lang/instrument.deps
+
+java/lang/management.list: $(java_lang_management_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(java_lang_management_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > java/lang/management.list
+
+-include java/lang/management.deps
+
 java/lang/ref.list: $(java_lang_ref_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(java_lang_ref_source_files); do \
@@ -10000,7 +11136,7 @@ javax/crypto/spec.list: $(javax_crypto_spec_source_files)
 
 javax-imageio.lo: $(javax_imageio_source_files)
        @find classpath/lib/javax/imageio -name '*.class' > javax-imageio.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o javax-imageio.lo @javax-imageio.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-imageio.lo @javax-imageio.list
        @rm -f javax-imageio.list
 
 javax/management.list: $(javax_management_source_files)
@@ -10013,6 +11149,16 @@ javax/management.list: $(javax_management_source_files)
 
 -include javax/management.deps
 
+javax/management/openmbean.list: $(javax_management_openmbean_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(javax_management_openmbean_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > javax/management/openmbean.list
+
+-include javax/management/openmbean.deps
+
 javax/naming.list: $(javax_naming_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(javax_naming_source_files); do \
@@ -10125,7 +11271,7 @@ javax/print/event.list: $(javax_print_event_source_files)
 
 javax-rmi.lo: $(javax_rmi_source_files)
        @find classpath/lib/javax/rmi -name '*.class' > javax-rmi.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o javax-rmi.lo @javax-rmi.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-rmi.lo @javax-rmi.list
        @rm -f javax-rmi.list
 
 javax/security/auth.list: $(javax_security_auth_source_files)
@@ -10148,6 +11294,16 @@ javax/security/auth/callback.list: $(javax_security_auth_callback_source_files)
 
 -include javax/security/auth/callback.deps
 
+javax/security/auth/kerberos.list: $(javax_security_auth_kerberos_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(javax_security_auth_kerberos_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > javax/security/auth/kerberos.list
+
+-include javax/security/auth/kerberos.deps
+
 javax/security/auth/login.list: $(javax_security_auth_login_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(javax_security_auth_login_source_files); do \
@@ -10440,7 +11596,7 @@ javax/transaction/xa.list: $(javax_transaction_xa_source_files)
 
 javax-xml.lo: $(javax_xml_source_files)
        @find classpath/lib/javax/xml -name '*.class' > javax-xml.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o javax-xml.lo @javax-xml.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-xml.lo @javax-xml.list
        @rm -f javax-xml.list
 
 org/ietf/jgss.list: $(org_ietf_jgss_source_files)
@@ -10455,22 +11611,22 @@ org/ietf/jgss.list: $(org_ietf_jgss_source_files)
 
 org-omg.lo: $(org_omg_source_files)
        @find classpath/lib/org/omg -name '*.class' > org-omg.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-omg.lo @org-omg.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o org-omg.lo @org-omg.list
        @rm -f org-omg.list
 
 org-relaxng.lo: $(org_relaxng_source_files)
        @find classpath/lib/org/relaxng -name '*.class' > org-relaxng.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-relaxng.lo @org-relaxng.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o org-relaxng.lo @org-relaxng.list
        @rm -f org-relaxng.list
 
 org-w3c.lo: $(org_w3c_source_files)
        @find classpath/lib/org/w3c -name '*.class' > org-w3c.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-w3c.lo @org-w3c.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o org-w3c.lo @org-w3c.list
        @rm -f org-w3c.list
 
 org-xml.lo: $(org_xml_source_files)
        @find classpath/lib/org/xml -name '*.class' > org-xml.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-xml.lo @org-xml.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o org-xml.lo @org-xml.list
        @rm -f org-xml.list
 
 $(generic_header_files): %.h: classpath/lib/%.class
@@ -10489,6 +11645,7 @@ java/lang/ClassLoader.h: classpath/lib/java/lang/ClassLoader.class
 java/lang/Thread.h: classpath/lib/java/lang/Thread.class
        $(GCJH) -classpath '' -bootclasspath classpath/lib \
                -prepend 'class _Jv_JNIEnv;' \
+               -prepend 'class _Jv_Thread_t;' \
                -prepend '#define _JV_NOT_OWNER 1' \
                -prepend '#define _JV_INTERRUPTED 2' \
                -prepend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \
@@ -10498,6 +11655,7 @@ java/lang/Thread.h: classpath/lib/java/lang/Thread.class
                -prepend 'java::lang::Thread* _Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \
                -prepend 'java::lang::Thread* _Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \
                -prepend 'jint _Jv_DetachCurrentThread ();' \
+               -prepend '_Jv_Thread_t* _Jv_ThreadGetData (java::lang::Thread* thread);' \
                -friend '_Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();' \
                -friend 'void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
                -friend 'void ::_Jv_ThreadRun (java::lang::Thread* thread);' \
@@ -10505,6 +11663,7 @@ java/lang/Thread.h: classpath/lib/java/lang/Thread.class
                -friend 'java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \
                -friend 'java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \
                -friend 'jint (::_Jv_DetachCurrentThread) ();' \
+               -friend '_Jv_Thread_t* ::_Jv_ThreadGetData (java::lang::Thread* thread);' \
                java/lang/Thread
 
 java/lang/String.h: classpath/lib/java/lang/String.class
@@ -10611,6 +11770,16 @@ java/lang/ConcreteProcess$$ProcessManager.h: classpath/lib/java/lang/ConcretePro
 $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h:
        @:
 
+@USE_LIBGCJ_BC_TRUE@install-exec-hook: install-toolexeclibLTLIBRARIES
+@USE_LIBGCJ_BC_TRUE@   @echo Installing dummy lib libgcj_bc.so.1.0.0; \
+@USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
+@USE_LIBGCJ_BC_TRUE@   mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
+@USE_LIBGCJ_BC_TRUE@   $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
+@USE_LIBGCJ_BC_TRUE@   -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
+@USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
+@USE_LIBGCJ_BC_TRUE@   $(LN_S) libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
+@USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.la;
+
 install-data-local:
        $(PRE_INSTALL)
        @echo Creating list of headers to install...
@@ -10623,12 +11792,6 @@ install-data-local:
          $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f; \
        done
        -@rm -f tmp-ilist
-       $(mkinstalldirs) $(DESTDIR)$(secdir)
-       @for f in libgcj.security; do \
-         echo " $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f"; \
-         $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f; \
-       done
-       $(INSTALL_DATA) $(srcdir)/java/util/logging/logging.properties $(DESTDIR)$(propdir)/logging.properties
        $(INSTALL_DATA) 'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
        $(INSTALL_DATA) 'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
        $(INSTALL_DATA) 'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/
@@ -10752,6 +11915,11 @@ create-headers: $(headers_to_make)
 
 $(libgcj_la_OBJECTS) $(gcj_dbtool_OBJECTS) $(xlib_nat_files): headers.stamp
 $(libgij_la_OBJECTS): headers.stamp
+$(libjvm_la_OBJECTS): headers.stamp
+
+# No install-html support yet.
+.PHONY: install-html
+install-html:
 
 # Multilib support.
 .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \