PR c++/27668

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

index 2a7add5..631ebb8 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@
@@ -44,20 +42,20 @@ 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
  @NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \
  @NATIVE_TRUE@  grmic$(EXEEXT) grmiregistry$(EXEEXT) \
-@NATIVE_TRUE@  gcj-dbtool$(EXEEXT)
-@USING_GCC_TRUE@am__append_5 = $(WARNINGS)
-@USING_BOEHMGC_TRUE@am__append_6 = boehm.cc
-@USING_NOGC_TRUE@am__append_7 = nogc.cc
-@USING_POSIX_PLATFORM_TRUE@am__append_8 = posix.cc
-@USING_WIN32_PLATFORM_TRUE@am__append_9 = win32.cc
-@USING_DARWIN_CRT_TRUE@am__append_10 = darwin.cc
-@USING_POSIX_THREADS_TRUE@am__append_11 = posix-threads.cc
-@USING_WIN32_THREADS_TRUE@am__append_12 = win32-threads.cc
-@USING_NO_THREADS_TRUE@am__append_13 = no-threads.cc
+@NATIVE_TRUE@  gcj-dbtool$(EXEEXT) gappletviewer$(EXEEXT) \
+@NATIVE_TRUE@  gjarsigner$(EXEEXT) gkeytool$(EXEEXT)
+@BASH_JAR_TRUE@am__append_3 = scripts/jar
+@USING_GCC_TRUE@am__append_4 = $(WARNINGS)
+@USING_BOEHMGC_TRUE@am__append_5 = boehm.cc
+@USING_NOGC_TRUE@am__append_6 = nogc.cc
+@USING_POSIX_PLATFORM_TRUE@am__append_7 = posix.cc
+@USING_WIN32_PLATFORM_TRUE@am__append_8 = win32.cc
+@USING_DARWIN_CRT_TRUE@am__append_9 = darwin.cc
+@USING_POSIX_THREADS_TRUE@am__append_10 = posix-threads.cc
+@USING_WIN32_THREADS_TRUE@am__append_11 = win32-threads.cc
+@USING_NO_THREADS_TRUE@am__append_12 = no-threads.cc
  DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
         $(srcdir)/../config.guess $(srcdir)/../config.sub \
         $(srcdir)/../depcomp $(srcdir)/../install-sh \
@@ -65,11 +63,11 @@ 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)
+@XLIB_AWT_TRUE@am__append_13 = $(xlib_nat_headers)
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
@@ -93,7 +91,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 +105,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 +137,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,47 +149,84 @@ 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/pkcs.lo gnu/java/security/provider.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/reflect.lo gnu/java/locale.lo gnu/java/math.lo \
+       gnu/java/net.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/prefs.lo gnu/javax/crypto.lo \
-       gnu/javax/imageio/bmp.lo gnu/javax/swing/text/html/parser.lo \
+       gnu/java/util.lo gnu/java/util/jar.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/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/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/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 \
+       gnu/javax/swing/text/html/parser/support/low.lo \
+       gnu/javax/swing/tree.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/naming.lo javax/naming/directory.lo \
+       java/lang/instrument.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/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 \
@@ -206,17 +235,21 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.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/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/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-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-w3c.lo org-xml.lo
-am__DEPENDENCIES_4 = $(patsubst classpath/resource/%,%,$(addsuffix \
+am__DEPENDENCIES_2 = gnu-CORBA.lo gnu-java-awt-peer-gtk.lo \
+       gnu-java-awt-peer-qt.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_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 \
@@ -230,6 +263,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 \
@@ -252,13 +286,14 @@ 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/nio/channels/natVMChannels.cc \
+       java/nio/natDirectByteBufferImpl.cc \
+       java/security/natVMAccessController.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/gcj/convert/JIS0212_to_Unicode.lo \
@@ -270,6 +305,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 \
@@ -292,11 +328,12 @@ 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/nio/channels/natVMChannels.lo \
+       java/nio/natDirectByteBufferImpl.lo \
+       java/security/natVMAccessController.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
@@ -305,21 +342,21 @@ 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_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)
@@ -331,6 +368,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 =
@@ -362,19 +403,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) $(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) \
+       $(libgcj_tools_la_SOURCES) $(am__libgcj_la_SOURCES_DIST) \
+       $(libgij_la_SOURCES) $(libjvm_la_SOURCES) \
+       $(gappletviewer_SOURCES) $(gcj_dbtool_SOURCES) \
         $(am__gen_from_JIS_SOURCES_DIST) $(gij_SOURCES) \
-       $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_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 \
         install-exec-recursive install-info-recursive \
@@ -413,8 +454,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@
@@ -450,10 +491,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@
@@ -464,11 +501,15 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INTERPRETER = @INTERPRETER@
+JAR = @JAR@
  JAVA_HOME = @JAVA_HOME@
  JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@
  JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
  JC1GCSPEC = @JC1GCSPEC@
+LD = @LD@
  LDFLAGS = @LDFLAGS@
+LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
+LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
  LIBART_CFLAGS = @LIBART_CFLAGS@
  LIBART_LIBS = @LIBART_LIBS@
  LIBFFI = @LIBFFI@
@@ -502,14 +543,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@
@@ -525,7 +562,9 @@ THREADINCS = @THREADINCS@
  THREADLDFLAGS = @THREADLDFLAGS@
  THREADLIBS = @THREADLIBS@
  THREADSPEC = @THREADSPEC@
+THREADSTARTFILESPEC = @THREADSTARTFILESPEC@
  TOOLKIT = @TOOLKIT@
+UNZIP = @UNZIP@
  USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
  USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@
  USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@
@@ -561,6 +600,7 @@ ac_ct_AS = @ac_ct_AS@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
  ac_ct_GCJ = @ac_ct_GCJ@
+ac_ct_LD = @ac_ct_LD@
  ac_ct_RANLIB = @ac_ct_RANLIB@
  ac_ct_STRIP = @ac_ct_STRIP@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
@@ -578,10 +618,12 @@ 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@
  datadir = @datadir@
+dbexecdir = @dbexecdir@
  exec_prefix = @exec_prefix@
  extra_ldflags_libjava = @extra_ldflags_libjava@
  gxx_include_dir = @gxx_include_dir@
@@ -622,7 +664,6 @@ target_vendor = @target_vendor@
  toolexecdir = @toolexecdir@
  toolexeclibdir = @toolexeclibdir@
  toolexecmainlibdir = @toolexecmainlibdir@
-dbexecdir = @dbexecdir@
  AUTOMAKE_OPTIONS = foreign subdir-objects
  ACLOCAL_AMFLAGS = -I . -I .. -I ../config
  
@@ -638,23 +679,27 @@ SUBDIRS = $(DIRLTDL) gcj include classpath $(am__append_1)
  # $(1): variable containing entries to iterate over
  # $(2): output file
  write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach object,$(1),$(shell echo $(object) >> $(2)))
-toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) \
-       $(am__append_3) $(am__append_4)
+
+# This is required by TL_AC_GXX_INCLUDE_DIR.
+libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
+toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la \
+       $(am__append_2)
  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_3)
  GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
  GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
            $(LDFLAGS) -o $@
@@ -680,6 +725,8 @@ AM_CXXFLAGS = \
          -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)\""
@@ -690,13 +737,14 @@ AM_GCJFLAGS = \
         --encoding=UTF-8 \
         -Wno-deprecated -fbootstrap-classes
  
-AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_5)
+AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_4)
  PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long
  JCFLAGS = -g
  JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
  AM_CPPFLAGS = -I$(top_srcdir) \
         -Iinclude -I$(top_srcdir)/include \
         -I$(top_srcdir)/classpath/include \
+       -Iclasspath/include \
         -I$(top_srcdir)/classpath/native/fdlibm \
         $(GCINCS) $(THREADINCS) $(INCLTDL) \
         $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS)
@@ -711,12 +759,12 @@ 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_5) $(am__append_6) $(am__append_7) \
+       $(am__append_8) $(am__append_9) $(am__append_10) \
+       $(am__append_11) $(am__append_12)
  nat_files = $(nat_source_files:.cc=.lo)
  xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
  
@@ -738,43 +786,19 @@ 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 = \
+        -version-info `grep -v '^\#' $(srcdir)/libtool-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 \
@@ -793,22 +817,8 @@ 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
-
  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 = \
@@ -1003,6 +1013,7 @@ 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 \
@@ -1014,6 +1025,7 @@ gnu_classpath_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gn
  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
  
  gnu_classpath_debug_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_debug_source_files)))
@@ -1022,10 +1034,12 @@ 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/Event.java \
  classpath/gnu/classpath/jdwp/event/EventManager.java \
@@ -1066,6 +1080,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
  
@@ -1237,11 +1252,52 @@ 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_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 \
@@ -1250,13 +1306,17 @@ 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 \
@@ -1273,10 +1333,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 \
@@ -1296,7 +1356,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 \
@@ -1343,8 +1404,32 @@ classpath/gnu/java/awt/peer/qt/QtToolkit.java \
  classpath/gnu/java/awt/peer/qt/QtVolatileImage.java \
  classpath/gnu/java/awt/peer/qt/QtWindowPeer.java
  
+gnu_java_awt_peer_swing_source_files = \
+classpath/gnu/java/awt/peer/swing/SwingButtonPeer.java \
+classpath/gnu/java/awt/peer/swing/SwingCanvasPeer.java \
+classpath/gnu/java/awt/peer/swing/SwingComponent.java \
+classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java \
+classpath/gnu/java/awt/peer/swing/SwingContainerPeer.java \
+classpath/gnu/java/awt/peer/swing/SwingFramePeer.java \
+classpath/gnu/java/awt/peer/swing/SwingLabelPeer.java \
+classpath/gnu/java/awt/peer/swing/SwingMenuBarPeer.java \
+classpath/gnu/java/awt/peer/swing/SwingMenuItemPeer.java \
+classpath/gnu/java/awt/peer/swing/SwingMenuPeer.java \
+classpath/gnu/java/awt/peer/swing/SwingPanelPeer.java \
+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 \
  classpath/gnu/java/beans/DummyAppletContext.java \
  classpath/gnu/java/beans/DummyAppletStub.java \
  classpath/gnu/java/beans/ExplicitBeanInfo.java \
@@ -1363,7 +1448,6 @@ classpath/gnu/java/beans/decoder/ClassHandler.java \
  classpath/gnu/java/beans/decoder/ConstructorContext.java \
  classpath/gnu/java/beans/decoder/Context.java \
  classpath/gnu/java/beans/decoder/DecoderContext.java \
-classpath/gnu/java/beans/decoder/DefaultExceptionListener.java \
  classpath/gnu/java/beans/decoder/DoubleHandler.java \
  classpath/gnu/java/beans/decoder/DummyContext.java \
  classpath/gnu/java/beans/decoder/DummyHandler.java \
@@ -1395,7 +1479,37 @@ classpath/gnu/java/beans/editors/NativeFloatEditor.java \
  classpath/gnu/java/beans/editors/NativeIntEditor.java \
  classpath/gnu/java/beans/editors/NativeLongEditor.java \
  classpath/gnu/java/beans/editors/NativeShortEditor.java \
-classpath/gnu/java/beans/editors/StringEditor.java
+classpath/gnu/java/beans/editors/StringEditor.java \
+classpath/gnu/java/beans/encoder/ArrayPersistenceDelegate.java \
+classpath/gnu/java/beans/encoder/ClassPersistenceDelegate.java \
+classpath/gnu/java/beans/encoder/CollectionPersistenceDelegate.java \
+classpath/gnu/java/beans/encoder/Context.java \
+classpath/gnu/java/beans/encoder/GenericScannerState.java \
+classpath/gnu/java/beans/encoder/IgnoringScannerState.java \
+classpath/gnu/java/beans/encoder/MapPersistenceDelegate.java \
+classpath/gnu/java/beans/encoder/ObjectId.java \
+classpath/gnu/java/beans/encoder/PrimitivePersistenceDelegate.java \
+classpath/gnu/java/beans/encoder/ReportingScannerState.java \
+classpath/gnu/java/beans/encoder/Root.java \
+classpath/gnu/java/beans/encoder/ScanEngine.java \
+classpath/gnu/java/beans/encoder/ScannerState.java \
+classpath/gnu/java/beans/encoder/StAXWriter.java \
+classpath/gnu/java/beans/encoder/Writer.java \
+classpath/gnu/java/beans/encoder/elements/ArrayInstantiation.java \
+classpath/gnu/java/beans/encoder/elements/Array_Get.java \
+classpath/gnu/java/beans/encoder/elements/Array_Set.java \
+classpath/gnu/java/beans/encoder/elements/ClassResolution.java \
+classpath/gnu/java/beans/encoder/elements/Element.java \
+classpath/gnu/java/beans/encoder/elements/List_Get.java \
+classpath/gnu/java/beans/encoder/elements/List_Set.java \
+classpath/gnu/java/beans/encoder/elements/MethodInvocation.java \
+classpath/gnu/java/beans/encoder/elements/NullObject.java \
+classpath/gnu/java/beans/encoder/elements/ObjectInstantiation.java \
+classpath/gnu/java/beans/encoder/elements/ObjectReference.java \
+classpath/gnu/java/beans/encoder/elements/PrimitiveInstantiation.java \
+classpath/gnu/java/beans/encoder/elements/StaticFieldAccess.java \
+classpath/gnu/java/beans/encoder/elements/StaticMethodInvocation.java \
+classpath/gnu/java/beans/encoder/elements/StringReference.java
  
  gnu_java_io_source_files = \
  classpath/gnu/java/io/ASN1ParsingException.java \
@@ -1410,10 +1524,17 @@ 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_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)))
@@ -1422,6 +1543,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 \
@@ -1568,21 +1690,30 @@ 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_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
@@ -1607,6 +1738,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 \
@@ -1632,7 +1768,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)))
@@ -1640,6 +1776,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 \
@@ -1731,21 +1868,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 = \
@@ -1754,7 +1891,21 @@ 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 \
  classpath/gnu/java/rmi/server/RMIClassLoaderImpl.java \
@@ -1776,7 +1927,9 @@ gnu_java_rmi_server_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.
  gnu_java_security_source_files = \
  classpath/gnu/java/security/Engine.java \
  classpath/gnu/java/security/OID.java \
-classpath/gnu/java/security/PolicyFile.java
+classpath/gnu/java/security/PolicyFile.java \
+classpath/gnu/java/security/Properties.java \
+classpath/gnu/java/security/Registry.java
  
  gnu_java_security_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_source_files)))
  gnu_java_security_action_source_files = \
@@ -1801,43 +1954,168 @@ classpath/gnu/java/security/der/DERValue.java \
  classpath/gnu/java/security/der/DERWriter.java
  
  gnu_java_security_der_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_der_source_files)))
+gnu_java_security_hash_source_files = \
+classpath/gnu/java/security/hash/BaseHash.java \
+classpath/gnu/java/security/hash/HashFactory.java \
+classpath/gnu/java/security/hash/Haval.java \
+classpath/gnu/java/security/hash/IMessageDigest.java \
+classpath/gnu/java/security/hash/MD2.java \
+classpath/gnu/java/security/hash/MD4.java \
+classpath/gnu/java/security/hash/MD5.java \
+classpath/gnu/java/security/hash/RipeMD128.java \
+classpath/gnu/java/security/hash/RipeMD160.java \
+classpath/gnu/java/security/hash/Sha160.java \
+classpath/gnu/java/security/hash/Sha256.java \
+classpath/gnu/java/security/hash/Sha384.java \
+classpath/gnu/java/security/hash/Sha512.java \
+classpath/gnu/java/security/hash/Tiger.java \
+classpath/gnu/java/security/hash/Whirlpool.java
+
+gnu_java_security_hash_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_hash_source_files)))
+gnu_java_security_jce_hash_source_files = \
+classpath/gnu/java/security/jce/hash/HavalSpi.java \
+classpath/gnu/java/security/jce/hash/MD2Spi.java \
+classpath/gnu/java/security/jce/hash/MD4Spi.java \
+classpath/gnu/java/security/jce/hash/MD5Spi.java \
+classpath/gnu/java/security/jce/hash/MessageDigestAdapter.java \
+classpath/gnu/java/security/jce/hash/RipeMD128Spi.java \
+classpath/gnu/java/security/jce/hash/RipeMD160Spi.java \
+classpath/gnu/java/security/jce/hash/Sha160Spi.java \
+classpath/gnu/java/security/jce/hash/Sha256Spi.java \
+classpath/gnu/java/security/jce/hash/Sha384Spi.java \
+classpath/gnu/java/security/jce/hash/Sha512Spi.java \
+classpath/gnu/java/security/jce/hash/TigerSpi.java \
+classpath/gnu/java/security/jce/hash/WhirlpoolSpi.java
+
+gnu_java_security_jce_hash_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_jce_hash_source_files)))
+gnu_java_security_jce_prng_source_files = \
+classpath/gnu/java/security/jce/prng/HavalRandomSpi.java \
+classpath/gnu/java/security/jce/prng/MD2RandomSpi.java \
+classpath/gnu/java/security/jce/prng/MD4RandomSpi.java \
+classpath/gnu/java/security/jce/prng/MD5RandomSpi.java \
+classpath/gnu/java/security/jce/prng/RipeMD128RandomSpi.java \
+classpath/gnu/java/security/jce/prng/RipeMD160RandomSpi.java \
+classpath/gnu/java/security/jce/prng/SecureRandomAdapter.java \
+classpath/gnu/java/security/jce/prng/Sha160RandomSpi.java \
+classpath/gnu/java/security/jce/prng/Sha256RandomSpi.java \
+classpath/gnu/java/security/jce/prng/Sha384RandomSpi.java \
+classpath/gnu/java/security/jce/prng/Sha512RandomSpi.java \
+classpath/gnu/java/security/jce/prng/TigerRandomSpi.java \
+classpath/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java
+
+gnu_java_security_jce_prng_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_jce_prng_source_files)))
+gnu_java_security_jce_sig_source_files = \
+classpath/gnu/java/security/jce/sig/DSSKeyFactory.java \
+classpath/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java \
+classpath/gnu/java/security/jce/sig/DSSParameters.java \
+classpath/gnu/java/security/jce/sig/DSSParametersGenerator.java \
+classpath/gnu/java/security/jce/sig/DSSRawSignatureSpi.java \
+classpath/gnu/java/security/jce/sig/EncodedKeyFactory.java \
+classpath/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java \
+classpath/gnu/java/security/jce/sig/MD2withRSA.java \
+classpath/gnu/java/security/jce/sig/MD5withRSA.java \
+classpath/gnu/java/security/jce/sig/RSAKeyFactory.java \
+classpath/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java \
+classpath/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java \
+classpath/gnu/java/security/jce/sig/SHA160withDSS.java \
+classpath/gnu/java/security/jce/sig/SHA160withRSA.java \
+classpath/gnu/java/security/jce/sig/SHA256withRSA.java \
+classpath/gnu/java/security/jce/sig/SHA384withRSA.java \
+classpath/gnu/java/security/jce/sig/SHA512withRSA.java \
+classpath/gnu/java/security/jce/sig/SignatureAdapter.java
+
+gnu_java_security_jce_sig_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_jce_sig_source_files)))
+gnu_java_security_key_source_files = \
+classpath/gnu/java/security/key/IKeyPairCodec.java \
+classpath/gnu/java/security/key/IKeyPairGenerator.java \
+classpath/gnu/java/security/key/KeyPairCodecFactory.java \
+classpath/gnu/java/security/key/KeyPairGeneratorFactory.java
+
+gnu_java_security_key_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_key_source_files)))
+gnu_java_security_key_dss_source_files = \
+classpath/gnu/java/security/key/dss/DSSKey.java \
+classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java \
+classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java \
+classpath/gnu/java/security/key/dss/DSSKeyPairRawCodec.java \
+classpath/gnu/java/security/key/dss/DSSKeyPairX509Codec.java \
+classpath/gnu/java/security/key/dss/DSSPrivateKey.java \
+classpath/gnu/java/security/key/dss/DSSPublicKey.java \
+classpath/gnu/java/security/key/dss/FIPS186.java
+
+gnu_java_security_key_dss_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_key_dss_source_files)))
+gnu_java_security_key_rsa_source_files = \
+classpath/gnu/java/security/key/rsa/GnuRSAKey.java \
+classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java \
+classpath/gnu/java/security/key/rsa/GnuRSAPublicKey.java \
+classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java \
+classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java \
+classpath/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java \
+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
  
  gnu_java_security_pkcs_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_pkcs_source_files)))
+gnu_java_security_prng_source_files = \
+classpath/gnu/java/security/prng/BasePRNG.java \
+classpath/gnu/java/security/prng/EntropySource.java \
+classpath/gnu/java/security/prng/IRandom.java \
+classpath/gnu/java/security/prng/LimitReachedException.java \
+classpath/gnu/java/security/prng/MDGenerator.java \
+classpath/gnu/java/security/prng/PRNGFactory.java \
+classpath/gnu/java/security/prng/RandomEvent.java \
+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/DSAKeyFactory.java \
-classpath/gnu/java/security/provider/DSAKeyPairGenerator.java \
-classpath/gnu/java/security/provider/DSAParameterGenerator.java \
-classpath/gnu/java/security/provider/DSAParameters.java \
-classpath/gnu/java/security/provider/DSASignature.java \
  classpath/gnu/java/security/provider/DefaultPolicy.java \
-classpath/gnu/java/security/provider/DiffieHellmanKeyFactoryImpl.java \
-classpath/gnu/java/security/provider/DiffieHellmanKeyPairGeneratorImpl.java \
-classpath/gnu/java/security/provider/EncodedKeyFactory.java \
  classpath/gnu/java/security/provider/Gnu.java \
-classpath/gnu/java/security/provider/GnuDHPublicKey.java \
-classpath/gnu/java/security/provider/GnuDSAPrivateKey.java \
-classpath/gnu/java/security/provider/GnuDSAPublicKey.java \
-classpath/gnu/java/security/provider/GnuRSAPrivateKey.java \
-classpath/gnu/java/security/provider/GnuRSAPublicKey.java \
-classpath/gnu/java/security/provider/MD2withRSA.java \
-classpath/gnu/java/security/provider/MD4withRSA.java \
-classpath/gnu/java/security/provider/MD5.java \
-classpath/gnu/java/security/provider/MD5withRSA.java \
  classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java \
-classpath/gnu/java/security/provider/RSA.java \
-classpath/gnu/java/security/provider/RSAKeyFactory.java \
-classpath/gnu/java/security/provider/SHA.java \
-classpath/gnu/java/security/provider/SHA1PRNG.java \
-classpath/gnu/java/security/provider/SHA1withRSA.java \
  classpath/gnu/java/security/provider/X509CertificateFactory.java
  
  gnu_java_security_provider_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_provider_source_files)))
+gnu_java_security_sig_source_files = \
+classpath/gnu/java/security/sig/BaseSignature.java \
+classpath/gnu/java/security/sig/ISignature.java \
+classpath/gnu/java/security/sig/ISignatureCodec.java \
+classpath/gnu/java/security/sig/SignatureCodecFactory.java \
+classpath/gnu/java/security/sig/SignatureFactory.java
+
+gnu_java_security_sig_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_sig_source_files)))
+gnu_java_security_sig_dss_source_files = \
+classpath/gnu/java/security/sig/dss/DSSSignature.java \
+classpath/gnu/java/security/sig/dss/DSSSignatureRawCodec.java \
+classpath/gnu/java/security/sig/dss/DSSSignatureX509Codec.java
+
+gnu_java_security_sig_dss_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_sig_dss_source_files)))
+gnu_java_security_sig_rsa_source_files = \
+classpath/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java \
+classpath/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java \
+classpath/gnu/java/security/sig/rsa/EMSA_PSS.java \
+classpath/gnu/java/security/sig/rsa/RSA.java \
+classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java \
+classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.java \
+classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.java \
+classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java \
+classpath/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java \
+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/Prime.java
+classpath/gnu/java/security/util/Base64.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/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
  
  gnu_java_security_util_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_util_source_files)))
  gnu_java_security_x509_source_files = \
@@ -1885,11 +2163,18 @@ classpath/gnu/java/text/WordBreakIterator.java
  gnu_java_text_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_text_source_files)))
  gnu_java_util_source_files = \
  classpath/gnu/java/util/DoubleEnumeration.java \
-classpath/gnu/java/util/EmptyEnumeration.java
+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/MemoryBasedFactory.java \
  classpath/gnu/java/util/prefs/MemoryBasedPreferences.java \
  classpath/gnu/java/util/prefs/NodeReader.java \
@@ -1897,17 +2182,348 @@ 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_javax_crypto_source_files = \
-classpath/gnu/javax/crypto/DiffieHellmanImpl.java \
-classpath/gnu/javax/crypto/GnuDHPrivateKey.java \
  classpath/gnu/javax/crypto/RSACipherImpl.java
  
  gnu_javax_crypto_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_source_files)))
+gnu_javax_crypto_assembly_source_files = \
+classpath/gnu/javax/crypto/assembly/Assembly.java \
+classpath/gnu/javax/crypto/assembly/Cascade.java \
+classpath/gnu/javax/crypto/assembly/CascadeStage.java \
+classpath/gnu/javax/crypto/assembly/CascadeTransformer.java \
+classpath/gnu/javax/crypto/assembly/DeflateTransformer.java \
+classpath/gnu/javax/crypto/assembly/Direction.java \
+classpath/gnu/javax/crypto/assembly/LoopbackTransformer.java \
+classpath/gnu/javax/crypto/assembly/ModeStage.java \
+classpath/gnu/javax/crypto/assembly/Operation.java \
+classpath/gnu/javax/crypto/assembly/PaddingTransformer.java \
+classpath/gnu/javax/crypto/assembly/Stage.java \
+classpath/gnu/javax/crypto/assembly/Transformer.java \
+classpath/gnu/javax/crypto/assembly/TransformerException.java
+
+gnu_javax_crypto_assembly_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_assembly_source_files)))
+gnu_javax_crypto_cipher_source_files = \
+classpath/gnu/javax/crypto/cipher/Anubis.java \
+classpath/gnu/javax/crypto/cipher/BaseCipher.java \
+classpath/gnu/javax/crypto/cipher/Blowfish.java \
+classpath/gnu/javax/crypto/cipher/Cast5.java \
+classpath/gnu/javax/crypto/cipher/CipherFactory.java \
+classpath/gnu/javax/crypto/cipher/DES.java \
+classpath/gnu/javax/crypto/cipher/IBlockCipher.java \
+classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java \
+classpath/gnu/javax/crypto/cipher/Khazad.java \
+classpath/gnu/javax/crypto/cipher/NullCipher.java \
+classpath/gnu/javax/crypto/cipher/Rijndael.java \
+classpath/gnu/javax/crypto/cipher/Serpent.java \
+classpath/gnu/javax/crypto/cipher/Square.java \
+classpath/gnu/javax/crypto/cipher/TripleDES.java \
+classpath/gnu/javax/crypto/cipher/Twofish.java \
+classpath/gnu/javax/crypto/cipher/WeakKeyException.java
+
+gnu_javax_crypto_cipher_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_cipher_source_files)))
+gnu_javax_crypto_jce_source_files = \
+classpath/gnu/javax/crypto/jce/DiffieHellmanImpl.java \
+classpath/gnu/javax/crypto/jce/GnuCrypto.java \
+classpath/gnu/javax/crypto/jce/GnuSasl.java \
+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/AESSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/ARCFourSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/AnubisSpi.java \
+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/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/TripleDESSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/TwofishSpi.java
+
+gnu_javax_crypto_jce_cipher_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_jce_cipher_source_files)))
+gnu_javax_crypto_jce_key_source_files = \
+classpath/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.java \
+classpath/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java \
+classpath/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.java \
+classpath/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java \
+classpath/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.java \
+classpath/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java \
+classpath/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.java \
+classpath/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.java \
+classpath/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.java \
+classpath/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.java \
+classpath/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java \
+classpath/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.java \
+classpath/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java \
+classpath/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.java \
+classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java \
+classpath/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.java \
+classpath/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java \
+classpath/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.java \
+classpath/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java \
+classpath/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.java \
+classpath/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.java \
+classpath/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java
+
+gnu_javax_crypto_jce_key_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_jce_key_source_files)))
+gnu_javax_crypto_jce_keyring_source_files = \
+classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java
+
+gnu_javax_crypto_jce_keyring_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_jce_keyring_source_files)))
+gnu_javax_crypto_jce_mac_source_files = \
+classpath/gnu/javax/crypto/jce/mac/HMacHavalSpi.java \
+classpath/gnu/javax/crypto/jce/mac/HMacMD2Spi.java \
+classpath/gnu/javax/crypto/jce/mac/HMacMD4Spi.java \
+classpath/gnu/javax/crypto/jce/mac/HMacMD5Spi.java \
+classpath/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java \
+classpath/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java \
+classpath/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java \
+classpath/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java \
+classpath/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java \
+classpath/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java \
+classpath/gnu/javax/crypto/jce/mac/HMacTigerSpi.java \
+classpath/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java \
+classpath/gnu/javax/crypto/jce/mac/MacAdapter.java \
+classpath/gnu/javax/crypto/jce/mac/OMacAnubisImpl.java \
+classpath/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.java \
+classpath/gnu/javax/crypto/jce/mac/OMacCast5Impl.java \
+classpath/gnu/javax/crypto/jce/mac/OMacDESImpl.java \
+classpath/gnu/javax/crypto/jce/mac/OMacImpl.java \
+classpath/gnu/javax/crypto/jce/mac/OMacKhazadImpl.java \
+classpath/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.java \
+classpath/gnu/javax/crypto/jce/mac/OMacSerpentImpl.java \
+classpath/gnu/javax/crypto/jce/mac/OMacSquareImpl.java \
+classpath/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.java \
+classpath/gnu/javax/crypto/jce/mac/OMacTwofishImpl.java \
+classpath/gnu/javax/crypto/jce/mac/TMMH16Spi.java \
+classpath/gnu/javax/crypto/jce/mac/UHash32Spi.java \
+classpath/gnu/javax/crypto/jce/mac/UMac32Spi.java
+
+gnu_javax_crypto_jce_mac_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_jce_mac_source_files)))
+gnu_javax_crypto_jce_params_source_files = \
+classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java \
+classpath/gnu/javax/crypto/jce/params/DEREncodingException.java \
+classpath/gnu/javax/crypto/jce/params/DERReader.java \
+classpath/gnu/javax/crypto/jce/params/DERWriter.java
+
+gnu_javax_crypto_jce_params_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_jce_params_source_files)))
+gnu_javax_crypto_jce_prng_source_files = \
+classpath/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java \
+classpath/gnu/javax/crypto/jce/prng/CSPRNGSpi.java \
+classpath/gnu/javax/crypto/jce/prng/FortunaImpl.java \
+classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java \
+classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java
+
+gnu_javax_crypto_jce_prng_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_jce_prng_source_files)))
+gnu_javax_crypto_jce_sig_source_files = \
+classpath/gnu/javax/crypto/jce/sig/DHKeyFactory.java \
+classpath/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java \
+classpath/gnu/javax/crypto/jce/sig/DHParameters.java \
+classpath/gnu/javax/crypto/jce/sig/DHParametersGenerator.java
+
+gnu_javax_crypto_jce_sig_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_jce_sig_source_files)))
+gnu_javax_crypto_jce_spec_source_files = \
+classpath/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java \
+classpath/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java \
+classpath/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java
+
+gnu_javax_crypto_jce_spec_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_jce_spec_source_files)))
+gnu_javax_crypto_key_source_files = \
+classpath/gnu/javax/crypto/key/BaseKeyAgreementParty.java \
+classpath/gnu/javax/crypto/key/GnuSecretKey.java \
+classpath/gnu/javax/crypto/key/IKeyAgreementParty.java \
+classpath/gnu/javax/crypto/key/IncomingMessage.java \
+classpath/gnu/javax/crypto/key/KeyAgreementException.java \
+classpath/gnu/javax/crypto/key/KeyAgreementFactory.java \
+classpath/gnu/javax/crypto/key/OutgoingMessage.java
+
+gnu_javax_crypto_key_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_key_source_files)))
+gnu_javax_crypto_key_dh_source_files = \
+classpath/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.java \
+classpath/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.java \
+classpath/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.java \
+classpath/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.java \
+classpath/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.java \
+classpath/gnu/javax/crypto/key/dh/DiffieHellmanSender.java \
+classpath/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.java \
+classpath/gnu/javax/crypto/key/dh/ElGamalReceiver.java \
+classpath/gnu/javax/crypto/key/dh/ElGamalSender.java \
+classpath/gnu/javax/crypto/key/dh/GnuDHKey.java \
+classpath/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java \
+classpath/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java \
+classpath/gnu/javax/crypto/key/dh/GnuDHPublicKey.java \
+classpath/gnu/javax/crypto/key/dh/RFC2631.java
+
+gnu_javax_crypto_key_dh_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_key_dh_source_files)))
+gnu_javax_crypto_key_srp6_source_files = \
+classpath/gnu/javax/crypto/key/srp6/SRP6Host.java \
+classpath/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.java \
+classpath/gnu/javax/crypto/key/srp6/SRP6SaslClient.java \
+classpath/gnu/javax/crypto/key/srp6/SRP6SaslServer.java \
+classpath/gnu/javax/crypto/key/srp6/SRP6TLSClient.java \
+classpath/gnu/javax/crypto/key/srp6/SRP6TLSServer.java \
+classpath/gnu/javax/crypto/key/srp6/SRP6User.java \
+classpath/gnu/javax/crypto/key/srp6/SRPAlgorithm.java \
+classpath/gnu/javax/crypto/key/srp6/SRPKey.java \
+classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java \
+classpath/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.java \
+classpath/gnu/javax/crypto/key/srp6/SRPPrivateKey.java \
+classpath/gnu/javax/crypto/key/srp6/SRPPublicKey.java
+
+gnu_javax_crypto_key_srp6_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_key_srp6_source_files)))
+gnu_javax_crypto_keyring_source_files = \
+classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java \
+classpath/gnu/javax/crypto/keyring/BaseKeyring.java \
+classpath/gnu/javax/crypto/keyring/BinaryDataEntry.java \
+classpath/gnu/javax/crypto/keyring/CertPathEntry.java \
+classpath/gnu/javax/crypto/keyring/CertificateEntry.java \
+classpath/gnu/javax/crypto/keyring/CompressedEntry.java \
+classpath/gnu/javax/crypto/keyring/EncryptedEntry.java \
+classpath/gnu/javax/crypto/keyring/Entry.java \
+classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java \
+classpath/gnu/javax/crypto/keyring/GnuPrivateKeyring.java \
+classpath/gnu/javax/crypto/keyring/GnuPublicKeyring.java \
+classpath/gnu/javax/crypto/keyring/IKeyring.java \
+classpath/gnu/javax/crypto/keyring/IPrivateKeyring.java \
+classpath/gnu/javax/crypto/keyring/IPublicKeyring.java \
+classpath/gnu/javax/crypto/keyring/MalformedKeyringException.java \
+classpath/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.java \
+classpath/gnu/javax/crypto/keyring/MeteredInputStream.java \
+classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java \
+classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java \
+classpath/gnu/javax/crypto/keyring/PasswordProtectedEntry.java \
+classpath/gnu/javax/crypto/keyring/PrimitiveEntry.java \
+classpath/gnu/javax/crypto/keyring/PrivateKeyEntry.java \
+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_mac_source_files = \
+classpath/gnu/javax/crypto/mac/BaseMac.java \
+classpath/gnu/javax/crypto/mac/HMac.java \
+classpath/gnu/javax/crypto/mac/HMacFactory.java \
+classpath/gnu/javax/crypto/mac/IMac.java \
+classpath/gnu/javax/crypto/mac/MacFactory.java \
+classpath/gnu/javax/crypto/mac/MacInputStream.java \
+classpath/gnu/javax/crypto/mac/MacOutputStream.java \
+classpath/gnu/javax/crypto/mac/OMAC.java \
+classpath/gnu/javax/crypto/mac/TMMH16.java \
+classpath/gnu/javax/crypto/mac/UHash32.java \
+classpath/gnu/javax/crypto/mac/UMac32.java
+
+gnu_javax_crypto_mac_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_mac_source_files)))
+gnu_javax_crypto_mode_source_files = \
+classpath/gnu/javax/crypto/mode/BaseMode.java \
+classpath/gnu/javax/crypto/mode/CBC.java \
+classpath/gnu/javax/crypto/mode/CFB.java \
+classpath/gnu/javax/crypto/mode/CTR.java \
+classpath/gnu/javax/crypto/mode/EAX.java \
+classpath/gnu/javax/crypto/mode/ECB.java \
+classpath/gnu/javax/crypto/mode/IAuthenticatedMode.java \
+classpath/gnu/javax/crypto/mode/ICM.java \
+classpath/gnu/javax/crypto/mode/IMode.java \
+classpath/gnu/javax/crypto/mode/ModeFactory.java \
+classpath/gnu/javax/crypto/mode/OFB.java
+
+gnu_javax_crypto_mode_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_mode_source_files)))
+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/PKCS1_V1_5.java \
+classpath/gnu/javax/crypto/pad/PKCS7.java \
+classpath/gnu/javax/crypto/pad/PadFactory.java \
+classpath/gnu/javax/crypto/pad/SSL3.java \
+classpath/gnu/javax/crypto/pad/TBC.java \
+classpath/gnu/javax/crypto/pad/TLS1.java \
+classpath/gnu/javax/crypto/pad/WrongPaddingException.java
+
+gnu_javax_crypto_pad_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_pad_source_files)))
+gnu_javax_crypto_prng_source_files = \
+classpath/gnu/javax/crypto/prng/ARCFour.java \
+classpath/gnu/javax/crypto/prng/CSPRNG.java \
+classpath/gnu/javax/crypto/prng/Fortuna.java \
+classpath/gnu/javax/crypto/prng/ICMGenerator.java \
+classpath/gnu/javax/crypto/prng/IPBE.java \
+classpath/gnu/javax/crypto/prng/PBKDF2.java \
+classpath/gnu/javax/crypto/prng/PRNGFactory.java \
+classpath/gnu/javax/crypto/prng/UMacGenerator.java
+
+gnu_javax_crypto_prng_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_prng_source_files)))
+gnu_javax_crypto_sasl_source_files = \
+classpath/gnu/javax/crypto/sasl/AuthInfo.java \
+classpath/gnu/javax/crypto/sasl/AuthInfoProviderFactory.java \
+classpath/gnu/javax/crypto/sasl/ClientFactory.java \
+classpath/gnu/javax/crypto/sasl/ClientMechanism.java \
+classpath/gnu/javax/crypto/sasl/ConfidentialityException.java \
+classpath/gnu/javax/crypto/sasl/IAuthInfoProvider.java \
+classpath/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.java \
+classpath/gnu/javax/crypto/sasl/IllegalMechanismStateException.java \
+classpath/gnu/javax/crypto/sasl/InputBuffer.java \
+classpath/gnu/javax/crypto/sasl/IntegrityException.java \
+classpath/gnu/javax/crypto/sasl/NoSuchMechanismException.java \
+classpath/gnu/javax/crypto/sasl/NoSuchUserException.java \
+classpath/gnu/javax/crypto/sasl/OutputBuffer.java \
+classpath/gnu/javax/crypto/sasl/SaslEncodingException.java \
+classpath/gnu/javax/crypto/sasl/SaslInputStream.java \
+classpath/gnu/javax/crypto/sasl/SaslOutputStream.java \
+classpath/gnu/javax/crypto/sasl/SaslUtil.java \
+classpath/gnu/javax/crypto/sasl/ServerFactory.java \
+classpath/gnu/javax/crypto/sasl/ServerMechanism.java \
+classpath/gnu/javax/crypto/sasl/UserAlreadyExistsException.java
+
+gnu_javax_crypto_sasl_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_sasl_source_files)))
+gnu_javax_crypto_sasl_anonymous_source_files = \
+classpath/gnu/javax/crypto/sasl/anonymous/AnonymousClient.java \
+classpath/gnu/javax/crypto/sasl/anonymous/AnonymousServer.java \
+classpath/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java
+
+gnu_javax_crypto_sasl_anonymous_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_sasl_anonymous_source_files)))
+gnu_javax_crypto_sasl_crammd5_source_files = \
+classpath/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.java \
+classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Client.java \
+classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.java \
+classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Server.java \
+classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Util.java \
+classpath/gnu/javax/crypto/sasl/crammd5/PasswordFile.java
+
+gnu_javax_crypto_sasl_crammd5_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_sasl_crammd5_source_files)))
+gnu_javax_crypto_sasl_plain_source_files = \
+classpath/gnu/javax/crypto/sasl/plain/PasswordFile.java \
+classpath/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.java \
+classpath/gnu/javax/crypto/sasl/plain/PlainClient.java \
+classpath/gnu/javax/crypto/sasl/plain/PlainRegistry.java \
+classpath/gnu/javax/crypto/sasl/plain/PlainServer.java
+
+gnu_javax_crypto_sasl_plain_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_sasl_plain_source_files)))
+gnu_javax_crypto_sasl_srp_source_files = \
+classpath/gnu/javax/crypto/sasl/srp/CALG.java \
+classpath/gnu/javax/crypto/sasl/srp/ClientStore.java \
+classpath/gnu/javax/crypto/sasl/srp/IALG.java \
+classpath/gnu/javax/crypto/sasl/srp/KDF.java \
+classpath/gnu/javax/crypto/sasl/srp/PasswordFile.java \
+classpath/gnu/javax/crypto/sasl/srp/SRP.java \
+classpath/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.java \
+classpath/gnu/javax/crypto/sasl/srp/SRPClient.java \
+classpath/gnu/javax/crypto/sasl/srp/SRPRegistry.java \
+classpath/gnu/javax/crypto/sasl/srp/SRPServer.java \
+classpath/gnu/javax/crypto/sasl/srp/SecurityContext.java \
+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_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 \
@@ -1916,9 +2532,190 @@ 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_net_ssl_source_files = \
+classpath/gnu/javax/net/ssl/Base64.java \
+classpath/gnu/javax/net/ssl/EntropySource.java \
+classpath/gnu/javax/net/ssl/NullManagerParameters.java \
+classpath/gnu/javax/net/ssl/PrivateCredentials.java \
+classpath/gnu/javax/net/ssl/SRPManagerParameters.java \
+classpath/gnu/javax/net/ssl/SRPTrustManager.java \
+classpath/gnu/javax/net/ssl/StaticTrustAnchors.java
+
+gnu_javax_net_ssl_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_net_ssl_source_files)))
+gnu_javax_net_ssl_provider_source_files = \
+classpath/gnu/javax/net/ssl/provider/Alert.java \
+classpath/gnu/javax/net/ssl/provider/AlertException.java \
+classpath/gnu/javax/net/ssl/provider/Certificate.java \
+classpath/gnu/javax/net/ssl/provider/CertificateRequest.java \
+classpath/gnu/javax/net/ssl/provider/CertificateType.java \
+classpath/gnu/javax/net/ssl/provider/CertificateVerify.java \
+classpath/gnu/javax/net/ssl/provider/CipherSuite.java \
+classpath/gnu/javax/net/ssl/provider/ClientHello.java \
+classpath/gnu/javax/net/ssl/provider/ClientKeyExchange.java \
+classpath/gnu/javax/net/ssl/provider/CompressionMethod.java \
+classpath/gnu/javax/net/ssl/provider/Constructed.java \
+classpath/gnu/javax/net/ssl/provider/ContentType.java \
+classpath/gnu/javax/net/ssl/provider/Context.java \
+classpath/gnu/javax/net/ssl/provider/DiffieHellman.java \
+classpath/gnu/javax/net/ssl/provider/DigestInputStream.java \
+classpath/gnu/javax/net/ssl/provider/DigestOutputStream.java \
+classpath/gnu/javax/net/ssl/provider/Enumerated.java \
+classpath/gnu/javax/net/ssl/provider/Extension.java \
+classpath/gnu/javax/net/ssl/provider/Extensions.java \
+classpath/gnu/javax/net/ssl/provider/Finished.java \
+classpath/gnu/javax/net/ssl/provider/GNUSecurityParameters.java \
+classpath/gnu/javax/net/ssl/provider/Handshake.java \
+classpath/gnu/javax/net/ssl/provider/JCESecurityParameters.java \
+classpath/gnu/javax/net/ssl/provider/JDBCSessionContext.java \
+classpath/gnu/javax/net/ssl/provider/Jessie.java \
+classpath/gnu/javax/net/ssl/provider/JessieDHPrivateKey.java \
+classpath/gnu/javax/net/ssl/provider/JessieDHPublicKey.java \
+classpath/gnu/javax/net/ssl/provider/JessieRSAPrivateKey.java \
+classpath/gnu/javax/net/ssl/provider/JessieRSAPublicKey.java \
+classpath/gnu/javax/net/ssl/provider/KeyPool.java \
+classpath/gnu/javax/net/ssl/provider/MacException.java \
+classpath/gnu/javax/net/ssl/provider/OverflowException.java \
+classpath/gnu/javax/net/ssl/provider/ProtocolVersion.java \
+classpath/gnu/javax/net/ssl/provider/Random.java \
+classpath/gnu/javax/net/ssl/provider/RecordInput.java \
+classpath/gnu/javax/net/ssl/provider/RecordInputStream.java \
+classpath/gnu/javax/net/ssl/provider/RecordOutputStream.java \
+classpath/gnu/javax/net/ssl/provider/RecordingInputStream.java \
+classpath/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java \
+classpath/gnu/javax/net/ssl/provider/SSLHMac.java \
+classpath/gnu/javax/net/ssl/provider/SSLRSASignature.java \
+classpath/gnu/javax/net/ssl/provider/SSLRandom.java \
+classpath/gnu/javax/net/ssl/provider/SSLServerSocket.java \
+classpath/gnu/javax/net/ssl/provider/SSLServerSocketFactory.java \
+classpath/gnu/javax/net/ssl/provider/SSLSocket.java \
+classpath/gnu/javax/net/ssl/provider/SSLSocketFactory.java \
+classpath/gnu/javax/net/ssl/provider/SSLSocketInputStream.java \
+classpath/gnu/javax/net/ssl/provider/SSLSocketOutputStream.java \
+classpath/gnu/javax/net/ssl/provider/SecurityParameters.java \
+classpath/gnu/javax/net/ssl/provider/ServerHello.java \
+classpath/gnu/javax/net/ssl/provider/ServerKeyExchange.java \
+classpath/gnu/javax/net/ssl/provider/Session.java \
+classpath/gnu/javax/net/ssl/provider/SessionContext.java \
+classpath/gnu/javax/net/ssl/provider/Signature.java \
+classpath/gnu/javax/net/ssl/provider/SynchronizedRandom.java \
+classpath/gnu/javax/net/ssl/provider/TLSHMac.java \
+classpath/gnu/javax/net/ssl/provider/TLSRandom.java \
+classpath/gnu/javax/net/ssl/provider/Util.java \
+classpath/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java \
+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 \
@@ -1932,6 +2729,25 @@ classpath/gnu/javax/rmi/CORBA/TieTargetRecord.java \
  classpath/gnu/javax/rmi/CORBA/UtilDelegateImpl.java \
  classpath/gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.java
  
+gnu_javax_security_auth_source_files = \
+classpath/gnu/javax/security/auth/Password.java
+
+gnu_javax_security_auth_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_security_auth_source_files)))
+gnu_javax_security_auth_callback_source_files = \
+classpath/gnu/javax/security/auth/callback/AWTCallbackHandler.java \
+classpath/gnu/javax/security/auth/callback/AbstractCallbackHandler.java \
+classpath/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java \
+classpath/gnu/javax/security/auth/callback/DefaultCallbackHandler.java \
+classpath/gnu/javax/security/auth/callback/GnuCallbacks.java \
+classpath/gnu/javax/security/auth/callback/SwingCallbackHandler.java
+
+gnu_javax_security_auth_callback_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_security_auth_callback_source_files)))
+gnu_javax_security_auth_login_source_files = \
+classpath/gnu/javax/security/auth/login/ConfigFileParser.java \
+classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java \
+classpath/gnu/javax/security/auth/login/GnuConfiguration.java
+
+gnu_javax_security_auth_login_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_security_auth_login_source_files)))
  gnu_javax_sound_midi_source_files = \
  classpath/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.java \
  classpath/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.java \
@@ -1941,8 +2757,23 @@ classpath/gnu/javax/sound/midi/alsa/AlsaPortDevice.java \
  classpath/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java \
  classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
  
+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/HTML_401F.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
@@ -1976,9 +2807,15 @@ 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_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_regexp_source_files = \
+classpath/gnu/regexp/BacktrackStack.java \
  classpath/gnu/regexp/CharIndexed.java \
  classpath/gnu/regexp/CharIndexedCharArray.java \
+classpath/gnu/regexp/CharIndexedCharSequence.java \
  classpath/gnu/regexp/CharIndexedInputStream.java \
  classpath/gnu/regexp/CharIndexedString.java \
  classpath/gnu/regexp/CharIndexedStringBuffer.java \
@@ -1993,8 +2830,12 @@ classpath/gnu/regexp/RETokenAny.java \
  classpath/gnu/regexp/RETokenBackRef.java \
  classpath/gnu/regexp/RETokenChar.java \
  classpath/gnu/regexp/RETokenEnd.java \
+classpath/gnu/regexp/RETokenEndOfPreviousMatch.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 \
@@ -2005,7 +2846,6 @@ classpath/gnu/regexp/UncheckedRE.java
  
  gnu_regexp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_regexp_source_files)))
  gnu_xml_source_files = \
-classpath/gnu/xml/aelfred2/ContentHandler2.java \
  classpath/gnu/xml/aelfred2/JAXPFactory.java \
  classpath/gnu/xml/aelfred2/SAXDriver.java \
  classpath/gnu/xml/aelfred2/XmlParser.java \
@@ -2059,6 +2899,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 \
@@ -2166,23 +3007,26 @@ classpath/gnu/xml/pipeline/WellFormednessFilter.java \
  classpath/gnu/xml/pipeline/XIncludeFilter.java \
  classpath/gnu/xml/pipeline/XsltFilter.java \
  classpath/gnu/xml/stream/AttributeImpl.java \
+classpath/gnu/xml/stream/BufferedReader.java \
+classpath/gnu/xml/stream/CRLFReader.java \
  classpath/gnu/xml/stream/CharactersImpl.java \
  classpath/gnu/xml/stream/CommentImpl.java \
  classpath/gnu/xml/stream/DTDImpl.java \
  classpath/gnu/xml/stream/EndDocumentImpl.java \
  classpath/gnu/xml/stream/EndElementImpl.java \
-classpath/gnu/xml/stream/EndEntityImpl.java \
  classpath/gnu/xml/stream/EntityDeclarationImpl.java \
  classpath/gnu/xml/stream/EntityReferenceImpl.java \
  classpath/gnu/xml/stream/FilteredEventReader.java \
  classpath/gnu/xml/stream/FilteredStreamReader.java \
-classpath/gnu/xml/stream/LocationImpl.java \
  classpath/gnu/xml/stream/NamespaceImpl.java \
  classpath/gnu/xml/stream/NotationDeclarationImpl.java \
  classpath/gnu/xml/stream/ProcessingInstructionImpl.java \
+classpath/gnu/xml/stream/SAXParser.java \
+classpath/gnu/xml/stream/SAXParserFactory.java \
  classpath/gnu/xml/stream/StartDocumentImpl.java \
  classpath/gnu/xml/stream/StartElementImpl.java \
-classpath/gnu/xml/stream/StartEntityImpl.java \
+classpath/gnu/xml/stream/UnicodeReader.java \
+classpath/gnu/xml/stream/XIncludeFilter.java \
  classpath/gnu/xml/stream/XMLEventAllocatorImpl.java \
  classpath/gnu/xml/stream/XMLEventFactoryImpl.java \
  classpath/gnu/xml/stream/XMLEventImpl.java \
@@ -2190,7 +3034,7 @@ classpath/gnu/xml/stream/XMLEventReaderImpl.java \
  classpath/gnu/xml/stream/XMLEventWriterImpl.java \
  classpath/gnu/xml/stream/XMLInputFactoryImpl.java \
  classpath/gnu/xml/stream/XMLOutputFactoryImpl.java \
-classpath/gnu/xml/stream/XMLStreamReaderImpl.java \
+classpath/gnu/xml/stream/XMLParser.java \
  classpath/gnu/xml/stream/XMLStreamWriterImpl.java \
  classpath/gnu/xml/transform/AbstractNumberNode.java \
  classpath/gnu/xml/transform/ApplyImportsNode.java \
@@ -2218,6 +3062,7 @@ classpath/gnu/xml/transform/Key.java \
  classpath/gnu/xml/transform/KeyFunction.java \
  classpath/gnu/xml/transform/LiteralNode.java \
  classpath/gnu/xml/transform/MessageNode.java \
+classpath/gnu/xml/transform/NamespaceProxy.java \
  classpath/gnu/xml/transform/NodeNumberNode.java \
  classpath/gnu/xml/transform/NumberNode.java \
  classpath/gnu/xml/transform/OtherwiseNode.java \
@@ -2226,6 +3071,7 @@ classpath/gnu/xml/transform/ProcessingInstructionNode.java \
  classpath/gnu/xml/transform/SAXSerializer.java \
  classpath/gnu/xml/transform/SortKey.java \
  classpath/gnu/xml/transform/StreamSerializer.java \
+classpath/gnu/xml/transform/StrippingInstruction.java \
  classpath/gnu/xml/transform/Stylesheet.java \
  classpath/gnu/xml/transform/SystemPropertyFunction.java \
  classpath/gnu/xml/transform/Template.java \
@@ -2249,6 +3095,116 @@ classpath/gnu/xml/util/SAXNullTransformerFactory.java \
  classpath/gnu/xml/util/XCat.java \
  classpath/gnu/xml/util/XHTMLWriter.java \
  classpath/gnu/xml/util/XMLWriter.java \
+classpath/gnu/xml/validation/datatype/Annotation.java \
+classpath/gnu/xml/validation/datatype/AnySimpleType.java \
+classpath/gnu/xml/validation/datatype/AnyType.java \
+classpath/gnu/xml/validation/datatype/AnyURIType.java \
+classpath/gnu/xml/validation/datatype/AtomicSimpleType.java \
+classpath/gnu/xml/validation/datatype/Base64BinaryType.java \
+classpath/gnu/xml/validation/datatype/BooleanType.java \
+classpath/gnu/xml/validation/datatype/ByteType.java \
+classpath/gnu/xml/validation/datatype/DateTimeType.java \
+classpath/gnu/xml/validation/datatype/DateType.java \
+classpath/gnu/xml/validation/datatype/DecimalType.java \
+classpath/gnu/xml/validation/datatype/DoubleType.java \
+classpath/gnu/xml/validation/datatype/DurationType.java \
+classpath/gnu/xml/validation/datatype/EntitiesType.java \
+classpath/gnu/xml/validation/datatype/EntityType.java \
+classpath/gnu/xml/validation/datatype/EnumerationFacet.java \
+classpath/gnu/xml/validation/datatype/Facet.java \
+classpath/gnu/xml/validation/datatype/FloatType.java \
+classpath/gnu/xml/validation/datatype/FractionDigitsFacet.java \
+classpath/gnu/xml/validation/datatype/GDayType.java \
+classpath/gnu/xml/validation/datatype/GMonthDayType.java \
+classpath/gnu/xml/validation/datatype/GMonthType.java \
+classpath/gnu/xml/validation/datatype/GYearMonthType.java \
+classpath/gnu/xml/validation/datatype/GYearType.java \
+classpath/gnu/xml/validation/datatype/HexBinaryType.java \
+classpath/gnu/xml/validation/datatype/IDRefType.java \
+classpath/gnu/xml/validation/datatype/IDRefsType.java \
+classpath/gnu/xml/validation/datatype/IDType.java \
+classpath/gnu/xml/validation/datatype/IntType.java \
+classpath/gnu/xml/validation/datatype/IntegerType.java \
+classpath/gnu/xml/validation/datatype/LanguageType.java \
+classpath/gnu/xml/validation/datatype/LengthFacet.java \
+classpath/gnu/xml/validation/datatype/ListSimpleType.java \
+classpath/gnu/xml/validation/datatype/LongType.java \
+classpath/gnu/xml/validation/datatype/MaxExclusiveFacet.java \
+classpath/gnu/xml/validation/datatype/MaxInclusiveFacet.java \
+classpath/gnu/xml/validation/datatype/MaxLengthFacet.java \
+classpath/gnu/xml/validation/datatype/MinExclusiveFacet.java \
+classpath/gnu/xml/validation/datatype/MinInclusiveFacet.java \
+classpath/gnu/xml/validation/datatype/MinLengthFacet.java \
+classpath/gnu/xml/validation/datatype/NCNameType.java \
+classpath/gnu/xml/validation/datatype/NMTokenType.java \
+classpath/gnu/xml/validation/datatype/NMTokensType.java \
+classpath/gnu/xml/validation/datatype/NameType.java \
+classpath/gnu/xml/validation/datatype/NegativeIntegerType.java \
+classpath/gnu/xml/validation/datatype/NonNegativeIntegerType.java \
+classpath/gnu/xml/validation/datatype/NonPositiveIntegerType.java \
+classpath/gnu/xml/validation/datatype/NormalizedStringType.java \
+classpath/gnu/xml/validation/datatype/NotationType.java \
+classpath/gnu/xml/validation/datatype/PatternFacet.java \
+classpath/gnu/xml/validation/datatype/PositiveIntegerType.java \
+classpath/gnu/xml/validation/datatype/QNameType.java \
+classpath/gnu/xml/validation/datatype/ShortType.java \
+classpath/gnu/xml/validation/datatype/SimpleType.java \
+classpath/gnu/xml/validation/datatype/StringType.java \
+classpath/gnu/xml/validation/datatype/TimeType.java \
+classpath/gnu/xml/validation/datatype/TokenType.java \
+classpath/gnu/xml/validation/datatype/TotalDigitsFacet.java \
+classpath/gnu/xml/validation/datatype/Type.java \
+classpath/gnu/xml/validation/datatype/TypeBuilder.java \
+classpath/gnu/xml/validation/datatype/TypeLibrary.java \
+classpath/gnu/xml/validation/datatype/TypeLibraryFactory.java \
+classpath/gnu/xml/validation/datatype/UnionSimpleType.java \
+classpath/gnu/xml/validation/datatype/UnsignedByteType.java \
+classpath/gnu/xml/validation/datatype/UnsignedIntType.java \
+classpath/gnu/xml/validation/datatype/UnsignedLongType.java \
+classpath/gnu/xml/validation/datatype/UnsignedShortType.java \
+classpath/gnu/xml/validation/datatype/WhiteSpaceFacet.java \
+classpath/gnu/xml/validation/relaxng/AnyNameNameClass.java \
+classpath/gnu/xml/validation/relaxng/AttributePattern.java \
+classpath/gnu/xml/validation/relaxng/ChoiceNameClass.java \
+classpath/gnu/xml/validation/relaxng/ChoicePattern.java \
+classpath/gnu/xml/validation/relaxng/DataPattern.java \
+classpath/gnu/xml/validation/relaxng/Define.java \
+classpath/gnu/xml/validation/relaxng/ElementPattern.java \
+classpath/gnu/xml/validation/relaxng/EmptyPattern.java \
+classpath/gnu/xml/validation/relaxng/FullSyntaxBuilder.java \
+classpath/gnu/xml/validation/relaxng/Grammar.java \
+classpath/gnu/xml/validation/relaxng/GrammarException.java \
+classpath/gnu/xml/validation/relaxng/GrammarValidator.java \
+classpath/gnu/xml/validation/relaxng/GroupPattern.java \
+classpath/gnu/xml/validation/relaxng/InterleavePattern.java \
+classpath/gnu/xml/validation/relaxng/ListPattern.java \
+classpath/gnu/xml/validation/relaxng/NSNameNameClass.java \
+classpath/gnu/xml/validation/relaxng/NameClass.java \
+classpath/gnu/xml/validation/relaxng/NameNameClass.java \
+classpath/gnu/xml/validation/relaxng/NotAllowedPattern.java \
+classpath/gnu/xml/validation/relaxng/OneOrMorePattern.java \
+classpath/gnu/xml/validation/relaxng/Param.java \
+classpath/gnu/xml/validation/relaxng/Pattern.java \
+classpath/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.java \
+classpath/gnu/xml/validation/relaxng/RefPattern.java \
+classpath/gnu/xml/validation/relaxng/TextPattern.java \
+classpath/gnu/xml/validation/relaxng/ValuePattern.java \
+classpath/gnu/xml/validation/xmlschema/AnyAttribute.java \
+classpath/gnu/xml/validation/xmlschema/AttributeDeclaration.java \
+classpath/gnu/xml/validation/xmlschema/AttributeUse.java \
+classpath/gnu/xml/validation/xmlschema/ComplexType.java \
+classpath/gnu/xml/validation/xmlschema/ElementDeclaration.java \
+classpath/gnu/xml/validation/xmlschema/Particle.java \
+classpath/gnu/xml/validation/xmlschema/ValidationException.java \
+classpath/gnu/xml/validation/xmlschema/XMLSchema.java \
+classpath/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java \
+classpath/gnu/xml/validation/xmlschema/XMLSchemaBuilder.java \
+classpath/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java \
+classpath/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.java \
+classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.java \
+classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.java \
+classpath/gnu/xml/validation/xmlschema/XMLSchemaValidator.java \
+classpath/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java \
  classpath/gnu/xml/xpath/AndExpr.java \
  classpath/gnu/xml/xpath/ArithmeticExpr.java \
  classpath/gnu/xml/xpath/BooleanFunction.java \
@@ -2381,6 +3337,7 @@ classpath/java/awt/KeyboardFocusManager.java \
  classpath/java/awt/Label.java \
  classpath/java/awt/LayoutManager.java \
  classpath/java/awt/LayoutManager2.java \
+classpath/java/awt/LightweightDispatcher.java \
  classpath/java/awt/List.java \
  classpath/java/awt/MediaTracker.java \
  classpath/java/awt/Menu.java \
@@ -2669,6 +3626,7 @@ classpath/java/awt/peer/WindowPeer.java
  java_awt_peer_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_awt_peer_source_files)))
  java_awt_print_source_files = \
  classpath/java/awt/print/Book.java \
+classpath/java/awt/print/NoPrinterJob.java \
  classpath/java/awt/print/PageFormat.java \
  classpath/java/awt/print/Pageable.java \
  classpath/java/awt/print/Paper.java \
@@ -2686,17 +3644,21 @@ classpath/java/beans/BeanDescriptor.java \
  classpath/java/beans/BeanInfo.java \
  classpath/java/beans/Beans.java \
  classpath/java/beans/Customizer.java \
+classpath/java/beans/DefaultPersistenceDelegate.java \
  classpath/java/beans/DesignMode.java \
+classpath/java/beans/Encoder.java \
  classpath/java/beans/EventHandler.java \
  classpath/java/beans/EventSetDescriptor.java \
  classpath/java/beans/ExceptionListener.java \
  classpath/java/beans/Expression.java \
  classpath/java/beans/FeatureDescriptor.java \
+classpath/java/beans/IndexedPropertyChangeEvent.java \
  classpath/java/beans/IndexedPropertyDescriptor.java \
  classpath/java/beans/IntrospectionException.java \
  classpath/java/beans/Introspector.java \
  classpath/java/beans/MethodDescriptor.java \
  classpath/java/beans/ParameterDescriptor.java \
+classpath/java/beans/PersistenceDelegate.java \
  classpath/java/beans/PropertyChangeEvent.java \
  classpath/java/beans/PropertyChangeListener.java \
  classpath/java/beans/PropertyChangeListenerProxy.java \
@@ -2712,7 +3674,8 @@ classpath/java/beans/VetoableChangeListener.java \
  classpath/java/beans/VetoableChangeListenerProxy.java \
  classpath/java/beans/VetoableChangeSupport.java \
  classpath/java/beans/Visibility.java \
-classpath/java/beans/XMLDecoder.java
+classpath/java/beans/XMLDecoder.java \
+classpath/java/beans/XMLEncoder.java
  
  java_beans_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_beans_source_files)))
  java_beans_beancontext_source_files = \
@@ -2757,9 +3720,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 \
@@ -2799,7 +3762,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 \
@@ -2838,12 +3801,13 @@ classpath/java/lang/Cloneable.java \
  classpath/java/lang/Comparable.java \
  classpath/java/lang/Compiler.java \
  java/lang/ConcreteProcess.java \
-java/lang/Double.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 \
  classpath/java/lang/ExceptionInInitializerError.java \
-java/lang/Float.java \
+classpath/java/lang/Float.java \
  classpath/java/lang/IllegalAccessError.java \
  classpath/java/lang/IllegalAccessException.java \
  classpath/java/lang/IllegalArgumentException.java \
@@ -2852,15 +3816,16 @@ 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 \
-classpath/java/lang/Math.java \
+java/lang/Math.java \
  classpath/java/lang/NegativeArraySizeException.java \
  classpath/java/lang/NoClassDefFoundError.java \
  classpath/java/lang/NoSuchFieldError.java \
@@ -2892,7 +3857,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 \
@@ -2901,6 +3866,8 @@ classpath/java/lang/UnsupportedClassVersionError.java \
  classpath/java/lang/UnsupportedOperationException.java \
  java/lang/VMClassLoader.java \
  java/lang/VMCompiler.java \
+java/lang/VMDouble.java \
+java/lang/VMFloat.java \
  java/lang/VMSecurityManager.java \
  java/lang/VMThrowable.java \
  classpath/java/lang/VerifyError.java \
@@ -2909,10 +3876,19 @@ 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
  
  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_ref_source_files = \
  classpath/java/lang/ref/PhantomReference.java \
  java/lang/ref/Reference.java \
@@ -2923,13 +3899,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 \
@@ -2937,6 +3916,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
@@ -2963,7 +3943,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 \
@@ -2986,7 +3966,7 @@ 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 \
@@ -3036,7 +4016,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 \
@@ -3065,6 +4045,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)))
@@ -3091,9 +4072,9 @@ classpath/java/nio/charset/UnsupportedCharsetException.java
  
  java_nio_charset_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_charset_source_files)))
  java_nio_charset_spi_source_files = \
-classpath/java/nio/charset/spi/CharsetProvider.java
+java/nio/charset/spi/CharsetProvider.java
  
-java_nio_charset_spi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_charset_spi_source_files)))
+java_nio_charset_spi_header_files = $(patsubst %.java,%.h,$(java_nio_charset_spi_source_files))
  java_rmi_source_files = \
  classpath/java/rmi/AccessException.java \
  classpath/java/rmi/AlreadyBoundException.java \
@@ -3161,6 +4142,7 @@ classpath/java/rmi/server/RMIServerSocketFactory.java \
  classpath/java/rmi/server/RMISocketFactory.java \
  classpath/java/rmi/server/RemoteCall.java \
  classpath/java/rmi/server/RemoteObject.java \
+classpath/java/rmi/server/RemoteObjectInvocationHandler.java \
  classpath/java/rmi/server/RemoteRef.java \
  classpath/java/rmi/server/RemoteServer.java \
  classpath/java/rmi/server/RemoteStub.java \
@@ -3177,9 +4159,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 \
@@ -3235,7 +4217,7 @@ classpath/java/security/PublicKey.java \
  classpath/java/security/SecureClassLoader.java \
  classpath/java/security/SecureRandom.java \
  classpath/java/security/SecureRandomSpi.java \
-classpath/java/security/Security.java \
+java/security/Security.java \
  classpath/java/security/SecurityPermission.java \
  classpath/java/security/Signature.java \
  classpath/java/security/SignatureException.java \
@@ -3243,7 +4225,9 @@ 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/VMAccessController.java \
+java/security/VMSecureRandom.java
  
  java_security_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_security_source_files)))
  java_security_acl_source_files = \
@@ -3372,13 +4356,14 @@ classpath/java/text/Annotation.java \
  classpath/java/text/AttributedCharacterIterator.java \
  classpath/java/text/AttributedString.java \
  classpath/java/text/AttributedStringIterator.java \
+classpath/java/text/Bidi.java \
  classpath/java/text/BreakIterator.java \
  classpath/java/text/CharacterIterator.java \
  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 \
@@ -3429,7 +4414,6 @@ 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/MissingResourceException.java \
  classpath/java/util/NoSuchElementException.java \
@@ -3501,6 +4485,7 @@ classpath/java/util/prefs/PreferencesFactory.java
  
  java_util_prefs_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_util_prefs_source_files)))
  java_util_regex_source_files = \
+classpath/java/util/regex/MatchResult.java \
  classpath/java/util/regex/Matcher.java \
  classpath/java/util/regex/Pattern.java \
  classpath/java/util/regex/PatternSyntaxException.java
@@ -3514,11 +4499,11 @@ classpath/java/util/zip/CheckedOutputStream.java \
  classpath/java/util/zip/Checksum.java \
  classpath/java/util/zip/DataFormatException.java \
  java/util/zip/Deflater.java \
-java/util/zip/DeflaterOutputStream.java \
-java/util/zip/GZIPInputStream.java \
-java/util/zip/GZIPOutputStream.java \
+classpath/java/util/zip/DeflaterOutputStream.java \
+classpath/java/util/zip/GZIPInputStream.java \
+classpath/java/util/zip/GZIPOutputStream.java \
  java/util/zip/Inflater.java \
-java/util/zip/InflaterInputStream.java \
+classpath/java/util/zip/InflaterInputStream.java \
  classpath/java/util/zip/ZipConstants.java \
  classpath/java/util/zip/ZipEntry.java \
  classpath/java/util/zip/ZipException.java \
@@ -3530,12 +4515,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 \
@@ -3547,9 +4534,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)))
@@ -3625,6 +4614,11 @@ classpath/javax/imageio/metadata/IIOMetadataController.java \
  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 \
@@ -3647,6 +4641,10 @@ classpath/javax/imageio/stream/ImageOutputStreamImpl.java \
  classpath/javax/imageio/stream/MemoryCacheImageInputStream.java \
  classpath/javax/imageio/stream/MemoryCacheImageOutputStream.java
  
+javax_management_source_files = \
+classpath/javax/management/Attribute.java
+
+javax_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_management_source_files)))
  javax_naming_source_files = \
  classpath/javax/naming/AuthenticationException.java \
  classpath/javax/naming/AuthenticationNotSupportedException.java \
@@ -3731,6 +4729,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
@@ -3803,8 +4803,11 @@ 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 \
+classpath/javax/print/StreamPrintServiceFactory.java \
  classpath/javax/print/URIException.java
  
  javax_print_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_print_source_files)))
@@ -3870,9 +4873,11 @@ classpath/javax/print/attribute/standard/JobState.java \
  classpath/javax/print/attribute/standard/JobStateReason.java \
  classpath/javax/print/attribute/standard/JobStateReasons.java \
  classpath/javax/print/attribute/standard/Media.java \
+classpath/javax/print/attribute/standard/MediaName.java \
  classpath/javax/print/attribute/standard/MediaPrintableArea.java \
  classpath/javax/print/attribute/standard/MediaSize.java \
  classpath/javax/print/attribute/standard/MediaSizeName.java \
+classpath/javax/print/attribute/standard/MediaTray.java \
  classpath/javax/print/attribute/standard/MultipleDocumentHandling.java \
  classpath/javax/print/attribute/standard/NumberOfDocuments.java \
  classpath/javax/print/attribute/standard/NumberOfInterveningJobs.java \
@@ -3955,11 +4960,25 @@ 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 \
+classpath/javax/security/auth/login/AccountLockedException.java \
+classpath/javax/security/auth/login/AccountNotFoundException.java \
  classpath/javax/security/auth/login/AppConfigurationEntry.java \
  classpath/javax/security/auth/login/Configuration.java \
+classpath/javax/security/auth/login/CredentialException.java \
  classpath/javax/security/auth/login/CredentialExpiredException.java \
+classpath/javax/security/auth/login/CredentialNotFoundException.java \
  classpath/javax/security/auth/login/FailedLoginException.java \
  classpath/javax/security/auth/login/LoginContext.java \
  classpath/javax/security/auth/login/LoginException.java \
@@ -4100,6 +5119,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 \
@@ -4348,6 +5368,7 @@ classpath/javax/swing/plaf/basic/BasicEditorPaneUI.java \
  classpath/javax/swing/plaf/basic/BasicFileChooserUI.java \
  classpath/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java \
  classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java \
+classpath/javax/swing/plaf/basic/BasicHTML.java \
  classpath/javax/swing/plaf/basic/BasicIconFactory.java \
  classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java \
  classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java \
@@ -4387,7 +5408,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 = \
@@ -4465,6 +5487,18 @@ classpath/javax/swing/plaf/multi/MultiTreeUI.java \
  classpath/javax/swing/plaf/multi/MultiViewportUI.java
  
  javax_swing_plaf_multi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_plaf_multi_source_files)))
+javax_swing_plaf_synth_source_files = \
+classpath/javax/swing/plaf/synth/ColorType.java \
+classpath/javax/swing/plaf/synth/Region.java \
+classpath/javax/swing/plaf/synth/SynthConstants.java \
+classpath/javax/swing/plaf/synth/SynthContext.java \
+classpath/javax/swing/plaf/synth/SynthGraphicsUtils.java \
+classpath/javax/swing/plaf/synth/SynthLookAndFeel.java \
+classpath/javax/swing/plaf/synth/SynthPainter.java \
+classpath/javax/swing/plaf/synth/SynthStyle.java \
+classpath/javax/swing/plaf/synth/SynthStyleFactory.java
+
+javax_swing_plaf_synth_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_plaf_synth_source_files)))
  javax_swing_table_source_files = \
  classpath/javax/swing/table/AbstractTableModel.java \
  classpath/javax/swing/table/DefaultTableCellRenderer.java \
@@ -4481,6 +5515,7 @@ javax_swing_table_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,
  javax_swing_text_source_files = \
  classpath/javax/swing/text/AbstractDocument.java \
  classpath/javax/swing/text/AbstractWriter.java \
+classpath/javax/swing/text/AsyncBoxView.java \
  classpath/javax/swing/text/AttributeSet.java \
  classpath/javax/swing/text/BadLocationException.java \
  classpath/javax/swing/text/BoxView.java \
@@ -4492,6 +5527,7 @@ classpath/javax/swing/text/DateFormatter.java \
  classpath/javax/swing/text/DefaultCaret.java \
  classpath/javax/swing/text/DefaultEditorKit.java \
  classpath/javax/swing/text/DefaultFormatter.java \
+classpath/javax/swing/text/DefaultFormatterFactory.java \
  classpath/javax/swing/text/DefaultHighlighter.java \
  classpath/javax/swing/text/DefaultStyledDocument.java \
  classpath/javax/swing/text/DefaultTextUI.java \
@@ -4512,8 +5548,10 @@ classpath/javax/swing/text/Keymap.java \
  classpath/javax/swing/text/LabelView.java \
  classpath/javax/swing/text/LayeredHighlighter.java \
  classpath/javax/swing/text/LayoutQueue.java \
+classpath/javax/swing/text/MaskFormatter.java \
  classpath/javax/swing/text/MutableAttributeSet.java \
  classpath/javax/swing/text/NavigationFilter.java \
+classpath/javax/swing/text/NumberFormatter.java \
  classpath/javax/swing/text/ParagraphView.java \
  classpath/javax/swing/text/PasswordView.java \
  classpath/javax/swing/text/PlainDocument.java \
@@ -4531,6 +5569,7 @@ classpath/javax/swing/text/TabExpander.java \
  classpath/javax/swing/text/TabSet.java \
  classpath/javax/swing/text/TabStop.java \
  classpath/javax/swing/text/TabableView.java \
+classpath/javax/swing/text/TableView.java \
  classpath/javax/swing/text/TextAction.java \
  classpath/javax/swing/text/Utilities.java \
  classpath/javax/swing/text/View.java \
@@ -4539,11 +5578,24 @@ 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/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/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/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
  
  javax_swing_text_html_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_text_html_source_files)))
  javax_swing_text_html_parser_source_files = \
@@ -4646,9 +5698,7 @@ classpath/javax/xml/stream/StreamFilter.java \
  classpath/javax/xml/stream/XMLEventFactory.java \
  classpath/javax/xml/stream/XMLEventReader.java \
  classpath/javax/xml/stream/XMLEventWriter.java \
-classpath/javax/xml/stream/XMLFilter.java \
  classpath/javax/xml/stream/XMLInputFactory.java \
-classpath/javax/xml/stream/XMLIterator.java \
  classpath/javax/xml/stream/XMLOutputFactory.java \
  classpath/javax/xml/stream/XMLReporter.java \
  classpath/javax/xml/stream/XMLResolver.java \
@@ -4662,7 +5712,6 @@ classpath/javax/xml/stream/events/Comment.java \
  classpath/javax/xml/stream/events/DTD.java \
  classpath/javax/xml/stream/events/EndDocument.java \
  classpath/javax/xml/stream/events/EndElement.java \
-classpath/javax/xml/stream/events/EndEntity.java \
  classpath/javax/xml/stream/events/EntityDeclaration.java \
  classpath/javax/xml/stream/events/EntityReference.java \
  classpath/javax/xml/stream/events/Namespace.java \
@@ -4670,7 +5719,6 @@ classpath/javax/xml/stream/events/NotationDeclaration.java \
  classpath/javax/xml/stream/events/ProcessingInstruction.java \
  classpath/javax/xml/stream/events/StartDocument.java \
  classpath/javax/xml/stream/events/StartElement.java \
-classpath/javax/xml/stream/events/StartEntity.java \
  classpath/javax/xml/stream/events/XMLEvent.java \
  classpath/javax/xml/stream/util/EventReaderDelegate.java \
  classpath/javax/xml/stream/util/ReaderDelegate.java \
@@ -4700,6 +5748,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 \
@@ -5157,7 +6206,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 \
@@ -5262,6 +6310,18 @@ classpath/org/omg/SendingContext/RunTime.java \
  classpath/org/omg/SendingContext/RunTimeOperations.java \
  classpath/org/omg/stub/java/rmi/_Remote_Stub.java
  
+org_relaxng_source_files = \
+classpath/external/relaxngDatatype/org/relaxng/datatype/Datatype.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeBuilder.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeException.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibrary.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibraryFactory.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeStreamingValidator.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/ValidationContext.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java \
+classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
+
  org_w3c_source_files = \
  classpath/external/w3c_dom/org/w3c/dom/Attr.java \
  classpath/external/w3c_dom/org/w3c/dom/CDATASection.java \
@@ -5468,16 +6528,24 @@ all_packages_source_files = \
    gnu/gcj/util.list \
    gnu/java/awt.list \
    gnu/java/awt/color.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/reflect.list \
    gnu/java/locale.list \
    gnu/java/math.list \
    gnu/java/net.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 \
@@ -5485,27 +6553,81 @@ 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 \
    gnu/java/security/ber.list \
    gnu/java/security/der.list \
+  gnu/java/security/hash.list \
+  gnu/java/security/jce/hash.list \
+  gnu/java/security/jce/prng.list \
+  gnu/java/security/jce/sig.list \
+  gnu/java/security/key.list \
+  gnu/java/security/key/dss.list \
+  gnu/java/security/key/rsa.list \
    gnu/java/security/pkcs.list \
+  gnu/java/security/prng.list \
    gnu/java/security/provider.list \
+  gnu/java/security/sig.list \
+  gnu/java/security/sig/dss.list \
+  gnu/java/security/sig/rsa.list \
    gnu/java/security/util.list \
    gnu/java/security/x509.list \
    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/javax/crypto.list \
+  gnu/javax/crypto/assembly.list \
+  gnu/javax/crypto/cipher.list \
+  gnu/javax/crypto/jce.list \
+  gnu/javax/crypto/jce/cipher.list \
+  gnu/javax/crypto/jce/key.list \
+  gnu/javax/crypto/jce/keyring.list \
+  gnu/javax/crypto/jce/mac.list \
+  gnu/javax/crypto/jce/params.list \
+  gnu/javax/crypto/jce/prng.list \
+  gnu/javax/crypto/jce/sig.list \
+  gnu/javax/crypto/jce/spec.list \
+  gnu/javax/crypto/key.list \
+  gnu/javax/crypto/key/dh.list \
+  gnu/javax/crypto/key/srp6.list \
+  gnu/javax/crypto/keyring.list \
+  gnu/javax/crypto/mac.list \
+  gnu/javax/crypto/mode.list \
+  gnu/javax/crypto/pad.list \
+  gnu/javax/crypto/prng.list \
+  gnu/javax/crypto/sasl.list \
+  gnu/javax/crypto/sasl/anonymous.list \
+  gnu/javax/crypto/sasl/crammd5.list \
+  gnu/javax/crypto/sasl/plain.list \
+  gnu/javax/crypto/sasl/srp.list \
    gnu/javax/imageio/bmp.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/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/javax/swing/tree.list \
    gnu/regexp.list \
    java/applet.list \
    java/awt.list \
@@ -5527,6 +6649,7 @@ all_packages_source_files = \
    java/io.list \
    java/lang.list \
    java/lang/annotation.list \
+  java/lang/instrument.list \
    java/lang/ref.list \
    java/lang/reflect.list \
    java/math.list \
@@ -5558,6 +6681,7 @@ all_packages_source_files = \
    javax/crypto.list \
    javax/crypto/interfaces.list \
    javax/crypto/spec.list \
+  javax/management.list \
    javax/naming.list \
    javax/naming/directory.list \
    javax/naming/event.list \
@@ -5571,6 +6695,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 \
@@ -5590,6 +6715,7 @@ all_packages_source_files = \
    javax/swing/plaf/basic.list \
    javax/swing/plaf/metal.list \
    javax/swing/plaf/multi.list \
+  javax/swing/plaf/synth.list \
    javax/swing/table.list \
    javax/swing/text.list \
    javax/swing/text/html.list \
@@ -5621,16 +6747,24 @@ ordinary_header_files = \
    $(gnu_gcj_util_header_files) \
    $(gnu_java_awt_header_files) \
    $(gnu_java_awt_color_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_reflect_header_files) \
    $(gnu_java_locale_header_files) \
    $(gnu_java_math_header_files) \
    $(gnu_java_net_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) \
@@ -5638,27 +6772,81 @@ 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) \
    $(gnu_java_security_ber_header_files) \
    $(gnu_java_security_der_header_files) \
+  $(gnu_java_security_hash_header_files) \
+  $(gnu_java_security_jce_hash_header_files) \
+  $(gnu_java_security_jce_prng_header_files) \
+  $(gnu_java_security_jce_sig_header_files) \
+  $(gnu_java_security_key_header_files) \
+  $(gnu_java_security_key_dss_header_files) \
+  $(gnu_java_security_key_rsa_header_files) \
    $(gnu_java_security_pkcs_header_files) \
+  $(gnu_java_security_prng_header_files) \
    $(gnu_java_security_provider_header_files) \
+  $(gnu_java_security_sig_header_files) \
+  $(gnu_java_security_sig_dss_header_files) \
+  $(gnu_java_security_sig_rsa_header_files) \
    $(gnu_java_security_util_header_files) \
    $(gnu_java_security_x509_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_javax_crypto_header_files) \
+  $(gnu_javax_crypto_assembly_header_files) \
+  $(gnu_javax_crypto_cipher_header_files) \
+  $(gnu_javax_crypto_jce_header_files) \
+  $(gnu_javax_crypto_jce_cipher_header_files) \
+  $(gnu_javax_crypto_jce_key_header_files) \
+  $(gnu_javax_crypto_jce_keyring_header_files) \
+  $(gnu_javax_crypto_jce_mac_header_files) \
+  $(gnu_javax_crypto_jce_params_header_files) \
+  $(gnu_javax_crypto_jce_prng_header_files) \
+  $(gnu_javax_crypto_jce_sig_header_files) \
+  $(gnu_javax_crypto_jce_spec_header_files) \
+  $(gnu_javax_crypto_key_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_mac_header_files) \
+  $(gnu_javax_crypto_mode_header_files) \
+  $(gnu_javax_crypto_pad_header_files) \
+  $(gnu_javax_crypto_prng_header_files) \
+  $(gnu_javax_crypto_sasl_header_files) \
+  $(gnu_javax_crypto_sasl_anonymous_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_bmp_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_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_javax_swing_tree_header_files) \
    $(gnu_regexp_header_files) \
    $(java_applet_header_files) \
    $(java_awt_header_files) \
@@ -5680,6 +6868,7 @@ ordinary_header_files = \
    $(java_io_header_files) \
    $(java_lang_header_files) \
    $(java_lang_annotation_header_files) \
+  $(java_lang_instrument_header_files) \
    $(java_lang_ref_header_files) \
    $(java_lang_reflect_header_files) \
    $(java_math_header_files) \
@@ -5711,6 +6900,7 @@ ordinary_header_files = \
    $(javax_crypto_header_files) \
    $(javax_crypto_interfaces_header_files) \
    $(javax_crypto_spec_header_files) \
+  $(javax_management_header_files) \
    $(javax_naming_header_files) \
    $(javax_naming_directory_header_files) \
    $(javax_naming_event_header_files) \
@@ -5724,6 +6914,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) \
@@ -5743,6 +6934,7 @@ ordinary_header_files = \
    $(javax_swing_plaf_basic_header_files) \
    $(javax_swing_plaf_metal_header_files) \
    $(javax_swing_plaf_multi_header_files) \
+  $(javax_swing_plaf_synth_header_files) \
    $(javax_swing_table_header_files) \
    $(javax_swing_text_header_files) \
    $(javax_swing_text_html_header_files) \
@@ -5756,6 +6948,9 @@ ordinary_header_files = \
  
  bc_objects = \
    gnu-CORBA.lo \
+  gnu-java-awt-peer-gtk.lo \
+  gnu-java-awt-peer-qt.lo \
+  gnu-java-awt-peer-swing.lo \
    gnu-java-beans.lo \
    gnu-javax-rmi.lo \
    gnu-javax-sound-midi.lo \
@@ -5764,9 +6959,36 @@ bc_objects = \
    javax-rmi.lo \
    javax-xml.lo \
    org-omg.lo \
+  org-relaxng.lo \
    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/javax/print/PrinterDialog.properties \
+  classpath/resource/gnu/javax/print/PrinterDialog_de.properties \
+  classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
+  classpath/resource/gnu/regexp/MessagesBundle.properties \
+  classpath/resource/gnu/regexp/MessagesBundle_fr.properties \
+  classpath/resource/gnu/regexp/MessagesBundle_it.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/javax.sound.midi.spi.MidiDeviceProvider \
+  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 \
@@ -5822,7 +7044,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
@@ -5840,6 +7064,27 @@ 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/gcj/natCore.cc \
@@ -5855,6 +7100,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 \
@@ -5892,8 +7138,9 @@ 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/channels/natVMChannels.cc \
  java/nio/natDirectByteBufferImpl.cc \
+java/security/natVMAccessController.cc \
  java/text/natCollator.cc \
  java/util/natResourceBundle.cc \
  java/util/natVMTimeZone.cc \
@@ -5924,7 +7171,7 @@ gnu/gcj/xlib/natXImage.cc \
  gnu/gcj/xlib/natXUnmapEvent.cc
  
  sourcesdir = $(jardir)
-headers_to_make = $(nat_headers) $(am__append_14)
+headers_to_make = $(nat_headers) $(am__append_13)
  
  # Work around what appears to be a GNU make bug handling MAKEFLAGS
  # values defined in terms of make variables, as is the case for CC and
@@ -5981,7 +7228,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)
@@ -6021,6 +7268,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)"
@@ -6114,10 +7390,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)
@@ -6190,6 +7473,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):
@@ -6334,7 +7620,7 @@ 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
@@ -6344,6 +7630,14 @@ 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/text/$(am__dirstamp):
         @$(mkdir_p) java/text
         @: > java/text/$(am__dirstamp)
@@ -6382,19 +7676,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)"
@@ -6430,6 +7715,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)
@@ -6456,6 +7744,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)
@@ -6487,8 +7781,8 @@ 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/natSystemProperties.$(OBJEXT)
         -rm -f gnu/classpath/natSystemProperties.lo
         -rm -f gnu/gcj/convert/JIS0208_to_Unicode.$(OBJEXT)
@@ -6521,6 +7815,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)
@@ -6639,10 +7935,12 @@ mostlyclean-compile:
         -rm -f java/net/natInetAddress.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/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)
@@ -6665,7 +7963,9 @@ 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)/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@
@@ -6676,7 +7976,7 @@ 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/gcj/$(DEPDIR)/natCore.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/JIS0208_to_Unicode.Plo@am__quote@
@@ -6694,6 +7994,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@
@@ -6755,7 +8056,8 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natInetAddress.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)/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@
@@ -6787,13 +8089,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 $@ $<; \
@@ -6958,6 +8253,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 $@ $<; \
@@ -6987,7 +8313,7 @@ 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/gcj/.libs gnu/gcj/_libs
         -rm -rf gnu/gcj/convert/.libs gnu/gcj/convert/_libs
@@ -7007,6 +8333,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
@@ -7091,7 +8418,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 \
@@ -7103,7 +8436,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; \
@@ -7111,7 +8444,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)' ;; \
@@ -7132,7 +8471,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 \
@@ -7207,7 +8546,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 \
@@ -7351,7 +8690,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
@@ -7375,8 +8714,8 @@ 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/gcj/$(DEPDIR)/$(am__dirstamp)
@@ -7417,6 +8756,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)
@@ -7432,13 +8773,13 @@ maintainer-clean-generic:
         @echo "it deletes files that may require special tools to rebuild."
  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/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
@@ -7457,8 +8798,8 @@ 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
  
  install-info: install-info-recursive
  
@@ -7469,7 +8810,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/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
  
@@ -7487,55 +8828,54 @@ 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 \
-       install-jarDATA install-man install-pkgconfigDATA \
-       install-strip install-toolexeclibLTLIBRARIES \
-       install-toolexecmainlibDATA installcheck installcheck-am \
-       installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic maintainer-clean-recursive \
-       mostlyclean mostlyclean-compile mostlyclean-generic \
-       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
+       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-info install-info-am install-jarDATA \
+       install-man install-pkgconfigDATA install-strip \
+       install-toolexeclibLTLIBRARIES install-toolexecmainlibDATA \
+       installcheck installcheck-am installdirs installdirs-am \
+       maintainer-clean maintainer-clean-generic \
+       maintainer-clean-recursive mostlyclean mostlyclean-compile \
+       mostlyclean-generic 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-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)
-
  $(propertyo_files): %.lo: classpath/resource/%
         $(mkinstalldirs) `dirname $@`; \
         $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,$(@:.lo=)
  
-libgcj-$(gcc_version).jar:
-       jardir=`dirname $(ZIP)`; \
-       jardir=`cd $$jardir && pwd`; \
-       jarname=`basename $(ZIP)`; \
-       cd classpath/lib; $$jardir/$$jarname -cfM \
+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
  
@@ -7557,7 +8897,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)
@@ -7770,6 +9110,36 @@ gnu/java/awt/color.list: $(gnu_java_awt_color_source_files)
  
  -include gnu/java/awt/color.deps
  
+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 \
@@ -7780,6 +9150,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 \
@@ -7792,17 +9172,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 -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)
@@ -7865,6 +9260,26 @@ gnu/java/net.list: $(gnu_java_net_source_files)
  
  -include gnu/java/net.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 \
@@ -7885,6 +9300,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 \
@@ -7955,6 +9380,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 \
@@ -7975,6 +9410,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 \
@@ -8025,6 +9470,76 @@ gnu/java/security/der.list: $(gnu_java_security_der_source_files)
  
  -include gnu/java/security/der.deps
  
+gnu/java/security/hash.list: $(gnu_java_security_hash_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_security_hash_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/security/hash.list
+
+-include gnu/java/security/hash.deps
+
+gnu/java/security/jce/hash.list: $(gnu_java_security_jce_hash_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_security_jce_hash_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/security/jce/hash.list
+
+-include gnu/java/security/jce/hash.deps
+
+gnu/java/security/jce/prng.list: $(gnu_java_security_jce_prng_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_security_jce_prng_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/security/jce/prng.list
+
+-include gnu/java/security/jce/prng.deps
+
+gnu/java/security/jce/sig.list: $(gnu_java_security_jce_sig_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_security_jce_sig_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/security/jce/sig.list
+
+-include gnu/java/security/jce/sig.deps
+
+gnu/java/security/key.list: $(gnu_java_security_key_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_security_key_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/security/key.list
+
+-include gnu/java/security/key.deps
+
+gnu/java/security/key/dss.list: $(gnu_java_security_key_dss_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_security_key_dss_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/security/key/dss.list
+
+-include gnu/java/security/key/dss.deps
+
+gnu/java/security/key/rsa.list: $(gnu_java_security_key_rsa_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_security_key_rsa_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/security/key/rsa.list
+
+-include gnu/java/security/key/rsa.deps
+
  gnu/java/security/pkcs.list: $(gnu_java_security_pkcs_source_files)
         @$(mkinstalldirs) $(dir $@)
         @for file in $(gnu_java_security_pkcs_source_files); do \
@@ -8035,6 +9550,16 @@ gnu/java/security/pkcs.list: $(gnu_java_security_pkcs_source_files)
  
  -include gnu/java/security/pkcs.deps
  
+gnu/java/security/prng.list: $(gnu_java_security_prng_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_security_prng_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/security/prng.list
+
+-include gnu/java/security/prng.deps
+
  gnu/java/security/provider.list: $(gnu_java_security_provider_source_files)
         @$(mkinstalldirs) $(dir $@)
         @for file in $(gnu_java_security_provider_source_files); do \
@@ -8045,6 +9570,36 @@ gnu/java/security/provider.list: $(gnu_java_security_provider_source_files)
  
  -include gnu/java/security/provider.deps
  
+gnu/java/security/sig.list: $(gnu_java_security_sig_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_security_sig_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/security/sig.list
+
+-include gnu/java/security/sig.deps
+
+gnu/java/security/sig/dss.list: $(gnu_java_security_sig_dss_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_security_sig_dss_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/security/sig/dss.list
+
+-include gnu/java/security/sig/dss.deps
+
+gnu/java/security/sig/rsa.list: $(gnu_java_security_sig_rsa_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_security_sig_rsa_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/security/sig/rsa.list
+
+-include gnu/java/security/sig/rsa.deps
+
  gnu/java/security/util.list: $(gnu_java_security_util_source_files)
         @$(mkinstalldirs) $(dir $@)
         @for file in $(gnu_java_security_util_source_files); do \
@@ -8095,6 +9650,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 \
@@ -8115,6 +9680,246 @@ gnu/javax/crypto.list: $(gnu_javax_crypto_source_files)
  
  -include gnu/javax/crypto.deps
  
+gnu/javax/crypto/assembly.list: $(gnu_javax_crypto_assembly_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_assembly_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/assembly.list
+
+-include gnu/javax/crypto/assembly.deps
+
+gnu/javax/crypto/cipher.list: $(gnu_javax_crypto_cipher_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_cipher_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/cipher.list
+
+-include gnu/javax/crypto/cipher.deps
+
+gnu/javax/crypto/jce.list: $(gnu_javax_crypto_jce_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_jce_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/jce.list
+
+-include gnu/javax/crypto/jce.deps
+
+gnu/javax/crypto/jce/cipher.list: $(gnu_javax_crypto_jce_cipher_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_jce_cipher_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/jce/cipher.list
+
+-include gnu/javax/crypto/jce/cipher.deps
+
+gnu/javax/crypto/jce/key.list: $(gnu_javax_crypto_jce_key_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_jce_key_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/jce/key.list
+
+-include gnu/javax/crypto/jce/key.deps
+
+gnu/javax/crypto/jce/keyring.list: $(gnu_javax_crypto_jce_keyring_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_jce_keyring_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/jce/keyring.list
+
+-include gnu/javax/crypto/jce/keyring.deps
+
+gnu/javax/crypto/jce/mac.list: $(gnu_javax_crypto_jce_mac_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_jce_mac_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/jce/mac.list
+
+-include gnu/javax/crypto/jce/mac.deps
+
+gnu/javax/crypto/jce/params.list: $(gnu_javax_crypto_jce_params_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_jce_params_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/jce/params.list
+
+-include gnu/javax/crypto/jce/params.deps
+
+gnu/javax/crypto/jce/prng.list: $(gnu_javax_crypto_jce_prng_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_jce_prng_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/jce/prng.list
+
+-include gnu/javax/crypto/jce/prng.deps
+
+gnu/javax/crypto/jce/sig.list: $(gnu_javax_crypto_jce_sig_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_jce_sig_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/jce/sig.list
+
+-include gnu/javax/crypto/jce/sig.deps
+
+gnu/javax/crypto/jce/spec.list: $(gnu_javax_crypto_jce_spec_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_jce_spec_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/jce/spec.list
+
+-include gnu/javax/crypto/jce/spec.deps
+
+gnu/javax/crypto/key.list: $(gnu_javax_crypto_key_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_key_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/key.list
+
+-include gnu/javax/crypto/key.deps
+
+gnu/javax/crypto/key/dh.list: $(gnu_javax_crypto_key_dh_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_key_dh_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/key/dh.list
+
+-include gnu/javax/crypto/key/dh.deps
+
+gnu/javax/crypto/key/srp6.list: $(gnu_javax_crypto_key_srp6_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_key_srp6_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/key/srp6.list
+
+-include gnu/javax/crypto/key/srp6.deps
+
+gnu/javax/crypto/keyring.list: $(gnu_javax_crypto_keyring_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_keyring_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/keyring.list
+
+-include gnu/javax/crypto/keyring.deps
+
+gnu/javax/crypto/mac.list: $(gnu_javax_crypto_mac_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_mac_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/mac.list
+
+-include gnu/javax/crypto/mac.deps
+
+gnu/javax/crypto/mode.list: $(gnu_javax_crypto_mode_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_mode_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/mode.list
+
+-include gnu/javax/crypto/mode.deps
+
+gnu/javax/crypto/pad.list: $(gnu_javax_crypto_pad_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_pad_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/pad.list
+
+-include gnu/javax/crypto/pad.deps
+
+gnu/javax/crypto/prng.list: $(gnu_javax_crypto_prng_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_prng_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/prng.list
+
+-include gnu/javax/crypto/prng.deps
+
+gnu/javax/crypto/sasl.list: $(gnu_javax_crypto_sasl_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_sasl_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/sasl.list
+
+-include gnu/javax/crypto/sasl.deps
+
+gnu/javax/crypto/sasl/anonymous.list: $(gnu_javax_crypto_sasl_anonymous_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_sasl_anonymous_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/sasl/anonymous.list
+
+-include gnu/javax/crypto/sasl/anonymous.deps
+
+gnu/javax/crypto/sasl/crammd5.list: $(gnu_javax_crypto_sasl_crammd5_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_sasl_crammd5_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/sasl/crammd5.list
+
+-include gnu/javax/crypto/sasl/crammd5.deps
+
+gnu/javax/crypto/sasl/plain.list: $(gnu_javax_crypto_sasl_plain_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_sasl_plain_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/sasl/plain.list
+
+-include gnu/javax/crypto/sasl/plain.deps
+
+gnu/javax/crypto/sasl/srp.list: $(gnu_javax_crypto_sasl_srp_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_crypto_sasl_srp_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/crypto/sasl/srp.list
+
+-include gnu/javax/crypto/sasl/srp.deps
+
  gnu/javax/imageio/bmp.list: $(gnu_javax_imageio_bmp_source_files)
         @$(mkinstalldirs) $(dir $@)
         @for file in $(gnu_javax_imageio_bmp_source_files); do \
@@ -8125,16 +9930,166 @@ gnu/javax/imageio/bmp.list: $(gnu_javax_imageio_bmp_source_files)
  
  -include gnu/javax/imageio/bmp.deps
  
+gnu/javax/net/ssl.list: $(gnu_javax_net_ssl_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_net_ssl_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/net/ssl.list
+
+-include gnu/javax/net/ssl.deps
+
+gnu/javax/net/ssl/provider.list: $(gnu_javax_net_ssl_provider_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_net_ssl_provider_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/net/ssl/provider.list
+
+-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)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_security_auth_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/security/auth.list
+
+-include gnu/javax/security/auth.deps
+
+gnu/javax/security/auth/callback.list: $(gnu_javax_security_auth_callback_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_security_auth_callback_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/security/auth/callback.list
+
+-include gnu/javax/security/auth/callback.deps
+
+gnu/javax/security/auth/login.list: $(gnu_javax_security_auth_login_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_security_auth_login_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/security/auth/login.list
+
+-include gnu/javax/security/auth/login.deps
+
  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/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 \
@@ -8175,6 +10130,16 @@ 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/javax/swing/tree.list: $(gnu_javax_swing_tree_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @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/javax/swing/tree.list
+
+-include gnu/javax/swing/tree.deps
+
  gnu/regexp.list: $(gnu_regexp_source_files)
         @$(mkinstalldirs) $(dir $@)
         @for file in $(gnu_regexp_source_files); do \
@@ -8187,7 +10152,7 @@ gnu/regexp.list: $(gnu_regexp_source_files)
  
  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)
@@ -8390,6 +10355,16 @@ 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/ref.list: $(java_lang_ref_source_files)
         @$(mkinstalldirs) $(dir $@)
         @for file in $(java_lang_ref_source_files); do \
@@ -8702,9 +10677,19 @@ 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)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(javax_management_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > javax/management.list
+
+-include javax/management.deps
+
  javax/naming.list: $(javax_naming_source_files)
         @$(mkinstalldirs) $(dir $@)
         @for file in $(javax_naming_source_files); do \
@@ -8817,7 +10802,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)
@@ -8840,6 +10825,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 \
@@ -9030,6 +11025,16 @@ javax/swing/plaf/multi.list: $(javax_swing_plaf_multi_source_files)
  
  -include javax/swing/plaf/multi.deps
  
+javax/swing/plaf/synth.list: $(javax_swing_plaf_synth_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(javax_swing_plaf_synth_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > javax/swing/plaf/synth.list
+
+-include javax/swing/plaf/synth.deps
+
  javax/swing/table.list: $(javax_swing_table_source_files)
         @$(mkinstalldirs) $(dir $@)
         @for file in $(javax_swing_table_source_files); do \
@@ -9122,7 +11127,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)
@@ -9137,17 +11142,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 -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
@@ -9166,6 +11176,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 ();' \
@@ -9175,6 +11186,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);' \
@@ -9182,6 +11194,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
@@ -9387,15 +11400,34 @@ write-entries-to-file-check:
  src.zip:
         -rm -f src.zip
         here=`pwd`; \
-       ( ( cd $(srcdir); \
+       ( \
+         ( cd $(srcdir)/classpath; \
           find java gnu javax org -name '*.java' -print | \
           while read file; do \
             echo "x-C" | sed -e 's/^.//'; \
+           echo $(srcdir)/classpath; \
+           echo $$file; \
+         done ); \
+         ( cd classpath; \
+           find gnu java -name '*.java' -print | \
+           while read file; do \
+           echo "x-C" | sed -e 's/^.//'; \
+           echo `pwd`; \
+           echo $$file; \
+         done ); \
+       ) | \
+       $(JAR) -cfM@ $$here/src.zip
+       here=`pwd`; \
+       ( \
+         ( cd $(srcdir); \
+         find gnu java -name '*.java' -print | \
+         while read file; do \
+           echo "x-C" | sed -e 's/^.//'; \
             echo $(srcdir); \
             echo $$file; \
           done ); \
-         find gnu java -name '*.java' -print) | \
-       $(ZIP) -cfM@ $$here/src.zip
+       ) | \
+       $(JAR) -ufM@ $$here/src.zip
  
  install-src.zip: src.zip
         $(INSTALL_DATA) src.zip $(DESTDIR)$(sourcesdir)/src-$(gcc_version).zip
@@ -9410,6 +11442,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 \