OSDN Git Service

2007-01-10 Matthias Klose <doko@debian.org>
[pf3gnuchains/gcc-fork.git] / libjava / Makefile.in
index ef20d79..17a7ed0 100644 (file)
@@ -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) $(libgcj_la_SOURCES) $(libgcjawt_la_SOURCES) $(libgij_la_SOURCES) $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -43,21 +41,28 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 @TESTSUBDIR_TRUE@am__append_1 = testsuite
-@XLIB_AWT_TRUE@am__append_2 = lib-gnu-awt-xlib.la
-@GTK_AWT_TRUE@am__append_3 = lib-gnu-java-awt-peer-gtk.la libgcjawt.la
+@USE_LIBGCJ_BC_TRUE@am__append_2 = libgcj_bc.la
+@XLIB_AWT_TRUE@am__append_3 = lib-gnu-awt-xlib.la
+@INSTALL_ECJ_JAR_TRUE@am__append_4 = $(ECJ_BUILD_JAR)
 @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_4 = $(WARNINGS)
-@USING_BOEHMGC_TRUE@am__append_5 = boehm.cc
-@USING_NOGC_TRUE@am__append_6 = nogc.cc
-@SUPPLY_BACKTRACE_TRUE@am__append_7 = sysdep/dwarf2-backtrace.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) \
+@NATIVE_TRUE@  gjar$(EXEEXT) gjavah$(EXEEXT) \
+@NATIVE_TRUE@  gnative2ascii$(EXEEXT) gorbd$(EXEEXT) \
+@NATIVE_TRUE@  grmid$(EXEEXT) gserialver$(EXEEXT) \
+@NATIVE_TRUE@  gtnameserv$(EXEEXT)
+@BUILD_ECJ1_TRUE@libexecsub_PROGRAMS = ecjx$(EXEEXT)
+@BASH_JAR_TRUE@am__append_5 = scripts/jar
+@USING_GCC_TRUE@am__append_6 = $(WARNINGS)
+@USING_BOEHMGC_TRUE@am__append_7 = boehm.cc
+@USING_NOGC_TRUE@am__append_8 = nogc.cc
+@USING_POSIX_PLATFORM_TRUE@am__append_9 = posix.cc
+@USING_WIN32_PLATFORM_TRUE@am__append_10 = win32.cc
+@USING_DARWIN_CRT_TRUE@am__append_11 = darwin.cc
+@USING_POSIX_THREADS_TRUE@am__append_12 = posix-threads.cc
+@USING_WIN32_THREADS_TRUE@am__append_13 = win32-threads.cc
+@USING_NO_THREADS_TRUE@am__append_14 = no-threads.cc
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
        $(srcdir)/../config.guess $(srcdir)/../config.sub \
        $(srcdir)/../depcomp $(srcdir)/../install-sh \
@@ -65,25 +70,29 @@ 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_15 = $(xlib_nat_headers)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
        $(top_srcdir)/../config/depstand.m4 \
+       $(top_srcdir)/../config/enable.m4 \
        $(top_srcdir)/../config/gxx-include-dir.m4 \
        $(top_srcdir)/../config/iconv.m4 \
        $(top_srcdir)/../config/lcmessage.m4 \
        $(top_srcdir)/../config/lead-dot.m4 \
        $(top_srcdir)/../config/lib-ld.m4 \
        $(top_srcdir)/../config/lib-link.m4 \
-       $(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \
-       $(top_srcdir)/acinclude.m4 \
+       $(top_srcdir)/../config/lib-prefix.m4 \
        $(top_srcdir)/../config/no-executables.m4 \
-       $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../config/tls.m4 \
+       $(top_srcdir)/../config/unwind_ipinfo.m4 \
+       $(top_srcdir)/../libtool.m4 $(top_srcdir)/mingwld.m4 \
+       $(top_srcdir)/pkg.m4 $(top_srcdir)/shlibpath.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -91,9 +100,8 @@ 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 \
-       java/lang/natConcreteProcess.cc java/net/natInetAddress.cc \
-       java/net/natVMNetworkInterface.cc \
+       scripts/jar java/io/natFile.cc java/lang/natConcreteProcess.cc \
+       java/net/natVMInetAddress.cc java/net/natVMNetworkInterface.cc \
        gnu/java/net/natPlainSocketImpl.cc \
        gnu/java/net/natPlainDatagramSocketImpl.cc \
        gnu/java/nio/natPipeImpl.cc gnu/java/nio/natSelectorImpl.cc \
@@ -105,12 +113,14 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" \
-       "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbexecdir)" \
-       "$(DESTDIR)$(jardir)" "$(DESTDIR)$(pkgconfigdir)" \
+am__installdirs = "$(DESTDIR)$(dbexecdir)" \
+       "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" \
+       "$(DESTDIR)$(libexecsubdir)" "$(DESTDIR)$(bindir)" \
+       "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(jardir)" \
        "$(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 \
@@ -135,77 +145,141 @@ 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__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
-       gnu/classpath/debug.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 \
+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 \
+       gnu/classpath/jdwp/exception.lo gnu/classpath/jdwp/id.lo \
+       gnu/classpath/jdwp/processor.lo \
+       gnu/classpath/jdwp/transport.lo gnu/classpath/jdwp/util.lo \
+       gnu/gcj.lo gnu/gcj/convert.lo gnu/gcj/io.lo gnu/gcj/jvmti.lo \
+       gnu/gcj/runtime.lo gnu/gcj/util.lo gnu/java/awt.lo \
+       gnu/java/awt/color.lo gnu/java/awt/dnd.lo gnu/java/awt/font.lo \
+       gnu/java/awt/font/autofit.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/peer/headless.lo gnu/java/awt/print.lo \
+       gnu/java/io.lo gnu/java/lang.lo gnu/java/lang/management.lo \
        gnu/java/lang/reflect.lo gnu/java/locale.lo gnu/java/math.lo \
-       gnu/java/net.lo gnu/java/net/protocol/file.lo \
-       gnu/java/net/protocol/ftp.lo gnu/java/net/protocol/http.lo \
-       gnu/java/net/protocol/http/event.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/net.lo gnu/java/net/loader.lo gnu/java/net/local.lo \
+       gnu/java/net/protocol/core.lo gnu/java/net/protocol/file.lo \
+       gnu/java/net/protocol/ftp.lo gnu/java/net/protocol/gcjlib.lo \
+       gnu/java/net/protocol/http.lo gnu/java/net/protocol/https.lo \
+       gnu/java/net/protocol/jar.lo gnu/java/nio.lo \
+       gnu/java/nio/channels.lo gnu/java/nio/charset.lo \
+       gnu/java/rmi.lo gnu/java/rmi/activation.lo gnu/java/rmi/dgc.lo \
        gnu/java/rmi/registry.lo gnu/java/rmi/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/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/java/security/hash.lo gnu/java/security/jce/hash.lo \
+       gnu/java/security/jce/prng.lo gnu/java/security/jce/sig.lo \
+       gnu/java/security/key.lo gnu/java/security/key/dss.lo \
+       gnu/java/security/key/rsa.lo gnu/java/security/pkcs.lo \
+       gnu/java/security/prng.lo gnu/java/security/provider.lo \
+       gnu/java/security/sig.lo gnu/java/security/sig/dss.lo \
+       gnu/java/security/sig/rsa.lo gnu/java/security/util.lo \
+       gnu/java/security/x509.lo gnu/java/security/x509/ext.lo \
+       gnu/java/text.lo gnu/java/util.lo gnu/java/util/jar.lo \
+       gnu/java/util/prefs.lo gnu/java/util/regex.lo \
+       gnu/javax/crypto.lo gnu/javax/crypto/assembly.lo \
+       gnu/javax/crypto/cipher.lo gnu/javax/crypto/jce.lo \
+       gnu/javax/crypto/jce/cipher.lo gnu/javax/crypto/jce/key.lo \
+       gnu/javax/crypto/jce/keyring.lo gnu/javax/crypto/jce/mac.lo \
+       gnu/javax/crypto/jce/params.lo gnu/javax/crypto/jce/prng.lo \
+       gnu/javax/crypto/jce/sig.lo gnu/javax/crypto/jce/spec.lo \
+       gnu/javax/crypto/key.lo gnu/javax/crypto/key/dh.lo \
+       gnu/javax/crypto/key/srp6.lo gnu/javax/crypto/keyring.lo \
+       gnu/javax/crypto/kwa.lo gnu/javax/crypto/mac.lo \
+       gnu/javax/crypto/mode.lo gnu/javax/crypto/pad.lo \
+       gnu/javax/crypto/prng.lo gnu/javax/crypto/sasl.lo \
+       gnu/javax/crypto/sasl/anonymous.lo \
+       gnu/javax/crypto/sasl/crammd5.lo \
+       gnu/javax/crypto/sasl/plain.lo gnu/javax/crypto/sasl/srp.lo \
+       gnu/javax/imageio.lo gnu/javax/imageio/bmp.lo \
+       gnu/javax/imageio/gif.lo gnu/javax/imageio/jpeg.lo \
+       gnu/javax/imageio/png.lo gnu/javax/management.lo \
+       gnu/javax/naming/giop.lo gnu/javax/naming/ictxImpl/trans.lo \
+       gnu/javax/naming/jndi/url/corbaname.lo \
+       gnu/javax/naming/jndi/url/rmi.lo gnu/javax/net/ssl.lo \
+       gnu/javax/net/ssl/provider.lo gnu/javax/print.lo \
+       gnu/javax/print/ipp.lo gnu/javax/print/ipp/attribute.lo \
+       gnu/javax/print/ipp/attribute/defaults.lo \
+       gnu/javax/print/ipp/attribute/job.lo \
+       gnu/javax/print/ipp/attribute/printer.lo \
+       gnu/javax/print/ipp/attribute/supported.lo \
+       gnu/javax/security/auth.lo gnu/javax/security/auth/callback.lo \
+       gnu/javax/security/auth/login.lo gnu/javax/sound/sampled/AU.lo \
+       gnu/javax/sound/sampled/WAV.lo gnu/javax/swing/plaf/gnu.lo \
+       gnu/javax/swing/plaf/metal.lo gnu/javax/swing/text/html.lo \
+       gnu/javax/swing/text/html/css.lo \
        gnu/javax/swing/text/html/parser.lo \
        gnu/javax/swing/text/html/parser/models.lo \
        gnu/javax/swing/text/html/parser/support.lo \
-       gnu/javax/swing/text/html/parser/support/low.lo gnu/regexp.lo \
-       java/applet.lo java/awt.lo java/awt/color.lo \
-       java/awt/datatransfer.lo java/awt/dnd.lo java/awt/dnd/peer.lo \
-       java/awt/event.lo java/awt/font.lo java/awt/geom.lo \
-       java/awt/im.lo java/awt/im/spi.lo java/awt/image.lo \
-       java/awt/image/renderable.lo java/awt/peer.lo \
-       java/awt/print.lo java/beans.lo java/beans/beancontext.lo \
-       java/io.lo java/lang.lo java/lang/annotation.lo \
-       java/lang/ref.lo java/lang/reflect.lo java/math.lo java/net.lo \
-       java/nio.lo java/nio/channels.lo java/nio/channels/spi.lo \
-       java/nio/charset.lo java/nio/charset/spi.lo java/rmi.lo \
-       java/rmi/activation.lo java/rmi/dgc.lo java/rmi/registry.lo \
-       java/rmi/server.lo java/security.lo java/security/acl.lo \
-       java/security/cert.lo java/security/interfaces.lo \
-       java/security/spec.lo java/sql.lo java/text.lo java/util.lo \
+       gnu/javax/swing/text/html/parser/support/low.lo \
+       gnu/javax/swing/tree.lo java/applet.lo java/awt.lo \
+       java/awt/color.lo java/awt/datatransfer.lo java/awt/dnd.lo \
+       java/awt/dnd/peer.lo java/awt/event.lo java/awt/font.lo \
+       java/awt/geom.lo java/awt/im.lo java/awt/im/spi.lo \
+       java/awt/image.lo java/awt/image/renderable.lo \
+       java/awt/peer.lo java/awt/print.lo java/beans.lo \
+       java/beans/beancontext.lo java/io.lo java/lang.lo \
+       java/lang/annotation.lo java/lang/instrument.lo \
+       java/lang/management.lo java/lang/ref.lo java/lang/reflect.lo \
+       java/math.lo java/net.lo java/nio.lo java/nio/channels.lo \
+       java/nio/channels/spi.lo java/nio/charset.lo \
+       java/nio/charset/spi.lo java/rmi.lo java/rmi/activation.lo \
+       java/rmi/dgc.lo java/rmi/registry.lo java/rmi/server.lo \
+       java/security.lo java/security/acl.lo java/security/cert.lo \
+       java/security/interfaces.lo java/security/spec.lo java/sql.lo \
+       java/text.lo java/util.lo java/util/concurrent.lo \
+       java/util/concurrent/atomic.lo java/util/concurrent/locks.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 \
+       javax/crypto/spec.lo javax/management.lo \
+       javax/management/loading.lo javax/management/openmbean.lo \
+       javax/naming.lo javax/naming/directory.lo \
        javax/naming/event.lo javax/naming/ldap.lo javax/naming/spi.lo \
        javax/net.lo javax/net/ssl.lo javax/print.lo \
        javax/print/attribute.lo javax/print/attribute/standard.lo \
        javax/print/event.lo javax/security/auth.lo \
-       javax/security/auth/callback.lo javax/security/auth/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/sql.lo \
+       javax/security/cert.lo javax/security/sasl.lo \
+       javax/sound/midi.lo javax/sound/midi/spi.lo \
+       javax/sound/sampled.lo javax/sound/sampled/spi.lo javax/sql.lo \
        javax/swing.lo javax/swing/border.lo \
        javax/swing/colorchooser.lo javax/swing/event.lo \
        javax/swing/filechooser.lo javax/swing/plaf.lo \
        javax/swing/plaf/basic.lo javax/swing/plaf/metal.lo \
+       javax/swing/plaf/multi.lo javax/swing/plaf/synth.lo \
        javax/swing/table.lo javax/swing/text.lo \
        javax/swing/text/html.lo javax/swing/text/html/parser.lo \
        javax/swing/text/rtf.lo javax/swing/tree.lo \
        javax/swing/undo.lo javax/transaction.lo \
-       javax/transaction/xa.lo org/ietf/jgss.lo
-am__DEPENDENCIES_3 = gnu-java-beans.lo gnu-xml.lo javax-imageio.lo \
-       javax-xml.lo org-w3c.lo org-xml.lo
-am__DEPENDENCIES_4 = $(patsubst \
-       classpath/resource/%,%,$(property_files:.properties=.properties.lo))
-am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
+       javax/transaction/xa.lo org/ietf/jgss.lo sun/misc.lo \
+       sun/reflect.lo sun/reflect/annotation.lo sun/reflect/misc.lo
+am__DEPENDENCIES_2 = gnu-CORBA.lo gnu-java-awt-dnd-peer-gtk.lo \
+       gnu-java-awt-peer-gtk.lo gnu-java-awt-peer-swing.lo \
+       gnu-java-beans.lo gnu-java-util-prefs-gconf.lo \
+       gnu-javax-rmi.lo gnu-javax-sound-midi.lo gnu-xml.lo \
+       javax-imageio.lo javax-rmi.lo javax-xml.lo org-omg.lo \
+       org-relaxng.lo org-w3c.lo org-xml.lo
+am__DEPENDENCIES_3 = $(patsubst classpath/resource/%,%,$(addsuffix \
+       .lo,$(property_files)))
+am__DEPENDENCIES_4 =
+am__libgcj_la_SOURCES_DIST = prims.cc jni.cc jvmti.cc exception.cc \
        stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \
-       java/lang/Class.java java/lang/Object.java \
-       gnu/classpath/natSystemProperties.cc gnu/gcj/natCore.cc \
+       gnu/classpath/jdwp/natVMFrame.cc \
+       gnu/classpath/jdwp/natVMMethod.cc \
+       gnu/classpath/jdwp/natVMVirtualMachine.cc \
+       gnu/classpath/natConfiguration.cc \
+       gnu/classpath/natSystemProperties.cc \
+       gnu/classpath/natVMStackWalker.cc gnu/gcj/natCore.cc \
        gnu/gcj/convert/JIS0208_to_Unicode.cc \
        gnu/gcj/convert/JIS0212_to_Unicode.cc \
        gnu/gcj/convert/Unicode_to_JIS.cc gnu/gcj/convert/natIconv.cc \
@@ -214,40 +288,62 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
        gnu/gcj/convert/natOutput_EUCJIS.cc \
        gnu/gcj/convert/natOutput_SJIS.cc \
        gnu/gcj/io/natSimpleSHSStream.cc gnu/gcj/io/shs.cc \
+       gnu/gcj/jvmti/natBreakpoint.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/lang/management/natVMClassLoadingMXBeanImpl.cc \
+       gnu/java/lang/management/natVMCompilationMXBeanImpl.cc \
+       gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.cc \
+       gnu/java/lang/management/natVMMemoryMXBeanImpl.cc \
+       gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.cc \
+       gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc \
+       gnu/java/lang/management/natVMRuntimeMXBeanImpl.cc \
+       gnu/java/lang/management/natVMThreadMXBeanImpl.cc \
        gnu/java/net/natPlainDatagramSocketImpl.cc \
        gnu/java/net/natPlainSocketImpl.cc \
        gnu/java/net/protocol/core/natCoreInputStream.cc \
        gnu/java/nio/natPipeImpl.cc gnu/java/nio/natSelectorImpl.cc \
        gnu/java/nio/natNIOServerSocket.cc \
+       gnu/java/nio/natVMChannel.cc \
        gnu/java/nio/channels/natFileChannelImpl.cc java/io/natFile.cc \
        java/io/natObjectInputStream.cc \
-       java/io/natVMObjectStreamClass.cc java/lang/natCharacter.cc \
-       java/lang/natClass.cc java/lang/natClassLoader.cc \
-       java/lang/natConcreteProcess.cc java/lang/natDouble.cc \
-       java/lang/natFloat.cc java/lang/natMath.cc \
-       java/lang/natObject.cc java/lang/natRuntime.cc \
-       java/lang/natString.cc java/lang/natStringBuffer.cc \
-       java/lang/natStringBuilder.cc java/lang/natSystem.cc \
-       java/lang/natThread.cc java/lang/natVMClassLoader.cc \
-       java/lang/natVMSecurityManager.cc java/lang/natVMThrowable.cc \
-       java/lang/ref/natReference.cc java/lang/reflect/natArray.cc \
+       java/io/natVMObjectStreamClass.cc \
+       java/lang/management/natVMManagementFactory.cc \
+       java/lang/natCharacter.cc java/lang/natClass.cc \
+       java/lang/natClassLoader.cc java/lang/natConcreteProcess.cc \
+       java/lang/natDouble.cc java/lang/natFloat.cc \
+       java/lang/natMath.cc java/lang/natObject.cc \
+       java/lang/natRuntime.cc java/lang/natString.cc \
+       java/lang/natStringBuffer.cc java/lang/natStringBuilder.cc \
+       java/lang/natSystem.cc java/lang/natThread.cc \
+       java/lang/natThreadLocal.cc java/lang/natVMClassLoader.cc \
+       java/lang/natVMThrowable.cc java/lang/ref/natReference.cc \
+       java/lang/reflect/natArray.cc \
        java/lang/reflect/natConstructor.cc \
        java/lang/reflect/natField.cc java/lang/reflect/natMethod.cc \
-       java/lang/reflect/natProxy.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/lang/reflect/natVMProxy.cc java/net/natVMInetAddress.cc \
+       java/net/natVMNetworkInterface.cc \
+       java/net/natVMURLConnection.cc \
+       java/nio/channels/natVMChannels.cc \
+       java/nio/natDirectByteBufferImpl.cc \
+       java/security/natVMAccessController.cc \
+       java/security/natVMAccessControlState.cc \
+       java/text/natCollator.cc java/util/natVMTimeZone.cc \
+       java/util/concurrent/atomic/natAtomicLong.cc \
        java/util/logging/natLogger.cc java/util/zip/natDeflater.cc \
-       java/util/zip/natInflater.cc boehm.cc nogc.cc \
-       sysdep/dwarf2-backtrace.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 \
+       java/util/zip/natInflater.cc sun/misc/natUnsafe.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/jdwp/natVMFrame.lo \
+       gnu/classpath/jdwp/natVMMethod.lo \
+       gnu/classpath/jdwp/natVMVirtualMachine.lo \
+       gnu/classpath/natConfiguration.lo \
+       gnu/classpath/natSystemProperties.lo \
+       gnu/classpath/natVMStackWalker.lo gnu/gcj/natCore.lo \
+       gnu/gcj/convert/JIS0208_to_Unicode.lo \
        gnu/gcj/convert/JIS0212_to_Unicode.lo \
        gnu/gcj/convert/Unicode_to_JIS.lo gnu/gcj/convert/natIconv.lo \
        gnu/gcj/convert/natInput_EUCJIS.lo \
@@ -255,62 +351,82 @@ am__objects_2 = gnu/classpath/natSystemProperties.lo \
        gnu/gcj/convert/natOutput_EUCJIS.lo \
        gnu/gcj/convert/natOutput_SJIS.lo \
        gnu/gcj/io/natSimpleSHSStream.lo gnu/gcj/io/shs.lo \
+       gnu/gcj/jvmti/natBreakpoint.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/lang/management/natVMClassLoadingMXBeanImpl.lo \
+       gnu/java/lang/management/natVMCompilationMXBeanImpl.lo \
+       gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.lo \
+       gnu/java/lang/management/natVMMemoryMXBeanImpl.lo \
+       gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.lo \
+       gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.lo \
+       gnu/java/lang/management/natVMRuntimeMXBeanImpl.lo \
+       gnu/java/lang/management/natVMThreadMXBeanImpl.lo \
        gnu/java/net/natPlainDatagramSocketImpl.lo \
        gnu/java/net/natPlainSocketImpl.lo \
        gnu/java/net/protocol/core/natCoreInputStream.lo \
        gnu/java/nio/natPipeImpl.lo gnu/java/nio/natSelectorImpl.lo \
        gnu/java/nio/natNIOServerSocket.lo \
+       gnu/java/nio/natVMChannel.lo \
        gnu/java/nio/channels/natFileChannelImpl.lo java/io/natFile.lo \
        java/io/natObjectInputStream.lo \
-       java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \
-       java/lang/natClass.lo java/lang/natClassLoader.lo \
-       java/lang/natConcreteProcess.lo java/lang/natDouble.lo \
-       java/lang/natFloat.lo java/lang/natMath.lo \
-       java/lang/natObject.lo java/lang/natRuntime.lo \
-       java/lang/natString.lo java/lang/natStringBuffer.lo \
-       java/lang/natStringBuilder.lo java/lang/natSystem.lo \
-       java/lang/natThread.lo java/lang/natVMClassLoader.lo \
-       java/lang/natVMSecurityManager.lo java/lang/natVMThrowable.lo \
-       java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \
+       java/io/natVMObjectStreamClass.lo \
+       java/lang/management/natVMManagementFactory.lo \
+       java/lang/natCharacter.lo java/lang/natClass.lo \
+       java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \
+       java/lang/natDouble.lo java/lang/natFloat.lo \
+       java/lang/natMath.lo java/lang/natObject.lo \
+       java/lang/natRuntime.lo java/lang/natString.lo \
+       java/lang/natStringBuffer.lo java/lang/natStringBuilder.lo \
+       java/lang/natSystem.lo java/lang/natThread.lo \
+       java/lang/natThreadLocal.lo java/lang/natVMClassLoader.lo \
+       java/lang/natVMThrowable.lo java/lang/ref/natReference.lo \
+       java/lang/reflect/natArray.lo \
        java/lang/reflect/natConstructor.lo \
        java/lang/reflect/natField.lo java/lang/reflect/natMethod.lo \
-       java/lang/reflect/natProxy.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/lang/reflect/natVMProxy.lo java/net/natVMInetAddress.lo \
+       java/net/natVMNetworkInterface.lo \
+       java/net/natVMURLConnection.lo \
+       java/nio/channels/natVMChannels.lo \
+       java/nio/natDirectByteBufferImpl.lo \
+       java/security/natVMAccessController.lo \
+       java/security/natVMAccessControlState.lo \
+       java/text/natCollator.lo java/util/natVMTimeZone.lo \
+       java/util/concurrent/atomic/natAtomicLong.lo \
        java/util/logging/natLogger.lo java/util/zip/natDeflater.lo \
-       java/util/zip/natInflater.lo
+       java/util/zip/natInflater.lo sun/misc/natUnsafe.lo
 @USING_BOEHMGC_TRUE@am__objects_3 = boehm.lo
 @USING_NOGC_TRUE@am__objects_4 = nogc.lo
-@SUPPLY_BACKTRACE_TRUE@am__objects_5 = sysdep/dwarf2-backtrace.lo
-@USING_POSIX_PLATFORM_TRUE@am__objects_6 = posix.lo
-@USING_WIN32_PLATFORM_TRUE@am__objects_7 = win32.lo
-@USING_DARWIN_CRT_TRUE@am__objects_8 = darwin.lo
-@USING_POSIX_THREADS_TRUE@am__objects_9 = posix-threads.lo
-@USING_WIN32_THREADS_TRUE@am__objects_10 = win32-threads.lo
-@USING_NO_THREADS_TRUE@am__objects_11 = no-threads.lo
-am_libgcj_la_OBJECTS = prims.lo jni.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) $(am__objects_11)
+@USING_POSIX_PLATFORM_TRUE@am__objects_5 = posix.lo
+@USING_WIN32_PLATFORM_TRUE@am__objects_6 = win32.lo
+@USING_DARWIN_CRT_TRUE@am__objects_7 = darwin.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 jvmti.lo exception.lo \
+       stacktrace.lo link.lo defineclass.lo interpret.lo verify.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 = libgcjawt_la-jawt.lo
-libgcjawt_la_OBJECTS = $(am_libgcjawt_la_OBJECTS)
-@GTK_AWT_TRUE@am_libgcjawt_la_rpath = -rpath $(toolexeclibdir)
+am_libgcj_bc_la_OBJECTS = libgcj_bc.lo
+libgcj_bc_la_OBJECTS = $(am_libgcj_bc_la_OBJECTS)
+@USE_LIBGCJ_BC_TRUE@am_libgcj_bc_la_rpath = -rpath $(toolexeclibdir)
 am_libgij_la_OBJECTS = gij.lo
 libgij_la_OBJECTS = $(am_libgij_la_OBJECTS)
+am_libjvm_la_OBJECTS = jni-libjvm.lo
+libjvm_la_OBJECTS = $(am_libjvm_la_OBJECTS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-am_gcj_dbtool_OBJECTS = gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT) \
-       gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT)
+libexecsubPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(libexecsub_PROGRAMS) $(noinst_PROGRAMS)
+am_ecjx_OBJECTS =
+ecjx_OBJECTS = $(am_ecjx_OBJECTS)
+am_gappletviewer_OBJECTS =
+gappletviewer_OBJECTS = $(am_gappletviewer_OBJECTS)
+am_gcj_dbtool_OBJECTS = gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT)
 gcj_dbtool_OBJECTS = $(am_gcj_dbtool_OBJECTS)
 am__gen_from_JIS_SOURCES_DIST = gnu/gcj/convert/gen-from-JIS.c \
        gnu/gcj/convert/make-trie.c
@@ -320,10 +436,28 @@ gen_from_JIS_OBJECTS = $(am_gen_from_JIS_OBJECTS)
 gen_from_JIS_LDADD = $(LDADD)
 am_gij_OBJECTS =
 gij_OBJECTS = $(am_gij_OBJECTS)
+am_gjar_OBJECTS =
+gjar_OBJECTS = $(am_gjar_OBJECTS)
+am_gjarsigner_OBJECTS =
+gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS)
+am_gjavah_OBJECTS =
+gjavah_OBJECTS = $(am_gjavah_OBJECTS)
+am_gkeytool_OBJECTS =
+gkeytool_OBJECTS = $(am_gkeytool_OBJECTS)
+am_gnative2ascii_OBJECTS =
+gnative2ascii_OBJECTS = $(am_gnative2ascii_OBJECTS)
+am_gorbd_OBJECTS =
+gorbd_OBJECTS = $(am_gorbd_OBJECTS)
 am_grmic_OBJECTS =
 grmic_OBJECTS = $(am_grmic_OBJECTS)
+am_grmid_OBJECTS =
+grmid_OBJECTS = $(am_grmid_OBJECTS)
 am_grmiregistry_OBJECTS =
 grmiregistry_OBJECTS = $(am_grmiregistry_OBJECTS)
+am_gserialver_OBJECTS =
+gserialver_OBJECTS = $(am_gserialver_OBJECTS)
+am_gtnameserv_OBJECTS =
+gtnameserv_OBJECTS = $(am_gtnameserv_OBJECTS)
 am_jv_convert_OBJECTS =
 jv_convert_OBJECTS = $(am_jv_convert_OBJECTS)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@@ -351,17 +485,27 @@ 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) $(libgcj_la_SOURCES) \
-       $(libgcjawt_la_SOURCES) $(libgij_la_SOURCES) \
+SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(libgcj_tools_la_SOURCES) \
+       $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) \
+       $(libgcj_bc_la_SOURCES) $(libgij_la_SOURCES) \
+       $(libjvm_la_SOURCES) $(ecjx_SOURCES) $(gappletviewer_SOURCES) \
        $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) \
-       $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
+       $(gjar_SOURCES) $(gjarsigner_SOURCES) $(gjavah_SOURCES) \
+       $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \
+       $(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \
+       $(gserialver_SOURCES) $(gtnameserv_SOURCES) \
+       $(jv_convert_SOURCES)
 DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
-       $(lib_gnu_java_awt_peer_gtk_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) \
+       $(EXTRA_libgcj_la_SOURCES) $(libgcj_bc_la_SOURCES) \
+       $(libgij_la_SOURCES) $(libjvm_la_SOURCES) $(ecjx_SOURCES) \
+       $(gappletviewer_SOURCES) $(gcj_dbtool_SOURCES) \
        $(am__gen_from_JIS_SOURCES_DIST) $(gij_SOURCES) \
-       $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
+       $(gjar_SOURCES) $(gjarsigner_SOURCES) $(gjavah_SOURCES) \
+       $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \
+       $(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \
+       $(gserialver_SOURCES) $(gtnameserv_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 \
@@ -370,10 +514,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        uninstall-recursive
 dbexecDATA_INSTALL = $(INSTALL_DATA)
 jarDATA_INSTALL = $(INSTALL_DATA)
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
 toolexecmainlibDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dbexec_DATA) $(jar_DATA) $(pkgconfig_DATA) \
-       $(toolexecmainlib_DATA)
+DATA = $(dbexec_DATA) $(jar_DATA) $(toolexecmainlib_DATA)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = @DIRLTDL@ gcj include classpath testsuite
@@ -400,8 +542,10 @@ 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@
+BUILD_ECJ1_FALSE = @BUILD_ECJ1_FALSE@
+BUILD_ECJ1_TRUE = @BUILD_ECJ1_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -421,7 +565,11 @@ DIVIDESPEC = @DIVIDESPEC@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+ECJ_BUILD_JAR = @ECJ_BUILD_JAR@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
+ENABLE_SHARED_FALSE = @ENABLE_SHARED_FALSE@
+ENABLE_SHARED_TRUE = @ENABLE_SHARED_TRUE@
 EXCEPTIONSPEC = @EXCEPTIONSPEC@
 EXEEXT = @EXEEXT@
 GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
@@ -432,30 +580,35 @@ GCJDEPMODE = @GCJDEPMODE@
 GCJFLAGS = @GCJFLAGS@
 GCJH = @GCJH@
 GCJVERSION = @GCJVERSION@
+GCJ_FOR_ECJX = @GCJ_FOR_ECJX@
 GCLIBS = @GCLIBS@
 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@
 IEEESPEC = @IEEESPEC@
 INCLTDL = @INCLTDL@
 INSTALL_DATA = @INSTALL_DATA@
+INSTALL_ECJ_JAR_FALSE = @INSTALL_ECJ_JAR_FALSE@
+INSTALL_ECJ_JAR_TRUE = @INSTALL_ECJ_JAR_TRUE@
 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@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_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@
@@ -466,8 +619,10 @@ LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
 LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
 LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
 LIBGCJ_LD_SYMBOLIC = @LIBGCJ_LD_SYMBOLIC@
+LIBGCJ_SPEC = @LIBGCJ_SPEC@
 LIBICONV = @LIBICONV@
 LIBLTDL = @LIBLTDL@
+LIBMAGIC = @LIBMAGIC@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -489,18 +644,14 @@ 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@
+PLATFORM = @PLATFORM@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SUPPLY_BACKTRACE_FALSE = @SUPPLY_BACKTRACE_FALSE@
-SUPPLY_BACKTRACE_TRUE = @SUPPLY_BACKTRACE_TRUE@
 SYSDEP_SOURCES = @SYSDEP_SOURCES@
 SYSTEMSPEC = @SYSTEMSPEC@
 SYS_ZLIBS = @SYS_ZLIBS@
@@ -512,7 +663,11 @@ THREADINCS = @THREADINCS@
 THREADLDFLAGS = @THREADLDFLAGS@
 THREADLIBS = @THREADLIBS@
 THREADSPEC = @THREADSPEC@
+THREADSTARTFILESPEC = @THREADSTARTFILESPEC@
 TOOLKIT = @TOOLKIT@
+UNZIP = @UNZIP@
+USE_LIBGCJ_BC_FALSE = @USE_LIBGCJ_BC_FALSE@
+USE_LIBGCJ_BC_TRUE = @USE_LIBGCJ_BC_TRUE@
 USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
 USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@
 USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@
@@ -534,6 +689,8 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@
 VERSION = @VERSION@
 XLIB_AWT_FALSE = @XLIB_AWT_FALSE@
 XLIB_AWT_TRUE = @XLIB_AWT_TRUE@
+X_AWT_FALSE = @X_AWT_FALSE@
+X_AWT_TRUE = @X_AWT_TRUE@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
@@ -548,6 +705,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@
@@ -565,16 +723,20 @@ 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@
 here = @here@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
+host_exeext = @host_exeext@
 host_os = @host_os@
 host_subdir = @host_subdir@
 host_vendor = @host_vendor@
@@ -609,7 +771,7 @@ toolexecdir = @toolexecdir@
 toolexeclibdir = @toolexeclibdir@
 toolexecmainlibdir = @toolexecmainlibdir@
 AUTOMAKE_OPTIONS = foreign subdir-objects
-ACLOCAL_AMFLAGS = -I . -I ../config
+ACLOCAL_AMFLAGS = -I . -I .. -I ../config
 
 # May be used by various substitution variables.
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
@@ -623,27 +785,34 @@ 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)
+
+# This is required by TL_AC_GXX_INCLUDE_DIR.
+libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
+libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
+toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la \
+       $(am__append_2) $(am__append_3)
 toolexecmainlib_DATA = libgcj.spec
+dbexec_LTLIBRARIES = libjvm.la
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgcj.pc
 jardir = $(datadir)/java
-jar_DATA = libgcj-$(gcc_version).jar
+jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
+       $(am__append_4)
 @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)
-dbexecdir = $(libdir)/gcj-$(gcc_version)
 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_5)
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
-GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
-LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
+GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
+          $(LDFLAGS) -o $@
+
+GCJ_FOR_ECJX_LINK = $(GCJ_FOR_ECJX) -o $@
+LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) \
+          $(LDFLAGS) $(extra_ldflags_libjava) -o $@
+
 WARNINGS = -Wextra -Wall
 AM_CXXFLAGS = \
        -fno-rtti \
@@ -653,18 +822,18 @@ AM_CXXFLAGS = \
        -Wswitch-enum \
        -D_FILE_OFFSET_BITS=64 \
        @LIBGCJ_CXXFLAGS@ \
-       @X_CFLAGS@ \
        $(WARNINGS) \
        -D_GNU_SOURCE \
        -DPREFIX="\"$(prefix)\"" \
-       -DLIBDIR="\"$(libdir)\"" \
+       -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\"" \
         -DJAVA_HOME="\"$(JAVA_HOME_DIR)\"" \
         -DBOOT_CLASS_PATH="\"$(BOOT_CLASS_PATH_DIR)\"" \
        -DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \
        -DGCJ_ENDORSED_DIRS="\"$(jardir)/gcj-endorsed\"" \
+       -DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
+       -DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
        -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
-       -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \
-       -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\""
+       -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\""
 
 AM_GCJFLAGS = \
        @LIBGCJ_JAVAFLAGS@ \
@@ -672,33 +841,30 @@ AM_GCJFLAGS = \
        --encoding=UTF-8 \
        -Wno-deprecated -fbootstrap-classes
 
-AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_4)
+AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_6)
 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)
 
-BOOTCLASSPATH = $(here)/classpath/lib
-all_property_files = $(property_files) \
-    java/util/logging/logging.properties
-
+BOOTCLASSPATH = $(srcdir)/classpath/lib
 libgij_la_SOURCES = gij.cc
 libgij_la_DEPENDENCIES = libgcj.la libgcj.spec
 libgij_la_LIBADD = -L$(here)/.libs libgcj.la
 libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
         -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
 
-libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \
-       defineclass.cc interpret.cc verify.cc java/lang/Class.java \
-       java/lang/Object.java $(nat_source_files) $(am__append_5) \
-       $(am__append_6) $(am__append_7) $(am__append_8) \
+libgcj_la_SOURCES = prims.cc jni.cc jvmti.cc exception.cc \
+       stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \
+       $(nat_source_files) $(am__append_7) $(am__append_8) \
        $(am__append_9) $(am__append_10) $(am__append_11) \
-       $(am__append_12) $(am__append_13)
+       $(am__append_12) $(am__append_13) $(am__append_14)
 nat_files = $(nat_source_files:.cc=.lo)
 xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
 
@@ -710,40 +876,34 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
 
 libgcj_la_LIBADD = \
        classpath/native/fdlibm/libfdlibm.la \
+       java/lang/Object.lo \
+       java/lang/Class.lo \
+       java/process-$(PLATFORM).lo \
        $(all_packages_source_files:.list=.lo) \
        $(bc_objects) \
        $(propertyo_files) \
-       $(LIBFFI) $(ZLIBS) $(GCLIBS)
+       $(LIBMAGIC) $(LIBFFI) $(ZLIBS) $(GCLIBS)
 
 libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
+       java/lang/Object.lo \
+       java/lang/Class.lo \
+       java/process-$(PLATFORM).lo \
        $(all_packages_source_files:.list=.lo) \
        $(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 = 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)
+EXTRA_libgcj_la_SOURCES = java/lang/Object.java
+libgcj_tools_la_SOURCES = classpath/tools/tools.zip
+libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes  -fsource-filename=$(here)/classpath/tools/all-classes.lst
+libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
+ -version-info `grep -v '^\#' $(srcdir)/libtool-version`
+
+libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
+libgcj_tools_la_LINK = $(LIBLINK)
+libjvm_la_SOURCES = jni-libjvm.cc
+libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec
+libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
+libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC)
 lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files)
 lib_gnu_awt_xlib_la_LIBADD = gnu/awt/xlib.lo gnu/gcj/xlib.lo
 lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
@@ -762,20 +922,181 @@ 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
-
-propertyo_files = $(patsubst classpath/resource/%,%,$(property_files:.properties=.properties.lo))
-CLEANFILES = libgcj-$(gcc_version).jar \
-       $(all_java_deps_files) $(all_java_filelist_files)
-
+libgcj_bc_la_SOURCES = libgcj_bc.c
+libgcj_bc_la_LDFLAGS = -rpath $(toolexeclibdir) -no-static -version-info 1:0:0
+libgcj_bc_la_LIBADD = libgcj.la
+libgcj_bc_la_DEPENDENCIES = libgcj.la
+libgcj_bc_la_LINK = $(LIBLINK)
+libgcj_bc_dummy_LINK = $(CC) -L$(here)/.libs $(CFLAGS) $(LDFLAGS) -shared \
+       -fPIC -nostdlib
+
+propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files)))
+CLEANFILES = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
 DISTCLEANFILES = native.dirs
 SUFFIXES = .class .java .h .properties .list
+gnu_CORBA_source_files = \
+classpath/gnu/CORBA/Asynchron.java \
+classpath/gnu/CORBA/BigDecimalHelper.java \
+classpath/gnu/CORBA/ByteArrayComparator.java \
+classpath/gnu/CORBA/CDR/AbstractCdrInput.java \
+classpath/gnu/CORBA/CDR/AbstractCdrOutput.java \
+classpath/gnu/CORBA/CDR/AbstractDataInput.java \
+classpath/gnu/CORBA/CDR/AbstractDataOutput.java \
+classpath/gnu/CORBA/CDR/AligningInput.java \
+classpath/gnu/CORBA/CDR/AligningOutput.java \
+classpath/gnu/CORBA/CDR/ArrayValueHelper.java \
+classpath/gnu/CORBA/CDR/BigEndianInputStream.java \
+classpath/gnu/CORBA/CDR/BigEndianOutputStream.java \
+classpath/gnu/CORBA/CDR/BufferedCdrOutput.java \
+classpath/gnu/CORBA/CDR/BufferredCdrInput.java \
+classpath/gnu/CORBA/CDR/EncapsulationStream.java \
+classpath/gnu/CORBA/CDR/HeadlessInput.java \
+classpath/gnu/CORBA/CDR/IDLTypeHelper.java \
+classpath/gnu/CORBA/CDR/LittleEndianInputStream.java \
+classpath/gnu/CORBA/CDR/LittleEndianOutputStream.java \
+classpath/gnu/CORBA/CDR/UnknownExceptionCtxHandler.java \
+classpath/gnu/CORBA/CDR/VMVio.java \
+classpath/gnu/CORBA/CDR/Vio.java \
+classpath/gnu/CORBA/CDR/gnuRuntime.java \
+classpath/gnu/CORBA/CDR/gnuValueStream.java \
+classpath/gnu/CORBA/CdrEncapsCodecImpl.java \
+classpath/gnu/CORBA/CollocatedOrbs.java \
+classpath/gnu/CORBA/Connected_objects.java \
+classpath/gnu/CORBA/CorbaList.java \
+classpath/gnu/CORBA/DefaultSocketFactory.java \
+classpath/gnu/CORBA/DefinitionKindHolder.java \
+classpath/gnu/CORBA/DuplicateNameHolder.java \
+classpath/gnu/CORBA/DynAn/AbstractAny.java \
+classpath/gnu/CORBA/DynAn/DivideableAny.java \
+classpath/gnu/CORBA/DynAn/NameValuePairHolder.java \
+classpath/gnu/CORBA/DynAn/RecordAny.java \
+classpath/gnu/CORBA/DynAn/UndivideableAny.java \
+classpath/gnu/CORBA/DynAn/ValueChangeListener.java \
+classpath/gnu/CORBA/DynAn/gnuDynAny.java \
+classpath/gnu/CORBA/DynAn/gnuDynAnyFactory.java \
+classpath/gnu/CORBA/DynAn/gnuDynArray.java \
+classpath/gnu/CORBA/DynAn/gnuDynEnum.java \
+classpath/gnu/CORBA/DynAn/gnuDynFixed.java \
+classpath/gnu/CORBA/DynAn/gnuDynSequence.java \
+classpath/gnu/CORBA/DynAn/gnuDynStruct.java \
+classpath/gnu/CORBA/DynAn/gnuDynUnion.java \
+classpath/gnu/CORBA/DynAn/gnuDynValue.java \
+classpath/gnu/CORBA/DynAn/gnuDynValueBox.java \
+classpath/gnu/CORBA/DynAnySeqHolder.java \
+classpath/gnu/CORBA/EmptyExceptionHolder.java \
+classpath/gnu/CORBA/ForwardRequestHelper.java \
+classpath/gnu/CORBA/GIOP/CancelHeader.java \
+classpath/gnu/CORBA/GIOP/CharSets_OSF.java \
+classpath/gnu/CORBA/GIOP/CloseMessage.java \
+classpath/gnu/CORBA/GIOP/CodeSetServiceContext.java \
+classpath/gnu/CORBA/GIOP/ContextHandler.java \
+classpath/gnu/CORBA/GIOP/ErrorMessage.java \
+classpath/gnu/CORBA/GIOP/MessageHeader.java \
+classpath/gnu/CORBA/GIOP/ReplyHeader.java \
+classpath/gnu/CORBA/GIOP/RequestHeader.java \
+classpath/gnu/CORBA/GIOP/ServiceContext.java \
+classpath/gnu/CORBA/GIOP/v1_0/CancelHeader.java \
+classpath/gnu/CORBA/GIOP/v1_0/ReplyHeader.java \
+classpath/gnu/CORBA/GIOP/v1_0/RequestHeader.java \
+classpath/gnu/CORBA/GIOP/v1_2/ReplyHeader.java \
+classpath/gnu/CORBA/GIOP/v1_2/RequestHeader.java \
+classpath/gnu/CORBA/GeneralHolder.java \
+classpath/gnu/CORBA/HolderLocator.java \
+classpath/gnu/CORBA/IOR.java \
+classpath/gnu/CORBA/Interceptor/ClientRequestInterceptors.java \
+classpath/gnu/CORBA/Interceptor/ForwardRequestHolder.java \
+classpath/gnu/CORBA/Interceptor/IORInterceptors.java \
+classpath/gnu/CORBA/Interceptor/Registrator.java \
+classpath/gnu/CORBA/Interceptor/ServerRequestInterceptors.java \
+classpath/gnu/CORBA/Interceptor/gnuClientRequestInfo.java \
+classpath/gnu/CORBA/Interceptor/gnuIcCurrent.java \
+classpath/gnu/CORBA/Interceptor/gnuIorInfo.java \
+classpath/gnu/CORBA/Interceptor/gnuServerRequestInfo.java \
+classpath/gnu/CORBA/IorDelegate.java \
+classpath/gnu/CORBA/IorObject.java \
+classpath/gnu/CORBA/IorProvider.java \
+classpath/gnu/CORBA/Minor.java \
+classpath/gnu/CORBA/NameDynAnyPairHolder.java \
+classpath/gnu/CORBA/NameDynAnyPairSeqHolder.java \
+classpath/gnu/CORBA/NameValuePairHolder.java \
+classpath/gnu/CORBA/NameValuePairSeqHolder.java \
+classpath/gnu/CORBA/NamingService/Binding_iterator_impl.java \
+classpath/gnu/CORBA/NamingService/Ext.java \
+classpath/gnu/CORBA/NamingService/NameComponentComparator.java \
+classpath/gnu/CORBA/NamingService/NameParser.java \
+classpath/gnu/CORBA/NamingService/NameTransformer.java \
+classpath/gnu/CORBA/NamingService/NameValidator.java \
+classpath/gnu/CORBA/NamingService/NamingMap.java \
+classpath/gnu/CORBA/NamingService/NamingServiceTransient.java \
+classpath/gnu/CORBA/NamingService/TransientContext.java \
+classpath/gnu/CORBA/ObjectCreator.java \
+classpath/gnu/CORBA/OctetHolder.java \
+classpath/gnu/CORBA/OrbFocused.java \
+classpath/gnu/CORBA/OrbFunctional.java \
+classpath/gnu/CORBA/OrbRestricted.java \
+classpath/gnu/CORBA/Poa/AOM.java \
+classpath/gnu/CORBA/Poa/AccessiblePolicy.java \
+classpath/gnu/CORBA/Poa/DynamicImpHandler.java \
+classpath/gnu/CORBA/Poa/ForwardRequestHolder.java \
+classpath/gnu/CORBA/Poa/ForwardedServant.java \
+classpath/gnu/CORBA/Poa/InvalidPolicyHolder.java \
+classpath/gnu/CORBA/Poa/LocalDelegate.java \
+classpath/gnu/CORBA/Poa/LocalRequest.java \
+classpath/gnu/CORBA/Poa/LocalServerRequest.java \
+classpath/gnu/CORBA/Poa/ORB_1_4.java \
+classpath/gnu/CORBA/Poa/ServantDelegateImpl.java \
+classpath/gnu/CORBA/Poa/StandardPolicies.java \
+classpath/gnu/CORBA/Poa/gnuAdapterActivator.java \
+classpath/gnu/CORBA/Poa/gnuForwardRequest.java \
+classpath/gnu/CORBA/Poa/gnuIdAssignmentPolicy.java \
+classpath/gnu/CORBA/Poa/gnuIdUniquenessPolicy.java \
+classpath/gnu/CORBA/Poa/gnuImplicitActivationPolicy.java \
+classpath/gnu/CORBA/Poa/gnuLifespanPolicy.java \
+classpath/gnu/CORBA/Poa/gnuPOA.java \
+classpath/gnu/CORBA/Poa/gnuPOAManager.java \
+classpath/gnu/CORBA/Poa/gnuPoaCurrent.java \
+classpath/gnu/CORBA/Poa/gnuRequestProcessingPolicy.java \
+classpath/gnu/CORBA/Poa/gnuServantObject.java \
+classpath/gnu/CORBA/Poa/gnuServantRetentionPolicy.java \
+classpath/gnu/CORBA/Poa/gnuThreadPolicy.java \
+classpath/gnu/CORBA/RawReply.java \
+classpath/gnu/CORBA/ResponseHandlerImpl.java \
+classpath/gnu/CORBA/SafeForDirectCalls.java \
+classpath/gnu/CORBA/ServiceDetailHolder.java \
+classpath/gnu/CORBA/ServiceRequestAdapter.java \
+classpath/gnu/CORBA/SetOverrideTypeHolder.java \
+classpath/gnu/CORBA/SimpleDelegate.java \
+classpath/gnu/CORBA/SocketRepository.java \
+classpath/gnu/CORBA/StreamBasedRequest.java \
+classpath/gnu/CORBA/StreamHolder.java \
+classpath/gnu/CORBA/StubLocator.java \
+classpath/gnu/CORBA/TypeCodeHelper.java \
+classpath/gnu/CORBA/TypeKindNamer.java \
+classpath/gnu/CORBA/Unexpected.java \
+classpath/gnu/CORBA/Version.java \
+classpath/gnu/CORBA/WCharHolder.java \
+classpath/gnu/CORBA/WStringHolder.java \
+classpath/gnu/CORBA/_PolicyImplBase.java \
+classpath/gnu/CORBA/gnuAny.java \
+classpath/gnu/CORBA/gnuCodecFactory.java \
+classpath/gnu/CORBA/gnuContext.java \
+classpath/gnu/CORBA/gnuContextList.java \
+classpath/gnu/CORBA/gnuEnvironment.java \
+classpath/gnu/CORBA/gnuExceptionList.java \
+classpath/gnu/CORBA/gnuNVList.java \
+classpath/gnu/CORBA/gnuNamedValue.java \
+classpath/gnu/CORBA/gnuRequest.java \
+classpath/gnu/CORBA/gnuValueHolder.java \
+classpath/gnu/CORBA/interfaces/SocketFactory.java \
+classpath/gnu/CORBA/typecodes/AliasTypeCode.java \
+classpath/gnu/CORBA/typecodes/ArrayTypeCode.java \
+classpath/gnu/CORBA/typecodes/FixedTypeCode.java \
+classpath/gnu/CORBA/typecodes/GeneralTypeCode.java \
+classpath/gnu/CORBA/typecodes/PrimitiveTypeCode.java \
+classpath/gnu/CORBA/typecodes/RecordTypeCode.java \
+classpath/gnu/CORBA/typecodes/RecursiveTypeCode.java \
+classpath/gnu/CORBA/typecodes/StringTypeCode.java
+
 gnu_awt_source_files = \
 gnu/awt/LightweightRedirector.java
 
@@ -797,27 +1118,155 @@ gnu/awt/xlib/XFontPeer.java \
 gnu/awt/xlib/XFramePeer.java \
 gnu/awt/xlib/XGraphics.java \
 gnu/awt/xlib/XGraphicsConfiguration.java \
+gnu/awt/xlib/XGraphicsDevice.java \
+gnu/awt/xlib/XGraphicsEnvironment.java \
 gnu/awt/xlib/XOffScreenImage.java \
 gnu/awt/xlib/XPanelPeer.java \
 gnu/awt/xlib/XToolkit.java
 
 gnu_awt_xlib_header_files = $(patsubst %.java,%.h,$(gnu_awt_xlib_source_files))
 gnu_classpath_source_files = \
-classpath/gnu/classpath/Configuration.java \
-classpath/gnu/classpath/RawData.java \
-classpath/gnu/classpath/RawData32.java \
-classpath/gnu/classpath/RawData64.java \
+gnu/classpath/Configuration.java \
+classpath/gnu/classpath/ListenerData.java \
+classpath/gnu/classpath/NotImplementedException.java \
+classpath/gnu/classpath/Pointer.java \
+classpath/gnu/classpath/Pointer32.java \
+classpath/gnu/classpath/Pointer64.java \
 classpath/gnu/classpath/ServiceFactory.java \
 classpath/gnu/classpath/ServiceProviderLoadingAction.java \
-gnu/classpath/SystemProperties.java
+gnu/classpath/SystemProperties.java \
+gnu/classpath/VMStackWalker.java
 
 gnu_classpath_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_source_files)))
 gnu_classpath_debug_source_files = \
 classpath/gnu/classpath/debug/Component.java \
 classpath/gnu/classpath/debug/PreciseFilter.java \
-classpath/gnu/classpath/debug/SystemLogger.java
+classpath/gnu/classpath/debug/Simple1LineFormatter.java \
+classpath/gnu/classpath/debug/SystemLogger.java \
+classpath/gnu/classpath/debug/TeeInputStream.java \
+classpath/gnu/classpath/debug/TeeOutputStream.java \
+classpath/gnu/classpath/debug/TeeReader.java \
+classpath/gnu/classpath/debug/TeeWriter.java
 
 gnu_classpath_debug_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_debug_source_files)))
+gnu_classpath_jdwp_source_files = \
+classpath/gnu/classpath/jdwp/Jdwp.java \
+classpath/gnu/classpath/jdwp/JdwpConstants.java \
+gnu/classpath/jdwp/VMFrame.java \
+gnu/classpath/jdwp/VMIdManager.java \
+gnu/classpath/jdwp/VMMethod.java \
+gnu/classpath/jdwp/VMVirtualMachine.java
+
+gnu_classpath_jdwp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_source_files)))
+gnu_classpath_jdwp_event_source_files = \
+classpath/gnu/classpath/jdwp/event/BreakpointEvent.java \
+classpath/gnu/classpath/jdwp/event/ClassPrepareEvent.java \
+classpath/gnu/classpath/jdwp/event/ClassUnloadEvent.java \
+classpath/gnu/classpath/jdwp/event/Event.java \
+classpath/gnu/classpath/jdwp/event/EventManager.java \
+classpath/gnu/classpath/jdwp/event/EventRequest.java \
+classpath/gnu/classpath/jdwp/event/ExceptionEvent.java \
+classpath/gnu/classpath/jdwp/event/MethodEntryEvent.java \
+classpath/gnu/classpath/jdwp/event/MethodExitEvent.java \
+classpath/gnu/classpath/jdwp/event/SingleStepEvent.java \
+classpath/gnu/classpath/jdwp/event/ThreadEndEvent.java \
+classpath/gnu/classpath/jdwp/event/ThreadStartEvent.java \
+classpath/gnu/classpath/jdwp/event/VmDeathEvent.java \
+classpath/gnu/classpath/jdwp/event/VmInitEvent.java
+
+gnu_classpath_jdwp_event_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_event_source_files)))
+gnu_classpath_jdwp_event_filters_source_files = \
+classpath/gnu/classpath/jdwp/event/filters/ClassExcludeFilter.java \
+classpath/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java \
+classpath/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java \
+classpath/gnu/classpath/jdwp/event/filters/ConditionalFilter.java \
+classpath/gnu/classpath/jdwp/event/filters/CountFilter.java \
+classpath/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java \
+classpath/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.java \
+classpath/gnu/classpath/jdwp/event/filters/IEventFilter.java \
+classpath/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java \
+classpath/gnu/classpath/jdwp/event/filters/LocationOnlyFilter.java \
+classpath/gnu/classpath/jdwp/event/filters/StepFilter.java \
+classpath/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java
+
+gnu_classpath_jdwp_event_filters_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_event_filters_source_files)))
+gnu_classpath_jdwp_exception_source_files = \
+classpath/gnu/classpath/jdwp/exception/InvalidClassException.java \
+classpath/gnu/classpath/jdwp/exception/InvalidClassLoaderException.java \
+classpath/gnu/classpath/jdwp/exception/InvalidCountException.java \
+classpath/gnu/classpath/jdwp/exception/InvalidEventTypeException.java \
+classpath/gnu/classpath/jdwp/exception/InvalidFieldException.java \
+classpath/gnu/classpath/jdwp/exception/InvalidLocationException.java \
+classpath/gnu/classpath/jdwp/exception/InvalidMethodException.java \
+classpath/gnu/classpath/jdwp/exception/InvalidObjectException.java \
+classpath/gnu/classpath/jdwp/exception/InvalidStringException.java \
+classpath/gnu/classpath/jdwp/exception/InvalidThreadException.java \
+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
+
+gnu_classpath_jdwp_exception_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_exception_source_files)))
+gnu_classpath_jdwp_id_source_files = \
+classpath/gnu/classpath/jdwp/id/ArrayId.java \
+classpath/gnu/classpath/jdwp/id/ArrayReferenceTypeId.java \
+classpath/gnu/classpath/jdwp/id/ClassLoaderId.java \
+classpath/gnu/classpath/jdwp/id/ClassObjectId.java \
+classpath/gnu/classpath/jdwp/id/ClassReferenceTypeId.java \
+classpath/gnu/classpath/jdwp/id/InterfaceReferenceTypeId.java \
+classpath/gnu/classpath/jdwp/id/JdwpId.java \
+classpath/gnu/classpath/jdwp/id/ObjectId.java \
+classpath/gnu/classpath/jdwp/id/ReferenceTypeId.java \
+classpath/gnu/classpath/jdwp/id/StringId.java \
+classpath/gnu/classpath/jdwp/id/ThreadGroupId.java \
+classpath/gnu/classpath/jdwp/id/ThreadId.java
+
+gnu_classpath_jdwp_id_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_id_source_files)))
+gnu_classpath_jdwp_processor_source_files = \
+classpath/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/ArrayTypeCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/ClassTypeCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/CommandSet.java \
+classpath/gnu/classpath/jdwp/processor/EventRequestCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/FieldCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/MethodCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/PacketProcessor.java \
+classpath/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/StackFrameCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/StringReferenceCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.java \
+classpath/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java
+
+gnu_classpath_jdwp_processor_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_processor_source_files)))
+gnu_classpath_jdwp_transport_source_files = \
+classpath/gnu/classpath/jdwp/transport/ITransport.java \
+classpath/gnu/classpath/jdwp/transport/JdwpCommandPacket.java \
+classpath/gnu/classpath/jdwp/transport/JdwpConnection.java \
+classpath/gnu/classpath/jdwp/transport/JdwpPacket.java \
+classpath/gnu/classpath/jdwp/transport/JdwpReplyPacket.java \
+classpath/gnu/classpath/jdwp/transport/SocketTransport.java \
+classpath/gnu/classpath/jdwp/transport/TransportException.java \
+classpath/gnu/classpath/jdwp/transport/TransportFactory.java
+
+gnu_classpath_jdwp_transport_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_transport_source_files)))
+gnu_classpath_jdwp_util_source_files = \
+classpath/gnu/classpath/jdwp/util/JdwpString.java \
+classpath/gnu/classpath/jdwp/util/LineTable.java \
+classpath/gnu/classpath/jdwp/util/Location.java \
+classpath/gnu/classpath/jdwp/util/MethodResult.java \
+classpath/gnu/classpath/jdwp/util/Signature.java \
+classpath/gnu/classpath/jdwp/util/Value.java \
+classpath/gnu/classpath/jdwp/util/VariableTable.java
+
+gnu_classpath_jdwp_util_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_util_source_files)))
 gnu_gcj_source_files = \
 gnu/gcj/Core.java \
 gnu/gcj/RawData.java \
@@ -825,7 +1274,9 @@ gnu/gcj/RawDataManaged.java
 
 gnu_gcj_header_files = $(patsubst %.java,%.h,$(gnu_gcj_source_files))
 gnu_gcj_convert_source_files = \
+gnu/gcj/convert/BytesToCharsetAdaptor.java \
 gnu/gcj/convert/BytesToUnicode.java \
+gnu/gcj/convert/CharsetToBytesAdaptor.java \
 gnu/gcj/convert/Convert.java \
 gnu/gcj/convert/IOConverter.java \
 gnu/gcj/convert/Input_8859_1.java \
@@ -854,10 +1305,15 @@ gnu/gcj/io/MimeTypes.java \
 gnu/gcj/io/SimpleSHSStream.java
 
 gnu_gcj_io_header_files = $(patsubst %.java,%.h,$(gnu_gcj_io_source_files))
+gnu_gcj_jvmti_source_files = \
+gnu/gcj/jvmti/Breakpoint.java \
+gnu/gcj/jvmti/BreakpointManager.java \
+gnu/gcj/jvmti/Location.java
+
+gnu_gcj_jvmti_header_files = $(patsubst %.java,%.h,$(gnu_gcj_jvmti_source_files))
 gnu_gcj_runtime_source_files = \
 gnu/gcj/runtime/BootClassLoader.java \
 gnu/gcj/runtime/ExtensionClassLoader.java \
-gnu/gcj/runtime/FileDeleter.java \
 gnu/gcj/runtime/FinalizerThread.java \
 gnu/gcj/runtime/HelperClassLoader.java \
 gnu/gcj/runtime/JNIWeakRef.java \
@@ -869,6 +1325,10 @@ gnu/gcj/runtime/StringBuffer.java \
 gnu/gcj/runtime/SystemClassLoader.java
 
 gnu_gcj_runtime_header_files = $(patsubst %.java,%.h,$(gnu_gcj_runtime_source_files))
+gnu_gcj_tools_gcj_dbtool_source_files = \
+gnu/gcj/tools/gcj_dbtool/Main.java
+
+gnu_gcj_tools_gcj_dbtool_header_files = $(patsubst %.java,%.h,$(gnu_gcj_tools_gcj_dbtool_source_files))
 gnu_gcj_util_source_files = \
 gnu/gcj/util/Debug.java
 
@@ -906,10 +1366,11 @@ classpath/gnu/java/awt/BitwiseXORComposite.java \
 classpath/gnu/java/awt/Buffers.java \
 classpath/gnu/java/awt/ClasspathToolkit.java \
 classpath/gnu/java/awt/ComponentDataBlitOp.java \
+classpath/gnu/java/awt/ComponentReshapeEvent.java \
 classpath/gnu/java/awt/EmbeddedWindow.java \
 classpath/gnu/java/awt/EventModifier.java \
-classpath/gnu/java/awt/FocusManager.java \
-classpath/gnu/java/awt/GradientPaintContext.java
+classpath/gnu/java/awt/GradientPaintContext.java \
+classpath/gnu/java/awt/LowPriorityEvent.java
 
 gnu_java_awt_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_source_files)))
 gnu_java_awt_color_source_files = \
@@ -928,67 +1389,234 @@ classpath/gnu/java/awt/color/TagEntry.java \
 classpath/gnu/java/awt/color/ToneReproductionCurve.java
 
 gnu_java_awt_color_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_color_source_files)))
+gnu_java_awt_dnd_source_files = \
+classpath/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.java
+
+gnu_java_awt_dnd_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_dnd_source_files)))
+gnu_java_awt_dnd_peer_gtk_source_files = \
+classpath/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java \
+classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java \
+classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.java
+
+gnu_java_awt_font_source_files = \
+classpath/gnu/java/awt/font/FontDelegate.java \
+classpath/gnu/java/awt/font/FontFactory.java \
+classpath/gnu/java/awt/font/GNUGlyphVector.java
+
+gnu_java_awt_font_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_font_source_files)))
+gnu_java_awt_font_autofit_source_files = \
+classpath/gnu/java/awt/font/autofit/AxisHints.java \
+classpath/gnu/java/awt/font/autofit/Constants.java \
+classpath/gnu/java/awt/font/autofit/GlyphHints.java \
+classpath/gnu/java/awt/font/autofit/Latin.java \
+classpath/gnu/java/awt/font/autofit/LatinAxis.java \
+classpath/gnu/java/awt/font/autofit/LatinMetrics.java \
+classpath/gnu/java/awt/font/autofit/Scaler.java \
+classpath/gnu/java/awt/font/autofit/Script.java \
+classpath/gnu/java/awt/font/autofit/ScriptMetrics.java \
+classpath/gnu/java/awt/font/autofit/Segment.java \
+classpath/gnu/java/awt/font/autofit/Width.java
+
+gnu_java_awt_font_autofit_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_font_autofit_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/ShapeCache.java \
+classpath/gnu/java/awt/java2d/TexturePaintContext.java
+
+gnu_java_awt_java2d_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_java2d_source_files)))
 gnu_java_awt_peer_source_files = \
 classpath/gnu/java/awt/peer/ClasspathFontPeer.java \
-classpath/gnu/java/awt/peer/ClasspathTextLayoutPeer.java \
 classpath/gnu/java/awt/peer/EmbeddedWindowPeer.java \
-classpath/gnu/java/awt/peer/GLightweightPeer.java
+classpath/gnu/java/awt/peer/GLightweightPeer.java \
+classpath/gnu/java/awt/peer/NativeEventLoopRunningEvent.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/AsyncImage.java \
+classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java \
+classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java \
+classpath/gnu/java/awt/peer/gtk/CairoSurface.java \
+classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java \
+classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java \
+classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java \
+classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java \
 classpath/gnu/java/awt/peer/gtk/GThreadMutex.java \
 classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java \
-classpath/gnu/java/awt/peer/gtk/GdkFontMetrics.java \
 classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java \
-classpath/gnu/java/awt/peer/gtk/GdkGlyphVector.java \
-classpath/gnu/java/awt/peer/gtk/GdkGraphics.java \
-classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java \
 classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java \
 classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java \
 classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java \
 classpath/gnu/java/awt/peer/gtk/GdkRobotPeer.java \
 classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java \
-classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java \
 classpath/gnu/java/awt/peer/gtk/GtkButtonPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkCanvasPeer.java \
-classpath/gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkChoicePeer.java \
 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 \
 classpath/gnu/java/awt/peer/gtk/GtkImageConsumer.java \
 classpath/gnu/java/awt/peer/gtk/GtkLabelPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkListPeer.java \
+classpath/gnu/java/awt/peer/gtk/GtkMainThread.java \
 classpath/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkMenuPeer.java \
+classpath/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkPanelPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java \
+classpath/gnu/java/awt/peer/gtk/GtkSelection.java \
 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_headless_source_files = \
+classpath/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.java \
+classpath/gnu/java/awt/peer/headless/HeadlessToolkit.java
+
+gnu_java_awt_peer_headless_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_peer_headless_source_files)))
+gnu_java_awt_peer_qt_source_files = \
+classpath/gnu/java/awt/peer/qt/MainQtThread.java \
+classpath/gnu/java/awt/peer/qt/NativeWrapper.java \
+classpath/gnu/java/awt/peer/qt/QMatrix.java \
+classpath/gnu/java/awt/peer/qt/QPainterPath.java \
+classpath/gnu/java/awt/peer/qt/QPen.java \
+classpath/gnu/java/awt/peer/qt/QtAudioClip.java \
+classpath/gnu/java/awt/peer/qt/QtButtonPeer.java \
+classpath/gnu/java/awt/peer/qt/QtCanvasPeer.java \
+classpath/gnu/java/awt/peer/qt/QtCheckboxPeer.java \
+classpath/gnu/java/awt/peer/qt/QtChoicePeer.java \
+classpath/gnu/java/awt/peer/qt/QtComponentGraphics.java \
+classpath/gnu/java/awt/peer/qt/QtComponentPeer.java \
+classpath/gnu/java/awt/peer/qt/QtContainerPeer.java \
+classpath/gnu/java/awt/peer/qt/QtDialogPeer.java \
+classpath/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java \
+classpath/gnu/java/awt/peer/qt/QtFileDialogPeer.java \
+classpath/gnu/java/awt/peer/qt/QtFontMetrics.java \
+classpath/gnu/java/awt/peer/qt/QtFontPeer.java \
+classpath/gnu/java/awt/peer/qt/QtFramePeer.java \
+classpath/gnu/java/awt/peer/qt/QtGraphics.java \
+classpath/gnu/java/awt/peer/qt/QtGraphicsEnvironment.java \
+classpath/gnu/java/awt/peer/qt/QtImage.java \
+classpath/gnu/java/awt/peer/qt/QtImageConsumer.java \
+classpath/gnu/java/awt/peer/qt/QtImageDirectGraphics.java \
+classpath/gnu/java/awt/peer/qt/QtImageGraphics.java \
+classpath/gnu/java/awt/peer/qt/QtLabelPeer.java \
+classpath/gnu/java/awt/peer/qt/QtListPeer.java \
+classpath/gnu/java/awt/peer/qt/QtMenuBarPeer.java \
+classpath/gnu/java/awt/peer/qt/QtMenuComponentPeer.java \
+classpath/gnu/java/awt/peer/qt/QtMenuItemPeer.java \
+classpath/gnu/java/awt/peer/qt/QtMenuPeer.java \
+classpath/gnu/java/awt/peer/qt/QtPanelPeer.java \
+classpath/gnu/java/awt/peer/qt/QtPopupMenuPeer.java \
+classpath/gnu/java/awt/peer/qt/QtRepaintThread.java \
+classpath/gnu/java/awt/peer/qt/QtScreenDevice.java \
+classpath/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java \
+classpath/gnu/java/awt/peer/qt/QtScrollPanePeer.java \
+classpath/gnu/java/awt/peer/qt/QtScrollbarPeer.java \
+classpath/gnu/java/awt/peer/qt/QtTextAreaPeer.java \
+classpath/gnu/java/awt/peer/qt/QtTextFieldPeer.java \
+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/SwingListPeer.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/SwingTextAreaPeer.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_peer_x_source_files = \
+classpath/gnu/java/awt/peer/x/GLGraphics.java \
+classpath/gnu/java/awt/peer/x/ImageConverter.java \
+classpath/gnu/java/awt/peer/x/KeyboardMapping.java \
+classpath/gnu/java/awt/peer/x/XDialogPeer.java \
+classpath/gnu/java/awt/peer/x/XEventPump.java \
+classpath/gnu/java/awt/peer/x/XFontPeer.java \
+classpath/gnu/java/awt/peer/x/XFontPeer2.java \
+classpath/gnu/java/awt/peer/x/XFramePeer.java \
+classpath/gnu/java/awt/peer/x/XGraphics.java \
+classpath/gnu/java/awt/peer/x/XGraphics2D.java \
+classpath/gnu/java/awt/peer/x/XGraphicsConfiguration.java \
+classpath/gnu/java/awt/peer/x/XGraphicsDevice.java \
+classpath/gnu/java/awt/peer/x/XGraphicsEnvironment.java \
+classpath/gnu/java/awt/peer/x/XImage.java \
+classpath/gnu/java/awt/peer/x/XLightweightPeer.java \
+classpath/gnu/java/awt/peer/x/XToolkit.java \
+classpath/gnu/java/awt/peer/x/XWindowPeer.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 \
@@ -1007,7 +1635,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 \
@@ -1039,13 +1666,44 @@ 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 \
 classpath/gnu/java/io/Base64InputStream.java \
 classpath/gnu/java/io/ClassLoaderObjectInputStream.java \
 classpath/gnu/java/io/NullOutputStream.java \
+classpath/gnu/java/io/ObjectIdentityMap2Int.java \
 classpath/gnu/java/io/ObjectIdentityWrapper.java \
 classpath/gnu/java/io/PlatformHelper.java
 
@@ -1054,10 +1712,38 @@ gnu_java_lang_source_files = \
 classpath/gnu/java/lang/ArrayHelper.java \
 classpath/gnu/java/lang/CharData.java \
 classpath/gnu/java/lang/ClassHelper.java \
-gnu/java/lang/MainThread.java
+classpath/gnu/java/lang/InstrumentationImpl.java \
+gnu/java/lang/MainThread.java \
+gnu/java/lang/VMInstrumentationImpl.java
 
 gnu_java_lang_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_source_files)))
+gnu_java_lang_management_source_files = \
+classpath/gnu/java/lang/management/BeanImpl.java \
+classpath/gnu/java/lang/management/ClassLoadingMXBeanImpl.java \
+classpath/gnu/java/lang/management/CompilationMXBeanImpl.java \
+classpath/gnu/java/lang/management/GarbageCollectorMXBeanImpl.java \
+classpath/gnu/java/lang/management/MemoryMXBeanImpl.java \
+classpath/gnu/java/lang/management/MemoryManagerMXBeanImpl.java \
+classpath/gnu/java/lang/management/MemoryPoolMXBeanImpl.java \
+classpath/gnu/java/lang/management/OperatingSystemMXBeanImpl.java \
+classpath/gnu/java/lang/management/RuntimeMXBeanImpl.java \
+classpath/gnu/java/lang/management/ThreadMXBeanImpl.java \
+gnu/java/lang/management/VMClassLoadingMXBeanImpl.java \
+gnu/java/lang/management/VMCompilationMXBeanImpl.java \
+gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java \
+gnu/java/lang/management/VMMemoryMXBeanImpl.java \
+gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java \
+gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java \
+gnu/java/lang/management/VMRuntimeMXBeanImpl.java \
+gnu/java/lang/management/VMThreadMXBeanImpl.java
+
+gnu_java_lang_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_management_source_files)))
 gnu_java_lang_reflect_source_files = \
+classpath/gnu/java/lang/reflect/ClassSignatureParser.java \
+classpath/gnu/java/lang/reflect/FieldSignatureParser.java \
+classpath/gnu/java/lang/reflect/GenericSignatureParser.java \
+classpath/gnu/java/lang/reflect/MethodSignatureParser.java \
+classpath/gnu/java/lang/reflect/TypeImpl.java \
 classpath/gnu/java/lang/reflect/TypeSignature.java
 
 gnu_java_lang_reflect_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_reflect_source_files)))
@@ -1066,6 +1752,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 \
@@ -1212,26 +1899,48 @@ 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/DefaultProxySelector.java \
 classpath/gnu/java/net/EmptyX509TrustManager.java \
 classpath/gnu/java/net/GetLocalHostAction.java \
 classpath/gnu/java/net/HeaderFieldHelper.java \
+classpath/gnu/java/net/IndexListParser.java \
 classpath/gnu/java/net/LineInputStream.java \
 gnu/java/net/PlainDatagramSocketImpl.java \
 gnu/java/net/PlainSocketImpl.java \
-classpath/gnu/java/net/URLParseError.java \
+classpath/gnu/java/net/URLParseError.java
+
+gnu_java_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_source_files)))
+gnu_java_net_loader_source_files = \
+classpath/gnu/java/net/loader/FileResource.java \
+classpath/gnu/java/net/loader/FileURLLoader.java \
+classpath/gnu/java/net/loader/JarURLLoader.java \
+classpath/gnu/java/net/loader/JarURLResource.java \
+classpath/gnu/java/net/loader/RemoteResource.java \
+classpath/gnu/java/net/loader/RemoteURLLoader.java \
+classpath/gnu/java/net/loader/Resource.java \
+classpath/gnu/java/net/loader/URLLoader.java \
+classpath/gnu/java/net/loader/URLStreamHandlerCache.java
+
+gnu_java_net_loader_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_loader_source_files)))
+gnu_java_net_local_source_files = \
+classpath/gnu/java/net/local/LocalServerSocket.java \
+classpath/gnu/java/net/local/LocalSocket.java \
+classpath/gnu/java/net/local/LocalSocketAddress.java \
+gnu/java/net/local/LocalSocketImpl.java
+
+gnu_java_net_local_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_local_source_files)))
+gnu_java_net_protocol_core_source_files = \
 gnu/java/net/protocol/core/Connection.java \
 gnu/java/net/protocol/core/CoreInputStream.java \
-gnu/java/net/protocol/core/Handler.java \
-gnu/java/net/protocol/gcjlib/Connection.java \
-gnu/java/net/protocol/gcjlib/Handler.java
+gnu/java/net/protocol/core/Handler.java
 
-gnu_java_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_source_files)))
+gnu_java_net_protocol_core_header_files = $(patsubst %.java,%.h,$(gnu_java_net_protocol_core_source_files))
 gnu_java_net_protocol_file_source_files = \
-gnu/java/net/protocol/file/Connection.java \
-gnu/java/net/protocol/file/Handler.java
+classpath/gnu/java/net/protocol/file/Connection.java \
+classpath/gnu/java/net/protocol/file/Handler.java
 
-gnu_java_net_protocol_file_header_files = $(patsubst %.java,%.h,$(gnu_java_net_protocol_file_source_files))
+gnu_java_net_protocol_file_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_file_source_files)))
 gnu_java_net_protocol_ftp_source_files = \
 classpath/gnu/java/net/protocol/ftp/ActiveModeDTP.java \
 classpath/gnu/java/net/protocol/ftp/BlockInputStream.java \
@@ -1251,10 +1960,14 @@ 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 \
-classpath/gnu/java/net/protocol/http/ByteArrayResponseBodyReader.java \
 classpath/gnu/java/net/protocol/http/ChunkedInputStream.java \
 classpath/gnu/java/net/protocol/http/Cookie.java \
 classpath/gnu/java/net/protocol/http/CookieManager.java \
@@ -1264,27 +1977,20 @@ classpath/gnu/java/net/protocol/http/HTTPDateFormat.java \
 classpath/gnu/java/net/protocol/http/HTTPURLConnection.java \
 classpath/gnu/java/net/protocol/http/Handler.java \
 classpath/gnu/java/net/protocol/http/Headers.java \
+classpath/gnu/java/net/protocol/http/LimitedLengthInputStream.java \
 classpath/gnu/java/net/protocol/http/Request.java \
 classpath/gnu/java/net/protocol/http/RequestBodyWriter.java \
 classpath/gnu/java/net/protocol/http/Response.java \
-classpath/gnu/java/net/protocol/http/ResponseBodyReader.java \
 classpath/gnu/java/net/protocol/http/ResponseHeaderHandler.java \
 classpath/gnu/java/net/protocol/http/SimpleCookieManager.java
 
 gnu_java_net_protocol_http_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_http_source_files)))
-gnu_java_net_protocol_http_event_source_files = \
-classpath/gnu/java/net/protocol/http/event/ConnectionEvent.java \
-classpath/gnu/java/net/protocol/http/event/ConnectionListener.java \
-classpath/gnu/java/net/protocol/http/event/RequestEvent.java \
-classpath/gnu/java/net/protocol/http/event/RequestListener.java
-
-gnu_java_net_protocol_http_event_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_http_event_source_files)))
 gnu_java_net_protocol_https_source_files = \
 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)))
@@ -1292,23 +1998,27 @@ 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 \
+gnu/java/nio/FileLockImpl.java \
 classpath/gnu/java/nio/InputStreamChannel.java \
 classpath/gnu/java/nio/NIOConstants.java \
 classpath/gnu/java/nio/NIODatagramSocket.java \
 gnu/java/nio/NIOServerSocket.java \
-classpath/gnu/java/nio/NIOSocket.java \
+gnu/java/nio/NIOSocket.java \
 classpath/gnu/java/nio/OutputStreamChannel.java \
-classpath/gnu/java/nio/PipeImpl.java \
+gnu/java/nio/PipeImpl.java \
 classpath/gnu/java/nio/SelectionKeyImpl.java \
 classpath/gnu/java/nio/SelectorImpl.java \
-classpath/gnu/java/nio/SelectorProviderImpl.java \
+gnu/java/nio/SelectorProviderImpl.java \
 gnu/java/nio/ServerSocketChannelImpl.java \
 gnu/java/nio/ServerSocketChannelSelectionKey.java \
 gnu/java/nio/SocketChannelImpl.java \
 gnu/java/nio/SocketChannelSelectionKey.java \
+gnu/java/nio/SocketChannelSelectionKeyImpl.java \
+gnu/java/nio/VMChannel.java \
+classpath/gnu/java/nio/VMChannelOwner.java \
 gnu/java/nio/VMPipe.java \
 gnu/java/nio/VMSelector.java
 
@@ -1361,7 +2071,7 @@ classpath/gnu/java/nio/charset/MacRomania.java \
 classpath/gnu/java/nio/charset/MacSymbol.java \
 classpath/gnu/java/nio/charset/MacThai.java \
 classpath/gnu/java/nio/charset/MacTurkish.java \
-gnu/java/nio/charset/Provider.java \
+classpath/gnu/java/nio/charset/Provider.java \
 classpath/gnu/java/nio/charset/US_ASCII.java \
 classpath/gnu/java/nio/charset/UTF_16.java \
 classpath/gnu/java/nio/charset/UTF_16BE.java \
@@ -1383,21 +2093,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 = \
@@ -1407,8 +2117,12 @@ 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_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 \
 classpath/gnu/java/rmi/server/RMIDefaultSocketFactory.java \
 classpath/gnu/java/rmi/server/RMIHashes.java \
 classpath/gnu/java/rmi/server/RMIIncomingThread.java \
@@ -1425,9 +2139,13 @@ classpath/gnu/java/rmi/server/UnicastServerRef.java
 
 gnu_java_rmi_server_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_server_source_files)))
 gnu_java_security_source_files = \
+classpath/gnu/java/security/Configuration.java \
 classpath/gnu/java/security/Engine.java \
 classpath/gnu/java/security/OID.java \
-classpath/gnu/java/security/PolicyFile.java
+classpath/gnu/java/security/PolicyFile.java \
+classpath/gnu/java/security/Properties.java \
+classpath/gnu/java/security/Registry.java \
+classpath/gnu/java/security/Requires.java
 
 gnu_java_security_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_source_files)))
 gnu_java_security_action_source_files = \
@@ -1452,41 +2170,170 @@ 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/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/ByteArray.java \
+classpath/gnu/java/security/util/ByteBufferOutputStream.java \
+classpath/gnu/java/security/util/DerUtil.java \
+classpath/gnu/java/security/util/ExpirableObject.java \
+classpath/gnu/java/security/util/FormatUtil.java \
+classpath/gnu/java/security/util/IntegerUtil.java \
+classpath/gnu/java/security/util/PRNG.java \
+classpath/gnu/java/security/util/Prime.java \
+classpath/gnu/java/security/util/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 = \
@@ -1534,19 +2381,819 @@ 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/GConfBasedFactory.java \
+classpath/gnu/java/util/prefs/GConfBasedPreferences.java \
 classpath/gnu/java/util/prefs/MemoryBasedFactory.java \
 classpath/gnu/java/util/prefs/MemoryBasedPreferences.java \
 classpath/gnu/java/util/prefs/NodeReader.java \
 classpath/gnu/java/util/prefs/NodeWriter.java
 
 gnu_java_util_prefs_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_prefs_source_files)))
+gnu_java_util_prefs_gconf_source_files = \
+classpath/gnu/java/util/prefs/gconf/GConfNativePeer.java
+
+gnu_java_util_regex_source_files = \
+classpath/gnu/java/util/regex/BacktrackStack.java \
+classpath/gnu/java/util/regex/CharIndexed.java \
+classpath/gnu/java/util/regex/CharIndexedCharArray.java \
+classpath/gnu/java/util/regex/CharIndexedCharSequence.java \
+classpath/gnu/java/util/regex/CharIndexedInputStream.java \
+classpath/gnu/java/util/regex/CharIndexedString.java \
+classpath/gnu/java/util/regex/CharIndexedStringBuffer.java \
+classpath/gnu/java/util/regex/RE.java \
+classpath/gnu/java/util/regex/REException.java \
+classpath/gnu/java/util/regex/REFilterInputStream.java \
+classpath/gnu/java/util/regex/REMatch.java \
+classpath/gnu/java/util/regex/REMatchEnumeration.java \
+classpath/gnu/java/util/regex/RESyntax.java \
+classpath/gnu/java/util/regex/REToken.java \
+classpath/gnu/java/util/regex/RETokenAny.java \
+classpath/gnu/java/util/regex/RETokenBackRef.java \
+classpath/gnu/java/util/regex/RETokenChar.java \
+classpath/gnu/java/util/regex/RETokenEnd.java \
+classpath/gnu/java/util/regex/RETokenEndOfPreviousMatch.java \
+classpath/gnu/java/util/regex/RETokenEndSub.java \
+classpath/gnu/java/util/regex/RETokenIndependent.java \
+classpath/gnu/java/util/regex/RETokenLookAhead.java \
+classpath/gnu/java/util/regex/RETokenLookBehind.java \
+classpath/gnu/java/util/regex/RETokenNamedProperty.java \
+classpath/gnu/java/util/regex/RETokenOneOf.java \
+classpath/gnu/java/util/regex/RETokenPOSIX.java \
+classpath/gnu/java/util/regex/RETokenRange.java \
+classpath/gnu/java/util/regex/RETokenRepeated.java \
+classpath/gnu/java/util/regex/RETokenStart.java \
+classpath/gnu/java/util/regex/RETokenWordBoundary.java \
+classpath/gnu/java/util/regex/UncheckedRE.java
+
+gnu_java_util_regex_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_regex_source_files)))
+gnu_javax_crypto_source_files = \
+classpath/gnu/javax/crypto/RSACipherImpl.java
+
+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/AES128KeyWrapSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/AESSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/ARCFourSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/AnubisSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/BlowfishSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/Cast5Spi.java \
+classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java \
+classpath/gnu/javax/crypto/jce/cipher/DESSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java \
+classpath/gnu/javax/crypto/jce/cipher/KhazadSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/NullCipherSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/PBES2.java \
+classpath/gnu/javax/crypto/jce/cipher/RijndaelSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/SerpentSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/SquareSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/TripleDESSpi.java \
+classpath/gnu/javax/crypto/jce/cipher/TwofishSpi.java
+
+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/GnuPBEKey.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_kwa_source_files = \
+classpath/gnu/javax/crypto/kwa/AESKeyWrap.java \
+classpath/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.java \
+classpath/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.java \
+classpath/gnu/javax/crypto/kwa/KeyUnwrappingException.java \
+classpath/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.java \
+classpath/gnu/javax/crypto/kwa/TripleDESKeyWrap.java
+
+gnu_javax_crypto_kwa_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_kwa_source_files)))
+gnu_javax_crypto_mac_source_files = \
+classpath/gnu/javax/crypto/mac/BaseMac.java \
+classpath/gnu/javax/crypto/mac/HMac.java \
+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/ISO10126.java \
+classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java \
+classpath/gnu/javax/crypto/pad/PKCS7.java \
+classpath/gnu/javax/crypto/pad/PadFactory.java \
+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_source_files = \
+classpath/gnu/javax/imageio/IIOInputStream.java
+
+gnu_javax_imageio_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_imageio_source_files)))
+gnu_javax_imageio_bmp_source_files = \
+classpath/gnu/javax/imageio/bmp/BMPDecoder.java \
+classpath/gnu/javax/imageio/bmp/BMPEncoder.java \
+classpath/gnu/javax/imageio/bmp/BMPException.java \
+classpath/gnu/javax/imageio/bmp/BMPFileHeader.java \
+classpath/gnu/javax/imageio/bmp/BMPImageReader.java \
+classpath/gnu/javax/imageio/bmp/BMPImageReaderSpi.java \
+classpath/gnu/javax/imageio/bmp/BMPImageWriter.java \
+classpath/gnu/javax/imageio/bmp/BMPImageWriterSpi.java \
+classpath/gnu/javax/imageio/bmp/BMPInfoHeader.java \
+classpath/gnu/javax/imageio/bmp/DecodeBF16.java \
+classpath/gnu/javax/imageio/bmp/DecodeBF32.java \
+classpath/gnu/javax/imageio/bmp/DecodeRGB1.java \
+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/EncodeRGB1.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB16.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB24.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB32.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB4.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB8.java \
+classpath/gnu/javax/imageio/bmp/EncodeRLE4.java \
+classpath/gnu/javax/imageio/bmp/EncodeRLE8.java
+
+gnu_javax_imageio_bmp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_imageio_bmp_source_files)))
+gnu_javax_imageio_gif_source_files = \
+classpath/gnu/javax/imageio/gif/GIFFile.java \
+classpath/gnu/javax/imageio/gif/GIFImageReader.java \
+classpath/gnu/javax/imageio/gif/GIFImageReaderSpi.java
+
+gnu_javax_imageio_gif_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_imageio_gif_source_files)))
+gnu_javax_imageio_jpeg_source_files = \
+classpath/gnu/javax/imageio/jpeg/DCT.java \
+classpath/gnu/javax/imageio/jpeg/HuffmanTable.java \
+classpath/gnu/javax/imageio/jpeg/JPEGComponent.java \
+classpath/gnu/javax/imageio/jpeg/JPEGDecoder.java \
+classpath/gnu/javax/imageio/jpeg/JPEGException.java \
+classpath/gnu/javax/imageio/jpeg/JPEGFrame.java \
+classpath/gnu/javax/imageio/jpeg/JPEGImageInputStream.java \
+classpath/gnu/javax/imageio/jpeg/JPEGImageReader.java \
+classpath/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.java \
+classpath/gnu/javax/imageio/jpeg/JPEGMarker.java \
+classpath/gnu/javax/imageio/jpeg/JPEGMarkerFoundException.java \
+classpath/gnu/javax/imageio/jpeg/JPEGScan.java \
+classpath/gnu/javax/imageio/jpeg/YCbCr_ColorSpace.java \
+classpath/gnu/javax/imageio/jpeg/ZigZag.java
+
+gnu_javax_imageio_jpeg_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_imageio_jpeg_source_files)))
+gnu_javax_imageio_png_source_files = \
+classpath/gnu/javax/imageio/png/PNGChunk.java \
+classpath/gnu/javax/imageio/png/PNGData.java \
+classpath/gnu/javax/imageio/png/PNGDecoder.java \
+classpath/gnu/javax/imageio/png/PNGEncoder.java \
+classpath/gnu/javax/imageio/png/PNGException.java \
+classpath/gnu/javax/imageio/png/PNGFile.java \
+classpath/gnu/javax/imageio/png/PNGFilter.java \
+classpath/gnu/javax/imageio/png/PNGGamma.java \
+classpath/gnu/javax/imageio/png/PNGHeader.java \
+classpath/gnu/javax/imageio/png/PNGICCProfile.java \
+classpath/gnu/javax/imageio/png/PNGImageReader.java \
+classpath/gnu/javax/imageio/png/PNGImageReaderSpi.java \
+classpath/gnu/javax/imageio/png/PNGPalette.java \
+classpath/gnu/javax/imageio/png/PNGPhys.java \
+classpath/gnu/javax/imageio/png/PNGTime.java
+
+gnu_javax_imageio_png_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_imageio_png_source_files)))
+gnu_javax_management_source_files = \
+classpath/gnu/javax/management/Server.java
+
+gnu_javax_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_management_source_files)))
+gnu_javax_naming_giop_source_files = \
+classpath/gnu/javax/naming/giop/ContextContinuation.java \
+classpath/gnu/javax/naming/giop/CorbalocParser.java \
+classpath/gnu/javax/naming/giop/GiopNamingEnumeration.java \
+classpath/gnu/javax/naming/giop/GiopNamingServiceFactory.java \
+classpath/gnu/javax/naming/giop/GiopNamingServiceURLContext.java \
+classpath/gnu/javax/naming/giop/ListBindingsEnumeration.java \
+classpath/gnu/javax/naming/giop/ListEnumeration.java
+
+gnu_javax_naming_giop_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_naming_giop_source_files)))
+gnu_javax_naming_ictxImpl_trans_source_files = \
+classpath/gnu/javax/naming/ictxImpl/trans/GnuName.java
+
+gnu_javax_naming_ictxImpl_trans_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_naming_ictxImpl_trans_source_files)))
+gnu_javax_naming_jndi_url_corbaname_source_files = \
+classpath/gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.java
+
+gnu_javax_naming_jndi_url_corbaname_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_naming_jndi_url_corbaname_source_files)))
+gnu_javax_naming_jndi_url_rmi_source_files = \
+classpath/gnu/javax/naming/jndi/url/rmi/ContextContinuation.java \
+classpath/gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.java \
+classpath/gnu/javax/naming/jndi/url/rmi/ListEnumeration.java \
+classpath/gnu/javax/naming/jndi/url/rmi/RmiContinuation.java \
+classpath/gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.java \
+classpath/gnu/javax/naming/jndi/url/rmi/rmiURLContext.java \
+classpath/gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.java
+
+gnu_javax_naming_jndi_url_rmi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_naming_jndi_url_rmi_source_files)))
+gnu_javax_net_ssl_source_files = \
+classpath/gnu/javax/net/ssl/AbstractSessionContext.java \
+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/PreSharedKeyManager.java \
+classpath/gnu/javax/net/ssl/PreSharedKeyManagerParameters.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/SSLCipherSuite.java \
+classpath/gnu/javax/net/ssl/SSLProtocolVersion.java \
+classpath/gnu/javax/net/ssl/SSLRecordHandler.java \
+classpath/gnu/javax/net/ssl/Session.java \
+classpath/gnu/javax/net/ssl/SessionStoreException.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/AbstractHandshake.java \
+classpath/gnu/javax/net/ssl/provider/Alert.java \
+classpath/gnu/javax/net/ssl/provider/AlertException.java \
+classpath/gnu/javax/net/ssl/provider/Builder.java \
+classpath/gnu/javax/net/ssl/provider/Certificate.java \
+classpath/gnu/javax/net/ssl/provider/CertificateBuilder.java \
+classpath/gnu/javax/net/ssl/provider/CertificateRequest.java \
+classpath/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java \
+classpath/gnu/javax/net/ssl/provider/CertificateStatusRequest.java \
+classpath/gnu/javax/net/ssl/provider/CertificateStatusType.java \
+classpath/gnu/javax/net/ssl/provider/CertificateType.java \
+classpath/gnu/javax/net/ssl/provider/CertificateURL.java \
+classpath/gnu/javax/net/ssl/provider/CertificateVerify.java \
+classpath/gnu/javax/net/ssl/provider/CipherAlgorithm.java \
+classpath/gnu/javax/net/ssl/provider/CipherSuite.java \
+classpath/gnu/javax/net/ssl/provider/CipherSuiteList.java \
+classpath/gnu/javax/net/ssl/provider/ClientCertificateTypeList.java \
+classpath/gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.java \
+classpath/gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.java \
+classpath/gnu/javax/net/ssl/provider/ClientHandshake.java \
+classpath/gnu/javax/net/ssl/provider/ClientHello.java \
+classpath/gnu/javax/net/ssl/provider/ClientHelloBuilder.java \
+classpath/gnu/javax/net/ssl/provider/ClientHelloV2.java \
+classpath/gnu/javax/net/ssl/provider/ClientKeyExchange.java \
+classpath/gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.java \
+classpath/gnu/javax/net/ssl/provider/ClientPSKParameters.java \
+classpath/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java \
+classpath/gnu/javax/net/ssl/provider/CompressionMethod.java \
+classpath/gnu/javax/net/ssl/provider/CompressionMethodList.java \
+classpath/gnu/javax/net/ssl/provider/Constructed.java \
+classpath/gnu/javax/net/ssl/provider/ContentType.java \
+classpath/gnu/javax/net/ssl/provider/Debug.java \
+classpath/gnu/javax/net/ssl/provider/DelegatedTask.java \
+classpath/gnu/javax/net/ssl/provider/DiffieHellman.java \
+classpath/gnu/javax/net/ssl/provider/EmptyExchangeKeys.java \
+classpath/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java \
+classpath/gnu/javax/net/ssl/provider/ExchangeKeys.java \
+classpath/gnu/javax/net/ssl/provider/Extension.java \
+classpath/gnu/javax/net/ssl/provider/ExtensionList.java \
+classpath/gnu/javax/net/ssl/provider/Finished.java \
+classpath/gnu/javax/net/ssl/provider/Handshake.java \
+classpath/gnu/javax/net/ssl/provider/HelloRequest.java \
+classpath/gnu/javax/net/ssl/provider/InputSecurityParameters.java \
+classpath/gnu/javax/net/ssl/provider/Jessie.java \
+classpath/gnu/javax/net/ssl/provider/KeyExchangeAlgorithm.java \
+classpath/gnu/javax/net/ssl/provider/MacAlgorithm.java \
+classpath/gnu/javax/net/ssl/provider/MacException.java \
+classpath/gnu/javax/net/ssl/provider/MaxFragmentLength.java \
+classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java \
+classpath/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.java \
+classpath/gnu/javax/net/ssl/provider/ProtocolVersion.java \
+classpath/gnu/javax/net/ssl/provider/Random.java \
+classpath/gnu/javax/net/ssl/provider/Record.java \
+classpath/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java \
+classpath/gnu/javax/net/ssl/provider/SSLContextImpl.java \
+classpath/gnu/javax/net/ssl/provider/SSLEngineImpl.java \
+classpath/gnu/javax/net/ssl/provider/SSLHMac.java \
+classpath/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java \
+classpath/gnu/javax/net/ssl/provider/SSLRandom.java \
+classpath/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.java \
+classpath/gnu/javax/net/ssl/provider/SSLServerSocketImpl.java \
+classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java \
+classpath/gnu/javax/net/ssl/provider/SSLSocketImpl.java \
+classpath/gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.java \
+classpath/gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.java \
+classpath/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java \
+classpath/gnu/javax/net/ssl/provider/ServerDHParams.java \
+classpath/gnu/javax/net/ssl/provider/ServerHandshake.java \
+classpath/gnu/javax/net/ssl/provider/ServerHello.java \
+classpath/gnu/javax/net/ssl/provider/ServerHelloBuilder.java \
+classpath/gnu/javax/net/ssl/provider/ServerHelloDone.java \
+classpath/gnu/javax/net/ssl/provider/ServerKeyExchange.java \
+classpath/gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.java \
+classpath/gnu/javax/net/ssl/provider/ServerKeyExchangeParams.java \
+classpath/gnu/javax/net/ssl/provider/ServerNameList.java \
+classpath/gnu/javax/net/ssl/provider/ServerPSKParameters.java \
+classpath/gnu/javax/net/ssl/provider/ServerRSAParams.java \
+classpath/gnu/javax/net/ssl/provider/ServerRSA_PSKParameters.java \
+classpath/gnu/javax/net/ssl/provider/SessionImpl.java \
+classpath/gnu/javax/net/ssl/provider/Signature.java \
+classpath/gnu/javax/net/ssl/provider/SignatureAlgorithm.java \
+classpath/gnu/javax/net/ssl/provider/SimpleSessionContext.java \
+classpath/gnu/javax/net/ssl/provider/TLSHMac.java \
+classpath/gnu/javax/net/ssl/provider/TLSRandom.java \
+classpath/gnu/javax/net/ssl/provider/TruncatedHMAC.java \
+classpath/gnu/javax/net/ssl/provider/TrustedAuthorities.java \
+classpath/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java \
+classpath/gnu/javax/net/ssl/provider/Util.java \
+classpath/gnu/javax/net/ssl/provider/X500PrincipalList.java \
+classpath/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java \
+classpath/gnu/javax/net/ssl/provider/X509TrustManagerFactory.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 \
+classpath/gnu/javax/rmi/CORBA/DefaultWriteObjectTester.java \
+classpath/gnu/javax/rmi/CORBA/DelegateFactory.java \
+classpath/gnu/javax/rmi/CORBA/GetDelegateInstanceException.java \
+classpath/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java \
+classpath/gnu/javax/rmi/CORBA/RmiUtilities.java \
+classpath/gnu/javax/rmi/CORBA/StubDelegateImpl.java \
+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/CertificateCallback.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 \
+classpath/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.java \
+classpath/gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.java \
+classpath/gnu/javax/sound/midi/alsa/AlsaPortDevice.java \
+classpath/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java \
+classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java \
+classpath/gnu/javax/sound/midi/file/ExtendedMidiFileFormat.java \
+classpath/gnu/javax/sound/midi/file/MidiDataInputStream.java \
+classpath/gnu/javax/sound/midi/file/MidiDataOutputStream.java \
+classpath/gnu/javax/sound/midi/file/MidiFileReader.java \
+classpath/gnu/javax/sound/midi/file/MidiFileWriter.java
+
+gnu_javax_sound_sampled_AU_source_files = \
+classpath/gnu/javax/sound/sampled/AU/AUReader.java
+
+gnu_javax_sound_sampled_AU_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_sound_sampled_AU_source_files)))
+gnu_javax_sound_sampled_WAV_source_files = \
+classpath/gnu/javax/sound/sampled/WAV/WAVReader.java
+
+gnu_javax_sound_sampled_WAV_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_sound_sampled_WAV_source_files)))
+gnu_javax_swing_plaf_gnu_source_files = \
+classpath/gnu/javax/swing/plaf/gnu/GNULookAndFeel.java
+
+gnu_javax_swing_plaf_gnu_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_plaf_gnu_source_files)))
+gnu_javax_swing_plaf_metal_source_files = \
+classpath/gnu/javax/swing/plaf/metal/CustomizableTheme.java
+
+gnu_javax_swing_plaf_metal_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_plaf_metal_source_files)))
+gnu_javax_swing_text_html_source_files = \
+classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java \
+classpath/gnu/javax/swing/text/html/CombinedAttributes.java \
+classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java
+
+gnu_javax_swing_text_html_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_text_html_source_files)))
+gnu_javax_swing_text_html_css_source_files = \
+classpath/gnu/javax/swing/text/html/css/BorderStyle.java \
+classpath/gnu/javax/swing/text/html/css/BorderWidth.java \
+classpath/gnu/javax/swing/text/html/css/CSSColor.java \
+classpath/gnu/javax/swing/text/html/css/CSSLexicalException.java \
+classpath/gnu/javax/swing/text/html/css/CSSParser.java \
+classpath/gnu/javax/swing/text/html/css/CSSParserCallback.java \
+classpath/gnu/javax/swing/text/html/css/CSSParserException.java \
+classpath/gnu/javax/swing/text/html/css/CSSScanner.java \
+classpath/gnu/javax/swing/text/html/css/FontSize.java \
+classpath/gnu/javax/swing/text/html/css/FontStyle.java \
+classpath/gnu/javax/swing/text/html/css/FontWeight.java \
+classpath/gnu/javax/swing/text/html/css/Length.java \
+classpath/gnu/javax/swing/text/html/css/Selector.java
+
+gnu_javax_swing_text_html_css_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_text_html_css_source_files)))
 gnu_javax_swing_text_html_parser_source_files = \
+classpath/gnu/javax/swing/text/html/parser/GnuParserDelegator.java \
 classpath/gnu/javax/swing/text/html/parser/HTML_401F.java \
+classpath/gnu/javax/swing/text/html/parser/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
@@ -1580,36 +3227,11 @@ classpath/gnu/javax/swing/text/html/parser/support/low/node.java \
 classpath/gnu/javax/swing/text/html/parser/support/low/pattern.java
 
 gnu_javax_swing_text_html_parser_support_low_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_text_html_parser_support_low_source_files)))
-gnu_regexp_source_files = \
-classpath/gnu/regexp/CharIndexed.java \
-classpath/gnu/regexp/CharIndexedCharArray.java \
-classpath/gnu/regexp/CharIndexedInputStream.java \
-classpath/gnu/regexp/CharIndexedString.java \
-classpath/gnu/regexp/CharIndexedStringBuffer.java \
-classpath/gnu/regexp/RE.java \
-classpath/gnu/regexp/REException.java \
-classpath/gnu/regexp/REFilterInputStream.java \
-classpath/gnu/regexp/REMatch.java \
-classpath/gnu/regexp/REMatchEnumeration.java \
-classpath/gnu/regexp/RESyntax.java \
-classpath/gnu/regexp/REToken.java \
-classpath/gnu/regexp/RETokenAny.java \
-classpath/gnu/regexp/RETokenBackRef.java \
-classpath/gnu/regexp/RETokenChar.java \
-classpath/gnu/regexp/RETokenEnd.java \
-classpath/gnu/regexp/RETokenEndSub.java \
-classpath/gnu/regexp/RETokenLookAhead.java \
-classpath/gnu/regexp/RETokenOneOf.java \
-classpath/gnu/regexp/RETokenPOSIX.java \
-classpath/gnu/regexp/RETokenRange.java \
-classpath/gnu/regexp/RETokenRepeated.java \
-classpath/gnu/regexp/RETokenStart.java \
-classpath/gnu/regexp/RETokenWordBoundary.java \
-classpath/gnu/regexp/UncheckedRE.java
-
-gnu_regexp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_regexp_source_files)))
+gnu_javax_swing_tree_source_files = \
+classpath/gnu/javax/swing/tree/GnuPath.java
+
+gnu_javax_swing_tree_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_tree_source_files)))
 gnu_xml_source_files = \
-classpath/gnu/xml/aelfred2/ContentHandler2.java \
 classpath/gnu/xml/aelfred2/JAXPFactory.java \
 classpath/gnu/xml/aelfred2/SAXDriver.java \
 classpath/gnu/xml/aelfred2/XmlParser.java \
@@ -1663,6 +3285,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 \
@@ -1769,6 +3392,36 @@ classpath/gnu/xml/pipeline/ValidationConsumer.java \
 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/EntityDeclarationImpl.java \
+classpath/gnu/xml/stream/EntityReferenceImpl.java \
+classpath/gnu/xml/stream/FilteredEventReader.java \
+classpath/gnu/xml/stream/FilteredStreamReader.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/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 \
+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/XMLParser.java \
+classpath/gnu/xml/stream/XMLStreamWriterImpl.java \
 classpath/gnu/xml/transform/AbstractNumberNode.java \
 classpath/gnu/xml/transform/ApplyImportsNode.java \
 classpath/gnu/xml/transform/ApplyTemplatesNode.java \
@@ -1795,14 +3448,18 @@ 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 \
 classpath/gnu/xml/transform/ParameterNode.java \
 classpath/gnu/xml/transform/ProcessingInstructionNode.java \
 classpath/gnu/xml/transform/SAXSerializer.java \
+classpath/gnu/xml/transform/SAXTemplatesHandler.java \
+classpath/gnu/xml/transform/SAXTransformerHandler.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 \
@@ -1826,6 +3483,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 \
@@ -1958,6 +3725,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 \
@@ -1966,11 +3734,13 @@ classpath/java/awt/MenuComponent.java \
 classpath/java/awt/MenuContainer.java \
 classpath/java/awt/MenuItem.java \
 classpath/java/awt/MenuShortcut.java \
+classpath/java/awt/MouseInfo.java \
 classpath/java/awt/PageAttributes.java \
 classpath/java/awt/Paint.java \
 classpath/java/awt/PaintContext.java \
 classpath/java/awt/Panel.java \
 classpath/java/awt/Point.java \
+classpath/java/awt/PointerInfo.java \
 classpath/java/awt/Polygon.java \
 classpath/java/awt/PopupMenu.java \
 classpath/java/awt/PrintGraphics.java \
@@ -2007,8 +3777,11 @@ java_awt_datatransfer_source_files = \
 classpath/java/awt/datatransfer/Clipboard.java \
 classpath/java/awt/datatransfer/ClipboardOwner.java \
 classpath/java/awt/datatransfer/DataFlavor.java \
+classpath/java/awt/datatransfer/FlavorEvent.java \
+classpath/java/awt/datatransfer/FlavorListener.java \
 classpath/java/awt/datatransfer/FlavorMap.java \
 classpath/java/awt/datatransfer/FlavorTable.java \
+classpath/java/awt/datatransfer/MimeType.java \
 classpath/java/awt/datatransfer/MimeTypeParseException.java \
 classpath/java/awt/datatransfer/StringSelection.java \
 classpath/java/awt/datatransfer/SystemFlavorMap.java \
@@ -2231,6 +4004,7 @@ classpath/java/awt/peer/MenuBarPeer.java \
 classpath/java/awt/peer/MenuComponentPeer.java \
 classpath/java/awt/peer/MenuItemPeer.java \
 classpath/java/awt/peer/MenuPeer.java \
+classpath/java/awt/peer/MouseInfoPeer.java \
 classpath/java/awt/peer/PanelPeer.java \
 classpath/java/awt/peer/PopupMenuPeer.java \
 classpath/java/awt/peer/RobotPeer.java \
@@ -2244,6 +4018,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 \
@@ -2261,17 +4036,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 \
@@ -2287,7 +4066,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 = \
@@ -2330,7 +4110,7 @@ classpath/java/io/DeleteFileHelper.java \
 classpath/java/io/EOFException.java \
 classpath/java/io/Externalizable.java \
 java/io/File.java \
-classpath/java/io/FileDescriptor.java \
+java/io/FileDescriptor.java \
 classpath/java/io/FileFilter.java \
 java/io/FileInputStream.java \
 classpath/java/io/FileNotFoundException.java \
@@ -2355,11 +4135,11 @@ classpath/java/io/LineNumberReader.java \
 classpath/java/io/NotActiveException.java \
 classpath/java/io/NotSerializableException.java \
 classpath/java/io/ObjectInput.java \
-java/io/ObjectInputStream.java \
+classpath/java/io/ObjectInputStream.java \
 classpath/java/io/ObjectInputValidation.java \
 classpath/java/io/ObjectOutput.java \
 classpath/java/io/ObjectOutputStream.java \
-java/io/ObjectStreamClass.java \
+classpath/java/io/ObjectStreamClass.java \
 classpath/java/io/ObjectStreamConstants.java \
 classpath/java/io/ObjectStreamException.java \
 classpath/java/io/ObjectStreamField.java \
@@ -2387,6 +4167,7 @@ classpath/java/io/StringWriter.java \
 classpath/java/io/SyncFailedException.java \
 classpath/java/io/UTFDataFormatException.java \
 classpath/java/io/UnsupportedEncodingException.java \
+java/io/VMObjectInputStream.java \
 java/io/VMObjectStreamClass.java \
 classpath/java/io/WriteAbortedException.java \
 classpath/java/io/Writer.java
@@ -2403,6 +4184,7 @@ classpath/java/lang/Boolean.java \
 classpath/java/lang/Byte.java \
 classpath/java/lang/CharSequence.java \
 java/lang/Character.java \
+java/lang/Class.java \
 classpath/java/lang/ClassCastException.java \
 classpath/java/lang/ClassCircularityError.java \
 classpath/java/lang/ClassFormatError.java \
@@ -2412,12 +4194,15 @@ classpath/java/lang/CloneNotSupportedException.java \
 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/Deprecated.java \
+classpath/java/lang/Double.java \
+java/lang/EcosProcess.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 \
@@ -2426,15 +4211,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 \
@@ -2444,16 +4230,20 @@ classpath/java/lang/NoSuchMethodException.java \
 classpath/java/lang/NullPointerException.java \
 classpath/java/lang/Number.java \
 classpath/java/lang/NumberFormatException.java \
+java/lang/Object.java \
 classpath/java/lang/OutOfMemoryError.java \
-java/lang/Package.java \
+classpath/java/lang/Override.java \
+classpath/java/lang/Package.java \
+java/lang/PosixProcess.java \
 classpath/java/lang/Process.java \
+java/lang/ProcessBuilder.java \
 classpath/java/lang/Readable.java \
 classpath/java/lang/Runnable.java \
 java/lang/Runtime.java \
 classpath/java/lang/RuntimeException.java \
 classpath/java/lang/RuntimePermission.java \
 classpath/java/lang/SecurityException.java \
-java/lang/SecurityManager.java \
+classpath/java/lang/SecurityManager.java \
 classpath/java/lang/Short.java \
 classpath/java/lang/StackOverflowError.java \
 classpath/java/lang/StackTraceElement.java \
@@ -2462,6 +4252,7 @@ java/lang/String.java \
 java/lang/StringBuffer.java \
 java/lang/StringBuilder.java \
 classpath/java/lang/StringIndexOutOfBoundsException.java \
+classpath/java/lang/SuppressWarnings.java \
 java/lang/System.java \
 java/lang/Thread.java \
 classpath/java/lang/ThreadDeath.java \
@@ -2475,18 +4266,55 @@ classpath/java/lang/UnsupportedClassVersionError.java \
 classpath/java/lang/UnsupportedOperationException.java \
 java/lang/VMClassLoader.java \
 java/lang/VMCompiler.java \
-java/lang/VMSecurityManager.java \
+java/lang/VMDouble.java \
+java/lang/VMFloat.java \
 java/lang/VMThrowable.java \
 classpath/java/lang/VerifyError.java \
 classpath/java/lang/VirtualMachineError.java \
-classpath/java/lang/Void.java
+classpath/java/lang/Void.java \
+java/lang/Win32Process.java
 
 java_lang_header_files = $(filter-out java/lang/Object.h java/lang/Class.h,$(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_source_files))))
 java_lang_annotation_source_files = \
+classpath/java/lang/annotation/Annotation.java \
 classpath/java/lang/annotation/AnnotationFormatError.java \
-classpath/java/lang/annotation/AnnotationTypeMismatchException.java
+classpath/java/lang/annotation/AnnotationTypeMismatchException.java \
+classpath/java/lang/annotation/Documented.java \
+classpath/java/lang/annotation/ElementType.java \
+classpath/java/lang/annotation/IncompleteAnnotationException.java \
+classpath/java/lang/annotation/Inherited.java \
+classpath/java/lang/annotation/Retention.java \
+classpath/java/lang/annotation/RetentionPolicy.java \
+classpath/java/lang/annotation/Target.java
 
 java_lang_annotation_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_annotation_source_files)))
+java_lang_instrument_source_files = \
+classpath/java/lang/instrument/ClassDefinition.java \
+classpath/java/lang/instrument/ClassFileTransformer.java \
+classpath/java/lang/instrument/IllegalClassFormatException.java \
+classpath/java/lang/instrument/Instrumentation.java \
+classpath/java/lang/instrument/UnmodifiableClassException.java
+
+java_lang_instrument_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_instrument_source_files)))
+java_lang_management_source_files = \
+classpath/java/lang/management/ClassLoadingMXBean.java \
+classpath/java/lang/management/CompilationMXBean.java \
+classpath/java/lang/management/GarbageCollectorMXBean.java \
+classpath/java/lang/management/ManagementFactory.java \
+classpath/java/lang/management/ManagementPermission.java \
+classpath/java/lang/management/MemoryMXBean.java \
+classpath/java/lang/management/MemoryManagerMXBean.java \
+classpath/java/lang/management/MemoryNotificationInfo.java \
+classpath/java/lang/management/MemoryPoolMXBean.java \
+classpath/java/lang/management/MemoryType.java \
+classpath/java/lang/management/MemoryUsage.java \
+classpath/java/lang/management/OperatingSystemMXBean.java \
+classpath/java/lang/management/RuntimeMXBean.java \
+classpath/java/lang/management/ThreadInfo.java \
+classpath/java/lang/management/ThreadMXBean.java \
+java/lang/management/VMManagementFactory.java
+
+java_lang_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_management_source_files)))
 java_lang_ref_source_files = \
 classpath/java/lang/ref/PhantomReference.java \
 java/lang/ref/Reference.java \
@@ -2497,13 +4325,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 \
@@ -2511,13 +4342,17 @@ 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
 
 java_lang_reflect_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_reflect_source_files)))
 java_math_source_files = \
 classpath/java/math/BigDecimal.java \
-classpath/java/math/BigInteger.java
+classpath/java/math/BigInteger.java \
+classpath/java/math/MathContext.java \
+classpath/java/math/RoundingMode.java
 
 java_math_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_math_source_files)))
 java_net_source_files = \
@@ -2527,27 +4362,30 @@ classpath/java/net/ConnectException.java \
 classpath/java/net/ContentHandler.java \
 classpath/java/net/ContentHandlerFactory.java \
 classpath/java/net/DatagramPacket.java \
-classpath/java/net/DatagramSocket.java \
+java/net/DatagramSocket.java \
 classpath/java/net/DatagramSocketImpl.java \
 classpath/java/net/DatagramSocketImplFactory.java \
 classpath/java/net/FileNameMap.java \
 classpath/java/net/HttpURLConnection.java \
 classpath/java/net/Inet4Address.java \
 classpath/java/net/Inet6Address.java \
-java/net/InetAddress.java \
+classpath/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 \
+java/net/MulticastSocket.java \
 classpath/java/net/NetPermission.java \
-classpath/java/net/NetworkInterface.java \
+java/net/NetworkInterface.java \
 classpath/java/net/NoRouteToHostException.java \
 classpath/java/net/PasswordAuthentication.java \
 classpath/java/net/PortUnreachableException.java \
 classpath/java/net/ProtocolException.java \
-java/net/ServerSocket.java \
-classpath/java/net/Socket.java \
+classpath/java/net/Proxy.java \
+classpath/java/net/ProxySelector.java \
+classpath/java/net/ResolverCache.java \
+classpath/java/net/ServerSocket.java \
+java/net/Socket.java \
 classpath/java/net/SocketAddress.java \
 classpath/java/net/SocketException.java \
 classpath/java/net/SocketImpl.java \
@@ -2559,14 +4397,16 @@ classpath/java/net/URI.java \
 classpath/java/net/URISyntaxException.java \
 java/net/URL.java \
 java/net/URLClassLoader.java \
-java/net/URLConnection.java \
+classpath/java/net/URLConnection.java \
 classpath/java/net/URLDecoder.java \
 classpath/java/net/URLEncoder.java \
 classpath/java/net/URLStreamHandler.java \
 classpath/java/net/URLStreamHandlerFactory.java \
 classpath/java/net/UnknownHostException.java \
 classpath/java/net/UnknownServiceException.java \
-java/net/VMNetworkInterface.java
+java/net/VMInetAddress.java \
+java/net/VMNetworkInterface.java \
+java/net/VMURLConnection.java
 
 java_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_net_source_files)))
 java_nio_source_files = \
@@ -2609,7 +4449,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 \
@@ -2638,6 +4478,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)))
@@ -2664,9 +4505,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 \
@@ -2698,6 +4539,7 @@ classpath/java/rmi/activation/ActivationException.java \
 classpath/java/rmi/activation/ActivationGroup.java \
 classpath/java/rmi/activation/ActivationGroupDesc.java \
 classpath/java/rmi/activation/ActivationGroupID.java \
+classpath/java/rmi/activation/ActivationGroup_Stub.java \
 classpath/java/rmi/activation/ActivationID.java \
 classpath/java/rmi/activation/ActivationInstantiator.java \
 classpath/java/rmi/activation/ActivationMonitor.java \
@@ -2733,6 +4575,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 \
@@ -2749,9 +4592,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 \
@@ -2815,7 +4658,10 @@ classpath/java/security/SignatureSpi.java \
 classpath/java/security/SignedObject.java \
 classpath/java/security/Signer.java \
 classpath/java/security/UnrecoverableKeyException.java \
-classpath/java/security/UnresolvedPermission.java
+classpath/java/security/UnresolvedPermission.java \
+java/security/VMAccessControlState.java \
+java/security/VMAccessController.java \
+java/security/VMSecureRandom.java
 
 java_security_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_security_source_files)))
 java_security_acl_source_files = \
@@ -2944,13 +4790,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 \
@@ -2961,7 +4808,7 @@ classpath/java/text/NumberFormat.java \
 classpath/java/text/ParseException.java \
 classpath/java/text/ParsePosition.java \
 classpath/java/text/RuleBasedCollator.java \
-java/text/SimpleDateFormat.java \
+classpath/java/text/SimpleDateFormat.java \
 classpath/java/text/StringCharacterIterator.java
 
 java_text_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_text_source_files)))
@@ -2969,8 +4816,10 @@ java_util_source_files = \
 classpath/java/util/AbstractCollection.java \
 classpath/java/util/AbstractList.java \
 classpath/java/util/AbstractMap.java \
+classpath/external/jsr166/java/util/AbstractQueue.java \
 classpath/java/util/AbstractSequentialList.java \
 classpath/java/util/AbstractSet.java \
+classpath/external/jsr166/java/util/ArrayDeque.java \
 classpath/java/util/ArrayList.java \
 classpath/java/util/Arrays.java \
 classpath/java/util/BitSet.java \
@@ -2980,18 +4829,35 @@ classpath/java/util/Collections.java \
 classpath/java/util/Comparator.java \
 classpath/java/util/ConcurrentModificationException.java \
 java/util/Currency.java \
-java/util/Date.java \
+classpath/java/util/Date.java \
+classpath/external/jsr166/java/util/Deque.java \
 classpath/java/util/Dictionary.java \
+classpath/java/util/DuplicateFormatFlagsException.java \
 classpath/java/util/EmptyStackException.java \
+classpath/java/util/EnumMap.java \
+classpath/java/util/EnumSet.java \
 classpath/java/util/Enumeration.java \
 classpath/java/util/EventListener.java \
 classpath/java/util/EventListenerProxy.java \
 classpath/java/util/EventObject.java \
+classpath/java/util/FormatFlagsConversionMismatchException.java \
+classpath/java/util/Formattable.java \
+classpath/java/util/FormattableFlags.java \
+classpath/java/util/Formatter.java \
+classpath/java/util/FormatterClosedException.java \
 java/util/GregorianCalendar.java \
 classpath/java/util/HashMap.java \
 classpath/java/util/HashSet.java \
 classpath/java/util/Hashtable.java \
 classpath/java/util/IdentityHashMap.java \
+classpath/java/util/IllegalFormatCodePointException.java \
+classpath/java/util/IllegalFormatConversionException.java \
+classpath/java/util/IllegalFormatException.java \
+classpath/java/util/IllegalFormatFlagsException.java \
+classpath/java/util/IllegalFormatPrecisionException.java \
+classpath/java/util/IllegalFormatWidthException.java \
+classpath/java/util/InputMismatchException.java \
+classpath/java/util/InvalidPropertiesFormatException.java \
 classpath/java/util/Iterator.java \
 classpath/java/util/LinkedHashMap.java \
 classpath/java/util/LinkedHashSet.java \
@@ -3000,21 +4866,26 @@ classpath/java/util/List.java \
 classpath/java/util/ListIterator.java \
 classpath/java/util/ListResourceBundle.java \
 java/util/Locale.java \
-classpath/java/util/LocaleData.java \
 classpath/java/util/Map.java \
+classpath/java/util/MissingFormatArgumentException.java \
+classpath/java/util/MissingFormatWidthException.java \
 classpath/java/util/MissingResourceException.java \
+classpath/external/jsr166/java/util/NavigableMap.java \
+classpath/external/jsr166/java/util/NavigableSet.java \
 classpath/java/util/NoSuchElementException.java \
 classpath/java/util/Observable.java \
 classpath/java/util/Observer.java \
+classpath/java/util/PriorityQueue.java \
 classpath/java/util/Properties.java \
 classpath/java/util/PropertyPermission.java \
 classpath/java/util/PropertyPermissionCollection.java \
 classpath/java/util/PropertyResourceBundle.java \
+classpath/external/jsr166/java/util/Queue.java \
 classpath/java/util/Random.java \
 classpath/java/util/RandomAccess.java \
-java/util/ResourceBundle.java \
+classpath/java/util/ResourceBundle.java \
 classpath/java/util/Set.java \
-java/util/SimpleTimeZone.java \
+classpath/java/util/SimpleTimeZone.java \
 classpath/java/util/SortedMap.java \
 classpath/java/util/SortedSet.java \
 classpath/java/util/Stack.java \
@@ -3025,11 +4896,88 @@ classpath/java/util/TimerTask.java \
 classpath/java/util/TooManyListenersException.java \
 classpath/java/util/TreeMap.java \
 classpath/java/util/TreeSet.java \
+classpath/java/util/UUID.java \
+classpath/java/util/UnknownFormatConversionException.java \
+classpath/java/util/UnknownFormatFlagsException.java \
 java/util/VMTimeZone.java \
 classpath/java/util/Vector.java \
 classpath/java/util/WeakHashMap.java
 
-java_util_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_util_source_files)))
+java_util_header_files = $(patsubst classpath/%,%,$(patsubst classpath/external/jsr166/%,%,$(patsubst %.java,%.h,$(java_util_source_files))))
+java_util_concurrent_source_files = \
+classpath/external/jsr166/java/util/concurrent/AbstractExecutorService.java \
+classpath/external/jsr166/java/util/concurrent/ArrayBlockingQueue.java \
+classpath/external/jsr166/java/util/concurrent/BlockingDeque.java \
+classpath/external/jsr166/java/util/concurrent/BlockingQueue.java \
+classpath/external/jsr166/java/util/concurrent/BrokenBarrierException.java \
+classpath/external/jsr166/java/util/concurrent/Callable.java \
+classpath/external/jsr166/java/util/concurrent/CancellationException.java \
+classpath/external/jsr166/java/util/concurrent/CompletionService.java \
+classpath/external/jsr166/java/util/concurrent/ConcurrentHashMap.java \
+classpath/external/jsr166/java/util/concurrent/ConcurrentLinkedQueue.java \
+classpath/external/jsr166/java/util/concurrent/ConcurrentMap.java \
+classpath/external/jsr166/java/util/concurrent/ConcurrentNavigableMap.java \
+classpath/external/jsr166/java/util/concurrent/ConcurrentSkipListMap.java \
+classpath/external/jsr166/java/util/concurrent/ConcurrentSkipListSet.java \
+classpath/java/util/concurrent/CopyOnWriteArrayList.java \
+classpath/external/jsr166/java/util/concurrent/CopyOnWriteArraySet.java \
+classpath/external/jsr166/java/util/concurrent/CountDownLatch.java \
+classpath/external/jsr166/java/util/concurrent/CyclicBarrier.java \
+classpath/external/jsr166/java/util/concurrent/DelayQueue.java \
+classpath/external/jsr166/java/util/concurrent/Delayed.java \
+classpath/external/jsr166/java/util/concurrent/Exchanger.java \
+classpath/external/jsr166/java/util/concurrent/ExecutionException.java \
+classpath/external/jsr166/java/util/concurrent/Executor.java \
+classpath/external/jsr166/java/util/concurrent/ExecutorCompletionService.java \
+classpath/external/jsr166/java/util/concurrent/ExecutorService.java \
+classpath/external/jsr166/java/util/concurrent/Executors.java \
+classpath/external/jsr166/java/util/concurrent/Future.java \
+classpath/external/jsr166/java/util/concurrent/FutureTask.java \
+classpath/external/jsr166/java/util/concurrent/LinkedBlockingDeque.java \
+classpath/external/jsr166/java/util/concurrent/LinkedBlockingQueue.java \
+classpath/external/jsr166/java/util/concurrent/PriorityBlockingQueue.java \
+classpath/external/jsr166/java/util/concurrent/RejectedExecutionException.java \
+classpath/external/jsr166/java/util/concurrent/RejectedExecutionHandler.java \
+classpath/external/jsr166/java/util/concurrent/RunnableFuture.java \
+classpath/external/jsr166/java/util/concurrent/RunnableScheduledFuture.java \
+classpath/external/jsr166/java/util/concurrent/ScheduledExecutorService.java \
+classpath/external/jsr166/java/util/concurrent/ScheduledFuture.java \
+classpath/external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java \
+classpath/external/jsr166/java/util/concurrent/Semaphore.java \
+classpath/external/jsr166/java/util/concurrent/SynchronousQueue.java \
+classpath/external/jsr166/java/util/concurrent/ThreadFactory.java \
+classpath/external/jsr166/java/util/concurrent/ThreadPoolExecutor.java \
+classpath/external/jsr166/java/util/concurrent/TimeUnit.java \
+classpath/external/jsr166/java/util/concurrent/TimeoutException.java
+
+java_util_concurrent_header_files = $(patsubst classpath/%,%,$(patsubst classpath/external/jsr166/%,%,$(patsubst %.java,%.h,$(java_util_concurrent_source_files))))
+java_util_concurrent_atomic_source_files = \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicBoolean.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicInteger.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicIntegerArray.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicLong.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicLongArray.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicLongFieldUpdater.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicMarkableReference.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicReference.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicReferenceArray.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicStampedReference.java
+
+java_util_concurrent_atomic_header_files = $(patsubst classpath/external/jsr166/%,%,$(patsubst %.java,%.h,$(java_util_concurrent_atomic_source_files)))
+java_util_concurrent_locks_source_files = \
+classpath/external/jsr166/java/util/concurrent/locks/AbstractOwnableSynchronizer.java \
+classpath/external/jsr166/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java \
+classpath/external/jsr166/java/util/concurrent/locks/AbstractQueuedSynchronizer.java \
+classpath/external/jsr166/java/util/concurrent/locks/Condition.java \
+classpath/external/jsr166/java/util/concurrent/locks/Lock.java \
+classpath/external/jsr166/java/util/concurrent/locks/LockSupport.java \
+classpath/external/jsr166/java/util/concurrent/locks/ReadWriteLock.java \
+classpath/external/jsr166/java/util/concurrent/locks/ReentrantLock.java \
+classpath/external/jsr166/java/util/concurrent/locks/ReentrantReadWriteLock.java
+
+java_util_concurrent_locks_header_files = $(patsubst classpath/external/jsr166/%,%,$(patsubst %.java,%.h,$(java_util_concurrent_locks_source_files)))
 java_util_jar_source_files = \
 classpath/java/util/jar/Attributes.java \
 classpath/java/util/jar/JarEntry.java \
@@ -3051,6 +4999,7 @@ classpath/java/util/logging/Level.java \
 java/util/logging/LogManager.java \
 classpath/java/util/logging/LogRecord.java \
 java/util/logging/Logger.java \
+classpath/java/util/logging/LoggingMXBean.java \
 classpath/java/util/logging/LoggingPermission.java \
 classpath/java/util/logging/MemoryHandler.java \
 classpath/java/util/logging/SimpleFormatter.java \
@@ -3072,6 +5021,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
@@ -3085,15 +5035,15 @@ 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 \
-java/util/zip/ZipEntry.java \
+classpath/java/util/zip/ZipEntry.java \
 classpath/java/util/zip/ZipException.java \
-java/util/zip/ZipFile.java \
+classpath/java/util/zip/ZipFile.java \
 classpath/java/util/zip/ZipInputStream.java \
 classpath/java/util/zip/ZipOutputStream.java
 
@@ -3101,12 +5051,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 \
@@ -3118,9 +5070,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)))
@@ -3190,15 +5144,17 @@ classpath/javax/imageio/event/IIOReadUpdateListener.java \
 classpath/javax/imageio/event/IIOReadWarningListener.java \
 classpath/javax/imageio/event/IIOWriteProgressListener.java \
 classpath/javax/imageio/event/IIOWriteWarningListener.java \
-classpath/javax/imageio/metadata/IIOAttr.java \
 classpath/javax/imageio/metadata/IIOInvalidTreeException.java \
 classpath/javax/imageio/metadata/IIOMetadata.java \
 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/metadata/IIONamedNodeMap.java \
-classpath/javax/imageio/metadata/IIONodeList.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 \
@@ -3221,6 +5177,92 @@ 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 \
+classpath/javax/management/AttributeList.java \
+classpath/javax/management/AttributeNotFoundException.java \
+classpath/javax/management/BadAttributeValueExpException.java \
+classpath/javax/management/BadBinaryOpValueExpException.java \
+classpath/javax/management/BadStringOperationException.java \
+classpath/javax/management/DynamicMBean.java \
+classpath/javax/management/InstanceAlreadyExistsException.java \
+classpath/javax/management/InstanceNotFoundException.java \
+classpath/javax/management/IntrospectionException.java \
+classpath/javax/management/InvalidApplicationException.java \
+classpath/javax/management/InvalidAttributeValueException.java \
+classpath/javax/management/JMException.java \
+classpath/javax/management/JMRuntimeException.java \
+classpath/javax/management/ListenerNotFoundException.java \
+classpath/javax/management/MBeanAttributeInfo.java \
+classpath/javax/management/MBeanConstructorInfo.java \
+classpath/javax/management/MBeanException.java \
+classpath/javax/management/MBeanFeatureInfo.java \
+classpath/javax/management/MBeanInfo.java \
+classpath/javax/management/MBeanNotificationInfo.java \
+classpath/javax/management/MBeanOperationInfo.java \
+classpath/javax/management/MBeanParameterInfo.java \
+classpath/javax/management/MBeanPermission.java \
+classpath/javax/management/MBeanRegistration.java \
+classpath/javax/management/MBeanRegistrationException.java \
+classpath/javax/management/MBeanServer.java \
+classpath/javax/management/MBeanServerBuilder.java \
+classpath/javax/management/MBeanServerConnection.java \
+classpath/javax/management/MBeanServerDelegate.java \
+classpath/javax/management/MBeanServerDelegateMBean.java \
+classpath/javax/management/MBeanServerFactory.java \
+classpath/javax/management/MBeanServerNotification.java \
+classpath/javax/management/MBeanServerPermission.java \
+classpath/javax/management/MBeanTrustPermission.java \
+classpath/javax/management/MalformedObjectNameException.java \
+classpath/javax/management/NotCompliantMBeanException.java \
+classpath/javax/management/Notification.java \
+classpath/javax/management/NotificationBroadcaster.java \
+classpath/javax/management/NotificationEmitter.java \
+classpath/javax/management/NotificationFilter.java \
+classpath/javax/management/NotificationListener.java \
+classpath/javax/management/ObjectInstance.java \
+classpath/javax/management/ObjectName.java \
+classpath/javax/management/OperationsException.java \
+classpath/javax/management/QueryExp.java \
+classpath/javax/management/ReflectionException.java \
+classpath/javax/management/RuntimeErrorException.java \
+classpath/javax/management/RuntimeMBeanException.java \
+classpath/javax/management/RuntimeOperationsException.java \
+classpath/javax/management/ServiceNotFoundException.java \
+classpath/javax/management/StandardMBean.java \
+classpath/javax/management/ValueExp.java
+
+javax_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_management_source_files)))
+javax_management_loading_source_files = \
+classpath/javax/management/loading/ClassLoaderRepository.java
+
+javax_management_loading_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_management_loading_source_files)))
+javax_management_openmbean_source_files = \
+classpath/javax/management/openmbean/ArrayType.java \
+classpath/javax/management/openmbean/CompositeData.java \
+classpath/javax/management/openmbean/CompositeDataSupport.java \
+classpath/javax/management/openmbean/CompositeType.java \
+classpath/javax/management/openmbean/InvalidKeyException.java \
+classpath/javax/management/openmbean/InvalidOpenTypeException.java \
+classpath/javax/management/openmbean/KeyAlreadyExistsException.java \
+classpath/javax/management/openmbean/OpenDataException.java \
+classpath/javax/management/openmbean/OpenMBeanAttributeInfo.java \
+classpath/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java \
+classpath/javax/management/openmbean/OpenMBeanConstructorInfo.java \
+classpath/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java \
+classpath/javax/management/openmbean/OpenMBeanInfo.java \
+classpath/javax/management/openmbean/OpenMBeanInfoSupport.java \
+classpath/javax/management/openmbean/OpenMBeanOperationInfo.java \
+classpath/javax/management/openmbean/OpenMBeanOperationInfoSupport.java \
+classpath/javax/management/openmbean/OpenMBeanParameterInfo.java \
+classpath/javax/management/openmbean/OpenMBeanParameterInfoSupport.java \
+classpath/javax/management/openmbean/OpenType.java \
+classpath/javax/management/openmbean/SimpleType.java \
+classpath/javax/management/openmbean/TabularData.java \
+classpath/javax/management/openmbean/TabularDataSupport.java \
+classpath/javax/management/openmbean/TabularType.java
+
+javax_management_openmbean_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_management_openmbean_source_files)))
 javax_naming_source_files = \
 classpath/javax/naming/AuthenticationException.java \
 classpath/javax/naming/AuthenticationNotSupportedException.java \
@@ -3305,6 +5347,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
@@ -3332,6 +5376,7 @@ classpath/javax/net/VanillaSocketFactory.java
 
 javax_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_net_source_files)))
 javax_net_ssl_source_files = \
+classpath/javax/net/ssl/CertPathTrustManagerParameters.java \
 classpath/javax/net/ssl/HandshakeCompletedEvent.java \
 classpath/javax/net/ssl/HandshakeCompletedListener.java \
 classpath/javax/net/ssl/HostnameVerifier.java \
@@ -3339,9 +5384,12 @@ classpath/javax/net/ssl/HttpsURLConnection.java \
 classpath/javax/net/ssl/KeyManager.java \
 classpath/javax/net/ssl/KeyManagerFactory.java \
 classpath/javax/net/ssl/KeyManagerFactorySpi.java \
+classpath/javax/net/ssl/KeyStoreBuilderParameters.java \
 classpath/javax/net/ssl/ManagerFactoryParameters.java \
 classpath/javax/net/ssl/SSLContext.java \
 classpath/javax/net/ssl/SSLContextSpi.java \
+classpath/javax/net/ssl/SSLEngine.java \
+classpath/javax/net/ssl/SSLEngineResult.java \
 classpath/javax/net/ssl/SSLException.java \
 classpath/javax/net/ssl/SSLHandshakeException.java \
 classpath/javax/net/ssl/SSLKeyException.java \
@@ -3360,6 +5408,7 @@ classpath/javax/net/ssl/TrivialHostnameVerifier.java \
 classpath/javax/net/ssl/TrustManager.java \
 classpath/javax/net/ssl/TrustManagerFactory.java \
 classpath/javax/net/ssl/TrustManagerFactorySpi.java \
+classpath/javax/net/ssl/X509ExtendedKeyManager.java \
 classpath/javax/net/ssl/X509KeyManager.java \
 classpath/javax/net/ssl/X509TrustManager.java
 
@@ -3377,8 +5426,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)))
@@ -3444,9 +5496,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 \
@@ -3492,6 +5546,20 @@ classpath/javax/print/event/PrintServiceAttributeEvent.java \
 classpath/javax/print/event/PrintServiceAttributeListener.java
 
 javax_print_event_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_print_event_source_files)))
+javax_rmi_source_files = \
+classpath/javax/rmi/CORBA/ClassDesc.java \
+classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java \
+classpath/javax/rmi/CORBA/Stub.java \
+classpath/javax/rmi/CORBA/StubDelegate.java \
+classpath/javax/rmi/CORBA/Tie.java \
+classpath/javax/rmi/CORBA/Util.java \
+classpath/javax/rmi/CORBA/UtilDelegate.java \
+classpath/javax/rmi/CORBA/ValueHandler.java \
+classpath/javax/rmi/CORBA/ValueHandlerMultiFormat.java \
+classpath/javax/rmi/PortableRemoteObject.java \
+classpath/javax/rmi/ssl/SslRMIClientSocketFactory.java \
+classpath/javax/rmi/ssl/SslRMIServerSocketFactory.java
+
 javax_security_auth_source_files = \
 classpath/javax/security/auth/AuthPermission.java \
 classpath/javax/security/auth/DestroyFailedException.java \
@@ -3517,11 +5585,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 \
@@ -3561,6 +5643,72 @@ classpath/javax/security/sasl/SaslServer.java \
 classpath/javax/security/sasl/SaslServerFactory.java
 
 javax_security_sasl_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_security_sasl_source_files)))
+javax_sound_midi_source_files = \
+classpath/javax/sound/midi/ControllerEventListener.java \
+classpath/javax/sound/midi/Instrument.java \
+classpath/javax/sound/midi/InvalidMidiDataException.java \
+classpath/javax/sound/midi/MetaEventListener.java \
+classpath/javax/sound/midi/MetaMessage.java \
+classpath/javax/sound/midi/MidiChannel.java \
+classpath/javax/sound/midi/MidiDevice.java \
+classpath/javax/sound/midi/MidiEvent.java \
+classpath/javax/sound/midi/MidiFileFormat.java \
+classpath/javax/sound/midi/MidiMessage.java \
+classpath/javax/sound/midi/MidiSystem.java \
+classpath/javax/sound/midi/MidiUnavailableException.java \
+classpath/javax/sound/midi/Patch.java \
+classpath/javax/sound/midi/Receiver.java \
+classpath/javax/sound/midi/Sequence.java \
+classpath/javax/sound/midi/Sequencer.java \
+classpath/javax/sound/midi/ShortMessage.java \
+classpath/javax/sound/midi/Soundbank.java \
+classpath/javax/sound/midi/SoundbankResource.java \
+classpath/javax/sound/midi/Synthesizer.java \
+classpath/javax/sound/midi/SysexMessage.java \
+classpath/javax/sound/midi/Track.java \
+classpath/javax/sound/midi/Transmitter.java \
+classpath/javax/sound/midi/VoiceStatus.java
+
+javax_sound_midi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_sound_midi_source_files)))
+javax_sound_midi_spi_source_files = \
+classpath/javax/sound/midi/spi/MidiDeviceProvider.java \
+classpath/javax/sound/midi/spi/MidiFileReader.java \
+classpath/javax/sound/midi/spi/MidiFileWriter.java \
+classpath/javax/sound/midi/spi/SoundbankReader.java
+
+javax_sound_midi_spi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_sound_midi_spi_source_files)))
+javax_sound_sampled_source_files = \
+classpath/javax/sound/sampled/AudioFileFormat.java \
+classpath/javax/sound/sampled/AudioFormat.java \
+classpath/javax/sound/sampled/AudioInputStream.java \
+classpath/javax/sound/sampled/AudioPermission.java \
+classpath/javax/sound/sampled/AudioSystem.java \
+classpath/javax/sound/sampled/BooleanControl.java \
+classpath/javax/sound/sampled/Clip.java \
+classpath/javax/sound/sampled/CompoundControl.java \
+classpath/javax/sound/sampled/Control.java \
+classpath/javax/sound/sampled/DataLine.java \
+classpath/javax/sound/sampled/EnumControl.java \
+classpath/javax/sound/sampled/FloatControl.java \
+classpath/javax/sound/sampled/Line.java \
+classpath/javax/sound/sampled/LineEvent.java \
+classpath/javax/sound/sampled/LineListener.java \
+classpath/javax/sound/sampled/LineUnavailableException.java \
+classpath/javax/sound/sampled/Mixer.java \
+classpath/javax/sound/sampled/Port.java \
+classpath/javax/sound/sampled/ReverbType.java \
+classpath/javax/sound/sampled/SourceDataLine.java \
+classpath/javax/sound/sampled/TargetDataLine.java \
+classpath/javax/sound/sampled/UnsupportedAudioFileException.java
+
+javax_sound_sampled_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_sound_sampled_source_files)))
+javax_sound_sampled_spi_source_files = \
+classpath/javax/sound/sampled/spi/AudioFileReader.java \
+classpath/javax/sound/sampled/spi/AudioFileWriter.java \
+classpath/javax/sound/sampled/spi/FormatConversionProvider.java \
+classpath/javax/sound/sampled/spi/MixerProvider.java
+
+javax_sound_sampled_spi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_sound_sampled_spi_source_files)))
 javax_sql_source_files = \
 classpath/javax/sql/ConnectionEvent.java \
 classpath/javax/sql/ConnectionEventListener.java \
@@ -3596,6 +5744,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 \
@@ -3662,6 +5811,7 @@ classpath/javax/swing/JTree.java \
 classpath/javax/swing/JViewport.java \
 classpath/javax/swing/JWindow.java \
 classpath/javax/swing/KeyStroke.java \
+classpath/javax/swing/KeyboardManager.java \
 classpath/javax/swing/LayoutFocusTraversalPolicy.java \
 classpath/javax/swing/ListCellRenderer.java \
 classpath/javax/swing/ListModel.java \
@@ -3843,6 +5993,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 \
@@ -3882,27 +6033,35 @@ 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 = \
 classpath/javax/swing/plaf/metal/DefaultMetalTheme.java \
 classpath/javax/swing/plaf/metal/MetalBorders.java \
+classpath/javax/swing/plaf/metal/MetalButtonListener.java \
 classpath/javax/swing/plaf/metal/MetalButtonUI.java \
 classpath/javax/swing/plaf/metal/MetalCheckBoxIcon.java \
 classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java \
+classpath/javax/swing/plaf/metal/MetalComboBoxButton.java \
+classpath/javax/swing/plaf/metal/MetalComboBoxEditor.java \
 classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java \
 classpath/javax/swing/plaf/metal/MetalComboBoxUI.java \
 classpath/javax/swing/plaf/metal/MetalDesktopIconUI.java \
+classpath/javax/swing/plaf/metal/MetalFileChooserUI.java \
 classpath/javax/swing/plaf/metal/MetalIconFactory.java \
+classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java \
 classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java \
 classpath/javax/swing/plaf/metal/MetalLabelUI.java \
 classpath/javax/swing/plaf/metal/MetalLookAndFeel.java \
+classpath/javax/swing/plaf/metal/MetalMenuBarUI.java \
 classpath/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java \
 classpath/javax/swing/plaf/metal/MetalProgressBarUI.java \
 classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java \
 classpath/javax/swing/plaf/metal/MetalRootPaneUI.java \
 classpath/javax/swing/plaf/metal/MetalScrollBarUI.java \
+classpath/javax/swing/plaf/metal/MetalScrollButton.java \
 classpath/javax/swing/plaf/metal/MetalScrollPaneUI.java \
 classpath/javax/swing/plaf/metal/MetalSeparatorUI.java \
 classpath/javax/swing/plaf/metal/MetalSliderUI.java \
@@ -3915,9 +6074,56 @@ classpath/javax/swing/plaf/metal/MetalToggleButtonUI.java \
 classpath/javax/swing/plaf/metal/MetalToolBarUI.java \
 classpath/javax/swing/plaf/metal/MetalToolTipUI.java \
 classpath/javax/swing/plaf/metal/MetalTreeUI.java \
-classpath/javax/swing/plaf/metal/MetalUtils.java
+classpath/javax/swing/plaf/metal/MetalUtils.java \
+classpath/javax/swing/plaf/metal/OceanTheme.java
 
 javax_swing_plaf_metal_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_plaf_metal_source_files)))
+javax_swing_plaf_multi_source_files = \
+classpath/javax/swing/plaf/multi/MultiButtonUI.java \
+classpath/javax/swing/plaf/multi/MultiColorChooserUI.java \
+classpath/javax/swing/plaf/multi/MultiComboBoxUI.java \
+classpath/javax/swing/plaf/multi/MultiDesktopIconUI.java \
+classpath/javax/swing/plaf/multi/MultiDesktopPaneUI.java \
+classpath/javax/swing/plaf/multi/MultiFileChooserUI.java \
+classpath/javax/swing/plaf/multi/MultiInternalFrameUI.java \
+classpath/javax/swing/plaf/multi/MultiLabelUI.java \
+classpath/javax/swing/plaf/multi/MultiListUI.java \
+classpath/javax/swing/plaf/multi/MultiLookAndFeel.java \
+classpath/javax/swing/plaf/multi/MultiMenuBarUI.java \
+classpath/javax/swing/plaf/multi/MultiMenuItemUI.java \
+classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java \
+classpath/javax/swing/plaf/multi/MultiPanelUI.java \
+classpath/javax/swing/plaf/multi/MultiPopupMenuUI.java \
+classpath/javax/swing/plaf/multi/MultiProgressBarUI.java \
+classpath/javax/swing/plaf/multi/MultiRootPaneUI.java \
+classpath/javax/swing/plaf/multi/MultiScrollBarUI.java \
+classpath/javax/swing/plaf/multi/MultiScrollPaneUI.java \
+classpath/javax/swing/plaf/multi/MultiSeparatorUI.java \
+classpath/javax/swing/plaf/multi/MultiSliderUI.java \
+classpath/javax/swing/plaf/multi/MultiSpinnerUI.java \
+classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java \
+classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java \
+classpath/javax/swing/plaf/multi/MultiTableHeaderUI.java \
+classpath/javax/swing/plaf/multi/MultiTableUI.java \
+classpath/javax/swing/plaf/multi/MultiTextUI.java \
+classpath/javax/swing/plaf/multi/MultiToolBarUI.java \
+classpath/javax/swing/plaf/multi/MultiToolTipUI.java \
+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 \
@@ -3933,30 +6139,46 @@ classpath/javax/swing/table/TableModel.java
 javax_swing_table_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_table_source_files)))
 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 \
 classpath/javax/swing/text/Caret.java \
 classpath/javax/swing/text/ChangedCharSetException.java \
 classpath/javax/swing/text/ComponentView.java \
+classpath/javax/swing/text/CompositeView.java \
 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 \
 classpath/javax/swing/text/Document.java \
 classpath/javax/swing/text/DocumentFilter.java \
 classpath/javax/swing/text/EditorKit.java \
 classpath/javax/swing/text/Element.java \
+classpath/javax/swing/text/ElementIterator.java \
+classpath/javax/swing/text/EmptyAttributeSet.java \
 classpath/javax/swing/text/FieldView.java \
+classpath/javax/swing/text/FlowView.java \
 classpath/javax/swing/text/GapContent.java \
+classpath/javax/swing/text/GlyphView.java \
 classpath/javax/swing/text/Highlighter.java \
+classpath/javax/swing/text/IconView.java \
 classpath/javax/swing/text/InternationalFormatter.java \
 classpath/javax/swing/text/JTextComponent.java \
 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 \
 classpath/javax/swing/text/PlainView.java \
@@ -3973,17 +6195,49 @@ 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 \
-classpath/javax/swing/text/ViewFactory.java
+classpath/javax/swing/text/ViewFactory.java \
+classpath/javax/swing/text/WrappedPlainView.java \
+classpath/javax/swing/text/ZoneView.java
 
 javax_swing_text_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_text_source_files)))
 javax_swing_text_html_source_files = \
+classpath/javax/swing/text/html/BRView.java \
+classpath/javax/swing/text/html/BlockView.java \
+classpath/javax/swing/text/html/CSS.java \
+classpath/javax/swing/text/html/CSSBorder.java \
+classpath/javax/swing/text/html/CSSParser.java \
+classpath/javax/swing/text/html/FormSubmitEvent.java \
+classpath/javax/swing/text/html/FormView.java \
+classpath/javax/swing/text/html/FrameSetView.java \
+classpath/javax/swing/text/html/FrameView.java \
+classpath/javax/swing/text/html/HRuleView.java \
 classpath/javax/swing/text/html/HTML.java \
 classpath/javax/swing/text/html/HTMLDocument.java \
 classpath/javax/swing/text/html/HTMLEditorKit.java \
-classpath/javax/swing/text/html/HTMLFrameHyperlinkEvent.java
+classpath/javax/swing/text/html/HTMLFrameHyperlinkEvent.java \
+classpath/javax/swing/text/html/HTMLWriter.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/MultiAttributeSet.java \
+classpath/javax/swing/text/html/MultiStyle.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/ResetableModel.java \
+classpath/javax/swing/text/html/ResetablePlainDocument.java \
+classpath/javax/swing/text/html/ResetableToggleButtonModel.java \
+classpath/javax/swing/text/html/SelectComboBoxModel.java \
+classpath/javax/swing/text/html/SelectListModel.java \
+classpath/javax/swing/text/html/StyleSheet.java \
+classpath/javax/swing/text/html/TableView.java \
+classpath/javax/swing/text/html/ViewAttributeSet.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 = \
@@ -4079,6 +6333,39 @@ classpath/javax/xml/parsers/FactoryConfigurationError.java \
 classpath/javax/xml/parsers/ParserConfigurationException.java \
 classpath/javax/xml/parsers/SAXParser.java \
 classpath/javax/xml/parsers/SAXParserFactory.java \
+classpath/javax/xml/stream/EventFilter.java \
+classpath/javax/xml/stream/FactoryConfigurationError.java \
+classpath/javax/xml/stream/Location.java \
+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/XMLInputFactory.java \
+classpath/javax/xml/stream/XMLOutputFactory.java \
+classpath/javax/xml/stream/XMLReporter.java \
+classpath/javax/xml/stream/XMLResolver.java \
+classpath/javax/xml/stream/XMLStreamConstants.java \
+classpath/javax/xml/stream/XMLStreamException.java \
+classpath/javax/xml/stream/XMLStreamReader.java \
+classpath/javax/xml/stream/XMLStreamWriter.java \
+classpath/javax/xml/stream/events/Attribute.java \
+classpath/javax/xml/stream/events/Characters.java \
+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/EntityDeclaration.java \
+classpath/javax/xml/stream/events/EntityReference.java \
+classpath/javax/xml/stream/events/Namespace.java \
+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/XMLEvent.java \
+classpath/javax/xml/stream/util/EventReaderDelegate.java \
+classpath/javax/xml/stream/util/ReaderDelegate.java \
+classpath/javax/xml/stream/util/XMLEventAllocator.java \
+classpath/javax/xml/stream/util/XMLEventConsumer.java \
 classpath/javax/xml/transform/ErrorListener.java \
 classpath/javax/xml/transform/OutputKeys.java \
 classpath/javax/xml/transform/Result.java \
@@ -4103,6 +6390,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 \
@@ -4129,6 +6417,553 @@ classpath/org/ietf/jgss/MessageProp.java \
 classpath/org/ietf/jgss/Oid.java
 
 org_ietf_jgss_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(org_ietf_jgss_source_files)))
+org_omg_source_files = \
+classpath/org/omg/CORBA/ACTIVITY_COMPLETED.java \
+classpath/org/omg/CORBA/ACTIVITY_REQUIRED.java \
+classpath/org/omg/CORBA/ARG_IN.java \
+classpath/org/omg/CORBA/ARG_INOUT.java \
+classpath/org/omg/CORBA/ARG_OUT.java \
+classpath/org/omg/CORBA/Any.java \
+classpath/org/omg/CORBA/AnyHolder.java \
+classpath/org/omg/CORBA/AnySeqHelper.java \
+classpath/org/omg/CORBA/AnySeqHolder.java \
+classpath/org/omg/CORBA/BAD_CONTEXT.java \
+classpath/org/omg/CORBA/BAD_INV_ORDER.java \
+classpath/org/omg/CORBA/BAD_OPERATION.java \
+classpath/org/omg/CORBA/BAD_PARAM.java \
+classpath/org/omg/CORBA/BAD_POLICY.java \
+classpath/org/omg/CORBA/BAD_POLICY_TYPE.java \
+classpath/org/omg/CORBA/BAD_POLICY_VALUE.java \
+classpath/org/omg/CORBA/BAD_QOS.java \
+classpath/org/omg/CORBA/BAD_TYPECODE.java \
+classpath/org/omg/CORBA/BooleanHolder.java \
+classpath/org/omg/CORBA/BooleanSeqHelper.java \
+classpath/org/omg/CORBA/BooleanSeqHolder.java \
+classpath/org/omg/CORBA/Bounds.java \
+classpath/org/omg/CORBA/ByteHolder.java \
+classpath/org/omg/CORBA/CODESET_INCOMPATIBLE.java \
+classpath/org/omg/CORBA/COMM_FAILURE.java \
+classpath/org/omg/CORBA/CTX_RESTRICT_SCOPE.java \
+classpath/org/omg/CORBA/CharHolder.java \
+classpath/org/omg/CORBA/CharSeqHelper.java \
+classpath/org/omg/CORBA/CharSeqHolder.java \
+classpath/org/omg/CORBA/CompletionStatus.java \
+classpath/org/omg/CORBA/CompletionStatusHelper.java \
+classpath/org/omg/CORBA/Context.java \
+classpath/org/omg/CORBA/ContextList.java \
+classpath/org/omg/CORBA/Current.java \
+classpath/org/omg/CORBA/CurrentHelper.java \
+classpath/org/omg/CORBA/CurrentHolder.java \
+classpath/org/omg/CORBA/CurrentOperations.java \
+classpath/org/omg/CORBA/CustomMarshal.java \
+classpath/org/omg/CORBA/CustomValue.java \
+classpath/org/omg/CORBA/DATA_CONVERSION.java \
+classpath/org/omg/CORBA/DataInputStream.java \
+classpath/org/omg/CORBA/DataOutputStream.java \
+classpath/org/omg/CORBA/DefinitionKind.java \
+classpath/org/omg/CORBA/DefinitionKindHelper.java \
+classpath/org/omg/CORBA/DomainManager.java \
+classpath/org/omg/CORBA/DomainManagerOperations.java \
+classpath/org/omg/CORBA/DoubleHolder.java \
+classpath/org/omg/CORBA/DoubleSeqHelper.java \
+classpath/org/omg/CORBA/DoubleSeqHolder.java \
+classpath/org/omg/CORBA/DynAny.java \
+classpath/org/omg/CORBA/DynAnyPackage/Invalid.java \
+classpath/org/omg/CORBA/DynAnyPackage/InvalidSeq.java \
+classpath/org/omg/CORBA/DynAnyPackage/InvalidValue.java \
+classpath/org/omg/CORBA/DynAnyPackage/TypeMismatch.java \
+classpath/org/omg/CORBA/DynArray.java \
+classpath/org/omg/CORBA/DynEnum.java \
+classpath/org/omg/CORBA/DynFixed.java \
+classpath/org/omg/CORBA/DynSequence.java \
+classpath/org/omg/CORBA/DynStruct.java \
+classpath/org/omg/CORBA/DynUnion.java \
+classpath/org/omg/CORBA/DynValue.java \
+classpath/org/omg/CORBA/DynamicImplementation.java \
+classpath/org/omg/CORBA/Environment.java \
+classpath/org/omg/CORBA/ExceptionList.java \
+classpath/org/omg/CORBA/FREE_MEM.java \
+classpath/org/omg/CORBA/FieldNameHelper.java \
+classpath/org/omg/CORBA/FixedHolder.java \
+classpath/org/omg/CORBA/FloatHolder.java \
+classpath/org/omg/CORBA/FloatSeqHelper.java \
+classpath/org/omg/CORBA/FloatSeqHolder.java \
+classpath/org/omg/CORBA/IDLType.java \
+classpath/org/omg/CORBA/IDLTypeHelper.java \
+classpath/org/omg/CORBA/IDLTypeOperations.java \
+classpath/org/omg/CORBA/IMP_LIMIT.java \
+classpath/org/omg/CORBA/INITIALIZE.java \
+classpath/org/omg/CORBA/INTERNAL.java \
+classpath/org/omg/CORBA/INTF_REPOS.java \
+classpath/org/omg/CORBA/INVALID_ACTIVITY.java \
+classpath/org/omg/CORBA/INVALID_TRANSACTION.java \
+classpath/org/omg/CORBA/INV_FLAG.java \
+classpath/org/omg/CORBA/INV_IDENT.java \
+classpath/org/omg/CORBA/INV_OBJREF.java \
+classpath/org/omg/CORBA/INV_POLICY.java \
+classpath/org/omg/CORBA/IRObject.java \
+classpath/org/omg/CORBA/IRObjectOperations.java \
+classpath/org/omg/CORBA/IdentifierHelper.java \
+classpath/org/omg/CORBA/IntHolder.java \
+classpath/org/omg/CORBA/LocalObject.java \
+classpath/org/omg/CORBA/LongHolder.java \
+classpath/org/omg/CORBA/LongLongSeqHelper.java \
+classpath/org/omg/CORBA/LongLongSeqHolder.java \
+classpath/org/omg/CORBA/LongSeqHelper.java \
+classpath/org/omg/CORBA/LongSeqHolder.java \
+classpath/org/omg/CORBA/MARSHAL.java \
+classpath/org/omg/CORBA/NO_IMPLEMENT.java \
+classpath/org/omg/CORBA/NO_MEMORY.java \
+classpath/org/omg/CORBA/NO_PERMISSION.java \
+classpath/org/omg/CORBA/NO_RESOURCES.java \
+classpath/org/omg/CORBA/NO_RESPONSE.java \
+classpath/org/omg/CORBA/NVList.java \
+classpath/org/omg/CORBA/NameValuePair.java \
+classpath/org/omg/CORBA/NameValuePairHelper.java \
+classpath/org/omg/CORBA/NamedValue.java \
+classpath/org/omg/CORBA/OBJECT_NOT_EXIST.java \
+classpath/org/omg/CORBA/OBJ_ADAPTER.java \
+classpath/org/omg/CORBA/OMGVMCID.java \
+classpath/org/omg/CORBA/ORB.java \
+classpath/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java \
+classpath/org/omg/CORBA/ORBPackage/InvalidName.java \
+classpath/org/omg/CORBA/Object.java \
+classpath/org/omg/CORBA/ObjectHelper.java \
+classpath/org/omg/CORBA/ObjectHolder.java \
+classpath/org/omg/CORBA/OctetSeqHelper.java \
+classpath/org/omg/CORBA/OctetSeqHolder.java \
+classpath/org/omg/CORBA/PERSIST_STORE.java \
+classpath/org/omg/CORBA/PRIVATE_MEMBER.java \
+classpath/org/omg/CORBA/PUBLIC_MEMBER.java \
+classpath/org/omg/CORBA/ParameterMode.java \
+classpath/org/omg/CORBA/ParameterModeHelper.java \
+classpath/org/omg/CORBA/ParameterModeHolder.java \
+classpath/org/omg/CORBA/Policy.java \
+classpath/org/omg/CORBA/PolicyError.java \
+classpath/org/omg/CORBA/PolicyErrorCodeHelper.java \
+classpath/org/omg/CORBA/PolicyErrorHelper.java \
+classpath/org/omg/CORBA/PolicyErrorHolder.java \
+classpath/org/omg/CORBA/PolicyHelper.java \
+classpath/org/omg/CORBA/PolicyHolder.java \
+classpath/org/omg/CORBA/PolicyListHelper.java \
+classpath/org/omg/CORBA/PolicyListHolder.java \
+classpath/org/omg/CORBA/PolicyOperations.java \
+classpath/org/omg/CORBA/PolicyTypeHelper.java \
+classpath/org/omg/CORBA/Principal.java \
+classpath/org/omg/CORBA/PrincipalHolder.java \
+classpath/org/omg/CORBA/REBIND.java \
+classpath/org/omg/CORBA/RepositoryIdHelper.java \
+classpath/org/omg/CORBA/Request.java \
+classpath/org/omg/CORBA/ServerRequest.java \
+classpath/org/omg/CORBA/ServiceDetail.java \
+classpath/org/omg/CORBA/ServiceDetailHelper.java \
+classpath/org/omg/CORBA/ServiceInformation.java \
+classpath/org/omg/CORBA/ServiceInformationHelper.java \
+classpath/org/omg/CORBA/ServiceInformationHolder.java \
+classpath/org/omg/CORBA/SetOverrideType.java \
+classpath/org/omg/CORBA/SetOverrideTypeHelper.java \
+classpath/org/omg/CORBA/ShortHolder.java \
+classpath/org/omg/CORBA/ShortSeqHelper.java \
+classpath/org/omg/CORBA/ShortSeqHolder.java \
+classpath/org/omg/CORBA/StringHolder.java \
+classpath/org/omg/CORBA/StringSeqHelper.java \
+classpath/org/omg/CORBA/StringSeqHolder.java \
+classpath/org/omg/CORBA/StringValueHelper.java \
+classpath/org/omg/CORBA/StructMember.java \
+classpath/org/omg/CORBA/StructMemberHelper.java \
+classpath/org/omg/CORBA/SystemException.java \
+classpath/org/omg/CORBA/TCKind.java \
+classpath/org/omg/CORBA/TIMEOUT.java \
+classpath/org/omg/CORBA/TRANSACTION_MODE.java \
+classpath/org/omg/CORBA/TRANSACTION_REQUIRED.java \
+classpath/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java \
+classpath/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java \
+classpath/org/omg/CORBA/TRANSIENT.java \
+classpath/org/omg/CORBA/TypeCode.java \
+classpath/org/omg/CORBA/TypeCodeHolder.java \
+classpath/org/omg/CORBA/TypeCodePackage/BadKind.java \
+classpath/org/omg/CORBA/TypeCodePackage/Bounds.java \
+classpath/org/omg/CORBA/ULongLongSeqHelper.java \
+classpath/org/omg/CORBA/ULongLongSeqHolder.java \
+classpath/org/omg/CORBA/ULongSeqHelper.java \
+classpath/org/omg/CORBA/ULongSeqHolder.java \
+classpath/org/omg/CORBA/UNKNOWN.java \
+classpath/org/omg/CORBA/UNSUPPORTED_POLICY.java \
+classpath/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java \
+classpath/org/omg/CORBA/UShortSeqHelper.java \
+classpath/org/omg/CORBA/UShortSeqHolder.java \
+classpath/org/omg/CORBA/UnionMember.java \
+classpath/org/omg/CORBA/UnionMemberHelper.java \
+classpath/org/omg/CORBA/UnknownUserException.java \
+classpath/org/omg/CORBA/UnknownUserExceptionHelper.java \
+classpath/org/omg/CORBA/UnknownUserExceptionHolder.java \
+classpath/org/omg/CORBA/UserException.java \
+classpath/org/omg/CORBA/VM_ABSTRACT.java \
+classpath/org/omg/CORBA/VM_CUSTOM.java \
+classpath/org/omg/CORBA/VM_NONE.java \
+classpath/org/omg/CORBA/VM_TRUNCATABLE.java \
+classpath/org/omg/CORBA/ValueBaseHelper.java \
+classpath/org/omg/CORBA/ValueBaseHolder.java \
+classpath/org/omg/CORBA/ValueMember.java \
+classpath/org/omg/CORBA/ValueMemberHelper.java \
+classpath/org/omg/CORBA/VersionSpecHelper.java \
+classpath/org/omg/CORBA/VisibilityHelper.java \
+classpath/org/omg/CORBA/WCharSeqHelper.java \
+classpath/org/omg/CORBA/WCharSeqHolder.java \
+classpath/org/omg/CORBA/WStringSeqHelper.java \
+classpath/org/omg/CORBA/WStringSeqHolder.java \
+classpath/org/omg/CORBA/WStringValueHelper.java \
+classpath/org/omg/CORBA/WrongTransaction.java \
+classpath/org/omg/CORBA/WrongTransactionHelper.java \
+classpath/org/omg/CORBA/WrongTransactionHolder.java \
+classpath/org/omg/CORBA/_IDLTypeStub.java \
+classpath/org/omg/CORBA/_PolicyStub.java \
+classpath/org/omg/CORBA/portable/ApplicationException.java \
+classpath/org/omg/CORBA/portable/BoxedValueHelper.java \
+classpath/org/omg/CORBA/portable/CustomValue.java \
+classpath/org/omg/CORBA/portable/Delegate.java \
+classpath/org/omg/CORBA/portable/IDLEntity.java \
+classpath/org/omg/CORBA/portable/IndirectionException.java \
+classpath/org/omg/CORBA/portable/InputStream.java \
+classpath/org/omg/CORBA/portable/InvokeHandler.java \
+classpath/org/omg/CORBA/portable/ObjectImpl.java \
+classpath/org/omg/CORBA/portable/OutputStream.java \
+classpath/org/omg/CORBA/portable/RemarshalException.java \
+classpath/org/omg/CORBA/portable/ResponseHandler.java \
+classpath/org/omg/CORBA/portable/ServantObject.java \
+classpath/org/omg/CORBA/portable/Streamable.java \
+classpath/org/omg/CORBA/portable/StreamableValue.java \
+classpath/org/omg/CORBA/portable/UnknownException.java \
+classpath/org/omg/CORBA/portable/ValueBase.java \
+classpath/org/omg/CORBA/portable/ValueFactory.java \
+classpath/org/omg/CORBA_2_3/ORB.java \
+classpath/org/omg/CORBA_2_3/portable/Delegate.java \
+classpath/org/omg/CORBA_2_3/portable/InputStream.java \
+classpath/org/omg/CORBA_2_3/portable/ObjectImpl.java \
+classpath/org/omg/CORBA_2_3/portable/OutputStream.java \
+classpath/org/omg/CosNaming/Binding.java \
+classpath/org/omg/CosNaming/BindingHelper.java \
+classpath/org/omg/CosNaming/BindingHolder.java \
+classpath/org/omg/CosNaming/BindingIterator.java \
+classpath/org/omg/CosNaming/BindingIteratorHelper.java \
+classpath/org/omg/CosNaming/BindingIteratorHolder.java \
+classpath/org/omg/CosNaming/BindingIteratorOperations.java \
+classpath/org/omg/CosNaming/BindingIteratorPOA.java \
+classpath/org/omg/CosNaming/BindingListHelper.java \
+classpath/org/omg/CosNaming/BindingListHolder.java \
+classpath/org/omg/CosNaming/BindingType.java \
+classpath/org/omg/CosNaming/BindingTypeHelper.java \
+classpath/org/omg/CosNaming/BindingTypeHolder.java \
+classpath/org/omg/CosNaming/IstringHelper.java \
+classpath/org/omg/CosNaming/NameComponent.java \
+classpath/org/omg/CosNaming/NameComponentHelper.java \
+classpath/org/omg/CosNaming/NameComponentHolder.java \
+classpath/org/omg/CosNaming/NameHelper.java \
+classpath/org/omg/CosNaming/NameHolder.java \
+classpath/org/omg/CosNaming/NamingContext.java \
+classpath/org/omg/CosNaming/NamingContextExt.java \
+classpath/org/omg/CosNaming/NamingContextExtHelper.java \
+classpath/org/omg/CosNaming/NamingContextExtHolder.java \
+classpath/org/omg/CosNaming/NamingContextExtOperations.java \
+classpath/org/omg/CosNaming/NamingContextExtPOA.java \
+classpath/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java \
+classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.java \
+classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java \
+classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java \
+classpath/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java \
+classpath/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java \
+classpath/org/omg/CosNaming/NamingContextHelper.java \
+classpath/org/omg/CosNaming/NamingContextHolder.java \
+classpath/org/omg/CosNaming/NamingContextOperations.java \
+classpath/org/omg/CosNaming/NamingContextPOA.java \
+classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBound.java \
+classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java \
+classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHolder.java \
+classpath/org/omg/CosNaming/NamingContextPackage/CannotProceed.java \
+classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java \
+classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHolder.java \
+classpath/org/omg/CosNaming/NamingContextPackage/InvalidName.java \
+classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java \
+classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHolder.java \
+classpath/org/omg/CosNaming/NamingContextPackage/NotEmpty.java \
+classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java \
+classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHolder.java \
+classpath/org/omg/CosNaming/NamingContextPackage/NotFound.java \
+classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java \
+classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHolder.java \
+classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReason.java \
+classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java \
+classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java \
+classpath/org/omg/CosNaming/_BindingIteratorImplBase.java \
+classpath/org/omg/CosNaming/_BindingIteratorStub.java \
+classpath/org/omg/CosNaming/_NamingContextExtImplBase.java \
+classpath/org/omg/CosNaming/_NamingContextExtStub.java \
+classpath/org/omg/CosNaming/_NamingContextImplBase.java \
+classpath/org/omg/CosNaming/_NamingContextStub.java \
+classpath/org/omg/Dynamic/Parameter.java \
+classpath/org/omg/DynamicAny/AnySeqHelper.java \
+classpath/org/omg/DynamicAny/DynAny.java \
+classpath/org/omg/DynamicAny/DynAnyFactory.java \
+classpath/org/omg/DynamicAny/DynAnyFactoryHelper.java \
+classpath/org/omg/DynamicAny/DynAnyFactoryOperations.java \
+classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.java \
+classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java \
+classpath/org/omg/DynamicAny/DynAnyHelper.java \
+classpath/org/omg/DynamicAny/DynAnyOperations.java \
+classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValue.java \
+classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java \
+classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatch.java \
+classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java \
+classpath/org/omg/DynamicAny/DynAnySeqHelper.java \
+classpath/org/omg/DynamicAny/DynArray.java \
+classpath/org/omg/DynamicAny/DynArrayHelper.java \
+classpath/org/omg/DynamicAny/DynArrayOperations.java \
+classpath/org/omg/DynamicAny/DynEnum.java \
+classpath/org/omg/DynamicAny/DynEnumHelper.java \
+classpath/org/omg/DynamicAny/DynEnumOperations.java \
+classpath/org/omg/DynamicAny/DynFixed.java \
+classpath/org/omg/DynamicAny/DynFixedHelper.java \
+classpath/org/omg/DynamicAny/DynFixedOperations.java \
+classpath/org/omg/DynamicAny/DynSequence.java \
+classpath/org/omg/DynamicAny/DynSequenceHelper.java \
+classpath/org/omg/DynamicAny/DynSequenceOperations.java \
+classpath/org/omg/DynamicAny/DynStruct.java \
+classpath/org/omg/DynamicAny/DynStructHelper.java \
+classpath/org/omg/DynamicAny/DynStructOperations.java \
+classpath/org/omg/DynamicAny/DynUnion.java \
+classpath/org/omg/DynamicAny/DynUnionHelper.java \
+classpath/org/omg/DynamicAny/DynUnionOperations.java \
+classpath/org/omg/DynamicAny/DynValue.java \
+classpath/org/omg/DynamicAny/DynValueBox.java \
+classpath/org/omg/DynamicAny/DynValueBoxOperations.java \
+classpath/org/omg/DynamicAny/DynValueCommon.java \
+classpath/org/omg/DynamicAny/DynValueCommonOperations.java \
+classpath/org/omg/DynamicAny/DynValueHelper.java \
+classpath/org/omg/DynamicAny/DynValueOperations.java \
+classpath/org/omg/DynamicAny/FieldNameHelper.java \
+classpath/org/omg/DynamicAny/NameDynAnyPair.java \
+classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java \
+classpath/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java \
+classpath/org/omg/DynamicAny/NameValuePair.java \
+classpath/org/omg/DynamicAny/NameValuePairHelper.java \
+classpath/org/omg/DynamicAny/NameValuePairSeqHelper.java \
+classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java \
+classpath/org/omg/DynamicAny/_DynAnyStub.java \
+classpath/org/omg/DynamicAny/_DynArrayStub.java \
+classpath/org/omg/DynamicAny/_DynEnumStub.java \
+classpath/org/omg/DynamicAny/_DynFixedStub.java \
+classpath/org/omg/DynamicAny/_DynSequenceStub.java \
+classpath/org/omg/DynamicAny/_DynStructStub.java \
+classpath/org/omg/DynamicAny/_DynUnionStub.java \
+classpath/org/omg/DynamicAny/_DynValueStub.java \
+classpath/org/omg/IOP/CodeSets.java \
+classpath/org/omg/IOP/Codec.java \
+classpath/org/omg/IOP/CodecFactory.java \
+classpath/org/omg/IOP/CodecFactoryHelper.java \
+classpath/org/omg/IOP/CodecFactoryOperations.java \
+classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.java \
+classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java \
+classpath/org/omg/IOP/CodecOperations.java \
+classpath/org/omg/IOP/CodecPackage/FormatMismatch.java \
+classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java \
+classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.java \
+classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java \
+classpath/org/omg/IOP/CodecPackage/TypeMismatch.java \
+classpath/org/omg/IOP/CodecPackage/TypeMismatchHelper.java \
+classpath/org/omg/IOP/ComponentIdHelper.java \
+classpath/org/omg/IOP/ENCODING_CDR_ENCAPS.java \
+classpath/org/omg/IOP/Encoding.java \
+classpath/org/omg/IOP/ExceptionDetailMessage.java \
+classpath/org/omg/IOP/IOR.java \
+classpath/org/omg/IOP/IORHelper.java \
+classpath/org/omg/IOP/IORHolder.java \
+classpath/org/omg/IOP/MultipleComponentProfileHelper.java \
+classpath/org/omg/IOP/MultipleComponentProfileHolder.java \
+classpath/org/omg/IOP/ProfileIdHelper.java \
+classpath/org/omg/IOP/RMICustomMaxStreamFormat.java \
+classpath/org/omg/IOP/ServiceContext.java \
+classpath/org/omg/IOP/ServiceContextHelper.java \
+classpath/org/omg/IOP/ServiceContextHolder.java \
+classpath/org/omg/IOP/ServiceContextListHelper.java \
+classpath/org/omg/IOP/ServiceContextListHolder.java \
+classpath/org/omg/IOP/ServiceIdHelper.java \
+classpath/org/omg/IOP/TAG_ALTERNATE_IIOP_ADDRESS.java \
+classpath/org/omg/IOP/TAG_CODE_SETS.java \
+classpath/org/omg/IOP/TAG_INTERNET_IOP.java \
+classpath/org/omg/IOP/TAG_JAVA_CODEBASE.java \
+classpath/org/omg/IOP/TAG_MULTIPLE_COMPONENTS.java \
+classpath/org/omg/IOP/TAG_ORB_TYPE.java \
+classpath/org/omg/IOP/TAG_POLICIES.java \
+classpath/org/omg/IOP/TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.java \
+classpath/org/omg/IOP/TaggedComponent.java \
+classpath/org/omg/IOP/TaggedComponentHelper.java \
+classpath/org/omg/IOP/TaggedComponentHolder.java \
+classpath/org/omg/IOP/TaggedProfile.java \
+classpath/org/omg/IOP/TaggedProfileHelper.java \
+classpath/org/omg/IOP/TaggedProfileHolder.java \
+classpath/org/omg/IOP/TransactionService.java \
+classpath/org/omg/Messaging/SYNC_WITH_TRANSPORT.java \
+classpath/org/omg/Messaging/SyncScopeHelper.java \
+classpath/org/omg/PortableInterceptor/ACTIVE.java \
+classpath/org/omg/PortableInterceptor/AdapterManagerIdHelper.java \
+classpath/org/omg/PortableInterceptor/AdapterNameHelper.java \
+classpath/org/omg/PortableInterceptor/AdapterStateHelper.java \
+classpath/org/omg/PortableInterceptor/ClientRequestInfo.java \
+classpath/org/omg/PortableInterceptor/ClientRequestInfoOperations.java \
+classpath/org/omg/PortableInterceptor/ClientRequestInterceptor.java \
+classpath/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java \
+classpath/org/omg/PortableInterceptor/Current.java \
+classpath/org/omg/PortableInterceptor/CurrentHelper.java \
+classpath/org/omg/PortableInterceptor/CurrentOperations.java \
+classpath/org/omg/PortableInterceptor/DISCARDING.java \
+classpath/org/omg/PortableInterceptor/ForwardRequest.java \
+classpath/org/omg/PortableInterceptor/ForwardRequestHelper.java \
+classpath/org/omg/PortableInterceptor/HOLDING.java \
+classpath/org/omg/PortableInterceptor/INACTIVE.java \
+classpath/org/omg/PortableInterceptor/IORInfo.java \
+classpath/org/omg/PortableInterceptor/IORInfoOperations.java \
+classpath/org/omg/PortableInterceptor/IORInterceptor.java \
+classpath/org/omg/PortableInterceptor/IORInterceptorOperations.java \
+classpath/org/omg/PortableInterceptor/IORInterceptor_3_0.java \
+classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java \
+classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java \
+classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.java \
+classpath/org/omg/PortableInterceptor/Interceptor.java \
+classpath/org/omg/PortableInterceptor/InterceptorOperations.java \
+classpath/org/omg/PortableInterceptor/InvalidSlot.java \
+classpath/org/omg/PortableInterceptor/InvalidSlotHelper.java \
+classpath/org/omg/PortableInterceptor/LOCATION_FORWARD.java \
+classpath/org/omg/PortableInterceptor/NON_EXISTENT.java \
+classpath/org/omg/PortableInterceptor/ORBIdHelper.java \
+classpath/org/omg/PortableInterceptor/ORBInitInfo.java \
+classpath/org/omg/PortableInterceptor/ORBInitInfoOperations.java \
+classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java \
+classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java \
+classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java \
+classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java \
+classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java \
+classpath/org/omg/PortableInterceptor/ORBInitializer.java \
+classpath/org/omg/PortableInterceptor/ORBInitializerOperations.java \
+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/ObjectReferenceTemplate.java \
+classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java \
+classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java \
+classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java \
+classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java \
+classpath/org/omg/PortableInterceptor/PolicyFactory.java \
+classpath/org/omg/PortableInterceptor/PolicyFactoryOperations.java \
+classpath/org/omg/PortableInterceptor/RequestInfo.java \
+classpath/org/omg/PortableInterceptor/RequestInfoOperations.java \
+classpath/org/omg/PortableInterceptor/SUCCESSFUL.java \
+classpath/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.java \
+classpath/org/omg/PortableInterceptor/ServerIdHelper.java \
+classpath/org/omg/PortableInterceptor/ServerRequestInfo.java \
+classpath/org/omg/PortableInterceptor/ServerRequestInfoOperations.java \
+classpath/org/omg/PortableInterceptor/ServerRequestInterceptor.java \
+classpath/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java \
+classpath/org/omg/PortableInterceptor/TRANSPORT_RETRY.java \
+classpath/org/omg/PortableInterceptor/USER_EXCEPTION.java \
+classpath/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.java \
+classpath/org/omg/PortableServer/AdapterActivator.java \
+classpath/org/omg/PortableServer/AdapterActivatorOperations.java \
+classpath/org/omg/PortableServer/Current.java \
+classpath/org/omg/PortableServer/CurrentHelper.java \
+classpath/org/omg/PortableServer/CurrentOperations.java \
+classpath/org/omg/PortableServer/CurrentPackage/NoContext.java \
+classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java \
+classpath/org/omg/PortableServer/DynamicImplementation.java \
+classpath/org/omg/PortableServer/ForwardRequest.java \
+classpath/org/omg/PortableServer/ForwardRequestHelper.java \
+classpath/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java \
+classpath/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java \
+classpath/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java \
+classpath/org/omg/PortableServer/IdAssignmentPolicy.java \
+classpath/org/omg/PortableServer/IdAssignmentPolicyOperations.java \
+classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java \
+classpath/org/omg/PortableServer/IdUniquenessPolicy.java \
+classpath/org/omg/PortableServer/IdUniquenessPolicyOperations.java \
+classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java \
+classpath/org/omg/PortableServer/ImplicitActivationPolicy.java \
+classpath/org/omg/PortableServer/ImplicitActivationPolicyOperations.java \
+classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java \
+classpath/org/omg/PortableServer/LIFESPAN_POLICY_ID.java \
+classpath/org/omg/PortableServer/LifespanPolicy.java \
+classpath/org/omg/PortableServer/LifespanPolicyOperations.java \
+classpath/org/omg/PortableServer/LifespanPolicyValue.java \
+classpath/org/omg/PortableServer/POA.java \
+classpath/org/omg/PortableServer/POAHelper.java \
+classpath/org/omg/PortableServer/POAManager.java \
+classpath/org/omg/PortableServer/POAManagerOperations.java \
+classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java \
+classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java \
+classpath/org/omg/PortableServer/POAManagerPackage/State.java \
+classpath/org/omg/PortableServer/POAOperations.java \
+classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java \
+classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java \
+classpath/org/omg/PortableServer/POAPackage/AdapterNonExistent.java \
+classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java \
+classpath/org/omg/PortableServer/POAPackage/InvalidPolicy.java \
+classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java \
+classpath/org/omg/PortableServer/POAPackage/NoServant.java \
+classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java \
+classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java \
+classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java \
+classpath/org/omg/PortableServer/POAPackage/ObjectNotActive.java \
+classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java \
+classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java \
+classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java \
+classpath/org/omg/PortableServer/POAPackage/ServantNotActive.java \
+classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java \
+classpath/org/omg/PortableServer/POAPackage/WrongAdapter.java \
+classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java \
+classpath/org/omg/PortableServer/POAPackage/WrongPolicy.java \
+classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java \
+classpath/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java \
+classpath/org/omg/PortableServer/RequestProcessingPolicy.java \
+classpath/org/omg/PortableServer/RequestProcessingPolicyOperations.java \
+classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java \
+classpath/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java \
+classpath/org/omg/PortableServer/Servant.java \
+classpath/org/omg/PortableServer/ServantActivator.java \
+classpath/org/omg/PortableServer/ServantActivatorHelper.java \
+classpath/org/omg/PortableServer/ServantActivatorOperations.java \
+classpath/org/omg/PortableServer/ServantActivatorPOA.java \
+classpath/org/omg/PortableServer/ServantLocator.java \
+classpath/org/omg/PortableServer/ServantLocatorHelper.java \
+classpath/org/omg/PortableServer/ServantLocatorOperations.java \
+classpath/org/omg/PortableServer/ServantLocatorPOA.java \
+classpath/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java \
+classpath/org/omg/PortableServer/ServantManager.java \
+classpath/org/omg/PortableServer/ServantManagerOperations.java \
+classpath/org/omg/PortableServer/ServantRetentionPolicy.java \
+classpath/org/omg/PortableServer/ServantRetentionPolicyOperations.java \
+classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java \
+classpath/org/omg/PortableServer/THREAD_POLICY_ID.java \
+classpath/org/omg/PortableServer/ThreadPolicy.java \
+classpath/org/omg/PortableServer/ThreadPolicyOperations.java \
+classpath/org/omg/PortableServer/ThreadPolicyValue.java \
+classpath/org/omg/PortableServer/_ServantActivatorStub.java \
+classpath/org/omg/PortableServer/_ServantLocatorStub.java \
+classpath/org/omg/PortableServer/portable/Delegate.java \
+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 \
@@ -4315,36 +7150,80 @@ classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java \
 classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java \
 classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java
 
+sun_misc_source_files = \
+classpath/sun/misc/Service.java \
+classpath/sun/misc/ServiceConfigurationError.java \
+sun/misc/Unsafe.java
+
+sun_misc_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(sun_misc_source_files)))
+sun_reflect_source_files = \
+sun/reflect/Reflection.java
+
+sun_reflect_header_files = $(patsubst %.java,%.h,$(sun_reflect_source_files))
+sun_reflect_annotation_source_files = \
+classpath/sun/reflect/annotation/AnnotationInvocationHandler.java \
+classpath/sun/reflect/annotation/AnnotationParser.java \
+classpath/sun/reflect/annotation/AnnotationType.java \
+classpath/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java \
+classpath/sun/reflect/annotation/ExceptionProxy.java
+
+sun_reflect_annotation_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(sun_reflect_annotation_source_files)))
+sun_reflect_misc_source_files = \
+sun/reflect/misc/ReflectUtil.java
+
+sun_reflect_misc_header_files = $(patsubst %.java,%.h,$(sun_reflect_misc_source_files))
 all_packages_source_files = \
   gnu/awt.list \
   gnu/awt/j2d.list \
   gnu/classpath.list \
   gnu/classpath/debug.list \
+  gnu/classpath/jdwp.list \
+  gnu/classpath/jdwp/event.list \
+  gnu/classpath/jdwp/event/filters.list \
+  gnu/classpath/jdwp/exception.list \
+  gnu/classpath/jdwp/id.list \
+  gnu/classpath/jdwp/processor.list \
+  gnu/classpath/jdwp/transport.list \
+  gnu/classpath/jdwp/util.list \
   gnu/gcj.list \
   gnu/gcj/convert.list \
   gnu/gcj/io.list \
+  gnu/gcj/jvmti.list \
   gnu/gcj/runtime.list \
   gnu/gcj/util.list \
   gnu/java/awt.list \
   gnu/java/awt/color.list \
+  gnu/java/awt/dnd.list \
+  gnu/java/awt/font.list \
+  gnu/java/awt/font/autofit.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/peer/headless.list \
+  gnu/java/awt/print.list \
   gnu/java/io.list \
   gnu/java/lang.list \
+  gnu/java/lang/management.list \
   gnu/java/lang/reflect.list \
   gnu/java/locale.list \
   gnu/java/math.list \
   gnu/java/net.list \
+  gnu/java/net/loader.list \
+  gnu/java/net/local.list \
+  gnu/java/net/protocol/core.list \
   gnu/java/net/protocol/file.list \
   gnu/java/net/protocol/ftp.list \
+  gnu/java/net/protocol/gcjlib.list \
   gnu/java/net/protocol/http.list \
-  gnu/java/net/protocol/http/event.list \
   gnu/java/net/protocol/https.list \
   gnu/java/net/protocol/jar.list \
   gnu/java/nio.list \
   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/server.list \
@@ -4352,19 +7231,86 @@ all_packages_source_files = \
   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/java/util/regex.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/kwa.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.list \
+  gnu/javax/imageio/bmp.list \
+  gnu/javax/imageio/gif.list \
+  gnu/javax/imageio/jpeg.list \
+  gnu/javax/imageio/png.list \
+  gnu/javax/management.list \
+  gnu/javax/naming/giop.list \
+  gnu/javax/naming/ictxImpl/trans.list \
+  gnu/javax/naming/jndi/url/corbaname.list \
+  gnu/javax/naming/jndi/url/rmi.list \
+  gnu/javax/net/ssl.list \
+  gnu/javax/net/ssl/provider.list \
+  gnu/javax/print.list \
+  gnu/javax/print/ipp.list \
+  gnu/javax/print/ipp/attribute.list \
+  gnu/javax/print/ipp/attribute/defaults.list \
+  gnu/javax/print/ipp/attribute/job.list \
+  gnu/javax/print/ipp/attribute/printer.list \
+  gnu/javax/print/ipp/attribute/supported.list \
+  gnu/javax/security/auth.list \
+  gnu/javax/security/auth/callback.list \
+  gnu/javax/security/auth/login.list \
+  gnu/javax/sound/sampled/AU.list \
+  gnu/javax/sound/sampled/WAV.list \
+  gnu/javax/swing/plaf/gnu.list \
+  gnu/javax/swing/plaf/metal.list \
+  gnu/javax/swing/text/html.list \
+  gnu/javax/swing/text/html/css.list \
   gnu/javax/swing/text/html/parser.list \
   gnu/javax/swing/text/html/parser/models.list \
   gnu/javax/swing/text/html/parser/support.list \
   gnu/javax/swing/text/html/parser/support/low.list \
-  gnu/regexp.list \
+  gnu/javax/swing/tree.list \
   java/applet.list \
   java/awt.list \
   java/awt/color.list \
@@ -4385,6 +7331,8 @@ all_packages_source_files = \
   java/io.list \
   java/lang.list \
   java/lang/annotation.list \
+  java/lang/instrument.list \
+  java/lang/management.list \
   java/lang/ref.list \
   java/lang/reflect.list \
   java/math.list \
@@ -4407,6 +7355,9 @@ all_packages_source_files = \
   java/sql.list \
   java/text.list \
   java/util.list \
+  java/util/concurrent.list \
+  java/util/concurrent/atomic.list \
+  java/util/concurrent/locks.list \
   java/util/jar.list \
   java/util/logging.list \
   java/util/prefs.list \
@@ -4416,6 +7367,9 @@ all_packages_source_files = \
   javax/crypto.list \
   javax/crypto/interfaces.list \
   javax/crypto/spec.list \
+  javax/management.list \
+  javax/management/loading.list \
+  javax/management/openmbean.list \
   javax/naming.list \
   javax/naming/directory.list \
   javax/naming/event.list \
@@ -4429,11 +7383,16 @@ 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 \
   javax/security/cert.list \
   javax/security/sasl.list \
+  javax/sound/midi.list \
+  javax/sound/midi/spi.list \
+  javax/sound/sampled.list \
+  javax/sound/sampled/spi.list \
   javax/sql.list \
   javax/swing.list \
   javax/swing/border.list \
@@ -4443,6 +7402,8 @@ all_packages_source_files = \
   javax/swing/plaf.list \
   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 \
@@ -4452,38 +7413,65 @@ all_packages_source_files = \
   javax/swing/undo.list \
   javax/transaction.list \
   javax/transaction/xa.list \
-  org/ietf/jgss.list
+  org/ietf/jgss.list \
+  sun/misc.list \
+  sun/reflect.list \
+  sun/reflect/annotation.list \
+  sun/reflect/misc.list
 
 ordinary_header_files = \
   $(gnu_awt_header_files) \
   $(gnu_awt_j2d_header_files) \
   $(gnu_classpath_header_files) \
   $(gnu_classpath_debug_header_files) \
+  $(gnu_classpath_jdwp_header_files) \
+  $(gnu_classpath_jdwp_event_header_files) \
+  $(gnu_classpath_jdwp_event_filters_header_files) \
+  $(gnu_classpath_jdwp_exception_header_files) \
+  $(gnu_classpath_jdwp_id_header_files) \
+  $(gnu_classpath_jdwp_processor_header_files) \
+  $(gnu_classpath_jdwp_transport_header_files) \
+  $(gnu_classpath_jdwp_util_header_files) \
   $(gnu_gcj_header_files) \
   $(gnu_gcj_convert_header_files) \
   $(gnu_gcj_io_header_files) \
+  $(gnu_gcj_jvmti_header_files) \
   $(gnu_gcj_runtime_header_files) \
+  $(gnu_gcj_tools_gcj_dbtool_header_files) \
   $(gnu_gcj_util_header_files) \
   $(gnu_java_awt_header_files) \
   $(gnu_java_awt_color_header_files) \
+  $(gnu_java_awt_dnd_header_files) \
+  $(gnu_java_awt_font_header_files) \
+  $(gnu_java_awt_font_autofit_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_peer_headless_header_files) \
+  $(gnu_java_awt_print_header_files) \
   $(gnu_java_io_header_files) \
   $(gnu_java_lang_header_files) \
+  $(gnu_java_lang_management_header_files) \
   $(gnu_java_lang_reflect_header_files) \
   $(gnu_java_locale_header_files) \
   $(gnu_java_math_header_files) \
   $(gnu_java_net_header_files) \
+  $(gnu_java_net_loader_header_files) \
+  $(gnu_java_net_local_header_files) \
+  $(gnu_java_net_protocol_core_header_files) \
   $(gnu_java_net_protocol_file_header_files) \
   $(gnu_java_net_protocol_ftp_header_files) \
+  $(gnu_java_net_protocol_gcjlib_header_files) \
   $(gnu_java_net_protocol_http_header_files) \
-  $(gnu_java_net_protocol_http_event_header_files) \
   $(gnu_java_net_protocol_https_header_files) \
   $(gnu_java_net_protocol_jar_header_files) \
   $(gnu_java_nio_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_server_header_files) \
@@ -4491,19 +7479,86 @@ ordinary_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_java_util_regex_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_kwa_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_header_files) \
+  $(gnu_javax_imageio_bmp_header_files) \
+  $(gnu_javax_imageio_gif_header_files) \
+  $(gnu_javax_imageio_jpeg_header_files) \
+  $(gnu_javax_imageio_png_header_files) \
+  $(gnu_javax_management_header_files) \
+  $(gnu_javax_naming_giop_header_files) \
+  $(gnu_javax_naming_ictxImpl_trans_header_files) \
+  $(gnu_javax_naming_jndi_url_corbaname_header_files) \
+  $(gnu_javax_naming_jndi_url_rmi_header_files) \
+  $(gnu_javax_net_ssl_header_files) \
+  $(gnu_javax_net_ssl_provider_header_files) \
+  $(gnu_javax_print_header_files) \
+  $(gnu_javax_print_ipp_header_files) \
+  $(gnu_javax_print_ipp_attribute_header_files) \
+  $(gnu_javax_print_ipp_attribute_defaults_header_files) \
+  $(gnu_javax_print_ipp_attribute_job_header_files) \
+  $(gnu_javax_print_ipp_attribute_printer_header_files) \
+  $(gnu_javax_print_ipp_attribute_supported_header_files) \
+  $(gnu_javax_security_auth_header_files) \
+  $(gnu_javax_security_auth_callback_header_files) \
+  $(gnu_javax_security_auth_login_header_files) \
+  $(gnu_javax_sound_sampled_AU_header_files) \
+  $(gnu_javax_sound_sampled_WAV_header_files) \
+  $(gnu_javax_swing_plaf_gnu_header_files) \
+  $(gnu_javax_swing_plaf_metal_header_files) \
+  $(gnu_javax_swing_text_html_header_files) \
+  $(gnu_javax_swing_text_html_css_header_files) \
   $(gnu_javax_swing_text_html_parser_header_files) \
   $(gnu_javax_swing_text_html_parser_models_header_files) \
   $(gnu_javax_swing_text_html_parser_support_header_files) \
   $(gnu_javax_swing_text_html_parser_support_low_header_files) \
-  $(gnu_regexp_header_files) \
+  $(gnu_javax_swing_tree_header_files) \
   $(java_applet_header_files) \
   $(java_awt_header_files) \
   $(java_awt_color_header_files) \
@@ -4524,6 +7579,8 @@ ordinary_header_files = \
   $(java_io_header_files) \
   $(java_lang_header_files) \
   $(java_lang_annotation_header_files) \
+  $(java_lang_instrument_header_files) \
+  $(java_lang_management_header_files) \
   $(java_lang_ref_header_files) \
   $(java_lang_reflect_header_files) \
   $(java_math_header_files) \
@@ -4546,6 +7603,9 @@ ordinary_header_files = \
   $(java_sql_header_files) \
   $(java_text_header_files) \
   $(java_util_header_files) \
+  $(java_util_concurrent_header_files) \
+  $(java_util_concurrent_atomic_header_files) \
+  $(java_util_concurrent_locks_header_files) \
   $(java_util_jar_header_files) \
   $(java_util_logging_header_files) \
   $(java_util_prefs_header_files) \
@@ -4555,6 +7615,9 @@ ordinary_header_files = \
   $(javax_crypto_header_files) \
   $(javax_crypto_interfaces_header_files) \
   $(javax_crypto_spec_header_files) \
+  $(javax_management_header_files) \
+  $(javax_management_loading_header_files) \
+  $(javax_management_openmbean_header_files) \
   $(javax_naming_header_files) \
   $(javax_naming_directory_header_files) \
   $(javax_naming_event_header_files) \
@@ -4568,11 +7631,16 @@ 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) \
   $(javax_security_cert_header_files) \
   $(javax_security_sasl_header_files) \
+  $(javax_sound_midi_header_files) \
+  $(javax_sound_midi_spi_header_files) \
+  $(javax_sound_sampled_header_files) \
+  $(javax_sound_sampled_spi_header_files) \
   $(javax_sql_header_files) \
   $(javax_swing_header_files) \
   $(javax_swing_border_header_files) \
@@ -4582,6 +7650,8 @@ ordinary_header_files = \
   $(javax_swing_plaf_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) \
@@ -4591,24 +7661,75 @@ ordinary_header_files = \
   $(javax_swing_undo_header_files) \
   $(javax_transaction_header_files) \
   $(javax_transaction_xa_header_files) \
-  $(org_ietf_jgss_header_files)
+  $(org_ietf_jgss_header_files) \
+  $(sun_misc_header_files) \
+  $(sun_reflect_header_files) \
+  $(sun_reflect_annotation_header_files) \
+  $(sun_reflect_misc_header_files)
 
 bc_objects = \
+  gnu-CORBA.lo \
+  gnu-java-awt-dnd-peer-gtk.lo \
+  gnu-java-awt-peer-gtk.lo \
+  gnu-java-awt-peer-swing.lo \
   gnu-java-beans.lo \
+  gnu-java-util-prefs-gconf.lo \
+  gnu-javax-rmi.lo \
+  gnu-javax-sound-midi.lo \
   gnu-xml.lo \
   javax-imageio.lo \
+  javax-rmi.lo \
   javax-xml.lo \
+  org-omg.lo \
+  org-relaxng.lo \
   org-w3c.lo \
   org-xml.lo
 
+property_files = \
+  classpath/resource/gnu/classpath/tools/appletviewer/messages.properties \
+  classpath/resource/gnu/classpath/tools/common/Messages.properties \
+  classpath/resource/gnu/classpath/tools/getopt/Messages.properties \
+  classpath/resource/gnu/classpath/tools/jar/messages.properties \
+  classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties \
+  classpath/resource/gnu/classpath/tools/jarsigner/messages.properties \
+  classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties \
+  classpath/resource/gnu/classpath/tools/keytool/messages.properties \
+  classpath/resource/gnu/classpath/tools/native2ascii/messages.properties \
+  classpath/resource/gnu/classpath/tools/orbd/messages.properties \
+  classpath/resource/gnu/classpath/tools/rmic/messages.properties \
+  classpath/resource/gnu/classpath/tools/rmid/messages.properties \
+  classpath/resource/gnu/classpath/tools/rmiregistry/messages.properties \
+  classpath/resource/gnu/classpath/tools/serialver/messages.properties \
+  classpath/resource/gnu/classpath/tools/tnameserv/messages.properties \
+  classpath/resource/gnu/java/awt/peer/gtk/font.properties \
+  classpath/resource/gnu/java/awt/peer/x/fonts.properties \
+  classpath/resource/gnu/java/util/regex/MessagesBundle.properties \
+  classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties \
+  classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties \
+  classpath/resource/gnu/javax/print/PrinterDialog.properties \
+  classpath/resource/gnu/javax/print/PrinterDialog_de.properties \
+  classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
+  classpath/resource/java/util/iso4217.properties \
+  classpath/resource/javax/imageio/plugins/jpeg/MessagesBundle.properties \
+  classpath/resource/org/ietf/jgss/MessagesBundle.properties \
+  classpath/resource/META-INF/services/java.util.prefs.PreferencesFactory.in \
+  classpath/resource/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider \
+  classpath/resource/META-INF/services/javax.sound.midi.spi.MidiFileReader \
+  classpath/resource/META-INF/services/javax.sound.midi.spi.MidiFileWriter \
+  classpath/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader \
+  classpath/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory \
+  classpath/resource/META-INF/services/javax.xml.parsers.SAXParserFactory \
+  classpath/resource/META-INF/services/javax.xml.parsers.TransformerFactory \
+  classpath/resource/META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory \
+  classpath/resource/META-INF/services/org.xml.sax.driver
+
 omitted_headers = java/lang/ClassLoader.h java/lang/Thread.h \
        java/lang/String.h java/lang/reflect/Constructor.h \
        java/lang/reflect/Field.h java/lang/reflect/Method.h \
        java/lang/reflect/Proxy.h gnu/gcj/runtime/ExtensionClassLoader.h
 
-generic_header_files = $(filter-out $(omitted_headers),$(ordinary_header_files) $(xlib_nat_headers)) \
-       gnu/gcj/tools/gcj_dbtool/Main.h
-
+generic_header_files = $(ordinary_header_files) $(xlib_nat_headers)
+MYGCJH = gjavah
 inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
        java/io/ObjectInputStream$$GetField.h \
        java/nio/DirectByteBufferImpl$$ReadWrite.h \
@@ -4619,12 +7740,9 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
        gnu/java/net/PlainSocketImpl$$SocketInputStream.h \
        gnu/java/net/PlainSocketImpl$$SocketOutputStream.h \
        gnu/java/nio/PipeImpl$$SinkChannelImpl.h \
-       gnu/java/nio/PipeImpl$$SourceChannelImpl.h \
-       $(PLATFORM_INNER_NAT_HDRS)
-
-nat_headers = $(ordinary_header_files) $(inner_nat_headers) \
-       gnu/gcj/tools/gcj_dbtool/Main.h
+       gnu/java/nio/PipeImpl$$SourceChannelImpl.h
 
+nat_headers = $(ordinary_header_files) $(inner_nat_headers)
 nat_headers_install = $(ordinary_header_files)
 xlib_nat_headers = $(gnu_awt_xlib_header_files) $(gnu_gcj_xlib_header_files)
 extra_headers = java/lang/Object.h java/lang/Class.h
@@ -4646,36 +7764,125 @@ jv_convert_LINK = $(GCJLINK)
 jv_convert_LDADD = -L$(here)/.libs libgcj.la
 jv_convert_DEPENDENCIES = libgcj.la libgcj.spec
 gcj_dbtool_SOURCES = \
-gnu/gcj/tools/gcj_dbtool/Main.java \
 gnu/gcj/tools/gcj_dbtool/natMain.cc
 
 gcj_dbtool_LDFLAGS = --main=gnu.gcj.tools.gcj_dbtool.Main \
        -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
 
 gcj_dbtool_LINK = $(GCJLINK)
-gcj_dbtool_LDADD = -L$(here)/.libs libgcj.la
-gcj_dbtool_DEPENDENCIES = libgcj.la libgcj.spec
+gcj_dbtool_LDADD = gnu/gcj/tools/gcj_dbtool.lo -L$(here)/.libs libgcj.la
+gcj_dbtool_DEPENDENCIES = gnu/gcj/tools/gcj_dbtool.lo 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
+ecjx_SOURCES = 
+ECJX_BASE_FLAGS = -findirect-dispatch \
+       --main=org.eclipse.jdt.internal.compiler.batch.GCCMain
+
+@NATIVE_FALSE@ecjx_LINK = $(GCJ_FOR_ECJX_LINK)
+@NATIVE_TRUE@ecjx_LINK = $(GCJLINK)
+@ENABLE_SHARED_FALSE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
+@ENABLE_SHARED_TRUE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR)
+@NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
+@NATIVE_FALSE@ecjx_LDADD = 
+@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la
+@NATIVE_FALSE@ecjx_DEPENDENCIES = 
+@NATIVE_TRUE@ecjx_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
+gjar_SOURCES = 
+gjar_LDFLAGS = --main=gnu.classpath.tools.jar.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+
+gjar_LINK = $(GCJLINK)
+gjar_LDADD = -L$(here)/.libs libgcj-tools.la
+gjar_DEPENDENCIES = libgcj-tools.la
+gjavah_SOURCES = 
+gjavah_LDFLAGS = --main=gnu.classpath.tools.javah.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+
+gjavah_LINK = $(GCJLINK)
+gjavah_LDADD = -L$(here)/.libs libgcj-tools.la
+gjavah_DEPENDENCIES = libgcj-tools.la
+gnative2ascii_SOURCES = 
+gnative2ascii_LDFLAGS = --main=gnu.classpath.tools.native2ascii.Native2ASCII \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+
+gnative2ascii_LINK = $(GCJLINK)
+gnative2ascii_LDADD = -L$(here)/.libs libgcj-tools.la
+gnative2ascii_DEPENDENCIES = libgcj-tools.la
+gorbd_SOURCES = 
+gorbd_LDFLAGS = --main=gnu.classpath.tools.orbd.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+
+gorbd_LINK = $(GCJLINK)
+gorbd_LDADD = -L$(here)/.libs libgcj-tools.la
+gorbd_DEPENDENCIES = libgcj-tools.la
+grmid_SOURCES = 
+grmid_LDFLAGS = --main=gnu.classpath.tools.rmid.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+
+grmid_LINK = $(GCJLINK)
+grmid_LDADD = -L$(here)/.libs libgcj-tools.la
+grmid_DEPENDENCIES = libgcj-tools.la
+gserialver_SOURCES = 
+gserialver_LDFLAGS = --main=gnu.classpath.tools.serialver.SerialVer \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+
+gserialver_LINK = $(GCJLINK)
+gserialver_LDADD = -L$(here)/.libs libgcj-tools.la
+gserialver_DEPENDENCIES = libgcj-tools.la
+gtnameserv_SOURCES = 
+gtnameserv_LDFLAGS = --main=gnu.classpath.tools.tnameserv.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+
+gtnameserv_LINK = $(GCJLINK)
+gtnameserv_LDADD = -L$(here)/.libs libgcj-tools.la
+gtnameserv_DEPENDENCIES = libgcj-tools.la
 grmic_SOURCES = 
-grmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \
+grmic_LDFLAGS = --main=gnu.classpath.tools.rmic.Main \
        -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
 
 grmic_LINK = $(GCJLINK)
-grmic_LDADD = -L$(here)/.libs libgcj.la
-grmic_DEPENDENCIES = libgcj.la libgcj.spec
+grmic_LDADD = -L$(here)/.libs libgcj-tools.la
+grmic_DEPENDENCIES = libgcj-tools.la
 grmiregistry_SOURCES = 
-grmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \
+grmiregistry_LDFLAGS = --main=gnu.classpath.tools.rmiregistry.Main \
        -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
 
 grmiregistry_LINK = $(GCJLINK)
-grmiregistry_LDADD = -L$(here)/.libs libgcj.la
-grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec
+grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la
+grmiregistry_DEPENDENCIES = libgcj-tools.la
 nat_source_files = \
+gnu/classpath/jdwp/natVMFrame.cc \
+gnu/classpath/jdwp/natVMMethod.cc \
+gnu/classpath/jdwp/natVMVirtualMachine.cc \
+gnu/classpath/natConfiguration.cc \
 gnu/classpath/natSystemProperties.cc \
+gnu/classpath/natVMStackWalker.cc \
 gnu/gcj/natCore.cc \
 gnu/gcj/convert/JIS0208_to_Unicode.cc \
 gnu/gcj/convert/JIS0212_to_Unicode.cc \
@@ -4687,21 +7894,33 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \
 gnu/gcj/convert/natOutput_SJIS.cc \
 gnu/gcj/io/natSimpleSHSStream.cc \
 gnu/gcj/io/shs.cc \
+gnu/gcj/jvmti/natBreakpoint.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/lang/management/natVMClassLoadingMXBeanImpl.cc \
+gnu/java/lang/management/natVMCompilationMXBeanImpl.cc \
+gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.cc \
+gnu/java/lang/management/natVMMemoryMXBeanImpl.cc \
+gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.cc \
+gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc \
+gnu/java/lang/management/natVMRuntimeMXBeanImpl.cc \
+gnu/java/lang/management/natVMThreadMXBeanImpl.cc \
 gnu/java/net/natPlainDatagramSocketImpl.cc \
 gnu/java/net/natPlainSocketImpl.cc \
 gnu/java/net/protocol/core/natCoreInputStream.cc \
 gnu/java/nio/natPipeImpl.cc \
 gnu/java/nio/natSelectorImpl.cc \
 gnu/java/nio/natNIOServerSocket.cc \
+gnu/java/nio/natVMChannel.cc \
 gnu/java/nio/channels/natFileChannelImpl.cc \
 java/io/natFile.cc \
 java/io/natObjectInputStream.cc \
 java/io/natVMObjectStreamClass.cc \
+java/lang/management/natVMManagementFactory.cc \
 java/lang/natCharacter.cc \
 java/lang/natClass.cc \
 java/lang/natClassLoader.cc \
@@ -4716,25 +7935,29 @@ java/lang/natStringBuffer.cc \
 java/lang/natStringBuilder.cc \
 java/lang/natSystem.cc \
 java/lang/natThread.cc \
+java/lang/natThreadLocal.cc \
 java/lang/natVMClassLoader.cc \
-java/lang/natVMSecurityManager.cc \
 java/lang/natVMThrowable.cc \
 java/lang/ref/natReference.cc \
 java/lang/reflect/natArray.cc \
 java/lang/reflect/natConstructor.cc \
 java/lang/reflect/natField.cc \
 java/lang/reflect/natMethod.cc \
-java/lang/reflect/natProxy.cc \
+java/lang/reflect/natVMProxy.cc \
+java/net/natVMInetAddress.cc \
 java/net/natVMNetworkInterface.cc \
-java/net/natInetAddress.cc \
-java/nio/channels/natChannels.cc \
+java/net/natVMURLConnection.cc \
+java/nio/channels/natVMChannels.cc \
 java/nio/natDirectByteBufferImpl.cc \
+java/security/natVMAccessController.cc \
+java/security/natVMAccessControlState.cc \
 java/text/natCollator.cc \
-java/util/natResourceBundle.cc \
 java/util/natVMTimeZone.cc \
+java/util/concurrent/atomic/natAtomicLong.cc \
 java/util/logging/natLogger.cc \
 java/util/zip/natDeflater.cc \
-java/util/zip/natInflater.cc
+java/util/zip/natInflater.cc \
+sun/misc/natUnsafe.cc
 
 xlib_nat_source_files = \
 gnu/gcj/xlib/natClip.cc \
@@ -4759,7 +7982,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_15)
 
 # 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
@@ -4798,7 +8021,8 @@ AM_MAKEFLAGS = \
        "NM=$(NM)" \
        "PICFLAG=$(PICFLAG)" \
        "RANLIB=$(RANLIB)" \
-       "DESTDIR=$(DESTDIR)"
+       "DESTDIR=$(DESTDIR)" \
+       "JAR=$(JAR)"
 
 
 # Subdir rules rely on $(FLAGS_TO_PASS)
@@ -4816,7 +8040,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 .lo .o .obj .zip
 am--refresh:
        @:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/sources.am $(am__configure_deps)
@@ -4856,6 +8080,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)"
@@ -4949,26 +8202,42 @@ 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)
-java/lang/$(am__dirstamp):
-       @$(mkdir_p) java/lang
-       @: > java/lang/$(am__dirstamp)
-java/lang/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) java/lang/$(DEPDIR)
-       @: > java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/Class.lo: java/lang/$(am__dirstamp) \
-       java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/Object.lo: java/lang/$(am__dirstamp) \
-       java/lang/$(DEPDIR)/$(am__dirstamp)
+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)
+gnu/classpath/jdwp/$(am__dirstamp):
+       @$(mkdir_p) gnu/classpath/jdwp
+       @: > gnu/classpath/jdwp/$(am__dirstamp)
+gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) gnu/classpath/jdwp/$(DEPDIR)
+       @: > gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp)
+gnu/classpath/jdwp/natVMFrame.lo: gnu/classpath/jdwp/$(am__dirstamp) \
+       gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp)
+gnu/classpath/jdwp/natVMMethod.lo: gnu/classpath/jdwp/$(am__dirstamp) \
+       gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp)
+gnu/classpath/jdwp/natVMVirtualMachine.lo:  \
+       gnu/classpath/jdwp/$(am__dirstamp) \
+       gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp)
 gnu/classpath/$(am__dirstamp):
        @$(mkdir_p) gnu/classpath
        @: > gnu/classpath/$(am__dirstamp)
 gnu/classpath/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) gnu/classpath/$(DEPDIR)
        @: > gnu/classpath/$(DEPDIR)/$(am__dirstamp)
+gnu/classpath/natConfiguration.lo: gnu/classpath/$(am__dirstamp) \
+       gnu/classpath/$(DEPDIR)/$(am__dirstamp)
 gnu/classpath/natSystemProperties.lo: gnu/classpath/$(am__dirstamp) \
        gnu/classpath/$(DEPDIR)/$(am__dirstamp)
+gnu/classpath/natVMStackWalker.lo: gnu/classpath/$(am__dirstamp) \
+       gnu/classpath/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/$(am__dirstamp):
        @$(mkdir_p) gnu/gcj
        @: > gnu/gcj/$(am__dirstamp)
@@ -5011,6 +8280,14 @@ gnu/gcj/io/natSimpleSHSStream.lo: gnu/gcj/io/$(am__dirstamp) \
        gnu/gcj/io/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/io/shs.lo: gnu/gcj/io/$(am__dirstamp) \
        gnu/gcj/io/$(DEPDIR)/$(am__dirstamp)
+gnu/gcj/jvmti/$(am__dirstamp):
+       @$(mkdir_p) gnu/gcj/jvmti
+       @: > gnu/gcj/jvmti/$(am__dirstamp)
+gnu/gcj/jvmti/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) gnu/gcj/jvmti/$(DEPDIR)
+       @: > gnu/gcj/jvmti/$(DEPDIR)/$(am__dirstamp)
+gnu/gcj/jvmti/natBreakpoint.lo: gnu/gcj/jvmti/$(am__dirstamp) \
+       gnu/gcj/jvmti/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/runtime/$(am__dirstamp):
        @$(mkdir_p) gnu/gcj/runtime
        @: > gnu/gcj/runtime/$(am__dirstamp)
@@ -5023,6 +8300,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):
@@ -5041,6 +8321,36 @@ gnu/java/lang/$(DEPDIR)/$(am__dirstamp):
        @: > gnu/java/lang/$(DEPDIR)/$(am__dirstamp)
 gnu/java/lang/natMainThread.lo: gnu/java/lang/$(am__dirstamp) \
        gnu/java/lang/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/$(am__dirstamp):
+       @$(mkdir_p) gnu/java/lang/management
+       @: > gnu/java/lang/management/$(am__dirstamp)
+gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) gnu/java/lang/management/$(DEPDIR)
+       @: > gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMClassLoadingMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMCompilationMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMMemoryMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMRuntimeMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMThreadMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
 gnu/java/net/$(am__dirstamp):
        @$(mkdir_p) gnu/java/net
        @: > gnu/java/net/$(am__dirstamp)
@@ -5073,6 +8383,8 @@ gnu/java/nio/natSelectorImpl.lo: gnu/java/nio/$(am__dirstamp) \
        gnu/java/nio/$(DEPDIR)/$(am__dirstamp)
 gnu/java/nio/natNIOServerSocket.lo: gnu/java/nio/$(am__dirstamp) \
        gnu/java/nio/$(DEPDIR)/$(am__dirstamp)
+gnu/java/nio/natVMChannel.lo: gnu/java/nio/$(am__dirstamp) \
+       gnu/java/nio/$(DEPDIR)/$(am__dirstamp)
 gnu/java/nio/channels/$(am__dirstamp):
        @$(mkdir_p) gnu/java/nio/channels
        @: > gnu/java/nio/channels/$(am__dirstamp)
@@ -5094,6 +8406,21 @@ java/io/natObjectInputStream.lo: java/io/$(am__dirstamp) \
        java/io/$(DEPDIR)/$(am__dirstamp)
 java/io/natVMObjectStreamClass.lo: java/io/$(am__dirstamp) \
        java/io/$(DEPDIR)/$(am__dirstamp)
+java/lang/management/$(am__dirstamp):
+       @$(mkdir_p) java/lang/management
+       @: > java/lang/management/$(am__dirstamp)
+java/lang/management/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) java/lang/management/$(DEPDIR)
+       @: > java/lang/management/$(DEPDIR)/$(am__dirstamp)
+java/lang/management/natVMManagementFactory.lo:  \
+       java/lang/management/$(am__dirstamp) \
+       java/lang/management/$(DEPDIR)/$(am__dirstamp)
+java/lang/$(am__dirstamp):
+       @$(mkdir_p) java/lang
+       @: > java/lang/$(am__dirstamp)
+java/lang/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) java/lang/$(DEPDIR)
+       @: > java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natCharacter.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natClass.lo: java/lang/$(am__dirstamp) \
@@ -5122,9 +8449,9 @@ java/lang/natSystem.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natThread.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/natVMClassLoader.lo: java/lang/$(am__dirstamp) \
+java/lang/natThreadLocal.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/natVMSecurityManager.lo: java/lang/$(am__dirstamp) \
+java/lang/natVMClassLoader.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natVMThrowable.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
@@ -5151,7 +8478,7 @@ java/lang/reflect/natField.lo: java/lang/reflect/$(am__dirstamp) \
        java/lang/reflect/$(DEPDIR)/$(am__dirstamp)
 java/lang/reflect/natMethod.lo: java/lang/reflect/$(am__dirstamp) \
        java/lang/reflect/$(DEPDIR)/$(am__dirstamp)
-java/lang/reflect/natProxy.lo: java/lang/reflect/$(am__dirstamp) \
+java/lang/reflect/natVMProxy.lo: java/lang/reflect/$(am__dirstamp) \
        java/lang/reflect/$(DEPDIR)/$(am__dirstamp)
 java/net/$(am__dirstamp):
        @$(mkdir_p) java/net
@@ -5159,9 +8486,11 @@ java/net/$(am__dirstamp):
 java/net/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) java/net/$(DEPDIR)
        @: > java/net/$(DEPDIR)/$(am__dirstamp)
+java/net/natVMInetAddress.lo: java/net/$(am__dirstamp) \
+       java/net/$(DEPDIR)/$(am__dirstamp)
 java/net/natVMNetworkInterface.lo: java/net/$(am__dirstamp) \
        java/net/$(DEPDIR)/$(am__dirstamp)
-java/net/natInetAddress.lo: java/net/$(am__dirstamp) \
+java/net/natVMURLConnection.lo: java/net/$(am__dirstamp) \
        java/net/$(DEPDIR)/$(am__dirstamp)
 java/nio/channels/$(am__dirstamp):
        @$(mkdir_p) java/nio/channels
@@ -5169,7 +8498,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
@@ -5179,6 +8508,17 @@ java/nio/$(DEPDIR)/$(am__dirstamp):
        @: > java/nio/$(DEPDIR)/$(am__dirstamp)
 java/nio/natDirectByteBufferImpl.lo: java/nio/$(am__dirstamp) \
        java/nio/$(DEPDIR)/$(am__dirstamp)
+java/security/$(am__dirstamp):
+       @$(mkdir_p) java/security
+       @: > java/security/$(am__dirstamp)
+java/security/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) java/security/$(DEPDIR)
+       @: > java/security/$(DEPDIR)/$(am__dirstamp)
+java/security/natVMAccessController.lo: java/security/$(am__dirstamp) \
+       java/security/$(DEPDIR)/$(am__dirstamp)
+java/security/natVMAccessControlState.lo:  \
+       java/security/$(am__dirstamp) \
+       java/security/$(DEPDIR)/$(am__dirstamp)
 java/text/$(am__dirstamp):
        @$(mkdir_p) java/text
        @: > java/text/$(am__dirstamp)
@@ -5193,10 +8533,17 @@ java/util/$(am__dirstamp):
 java/util/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) java/util/$(DEPDIR)
        @: > java/util/$(DEPDIR)/$(am__dirstamp)
-java/util/natResourceBundle.lo: java/util/$(am__dirstamp) \
-       java/util/$(DEPDIR)/$(am__dirstamp)
 java/util/natVMTimeZone.lo: java/util/$(am__dirstamp) \
        java/util/$(DEPDIR)/$(am__dirstamp)
+java/util/concurrent/atomic/$(am__dirstamp):
+       @$(mkdir_p) java/util/concurrent/atomic
+       @: > java/util/concurrent/atomic/$(am__dirstamp)
+java/util/concurrent/atomic/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) java/util/concurrent/atomic/$(DEPDIR)
+       @: > java/util/concurrent/atomic/$(DEPDIR)/$(am__dirstamp)
+java/util/concurrent/atomic/natAtomicLong.lo:  \
+       java/util/concurrent/atomic/$(am__dirstamp) \
+       java/util/concurrent/atomic/$(DEPDIR)/$(am__dirstamp)
 java/util/logging/$(am__dirstamp):
        @$(mkdir_p) java/util/logging
        @: > java/util/logging/$(am__dirstamp)
@@ -5215,20 +8562,22 @@ java/util/zip/natDeflater.lo: java/util/zip/$(am__dirstamp) \
        java/util/zip/$(DEPDIR)/$(am__dirstamp)
 java/util/zip/natInflater.lo: java/util/zip/$(am__dirstamp) \
        java/util/zip/$(DEPDIR)/$(am__dirstamp)
-sysdep/$(am__dirstamp):
-       @$(mkdir_p) sysdep
-       @: > sysdep/$(am__dirstamp)
-sysdep/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) sysdep/$(DEPDIR)
-       @: > sysdep/$(DEPDIR)/$(am__dirstamp)
-sysdep/dwarf2-backtrace.lo: sysdep/$(am__dirstamp) \
-       sysdep/$(DEPDIR)/$(am__dirstamp)
+sun/misc/$(am__dirstamp):
+       @$(mkdir_p) sun/misc
+       @: > sun/misc/$(am__dirstamp)
+sun/misc/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) sun/misc/$(DEPDIR)
+       @: > sun/misc/$(DEPDIR)/$(am__dirstamp)
+sun/misc/natUnsafe.lo: sun/misc/$(am__dirstamp) \
+       sun/misc/$(DEPDIR)/$(am__dirstamp)
+java/lang/Object.lo: java/lang/$(am__dirstamp) \
+       java/lang/$(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)
-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)"
@@ -5257,6 +8606,34 @@ clean-binPROGRAMS:
          echo " rm -f $$p $$f"; \
          rm -f $$p $$f ; \
        done
+install-libexecsubPROGRAMS: $(libexecsub_PROGRAMS)
+       @$(NORMAL_INSTALL)
+       test -z "$(libexecsubdir)" || $(mkdir_p) "$(DESTDIR)$(libexecsubdir)"
+       @list='$(libexecsub_PROGRAMS)'; for p in $$list; do \
+         p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         if test -f $$p \
+            || test -f $$p1 \
+         ; then \
+           f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecsubPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecsubdir)/$$f'"; \
+          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecsubPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecsubdir)/$$f" || exit 1; \
+         else :; fi; \
+       done
+
+uninstall-libexecsubPROGRAMS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libexecsub_PROGRAMS)'; for p in $$list; do \
+         f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+         echo " rm -f '$(DESTDIR)$(libexecsubdir)/$$f'"; \
+         rm -f "$(DESTDIR)$(libexecsubdir)/$$f"; \
+       done
+
+clean-libexecsubPROGRAMS:
+       @list='$(libexecsub_PROGRAMS)'; for p in $$list; do \
+         f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         echo " rm -f $$p $$f"; \
+         rm -f $$p $$f ; \
+       done
 
 clean-noinstPROGRAMS:
        @list='$(noinst_PROGRAMS)'; for p in $$list; do \
@@ -5264,15 +8641,18 @@ clean-noinstPROGRAMS:
          echo " rm -f $$p $$f"; \
          rm -f $$p $$f ; \
        done
+ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES) 
+       @rm -f ecjx$(EXEEXT)
+       $(ecjx_LINK) $(ecjx_LDFLAGS) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
+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)
 gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) gnu/gcj/tools/gcj_dbtool/$(DEPDIR)
        @: > gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/$(am__dirstamp)
-gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT):  \
-       gnu/gcj/tools/gcj_dbtool/$(am__dirstamp) \
-       gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT):  \
        gnu/gcj/tools/gcj_dbtool/$(am__dirstamp) \
        gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/$(am__dirstamp)
@@ -5290,12 +8670,39 @@ 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)
+gjar$(EXEEXT): $(gjar_OBJECTS) $(gjar_DEPENDENCIES) 
+       @rm -f gjar$(EXEEXT)
+       $(gjar_LINK) $(gjar_LDFLAGS) $(gjar_OBJECTS) $(gjar_LDADD) $(LIBS)
+gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsigner_DEPENDENCIES) 
+       @rm -f gjarsigner$(EXEEXT)
+       $(gjarsigner_LINK) $(gjarsigner_LDFLAGS) $(gjarsigner_OBJECTS) $(gjarsigner_LDADD) $(LIBS)
+gjavah$(EXEEXT): $(gjavah_OBJECTS) $(gjavah_DEPENDENCIES) 
+       @rm -f gjavah$(EXEEXT)
+       $(gjavah_LINK) $(gjavah_LDFLAGS) $(gjavah_OBJECTS) $(gjavah_LDADD) $(LIBS)
+gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DEPENDENCIES) 
+       @rm -f gkeytool$(EXEEXT)
+       $(gkeytool_LINK) $(gkeytool_LDFLAGS) $(gkeytool_OBJECTS) $(gkeytool_LDADD) $(LIBS)
+gnative2ascii$(EXEEXT): $(gnative2ascii_OBJECTS) $(gnative2ascii_DEPENDENCIES) 
+       @rm -f gnative2ascii$(EXEEXT)
+       $(gnative2ascii_LINK) $(gnative2ascii_LDFLAGS) $(gnative2ascii_OBJECTS) $(gnative2ascii_LDADD) $(LIBS)
+gorbd$(EXEEXT): $(gorbd_OBJECTS) $(gorbd_DEPENDENCIES) 
+       @rm -f gorbd$(EXEEXT)
+       $(gorbd_LINK) $(gorbd_LDFLAGS) $(gorbd_OBJECTS) $(gorbd_LDADD) $(LIBS)
 grmic$(EXEEXT): $(grmic_OBJECTS) $(grmic_DEPENDENCIES) 
        @rm -f grmic$(EXEEXT)
        $(grmic_LINK) $(grmic_LDFLAGS) $(grmic_OBJECTS) $(grmic_LDADD) $(LIBS)
+grmid$(EXEEXT): $(grmid_OBJECTS) $(grmid_DEPENDENCIES) 
+       @rm -f grmid$(EXEEXT)
+       $(grmid_LINK) $(grmid_LDFLAGS) $(grmid_OBJECTS) $(grmid_LDADD) $(LIBS)
 grmiregistry$(EXEEXT): $(grmiregistry_OBJECTS) $(grmiregistry_DEPENDENCIES) 
        @rm -f grmiregistry$(EXEEXT)
        $(grmiregistry_LINK) $(grmiregistry_LDFLAGS) $(grmiregistry_OBJECTS) $(grmiregistry_LDADD) $(LIBS)
+gserialver$(EXEEXT): $(gserialver_OBJECTS) $(gserialver_DEPENDENCIES) 
+       @rm -f gserialver$(EXEEXT)
+       $(gserialver_LINK) $(gserialver_LDFLAGS) $(gserialver_OBJECTS) $(gserialver_LDADD) $(LIBS)
+gtnameserv$(EXEEXT): $(gtnameserv_OBJECTS) $(gtnameserv_DEPENDENCIES) 
+       @rm -f gtnameserv$(EXEEXT)
+       $(gtnameserv_LINK) $(gtnameserv_LDFLAGS) $(gtnameserv_OBJECTS) $(gtnameserv_LDADD) $(LIBS)
 jv-convert$(EXEEXT): $(jv_convert_OBJECTS) $(jv_convert_DEPENDENCIES) 
        @rm -f jv-convert$(EXEEXT)
        $(jv_convert_LINK) $(jv_convert_LDFLAGS) $(jv_convert_OBJECTS) $(jv_convert_LDADD) $(LIBS)
@@ -5321,8 +8728,20 @@ uninstall-binSCRIPTS:
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
+       -rm -f classpath/tools/libgcj_tools_la-tools.$(OBJEXT)
+       -rm -f classpath/tools/libgcj_tools_la-tools.lo
+       -rm -f gnu/classpath/jdwp/natVMFrame.$(OBJEXT)
+       -rm -f gnu/classpath/jdwp/natVMFrame.lo
+       -rm -f gnu/classpath/jdwp/natVMMethod.$(OBJEXT)
+       -rm -f gnu/classpath/jdwp/natVMMethod.lo
+       -rm -f gnu/classpath/jdwp/natVMVirtualMachine.$(OBJEXT)
+       -rm -f gnu/classpath/jdwp/natVMVirtualMachine.lo
+       -rm -f gnu/classpath/natConfiguration.$(OBJEXT)
+       -rm -f gnu/classpath/natConfiguration.lo
        -rm -f gnu/classpath/natSystemProperties.$(OBJEXT)
        -rm -f gnu/classpath/natSystemProperties.lo
+       -rm -f gnu/classpath/natVMStackWalker.$(OBJEXT)
+       -rm -f gnu/classpath/natVMStackWalker.lo
        -rm -f gnu/gcj/convert/JIS0208_to_Unicode.$(OBJEXT)
        -rm -f gnu/gcj/convert/JIS0208_to_Unicode.lo
        -rm -f gnu/gcj/convert/JIS0212_to_Unicode.$(OBJEXT)
@@ -5345,6 +8764,8 @@ mostlyclean-compile:
        -rm -f gnu/gcj/io/natSimpleSHSStream.lo
        -rm -f gnu/gcj/io/shs.$(OBJEXT)
        -rm -f gnu/gcj/io/shs.lo
+       -rm -f gnu/gcj/jvmti/natBreakpoint.$(OBJEXT)
+       -rm -f gnu/gcj/jvmti/natBreakpoint.lo
        -rm -f gnu/gcj/natCore.$(OBJEXT)
        -rm -f gnu/gcj/natCore.lo
        -rm -f gnu/gcj/runtime/natFinalizerThread.$(OBJEXT)
@@ -5353,7 +8774,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/tools/gcj_dbtool/Main.$(OBJEXT)
+       -rm -f gnu/gcj/runtime/natSystemClassLoader.$(OBJEXT)
+       -rm -f gnu/gcj/runtime/natSystemClassLoader.lo
        -rm -f gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT)
        -rm -f gnu/gcj/util/natDebug.$(OBJEXT)
        -rm -f gnu/gcj/util/natDebug.lo
@@ -5397,6 +8819,22 @@ mostlyclean-compile:
        -rm -f gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo
        -rm -f gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.$(OBJEXT)
        -rm -f gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo
+       -rm -f gnu/java/lang/management/natVMClassLoadingMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMClassLoadingMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMCompilationMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMCompilationMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMMemoryMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMMemoryMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMRuntimeMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMRuntimeMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMThreadMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMThreadMXBeanImpl.lo
        -rm -f gnu/java/lang/natMainThread.$(OBJEXT)
        -rm -f gnu/java/lang/natMainThread.lo
        -rm -f gnu/java/net/natPlainDatagramSocketImpl.$(OBJEXT)
@@ -5413,16 +8851,18 @@ mostlyclean-compile:
        -rm -f gnu/java/nio/natPipeImpl.lo
        -rm -f gnu/java/nio/natSelectorImpl.$(OBJEXT)
        -rm -f gnu/java/nio/natSelectorImpl.lo
+       -rm -f gnu/java/nio/natVMChannel.$(OBJEXT)
+       -rm -f gnu/java/nio/natVMChannel.lo
        -rm -f java/io/natFile.$(OBJEXT)
        -rm -f java/io/natFile.lo
        -rm -f java/io/natObjectInputStream.$(OBJEXT)
        -rm -f java/io/natObjectInputStream.lo
        -rm -f java/io/natVMObjectStreamClass.$(OBJEXT)
        -rm -f java/io/natVMObjectStreamClass.lo
-       -rm -f java/lang/Class.$(OBJEXT)
-       -rm -f java/lang/Class.lo
        -rm -f java/lang/Object.$(OBJEXT)
        -rm -f java/lang/Object.lo
+       -rm -f java/lang/management/natVMManagementFactory.$(OBJEXT)
+       -rm -f java/lang/management/natVMManagementFactory.lo
        -rm -f java/lang/natCharacter.$(OBJEXT)
        -rm -f java/lang/natCharacter.lo
        -rm -f java/lang/natClass.$(OBJEXT)
@@ -5451,10 +8891,10 @@ mostlyclean-compile:
        -rm -f java/lang/natSystem.lo
        -rm -f java/lang/natThread.$(OBJEXT)
        -rm -f java/lang/natThread.lo
+       -rm -f java/lang/natThreadLocal.$(OBJEXT)
+       -rm -f java/lang/natThreadLocal.lo
        -rm -f java/lang/natVMClassLoader.$(OBJEXT)
        -rm -f java/lang/natVMClassLoader.lo
-       -rm -f java/lang/natVMSecurityManager.$(OBJEXT)
-       -rm -f java/lang/natVMSecurityManager.lo
        -rm -f java/lang/natVMThrowable.$(OBJEXT)
        -rm -f java/lang/natVMThrowable.lo
        -rm -f java/lang/ref/natReference.$(OBJEXT)
@@ -5467,30 +8907,36 @@ mostlyclean-compile:
        -rm -f java/lang/reflect/natField.lo
        -rm -f java/lang/reflect/natMethod.$(OBJEXT)
        -rm -f java/lang/reflect/natMethod.lo
-       -rm -f java/lang/reflect/natProxy.$(OBJEXT)
-       -rm -f java/lang/reflect/natProxy.lo
-       -rm -f java/net/natInetAddress.$(OBJEXT)
-       -rm -f java/net/natInetAddress.lo
+       -rm -f java/lang/reflect/natVMProxy.$(OBJEXT)
+       -rm -f java/lang/reflect/natVMProxy.lo
+       -rm -f java/net/natVMInetAddress.$(OBJEXT)
+       -rm -f java/net/natVMInetAddress.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/net/natVMURLConnection.$(OBJEXT)
+       -rm -f java/net/natVMURLConnection.lo
+       -rm -f java/nio/channels/natVMChannels.$(OBJEXT)
+       -rm -f java/nio/channels/natVMChannels.lo
        -rm -f java/nio/natDirectByteBufferImpl.$(OBJEXT)
        -rm -f java/nio/natDirectByteBufferImpl.lo
+       -rm -f java/security/natVMAccessControlState.$(OBJEXT)
+       -rm -f java/security/natVMAccessControlState.lo
+       -rm -f java/security/natVMAccessController.$(OBJEXT)
+       -rm -f java/security/natVMAccessController.lo
        -rm -f java/text/natCollator.$(OBJEXT)
        -rm -f java/text/natCollator.lo
+       -rm -f java/util/concurrent/atomic/natAtomicLong.$(OBJEXT)
+       -rm -f java/util/concurrent/atomic/natAtomicLong.lo
        -rm -f java/util/logging/natLogger.$(OBJEXT)
        -rm -f java/util/logging/natLogger.lo
-       -rm -f java/util/natResourceBundle.$(OBJEXT)
-       -rm -f java/util/natResourceBundle.lo
        -rm -f java/util/natVMTimeZone.$(OBJEXT)
        -rm -f java/util/natVMTimeZone.lo
        -rm -f java/util/zip/natDeflater.$(OBJEXT)
        -rm -f java/util/zip/natDeflater.lo
        -rm -f java/util/zip/natInflater.$(OBJEXT)
        -rm -f java/util/zip/natInflater.lo
-       -rm -f sysdep/dwarf2-backtrace.$(OBJEXT)
-       -rm -f sysdep/dwarf2-backtrace.lo
+       -rm -f sun/misc/natUnsafe.$(OBJEXT)
+       -rm -f sun/misc/natUnsafe.lo
 
 distclean-compile:
        -rm -f *.tab.c
@@ -5501,8 +8947,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gij.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpret.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jni-libjvm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jni.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgcjawt_la-jawt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jvmti.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgcj_bc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/no-threads.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nogc.Plo@am__quote@
@@ -5513,7 +8961,13 @@ 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/tools/$(DEPDIR)/libgcj_tools_la-tools.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/$(DEPDIR)/natConfiguration.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/$(DEPDIR)/natSystemProperties.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/$(DEPDIR)/natVMStackWalker.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/jdwp/$(DEPDIR)/natVMFrame.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/jdwp/$(DEPDIR)/natVMMethod.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/jdwp/$(DEPDIR)/natVMVirtualMachine.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/$(DEPDIR)/natCore.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/JIS0208_to_Unicode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/JIS0212_to_Unicode.Plo@am__quote@
@@ -5527,10 +8981,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/natOutput_SJIS.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/io/$(DEPDIR)/natSimpleSHSStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/io/$(DEPDIR)/shs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/jvmti/$(DEPDIR)/natBreakpoint.Plo@am__quote@
 @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/tools/gcj_dbtool/$(DEPDIR)/Main.Po@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)/natMain.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/util/$(DEPDIR)/natDebug.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natClip.Plo@am__quote@
@@ -5554,17 +9009,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXImage.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXUnmapEvent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/$(DEPDIR)/natMainThread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMClassLoadingMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMCompilationMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMGarbageCollectorMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMMemoryMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMMemoryManagerMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMMemoryPoolMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMRuntimeMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMThreadMXBeanImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/net/$(DEPDIR)/natPlainDatagramSocketImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/net/$(DEPDIR)/natPlainSocketImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/net/protocol/core/$(DEPDIR)/natCoreInputStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natNIOServerSocket.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natPipeImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natSelectorImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natVMChannel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/channels/$(DEPDIR)/natFileChannelImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natFile.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natObjectInputStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectStreamClass.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/Class.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/Object.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natCharacter.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natClass.Plo@am__quote@
@@ -5580,26 +9043,30 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natStringBuilder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natSystem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natThread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natThreadLocal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMClassLoader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMSecurityManager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMThrowable.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/lang/management/$(DEPDIR)/natVMManagementFactory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/ref/$(DEPDIR)/natReference.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natArray.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natConstructor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natField.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natMethod.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natProxy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natInetAddress.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natVMProxy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natVMInetAddress.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natVMNetworkInterface.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natVMURLConnection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/nio/$(DEPDIR)/natDirectByteBufferImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/nio/channels/$(DEPDIR)/natChannels.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/nio/channels/$(DEPDIR)/natVMChannels.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/security/$(DEPDIR)/natVMAccessControlState.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/security/$(DEPDIR)/natVMAccessController.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/text/$(DEPDIR)/natCollator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/natResourceBundle.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/natVMTimeZone.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/util/concurrent/atomic/$(DEPDIR)/natAtomicLong.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/util/logging/$(DEPDIR)/natLogger.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/util/zip/$(DEPDIR)/natDeflater.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/util/zip/$(DEPDIR)/natInflater.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sysdep/$(DEPDIR)/dwarf2-backtrace.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sun/misc/$(DEPDIR)/natUnsafe.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@@ -5625,13 +9092,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
-libgcjawt_la-jawt.lo: jawt.c
-@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgcjawt_la_CFLAGS) $(CFLAGS) -MT libgcjawt_la-jawt.lo -MD -MP -MF "$(DEPDIR)/libgcjawt_la-jawt.Tpo" -c -o libgcjawt_la-jawt.lo `test -f 'jawt.c' || echo '$(srcdir)/'`jawt.c; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/libgcjawt_la-jawt.Tpo" "$(DEPDIR)/libgcjawt_la-jawt.Plo"; else rm -f "$(DEPDIR)/libgcjawt_la-jawt.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='jawt.c' object='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 libgcjawt_la-jawt.lo `test -f 'jawt.c' || echo '$(srcdir)/'`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 $@ $<; \
@@ -5820,35 +9280,73 @@ gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo: gnu/gcj/xlib/natXUnmapEvent.
 @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.zip
+@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.zip' || echo '$(srcdir)/'`classpath/tools/tools.zip; \
+@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.zip' 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.zip' || echo '$(srcdir)/'`classpath/tools/tools.zip
+
+.zip.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 $@ $<
+
+.zip.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) '$<'`
+
+.zip.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 $@ $<
+
 mostlyclean-libtool:
        -rm -f *.lo
 
 clean-libtool:
        -rm -rf .libs _libs
+       -rm -rf classpath/tools/.libs classpath/tools/_libs
        -rm -rf gnu/classpath/.libs gnu/classpath/_libs
+       -rm -rf gnu/classpath/jdwp/.libs gnu/classpath/jdwp/_libs
        -rm -rf gnu/gcj/.libs gnu/gcj/_libs
        -rm -rf gnu/gcj/convert/.libs gnu/gcj/convert/_libs
        -rm -rf gnu/gcj/io/.libs gnu/gcj/io/_libs
+       -rm -rf gnu/gcj/jvmti/.libs gnu/gcj/jvmti/_libs
        -rm -rf gnu/gcj/runtime/.libs gnu/gcj/runtime/_libs
        -rm -rf gnu/gcj/util/.libs gnu/gcj/util/_libs
        -rm -rf gnu/gcj/xlib/.libs gnu/gcj/xlib/_libs
        -rm -rf gnu/java/lang/.libs gnu/java/lang/_libs
+       -rm -rf gnu/java/lang/management/.libs gnu/java/lang/management/_libs
        -rm -rf gnu/java/net/.libs gnu/java/net/_libs
        -rm -rf gnu/java/net/protocol/core/.libs gnu/java/net/protocol/core/_libs
        -rm -rf gnu/java/nio/.libs gnu/java/nio/_libs
        -rm -rf gnu/java/nio/channels/.libs gnu/java/nio/channels/_libs
        -rm -rf java/io/.libs java/io/_libs
        -rm -rf java/lang/.libs java/lang/_libs
+       -rm -rf java/lang/management/.libs java/lang/management/_libs
        -rm -rf java/lang/ref/.libs java/lang/ref/_libs
        -rm -rf java/lang/reflect/.libs java/lang/reflect/_libs
        -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/concurrent/atomic/.libs java/util/concurrent/atomic/_libs
        -rm -rf java/util/logging/.libs java/util/logging/_libs
        -rm -rf java/util/zip/.libs java/util/zip/_libs
-       -rm -rf sysdep/.libs sysdep/_libs
+       -rm -rf sun/misc/.libs sun/misc/_libs
 
 distclean-libtool:
        -rm -f libtool
@@ -5887,23 +9385,6 @@ uninstall-jarDATA:
          echo " rm -f '$(DESTDIR)$(jardir)/$$f'"; \
          rm -f "$(DESTDIR)$(jardir)/$$f"; \
        done
-install-pkgconfigDATA: $(pkgconfig_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
-       @list='$(pkgconfig_DATA)'; for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-         $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-       done
-
-uninstall-pkgconfigDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(pkgconfig_DATA)'; for p in $$list; do \
-         f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-         rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-       done
 install-toolexecmainlibDATA: $(toolexecmainlib_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(toolexecmainlibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexecmainlibdir)"
@@ -5929,7 +9410,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 \
@@ -5941,7 +9428,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; \
@@ -5949,7 +9436,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)' ;; \
@@ -5970,7 +9463,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 \
@@ -6045,7 +9538,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 \
@@ -6189,7 +9682,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)$(libexecsubdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(jardir)" "$(DESTDIR)$(toolexecmainlibdir)"; do \
          test -z "$$dir" || $(mkdir_p) "$$dir"; \
        done
 install: install-recursive
@@ -6213,14 +9706,20 @@ clean-generic:
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f classpath/tools/$(DEPDIR)/$(am__dirstamp)
+       -rm -f classpath/tools/$(am__dirstamp)
        -rm -f gnu/classpath/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/classpath/$(am__dirstamp)
+       -rm -f gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/classpath/jdwp/$(am__dirstamp)
        -rm -f gnu/gcj/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/gcj/$(am__dirstamp)
        -rm -f gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/gcj/convert/$(am__dirstamp)
        -rm -f gnu/gcj/io/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/gcj/io/$(am__dirstamp)
+       -rm -f gnu/gcj/jvmti/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/gcj/jvmti/$(am__dirstamp)
        -rm -f gnu/gcj/runtime/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/gcj/runtime/$(am__dirstamp)
        -rm -f gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/$(am__dirstamp)
@@ -6231,6 +9730,8 @@ distclean-generic:
        -rm -f gnu/gcj/xlib/$(am__dirstamp)
        -rm -f gnu/java/lang/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/java/lang/$(am__dirstamp)
+       -rm -f gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/java/lang/management/$(am__dirstamp)
        -rm -f gnu/java/net/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/java/net/$(am__dirstamp)
        -rm -f gnu/java/net/protocol/core/$(DEPDIR)/$(am__dirstamp)
@@ -6243,6 +9744,8 @@ distclean-generic:
        -rm -f java/io/$(am__dirstamp)
        -rm -f java/lang/$(DEPDIR)/$(am__dirstamp)
        -rm -f java/lang/$(am__dirstamp)
+       -rm -f java/lang/management/$(DEPDIR)/$(am__dirstamp)
+       -rm -f java/lang/management/$(am__dirstamp)
        -rm -f java/lang/ref/$(DEPDIR)/$(am__dirstamp)
        -rm -f java/lang/ref/$(am__dirstamp)
        -rm -f java/lang/reflect/$(DEPDIR)/$(am__dirstamp)
@@ -6253,16 +9756,20 @@ 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)
        -rm -f java/util/$(am__dirstamp)
+       -rm -f java/util/concurrent/atomic/$(DEPDIR)/$(am__dirstamp)
+       -rm -f java/util/concurrent/atomic/$(am__dirstamp)
        -rm -f java/util/logging/$(DEPDIR)/$(am__dirstamp)
        -rm -f java/util/logging/$(am__dirstamp)
        -rm -f java/util/zip/$(DEPDIR)/$(am__dirstamp)
        -rm -f java/util/zip/$(am__dirstamp)
-       -rm -f sysdep/$(DEPDIR)/$(am__dirstamp)
-       -rm -f sysdep/$(am__dirstamp)
+       -rm -f sun/misc/$(DEPDIR)/$(am__dirstamp)
+       -rm -f sun/misc/$(am__dirstamp)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -6270,13 +9777,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-libexecsubPROGRAMS clean-libtool clean-noinstPROGRAMS \
+       clean-toolexeclibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf ./$(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) sysdep/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(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/lang/management/$(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/management/$(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/concurrent/atomic/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) sun/misc/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-libtool distclean-local distclean-tags
@@ -6291,12 +9798,14 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local install-jarDATA \
-       install-pkgconfigDATA
+install-data-am: install-data-local install-jarDATA
 
 install-exec-am: install-binPROGRAMS install-binSCRIPTS \
-       install-dbexecDATA install-toolexeclibLTLIBRARIES \
+       install-dbexecDATA install-dbexecLTLIBRARIES \
+       install-libexecsubPROGRAMS install-toolexeclibLTLIBRARIES \
        install-toolexecmainlibDATA
+       @$(NORMAL_INSTALL)
+       $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-recursive
 
@@ -6307,7 +9816,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
-       -rm -rf ./$(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) sysdep/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(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/lang/management/$(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/management/$(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/concurrent/atomic/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) sun/misc/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -6325,14 +9834,16 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-       uninstall-dbexecDATA uninstall-info-am uninstall-jarDATA \
-       uninstall-pkgconfigDATA uninstall-toolexeclibLTLIBRARIES \
+       uninstall-dbexecDATA uninstall-dbexecLTLIBRARIES \
+       uninstall-info-am uninstall-jarDATA \
+       uninstall-libexecsubPROGRAMS 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 \
+       check-am clean clean-binPROGRAMS clean-dbexecLTLIBRARIES \
+       clean-generic clean-libexecsubPROGRAMS clean-libtool \
        clean-noinstPROGRAMS clean-recursive \
        clean-toolexeclibLTLIBRARIES ctags ctags-recursive dist \
        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
@@ -6342,37 +9853,46 @@ uninstall-info: uninstall-info-recursive
        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
+       install-dbexecLTLIBRARIES install-exec install-exec-am \
+       install-exec-hook install-info install-info-am install-jarDATA \
+       install-libexecsubPROGRAMS install-man 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-libexecsubPROGRAMS \
+       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): %.properties.lo: classpath/resource/%.properties
+libgcj_bc.la: $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_DEPENDENCIES)
+       $(libgcj_bc_la_LINK) $(am_libgcj_bc_la_rpath) $(libgcj_bc_la_LDFLAGS) \
+       $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_LIBADD) $(LIBS) || exit; \
+       rm .libs/libgcj_bc.so; \
+       mv .libs/libgcj_bc.so.1.0.0 .libs/libgcj_bc.so; \
+       $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
+       -o .libs/libgcj_bc.so.1.0.0 -lgcj || exit; \
+       rm .libs/libgcj_bc.so.1; \
+       $(LN_S) libgcj_bc.so.1.0.0 .libs/libgcj_bc.so.1
+
+$(propertyo_files): %.lo: classpath/resource/%
        $(mkinstalldirs) `dirname $@`; \
        $(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 gnu java javax org
+libgcj-$(gcc_version).jar: classpath/lib/compile-classes
+       here=`pwd`; cd $(srcdir)/classpath/lib; $(JAR) -cfM \
+           $$here/libgcj-$(gcc_version).jar gnu java javax org sun
+
+libgcj-tools-$(gcc_version).jar: classpath/tools/tools.zip
+       cp $< $@
 
 mostlyclean-local:
        find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f
@@ -6391,1573 +9911,1639 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND
        -rpath $(toolexeclibdir) $(lib_gnu_awt_xlib_la_LDFLAGS) $(LIBS)
 
 %.lo: %.list
-       $(LTGCJCOMPILE) -c -o $@ -MT $@ -MD -MP -MF $(basename $@).deps @$<
+       $(LTGCJCOMPILE) -c -o $@ -fsource-filename=$(here)/classpath/lib/classes -MT $@ -MD -MP -MF $(basename $@).deps @$<
+
+java/lang/Object.lo: classpath/lib/java/lang/Object.class
+       $(LTGCJCOMPILE) -c -o $@ -fsource-filename=$(srcdir)/$(basename $@).java $<
+
+java/lang/Class.lo: classpath/lib/java/lang/Class.class
+       $(LTGCJCOMPILE) -c -o $@  -fsource-filename=$(srcdir)/$(basename $@).java $<
+
+gnu-CORBA.lo: $(gnu_CORBA_source_files)
+       @find $(srcdir)/classpath/lib/gnu/CORBA -name '*.class' > 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)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_awt_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/awt.list
+       echo $(srcdir)/classpath/lib/gnu/awt/*.class > gnu/awt.list
 
 -include gnu/awt.deps
 
 gnu/awt/j2d.list: $(gnu_awt_j2d_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_awt_j2d_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/awt/j2d.list
+       echo $(srcdir)/classpath/lib/gnu/awt/j2d/*.class > gnu/awt/j2d.list
 
 -include gnu/awt/j2d.deps
 
 gnu/awt/xlib.list: $(gnu_awt_xlib_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_awt_xlib_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/awt/xlib.list
+       echo $(srcdir)/classpath/lib/gnu/awt/xlib/*.class > gnu/awt/xlib.list
 
 -include gnu/awt/xlib.deps
 
 gnu/classpath.list: $(gnu_classpath_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_classpath_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/classpath.list
+       echo $(srcdir)/classpath/lib/gnu/classpath/*.class > gnu/classpath.list
 
 -include gnu/classpath.deps
 
 gnu/classpath/debug.list: $(gnu_classpath_debug_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_classpath_debug_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/classpath/debug.list
+       echo $(srcdir)/classpath/lib/gnu/classpath/debug/*.class > gnu/classpath/debug.list
 
 -include gnu/classpath/debug.deps
 
+gnu/classpath/jdwp.list: $(gnu_classpath_jdwp_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/*.class > gnu/classpath/jdwp.list
+
+-include gnu/classpath/jdwp.deps
+
+gnu/classpath/jdwp/event.list: $(gnu_classpath_jdwp_event_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/event/*.class > gnu/classpath/jdwp/event.list
+
+-include gnu/classpath/jdwp/event.deps
+
+gnu/classpath/jdwp/event/filters.list: $(gnu_classpath_jdwp_event_filters_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/event/filters/*.class > gnu/classpath/jdwp/event/filters.list
+
+-include gnu/classpath/jdwp/event/filters.deps
+
+gnu/classpath/jdwp/exception.list: $(gnu_classpath_jdwp_exception_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/exception/*.class > gnu/classpath/jdwp/exception.list
+
+-include gnu/classpath/jdwp/exception.deps
+
+gnu/classpath/jdwp/id.list: $(gnu_classpath_jdwp_id_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/id/*.class > gnu/classpath/jdwp/id.list
+
+-include gnu/classpath/jdwp/id.deps
+
+gnu/classpath/jdwp/processor.list: $(gnu_classpath_jdwp_processor_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/processor/*.class > gnu/classpath/jdwp/processor.list
+
+-include gnu/classpath/jdwp/processor.deps
+
+gnu/classpath/jdwp/transport.list: $(gnu_classpath_jdwp_transport_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/transport/*.class > gnu/classpath/jdwp/transport.list
+
+-include gnu/classpath/jdwp/transport.deps
+
+gnu/classpath/jdwp/util.list: $(gnu_classpath_jdwp_util_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/util/*.class > gnu/classpath/jdwp/util.list
+
+-include gnu/classpath/jdwp/util.deps
+
 gnu/gcj.list: $(gnu_gcj_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_gcj_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/gcj.list
+       echo $(srcdir)/classpath/lib/gnu/gcj/*.class > gnu/gcj.list
 
 -include gnu/gcj.deps
 
 gnu/gcj/convert.list: $(gnu_gcj_convert_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_gcj_convert_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/gcj/convert.list
+       echo $(srcdir)/classpath/lib/gnu/gcj/convert/*.class > gnu/gcj/convert.list
 
 -include gnu/gcj/convert.deps
 
 gnu/gcj/io.list: $(gnu_gcj_io_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_gcj_io_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/gcj/io.list
+       echo $(srcdir)/classpath/lib/gnu/gcj/io/*.class > gnu/gcj/io.list
 
 -include gnu/gcj/io.deps
 
+gnu/gcj/jvmti.list: $(gnu_gcj_jvmti_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/gcj/jvmti/*.class > gnu/gcj/jvmti.list
+
+-include gnu/gcj/jvmti.deps
+
 gnu/gcj/runtime.list: $(gnu_gcj_runtime_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_gcj_runtime_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/gcj/runtime.list
+       echo $(srcdir)/classpath/lib/gnu/gcj/runtime/*.class > gnu/gcj/runtime.list
 
 -include gnu/gcj/runtime.deps
 
+gnu/gcj/tools/gcj_dbtool.list: $(gnu_gcj_tools_gcj_dbtool_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/gcj/tools/gcj_dbtool/*.class > gnu/gcj/tools/gcj_dbtool.list
+
+-include gnu/gcj/tools/gcj_dbtool.deps
+
 gnu/gcj/util.list: $(gnu_gcj_util_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_gcj_util_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/gcj/util.list
+       echo $(srcdir)/classpath/lib/gnu/gcj/util/*.class > gnu/gcj/util.list
 
 -include gnu/gcj/util.deps
 
 gnu/gcj/xlib.list: $(gnu_gcj_xlib_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_gcj_xlib_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/gcj/xlib.list
+       echo $(srcdir)/classpath/lib/gnu/gcj/xlib/*.class > gnu/gcj/xlib.list
 
 -include gnu/gcj/xlib.deps
 
 gnu/java/awt.list: $(gnu_java_awt_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_awt_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/awt.list
+       echo $(srcdir)/classpath/lib/gnu/java/awt/*.class > gnu/java/awt.list
 
 -include gnu/java/awt.deps
 
 gnu/java/awt/color.list: $(gnu_java_awt_color_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_awt_color_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/awt/color.list
+       echo $(srcdir)/classpath/lib/gnu/java/awt/color/*.class > gnu/java/awt/color.list
 
 -include gnu/java/awt/color.deps
 
+gnu/java/awt/dnd.list: $(gnu_java_awt_dnd_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/awt/dnd/*.class > gnu/java/awt/dnd.list
+
+-include gnu/java/awt/dnd.deps
+
+gnu-java-awt-dnd-peer-gtk.lo: $(gnu_java_awt_dnd_peer_gtk_source_files)
+       @find $(srcdir)/classpath/lib/gnu/java/awt/dnd/peer/gtk -name '*.class' > gnu-java-awt-dnd-peer-gtk.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-dnd-peer-gtk.lo @gnu-java-awt-dnd-peer-gtk.list
+       @rm -f gnu-java-awt-dnd-peer-gtk.list
+
+gnu/java/awt/font.list: $(gnu_java_awt_font_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/awt/font/*.class > gnu/java/awt/font.list
+
+-include gnu/java/awt/font.deps
+
+gnu/java/awt/font/autofit.list: $(gnu_java_awt_font_autofit_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/awt/font/autofit/*.class > gnu/java/awt/font/autofit.list
+
+-include gnu/java/awt/font/autofit.deps
+
+gnu/java/awt/font/opentype.list: $(gnu_java_awt_font_opentype_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/awt/font/opentype/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/java/awt/font/opentype/truetype/*.class > 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 \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/awt/image.list
+       echo $(srcdir)/classpath/lib/gnu/java/awt/image/*.class > gnu/java/awt/image.list
 
 -include gnu/java/awt/image.deps
 
+gnu/java/awt/java2d.list: $(gnu_java_awt_java2d_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/awt/java2d/*.class > 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 \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/awt/peer.list
+       echo $(srcdir)/classpath/lib/gnu/java/awt/peer/*.class > gnu/java/awt/peer.list
 
 -include gnu/java/awt/peer.deps
 
 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
+       @find $(srcdir)/classpath/lib/gnu/java/awt/peer/gtk -name '*.class' > 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/headless.list: $(gnu_java_awt_peer_headless_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/awt/peer/headless/*.class > gnu/java/awt/peer/headless.list
+
+-include gnu/java/awt/peer/headless.deps
+
+gnu-java-awt-peer-qt.lo: $(gnu_java_awt_peer_qt_source_files)
+       @find $(srcdir)/classpath/lib/gnu/java/awt/peer/qt -name '*.class' > 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 $(srcdir)/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-peer-x.lo: $(gnu_java_awt_peer_x_source_files)
+       @find $(srcdir)/classpath/lib/gnu/java/awt/peer/x -name '*.class' > gnu-java-awt-peer-x.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-x.lo @gnu-java-awt-peer-x.list
+       @rm -f gnu-java-awt-peer-x.list
+
+gnu/java/awt/print.list: $(gnu_java_awt_print_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/awt/print/*.class > 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
+       @find $(srcdir)/classpath/lib/gnu/java/beans -name '*.class' > 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)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_io_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/io.list
+       echo $(srcdir)/classpath/lib/gnu/java/io/*.class > gnu/java/io.list
 
 -include gnu/java/io.deps
 
 gnu/java/lang.list: $(gnu_java_lang_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_lang_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/lang.list
+       echo $(srcdir)/classpath/lib/gnu/java/lang/*.class > gnu/java/lang.list
 
 -include gnu/java/lang.deps
 
+gnu/java/lang/management.list: $(gnu_java_lang_management_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/lang/management/*.class > gnu/java/lang/management.list
+
+-include gnu/java/lang/management.deps
+
 gnu/java/lang/reflect.list: $(gnu_java_lang_reflect_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_lang_reflect_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/lang/reflect.list
+       echo $(srcdir)/classpath/lib/gnu/java/lang/reflect/*.class > gnu/java/lang/reflect.list
 
 -include gnu/java/lang/reflect.deps
 
 gnu/java/locale.list: $(gnu_java_locale_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_locale_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/locale.list
+       echo $(srcdir)/classpath/lib/gnu/java/locale/*.class > gnu/java/locale.list
 
 -include gnu/java/locale.deps
 
 gnu/java/math.list: $(gnu_java_math_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_math_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/math.list
+       echo $(srcdir)/classpath/lib/gnu/java/math/*.class > gnu/java/math.list
 
 -include gnu/java/math.deps
 
 gnu/java/net.list: $(gnu_java_net_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_net_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/*.class > gnu/java/net.list
 
 -include gnu/java/net.deps
 
+gnu/java/net/loader.list: $(gnu_java_net_loader_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/net/loader/*.class > gnu/java/net/loader.list
+
+-include gnu/java/net/loader.deps
+
+gnu/java/net/local.list: $(gnu_java_net_local_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/net/local/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/core/*.class > 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 \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net/protocol/file.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/file/*.class > gnu/java/net/protocol/file.list
 
 -include gnu/java/net/protocol/file.deps
 
 gnu/java/net/protocol/ftp.list: $(gnu_java_net_protocol_ftp_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_net_protocol_ftp_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net/protocol/ftp.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/ftp/*.class > gnu/java/net/protocol/ftp.list
 
 -include gnu/java/net/protocol/ftp.deps
 
-gnu/java/net/protocol/http.list: $(gnu_java_net_protocol_http_source_files)
+gnu/java/net/protocol/gcjlib.list: $(gnu_java_net_protocol_gcjlib_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_net_protocol_http_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net/protocol/http.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/gcjlib/*.class > gnu/java/net/protocol/gcjlib.list
 
--include gnu/java/net/protocol/http.deps
+-include gnu/java/net/protocol/gcjlib.deps
 
-gnu/java/net/protocol/http/event.list: $(gnu_java_net_protocol_http_event_source_files)
+gnu/java/net/protocol/http.list: $(gnu_java_net_protocol_http_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_net_protocol_http_event_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net/protocol/http/event.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/http/*.class > gnu/java/net/protocol/http.list
 
--include gnu/java/net/protocol/http/event.deps
+-include gnu/java/net/protocol/http.deps
 
 gnu/java/net/protocol/https.list: $(gnu_java_net_protocol_https_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_net_protocol_https_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net/protocol/https.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/https/*.class > gnu/java/net/protocol/https.list
 
 -include gnu/java/net/protocol/https.deps
 
 gnu/java/net/protocol/jar.list: $(gnu_java_net_protocol_jar_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_net_protocol_jar_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net/protocol/jar.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/jar/*.class > gnu/java/net/protocol/jar.list
 
 -include gnu/java/net/protocol/jar.deps
 
 gnu/java/nio.list: $(gnu_java_nio_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_nio_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/nio.list
+       echo $(srcdir)/classpath/lib/gnu/java/nio/*.class > gnu/java/nio.list
 
 -include gnu/java/nio.deps
 
 gnu/java/nio/channels.list: $(gnu_java_nio_channels_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_nio_channels_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/nio/channels.list
+       echo $(srcdir)/classpath/lib/gnu/java/nio/channels/*.class > gnu/java/nio/channels.list
 
 -include gnu/java/nio/channels.deps
 
 gnu/java/nio/charset.list: $(gnu_java_nio_charset_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_nio_charset_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/nio/charset.list
+       echo $(srcdir)/classpath/lib/gnu/java/nio/charset/*.class > gnu/java/nio/charset.list
 
 -include gnu/java/nio/charset.deps
 
 gnu/java/rmi.list: $(gnu_java_rmi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_rmi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/rmi.list
+       echo $(srcdir)/classpath/lib/gnu/java/rmi/*.class > gnu/java/rmi.list
 
 -include gnu/java/rmi.deps
 
+gnu/java/rmi/activation.list: $(gnu_java_rmi_activation_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/rmi/activation/*.class > 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 \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/rmi/dgc.list
+       echo $(srcdir)/classpath/lib/gnu/java/rmi/dgc/*.class > gnu/java/rmi/dgc.list
 
 -include gnu/java/rmi/dgc.deps
 
 gnu/java/rmi/registry.list: $(gnu_java_rmi_registry_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_rmi_registry_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/rmi/registry.list
+       echo $(srcdir)/classpath/lib/gnu/java/rmi/registry/*.class > gnu/java/rmi/registry.list
 
 -include gnu/java/rmi/registry.deps
 
 gnu/java/rmi/server.list: $(gnu_java_rmi_server_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_rmi_server_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/rmi/server.list
+       echo $(srcdir)/classpath/lib/gnu/java/rmi/server/*.class > gnu/java/rmi/server.list
 
 -include gnu/java/rmi/server.deps
 
 gnu/java/security.list: $(gnu_java_security_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/*.class > gnu/java/security.list
 
 -include gnu/java/security.deps
 
 gnu/java/security/action.list: $(gnu_java_security_action_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_action_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/action.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/action/*.class > gnu/java/security/action.list
 
 -include gnu/java/security/action.deps
 
 gnu/java/security/ber.list: $(gnu_java_security_ber_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_ber_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/ber.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/ber/*.class > gnu/java/security/ber.list
 
 -include gnu/java/security/ber.deps
 
 gnu/java/security/der.list: $(gnu_java_security_der_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_der_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/der.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/der/*.class > gnu/java/security/der.list
 
 -include gnu/java/security/der.deps
 
-gnu/java/security/pkcs.list: $(gnu_java_security_pkcs_source_files)
+gnu/java/security/hash.list: $(gnu_java_security_hash_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_pkcs_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/pkcs.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/hash/*.class > gnu/java/security/hash.list
 
--include gnu/java/security/pkcs.deps
+-include gnu/java/security/hash.deps
 
-gnu/java/security/provider.list: $(gnu_java_security_provider_source_files)
+gnu/java/security/jce/hash.list: $(gnu_java_security_jce_hash_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_provider_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/provider.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/jce/hash/*.class > gnu/java/security/jce/hash.list
 
--include gnu/java/security/provider.deps
+-include gnu/java/security/jce/hash.deps
 
-gnu/java/security/util.list: $(gnu_java_security_util_source_files)
+gnu/java/security/jce/prng.list: $(gnu_java_security_jce_prng_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_util_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/util.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/jce/prng/*.class > gnu/java/security/jce/prng.list
 
--include gnu/java/security/util.deps
+-include gnu/java/security/jce/prng.deps
 
-gnu/java/security/x509.list: $(gnu_java_security_x509_source_files)
+gnu/java/security/jce/sig.list: $(gnu_java_security_jce_sig_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_x509_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/x509.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/jce/sig/*.class > gnu/java/security/jce/sig.list
 
--include gnu/java/security/x509.deps
+-include gnu/java/security/jce/sig.deps
 
-gnu/java/security/x509/ext.list: $(gnu_java_security_x509_ext_source_files)
+gnu/java/security/key.list: $(gnu_java_security_key_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_x509_ext_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/x509/ext.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/key/*.class > gnu/java/security/key.list
 
--include gnu/java/security/x509/ext.deps
+-include gnu/java/security/key.deps
 
-gnu/java/text.list: $(gnu_java_text_source_files)
+gnu/java/security/key/dss.list: $(gnu_java_security_key_dss_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_text_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/text.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/key/dss/*.class > gnu/java/security/key/dss.list
 
--include gnu/java/text.deps
+-include gnu/java/security/key/dss.deps
 
-gnu/java/util.list: $(gnu_java_util_source_files)
+gnu/java/security/key/rsa.list: $(gnu_java_security_key_rsa_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_util_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/util.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/key/rsa/*.class > gnu/java/security/key/rsa.list
 
--include gnu/java/util.deps
+-include gnu/java/security/key/rsa.deps
 
-gnu/java/util/prefs.list: $(gnu_java_util_prefs_source_files)
+gnu/java/security/pkcs.list: $(gnu_java_security_pkcs_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/security/pkcs/*.class > gnu/java/security/pkcs.list
+
+-include gnu/java/security/pkcs.deps
+
+gnu/java/security/prng.list: $(gnu_java_security_prng_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/security/prng/*.class > gnu/java/security/prng.list
+
+-include gnu/java/security/prng.deps
+
+gnu/java/security/provider.list: $(gnu_java_security_provider_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/security/provider/*.class > gnu/java/security/provider.list
+
+-include gnu/java/security/provider.deps
+
+gnu/java/security/sig.list: $(gnu_java_security_sig_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/security/sig/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/java/security/sig/dss/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/java/security/sig/rsa/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/java/security/util/*.class > gnu/java/security/util.list
+
+-include gnu/java/security/util.deps
+
+gnu/java/security/x509.list: $(gnu_java_security_x509_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/security/x509/*.class > gnu/java/security/x509.list
+
+-include gnu/java/security/x509.deps
+
+gnu/java/security/x509/ext.list: $(gnu_java_security_x509_ext_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/security/x509/ext/*.class > gnu/java/security/x509/ext.list
+
+-include gnu/java/security/x509/ext.deps
+
+gnu/java/text.list: $(gnu_java_text_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/text/*.class > gnu/java/text.list
+
+-include gnu/java/text.deps
+
+gnu/java/util.list: $(gnu_java_util_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/util/*.class > gnu/java/util.list
+
+-include gnu/java/util.deps
+
+gnu/java/util/jar.list: $(gnu_java_util_jar_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/util/jar/*.class > 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 \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/util/prefs.list
+       echo $(srcdir)/classpath/lib/gnu/java/util/prefs/*.class > gnu/java/util/prefs.list
 
 -include gnu/java/util/prefs.deps
 
+gnu-java-util-prefs-gconf.lo: $(gnu_java_util_prefs_gconf_source_files)
+       @find $(srcdir)/classpath/lib/gnu/java/util/prefs/gconf -name '*.class' > gnu-java-util-prefs-gconf.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-util-prefs-gconf.lo @gnu-java-util-prefs-gconf.list
+       @rm -f gnu-java-util-prefs-gconf.list
+
+gnu/java/util/regex.list: $(gnu_java_util_regex_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/util/regex/*.class > gnu/java/util/regex.list
+
+-include gnu/java/util/regex.deps
+
+gnu/javax/crypto.list: $(gnu_javax_crypto_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/*.class > gnu/javax/crypto.list
+
+-include gnu/javax/crypto.deps
+
+gnu/javax/crypto/assembly.list: $(gnu_javax_crypto_assembly_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/assembly/*.class > gnu/javax/crypto/assembly.list
+
+-include gnu/javax/crypto/assembly.deps
+
+gnu/javax/crypto/cipher.list: $(gnu_javax_crypto_cipher_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/cipher/*.class > gnu/javax/crypto/cipher.list
+
+-include gnu/javax/crypto/cipher.deps
+
+gnu/javax/crypto/jce.list: $(gnu_javax_crypto_jce_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/cipher/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/key/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/keyring/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/mac/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/params/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/prng/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/sig/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/spec/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/key/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/key/dh/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/key/srp6/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/keyring/*.class > gnu/javax/crypto/keyring.list
+
+-include gnu/javax/crypto/keyring.deps
+
+gnu/javax/crypto/kwa.list: $(gnu_javax_crypto_kwa_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/kwa/*.class > gnu/javax/crypto/kwa.list
+
+-include gnu/javax/crypto/kwa.deps
+
+gnu/javax/crypto/mac.list: $(gnu_javax_crypto_mac_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/mac/*.class > gnu/javax/crypto/mac.list
+
+-include gnu/javax/crypto/mac.deps
+
+gnu/javax/crypto/mode.list: $(gnu_javax_crypto_mode_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/mode/*.class > gnu/javax/crypto/mode.list
+
+-include gnu/javax/crypto/mode.deps
+
+gnu/javax/crypto/pad.list: $(gnu_javax_crypto_pad_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/pad/*.class > gnu/javax/crypto/pad.list
+
+-include gnu/javax/crypto/pad.deps
+
+gnu/javax/crypto/prng.list: $(gnu_javax_crypto_prng_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/prng/*.class > gnu/javax/crypto/prng.list
+
+-include gnu/javax/crypto/prng.deps
+
+gnu/javax/crypto/sasl.list: $(gnu_javax_crypto_sasl_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/sasl/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/sasl/anonymous/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/sasl/crammd5/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/sasl/plain/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/sasl/srp/*.class > gnu/javax/crypto/sasl/srp.list
+
+-include gnu/javax/crypto/sasl/srp.deps
+
+gnu/javax/imageio.list: $(gnu_javax_imageio_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/imageio/*.class > gnu/javax/imageio.list
+
+-include gnu/javax/imageio.deps
+
+gnu/javax/imageio/bmp.list: $(gnu_javax_imageio_bmp_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/imageio/bmp/*.class > gnu/javax/imageio/bmp.list
+
+-include gnu/javax/imageio/bmp.deps
+
+gnu/javax/imageio/gif.list: $(gnu_javax_imageio_gif_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/imageio/gif/*.class > gnu/javax/imageio/gif.list
+
+-include gnu/javax/imageio/gif.deps
+
+gnu/javax/imageio/jpeg.list: $(gnu_javax_imageio_jpeg_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/imageio/jpeg/*.class > gnu/javax/imageio/jpeg.list
+
+-include gnu/javax/imageio/jpeg.deps
+
+gnu/javax/imageio/png.list: $(gnu_javax_imageio_png_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/imageio/png/*.class > gnu/javax/imageio/png.list
+
+-include gnu/javax/imageio/png.deps
+
+gnu/javax/management.list: $(gnu_javax_management_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/management/*.class > gnu/javax/management.list
+
+-include gnu/javax/management.deps
+
+gnu/javax/naming/giop.list: $(gnu_javax_naming_giop_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/naming/giop/*.class > gnu/javax/naming/giop.list
+
+-include gnu/javax/naming/giop.deps
+
+gnu/javax/naming/ictxImpl/trans.list: $(gnu_javax_naming_ictxImpl_trans_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/naming/ictxImpl/trans/*.class > gnu/javax/naming/ictxImpl/trans.list
+
+-include gnu/javax/naming/ictxImpl/trans.deps
+
+gnu/javax/naming/jndi/url/corbaname.list: $(gnu_javax_naming_jndi_url_corbaname_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/naming/jndi/url/corbaname/*.class > gnu/javax/naming/jndi/url/corbaname.list
+
+-include gnu/javax/naming/jndi/url/corbaname.deps
+
+gnu/javax/naming/jndi/url/rmi.list: $(gnu_javax_naming_jndi_url_rmi_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/naming/jndi/url/rmi/*.class > gnu/javax/naming/jndi/url/rmi.list
+
+-include gnu/javax/naming/jndi/url/rmi.deps
+
+gnu/javax/net/ssl.list: $(gnu_javax_net_ssl_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/net/ssl/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/net/ssl/provider/*.class > gnu/javax/net/ssl/provider.list
+
+-include gnu/javax/net/ssl/provider.deps
+
+gnu/javax/print.list: $(gnu_javax_print_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/print/*.class > gnu/javax/print.list
+
+-include gnu/javax/print.deps
+
+gnu/javax/print/ipp.list: $(gnu_javax_print_ipp_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/print/ipp/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/print/ipp/attribute/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/print/ipp/attribute/defaults/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/print/ipp/attribute/job/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/print/ipp/attribute/printer/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/print/ipp/attribute/supported/*.class > 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 $(srcdir)/classpath/lib/gnu/javax/rmi -name '*.class' > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/security/auth/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/security/auth/callback/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/security/auth/login/*.class > 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 $(srcdir)/classpath/lib/gnu/javax/sound/midi -name '*.class' > gnu-javax-sound-midi.list
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-sound-midi.lo @gnu-javax-sound-midi.list
+       @rm -f gnu-javax-sound-midi.list
+
+gnu/javax/sound/sampled/AU.list: $(gnu_javax_sound_sampled_AU_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/sound/sampled/AU/*.class > gnu/javax/sound/sampled/AU.list
+
+-include gnu/javax/sound/sampled/AU.deps
+
+gnu/javax/sound/sampled/WAV.list: $(gnu_javax_sound_sampled_WAV_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/sound/sampled/WAV/*.class > gnu/javax/sound/sampled/WAV.list
+
+-include gnu/javax/sound/sampled/WAV.deps
+
+gnu/javax/swing/plaf/gnu.list: $(gnu_javax_swing_plaf_gnu_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/plaf/gnu/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/plaf/metal/*.class > 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 $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/*.class > gnu/javax/swing/text/html.list
+
+-include gnu/javax/swing/text/html.deps
+
+gnu/javax/swing/text/html/css.list: $(gnu_javax_swing_text_html_css_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/css/*.class > gnu/javax/swing/text/html/css.list
+
+-include gnu/javax/swing/text/html/css.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 \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/swing/text/html/parser.list
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/parser/*.class > gnu/javax/swing/text/html/parser.list
 
 -include gnu/javax/swing/text/html/parser.deps
 
 gnu/javax/swing/text/html/parser/models.list: $(gnu_javax_swing_text_html_parser_models_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_swing_text_html_parser_models_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/swing/text/html/parser/models.list
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/parser/models/*.class > gnu/javax/swing/text/html/parser/models.list
 
 -include gnu/javax/swing/text/html/parser/models.deps
 
 gnu/javax/swing/text/html/parser/support.list: $(gnu_javax_swing_text_html_parser_support_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_swing_text_html_parser_support_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/swing/text/html/parser/support.list
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/parser/support/*.class > gnu/javax/swing/text/html/parser/support.list
 
 -include gnu/javax/swing/text/html/parser/support.deps
 
 gnu/javax/swing/text/html/parser/support/low.list: $(gnu_javax_swing_text_html_parser_support_low_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_swing_text_html_parser_support_low_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/swing/text/html/parser/support/low.list
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/parser/support/low/*.class > gnu/javax/swing/text/html/parser/support/low.list
 
 -include gnu/javax/swing/text/html/parser/support/low.deps
 
-gnu/regexp.list: $(gnu_regexp_source_files)
+gnu/javax/swing/tree.list: $(gnu_javax_swing_tree_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_regexp_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/regexp.list
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/tree/*.class > gnu/javax/swing/tree.list
 
--include gnu/regexp.deps
+-include gnu/javax/swing/tree.deps
 
 gnu-xml.lo: $(gnu_xml_source_files)
-       @find classpath/lib/gnu/xml -name '*.class' > gnu-xml.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-xml.lo @gnu-xml.list
+       @find $(srcdir)/classpath/lib/gnu/xml -name '*.class' > 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)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_applet_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/applet.list
+       echo $(srcdir)/classpath/lib/java/applet/*.class > java/applet.list
 
 -include java/applet.deps
 
 java/awt.list: $(java_awt_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt.list
+       echo $(srcdir)/classpath/lib/java/awt/*.class > java/awt.list
 
 -include java/awt.deps
 
 java/awt/color.list: $(java_awt_color_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_color_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/color.list
+       echo $(srcdir)/classpath/lib/java/awt/color/*.class > java/awt/color.list
 
 -include java/awt/color.deps
 
 java/awt/datatransfer.list: $(java_awt_datatransfer_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_datatransfer_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/datatransfer.list
+       echo $(srcdir)/classpath/lib/java/awt/datatransfer/*.class > java/awt/datatransfer.list
 
 -include java/awt/datatransfer.deps
 
 java/awt/dnd.list: $(java_awt_dnd_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_dnd_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/dnd.list
+       echo $(srcdir)/classpath/lib/java/awt/dnd/*.class > java/awt/dnd.list
 
 -include java/awt/dnd.deps
 
 java/awt/dnd/peer.list: $(java_awt_dnd_peer_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_dnd_peer_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/dnd/peer.list
+       echo $(srcdir)/classpath/lib/java/awt/dnd/peer/*.class > java/awt/dnd/peer.list
 
 -include java/awt/dnd/peer.deps
 
 java/awt/event.list: $(java_awt_event_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_event_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/event.list
+       echo $(srcdir)/classpath/lib/java/awt/event/*.class > java/awt/event.list
 
 -include java/awt/event.deps
 
 java/awt/font.list: $(java_awt_font_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_font_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/font.list
+       echo $(srcdir)/classpath/lib/java/awt/font/*.class > java/awt/font.list
 
 -include java/awt/font.deps
 
 java/awt/geom.list: $(java_awt_geom_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_geom_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/geom.list
+       echo $(srcdir)/classpath/lib/java/awt/geom/*.class > java/awt/geom.list
 
 -include java/awt/geom.deps
 
 java/awt/im.list: $(java_awt_im_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_im_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/im.list
+       echo $(srcdir)/classpath/lib/java/awt/im/*.class > java/awt/im.list
 
 -include java/awt/im.deps
 
 java/awt/im/spi.list: $(java_awt_im_spi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_im_spi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/im/spi.list
+       echo $(srcdir)/classpath/lib/java/awt/im/spi/*.class > java/awt/im/spi.list
 
 -include java/awt/im/spi.deps
 
 java/awt/image.list: $(java_awt_image_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_image_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/image.list
+       echo $(srcdir)/classpath/lib/java/awt/image/*.class > java/awt/image.list
 
 -include java/awt/image.deps
 
 java/awt/image/renderable.list: $(java_awt_image_renderable_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_image_renderable_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/image/renderable.list
+       echo $(srcdir)/classpath/lib/java/awt/image/renderable/*.class > java/awt/image/renderable.list
 
 -include java/awt/image/renderable.deps
 
 java/awt/peer.list: $(java_awt_peer_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_peer_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/peer.list
+       echo $(srcdir)/classpath/lib/java/awt/peer/*.class > java/awt/peer.list
 
 -include java/awt/peer.deps
 
 java/awt/print.list: $(java_awt_print_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_print_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/print.list
+       echo $(srcdir)/classpath/lib/java/awt/print/*.class > java/awt/print.list
 
 -include java/awt/print.deps
 
 java/beans.list: $(java_beans_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_beans_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/beans.list
+       echo $(srcdir)/classpath/lib/java/beans/*.class > java/beans.list
 
 -include java/beans.deps
 
 java/beans/beancontext.list: $(java_beans_beancontext_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_beans_beancontext_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/beans/beancontext.list
+       echo $(srcdir)/classpath/lib/java/beans/beancontext/*.class > java/beans/beancontext.list
 
 -include java/beans/beancontext.deps
 
 java/io.list: $(java_io_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_io_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/io.list
+       echo $(srcdir)/classpath/lib/java/io/*.class > java/io.list
 
 -include java/io.deps
 
 java/lang.list: $(java_lang_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_lang_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/lang.list
+       echo $(srcdir)/classpath/lib/java/lang/*.class | tr ' ' '\n' | fgrep -v Object.class | fgrep -v Class.class | grep -v '[^/]Process' > java/lang.list
 
 -include java/lang.deps
 
 java/lang/annotation.list: $(java_lang_annotation_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_lang_annotation_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/lang/annotation.list
+       echo $(srcdir)/classpath/lib/java/lang/annotation/*.class > java/lang/annotation.list
 
 -include java/lang/annotation.deps
 
+java/lang/instrument.list: $(java_lang_instrument_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/lang/instrument/*.class > java/lang/instrument.list
+
+-include java/lang/instrument.deps
+
+java/lang/management.list: $(java_lang_management_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/lang/management/*.class > java/lang/management.list
+
+-include java/lang/management.deps
+
 java/lang/ref.list: $(java_lang_ref_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_lang_ref_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/lang/ref.list
+       echo $(srcdir)/classpath/lib/java/lang/ref/*.class > java/lang/ref.list
 
 -include java/lang/ref.deps
 
 java/lang/reflect.list: $(java_lang_reflect_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_lang_reflect_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/lang/reflect.list
+       echo $(srcdir)/classpath/lib/java/lang/reflect/*.class > java/lang/reflect.list
 
 -include java/lang/reflect.deps
 
 java/math.list: $(java_math_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_math_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/math.list
+       echo $(srcdir)/classpath/lib/java/math/*.class > java/math.list
 
 -include java/math.deps
 
 java/net.list: $(java_net_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_net_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/net.list
+       echo $(srcdir)/classpath/lib/java/net/*.class > java/net.list
 
 -include java/net.deps
 
 java/nio.list: $(java_nio_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_nio_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/nio.list
+       echo $(srcdir)/classpath/lib/java/nio/*.class > java/nio.list
 
 -include java/nio.deps
 
 java/nio/channels.list: $(java_nio_channels_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_nio_channels_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/nio/channels.list
+       echo $(srcdir)/classpath/lib/java/nio/channels/*.class > java/nio/channels.list
 
 -include java/nio/channels.deps
 
 java/nio/channels/spi.list: $(java_nio_channels_spi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_nio_channels_spi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/nio/channels/spi.list
+       echo $(srcdir)/classpath/lib/java/nio/channels/spi/*.class > java/nio/channels/spi.list
 
 -include java/nio/channels/spi.deps
 
 java/nio/charset.list: $(java_nio_charset_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_nio_charset_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/nio/charset.list
+       echo $(srcdir)/classpath/lib/java/nio/charset/*.class > java/nio/charset.list
 
 -include java/nio/charset.deps
 
 java/nio/charset/spi.list: $(java_nio_charset_spi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_nio_charset_spi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/nio/charset/spi.list
+       echo $(srcdir)/classpath/lib/java/nio/charset/spi/*.class > java/nio/charset/spi.list
 
 -include java/nio/charset/spi.deps
 
 java/rmi.list: $(java_rmi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_rmi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/rmi.list
+       echo $(srcdir)/classpath/lib/java/rmi/*.class > java/rmi.list
 
 -include java/rmi.deps
 
 java/rmi/activation.list: $(java_rmi_activation_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_rmi_activation_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/rmi/activation.list
+       echo $(srcdir)/classpath/lib/java/rmi/activation/*.class > java/rmi/activation.list
 
 -include java/rmi/activation.deps
 
 java/rmi/dgc.list: $(java_rmi_dgc_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_rmi_dgc_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/rmi/dgc.list
+       echo $(srcdir)/classpath/lib/java/rmi/dgc/*.class > java/rmi/dgc.list
 
 -include java/rmi/dgc.deps
 
 java/rmi/registry.list: $(java_rmi_registry_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_rmi_registry_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/rmi/registry.list
+       echo $(srcdir)/classpath/lib/java/rmi/registry/*.class > java/rmi/registry.list
 
 -include java/rmi/registry.deps
 
 java/rmi/server.list: $(java_rmi_server_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_rmi_server_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/rmi/server.list
+       echo $(srcdir)/classpath/lib/java/rmi/server/*.class > java/rmi/server.list
 
 -include java/rmi/server.deps
 
 java/security.list: $(java_security_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_security_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/security.list
+       echo $(srcdir)/classpath/lib/java/security/*.class > java/security.list
 
 -include java/security.deps
 
 java/security/acl.list: $(java_security_acl_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_security_acl_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/security/acl.list
+       echo $(srcdir)/classpath/lib/java/security/acl/*.class > java/security/acl.list
 
 -include java/security/acl.deps
 
 java/security/cert.list: $(java_security_cert_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_security_cert_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/security/cert.list
+       echo $(srcdir)/classpath/lib/java/security/cert/*.class > java/security/cert.list
 
 -include java/security/cert.deps
 
 java/security/interfaces.list: $(java_security_interfaces_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_security_interfaces_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/security/interfaces.list
+       echo $(srcdir)/classpath/lib/java/security/interfaces/*.class > java/security/interfaces.list
 
 -include java/security/interfaces.deps
 
 java/security/spec.list: $(java_security_spec_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_security_spec_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/security/spec.list
+       echo $(srcdir)/classpath/lib/java/security/spec/*.class > java/security/spec.list
 
 -include java/security/spec.deps
 
 java/sql.list: $(java_sql_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_sql_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/sql.list
+       echo $(srcdir)/classpath/lib/java/sql/*.class > java/sql.list
 
 -include java/sql.deps
 
 java/text.list: $(java_text_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_text_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/text.list
+       echo $(srcdir)/classpath/lib/java/text/*.class > java/text.list
 
 -include java/text.deps
 
 java/util.list: $(java_util_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_util_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/util.list
+       echo $(srcdir)/classpath/lib/java/util/*.class > java/util.list
 
 -include java/util.deps
 
+java/util/concurrent.list: $(java_util_concurrent_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/util/concurrent/*.class > java/util/concurrent.list
+
+-include java/util/concurrent.deps
+
+java/util/concurrent/atomic.list: $(java_util_concurrent_atomic_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/util/concurrent/atomic/*.class > java/util/concurrent/atomic.list
+
+-include java/util/concurrent/atomic.deps
+
+java/util/concurrent/locks.list: $(java_util_concurrent_locks_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/util/concurrent/locks/*.class > java/util/concurrent/locks.list
+
+-include java/util/concurrent/locks.deps
+
 java/util/jar.list: $(java_util_jar_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_util_jar_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/util/jar.list
+       echo $(srcdir)/classpath/lib/java/util/jar/*.class > java/util/jar.list
 
 -include java/util/jar.deps
 
 java/util/logging.list: $(java_util_logging_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_util_logging_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/util/logging.list
+       echo $(srcdir)/classpath/lib/java/util/logging/*.class > java/util/logging.list
 
 -include java/util/logging.deps
 
 java/util/prefs.list: $(java_util_prefs_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_util_prefs_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/util/prefs.list
+       echo $(srcdir)/classpath/lib/java/util/prefs/*.class > java/util/prefs.list
 
 -include java/util/prefs.deps
 
 java/util/regex.list: $(java_util_regex_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_util_regex_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/util/regex.list
+       echo $(srcdir)/classpath/lib/java/util/regex/*.class > java/util/regex.list
 
 -include java/util/regex.deps
 
 java/util/zip.list: $(java_util_zip_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_util_zip_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/util/zip.list
+       echo $(srcdir)/classpath/lib/java/util/zip/*.class > java/util/zip.list
 
 -include java/util/zip.deps
 
 javax/accessibility.list: $(javax_accessibility_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_accessibility_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/accessibility.list
+       echo $(srcdir)/classpath/lib/javax/accessibility/*.class > javax/accessibility.list
 
 -include javax/accessibility.deps
 
 javax/crypto.list: $(javax_crypto_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_crypto_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/crypto.list
+       echo $(srcdir)/classpath/lib/javax/crypto/*.class > javax/crypto.list
 
 -include javax/crypto.deps
 
 javax/crypto/interfaces.list: $(javax_crypto_interfaces_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_crypto_interfaces_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/crypto/interfaces.list
+       echo $(srcdir)/classpath/lib/javax/crypto/interfaces/*.class > javax/crypto/interfaces.list
 
 -include javax/crypto/interfaces.deps
 
 javax/crypto/spec.list: $(javax_crypto_spec_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_crypto_spec_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/crypto/spec.list
+       echo $(srcdir)/classpath/lib/javax/crypto/spec/*.class > javax/crypto/spec.list
 
 -include javax/crypto/spec.deps
 
 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
+       @find $(srcdir)/classpath/lib/javax/imageio -name '*.class' > 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 $@)
+       echo $(srcdir)/classpath/lib/javax/management/*.class > javax/management.list
+
+-include javax/management.deps
+
+javax/management/loading.list: $(javax_management_loading_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/management/loading/*.class > javax/management/loading.list
+
+-include javax/management/loading.deps
+
+javax/management/openmbean.list: $(javax_management_openmbean_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/management/openmbean/*.class > javax/management/openmbean.list
+
+-include javax/management/openmbean.deps
+
 javax/naming.list: $(javax_naming_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_naming_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/naming.list
+       echo $(srcdir)/classpath/lib/javax/naming/*.class > javax/naming.list
 
 -include javax/naming.deps
 
 javax/naming/directory.list: $(javax_naming_directory_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_naming_directory_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/naming/directory.list
+       echo $(srcdir)/classpath/lib/javax/naming/directory/*.class > javax/naming/directory.list
 
 -include javax/naming/directory.deps
 
 javax/naming/event.list: $(javax_naming_event_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_naming_event_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/naming/event.list
+       echo $(srcdir)/classpath/lib/javax/naming/event/*.class > javax/naming/event.list
 
 -include javax/naming/event.deps
 
 javax/naming/ldap.list: $(javax_naming_ldap_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_naming_ldap_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/naming/ldap.list
+       echo $(srcdir)/classpath/lib/javax/naming/ldap/*.class > javax/naming/ldap.list
 
 -include javax/naming/ldap.deps
 
 javax/naming/spi.list: $(javax_naming_spi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_naming_spi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/naming/spi.list
+       echo $(srcdir)/classpath/lib/javax/naming/spi/*.class > javax/naming/spi.list
 
 -include javax/naming/spi.deps
 
 javax/net.list: $(javax_net_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_net_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/net.list
+       echo $(srcdir)/classpath/lib/javax/net/*.class > javax/net.list
 
 -include javax/net.deps
 
 javax/net/ssl.list: $(javax_net_ssl_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_net_ssl_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/net/ssl.list
+       echo $(srcdir)/classpath/lib/javax/net/ssl/*.class > javax/net/ssl.list
 
 -include javax/net/ssl.deps
 
 javax/print.list: $(javax_print_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_print_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/print.list
+       echo $(srcdir)/classpath/lib/javax/print/*.class > javax/print.list
 
 -include javax/print.deps
 
 javax/print/attribute.list: $(javax_print_attribute_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_print_attribute_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/print/attribute.list
+       echo $(srcdir)/classpath/lib/javax/print/attribute/*.class > javax/print/attribute.list
 
 -include javax/print/attribute.deps
 
 javax/print/attribute/standard.list: $(javax_print_attribute_standard_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_print_attribute_standard_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/print/attribute/standard.list
+       echo $(srcdir)/classpath/lib/javax/print/attribute/standard/*.class > javax/print/attribute/standard.list
 
 -include javax/print/attribute/standard.deps
 
 javax/print/event.list: $(javax_print_event_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_print_event_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/print/event.list
+       echo $(srcdir)/classpath/lib/javax/print/event/*.class > javax/print/event.list
 
 -include javax/print/event.deps
 
+javax-rmi.lo: $(javax_rmi_source_files)
+       @find $(srcdir)/classpath/lib/javax/rmi -name '*.class' > 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)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_security_auth_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/auth.list
+       echo $(srcdir)/classpath/lib/javax/security/auth/*.class > javax/security/auth.list
 
 -include javax/security/auth.deps
 
 javax/security/auth/callback.list: $(javax_security_auth_callback_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_security_auth_callback_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/auth/callback.list
+       echo $(srcdir)/classpath/lib/javax/security/auth/callback/*.class > javax/security/auth/callback.list
 
 -include javax/security/auth/callback.deps
 
+javax/security/auth/kerberos.list: $(javax_security_auth_kerberos_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/security/auth/kerberos/*.class > 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 \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/auth/login.list
+       echo $(srcdir)/classpath/lib/javax/security/auth/login/*.class > javax/security/auth/login.list
 
 -include javax/security/auth/login.deps
 
 javax/security/auth/spi.list: $(javax_security_auth_spi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_security_auth_spi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/auth/spi.list
+       echo $(srcdir)/classpath/lib/javax/security/auth/spi/*.class > javax/security/auth/spi.list
 
 -include javax/security/auth/spi.deps
 
 javax/security/auth/x500.list: $(javax_security_auth_x500_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_security_auth_x500_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/auth/x500.list
+       echo $(srcdir)/classpath/lib/javax/security/auth/x500/*.class > javax/security/auth/x500.list
 
 -include javax/security/auth/x500.deps
 
 javax/security/cert.list: $(javax_security_cert_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_security_cert_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/cert.list
+       echo $(srcdir)/classpath/lib/javax/security/cert/*.class > javax/security/cert.list
 
 -include javax/security/cert.deps
 
 javax/security/sasl.list: $(javax_security_sasl_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_security_sasl_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/sasl.list
+       echo $(srcdir)/classpath/lib/javax/security/sasl/*.class > javax/security/sasl.list
 
 -include javax/security/sasl.deps
 
+javax/sound/midi.list: $(javax_sound_midi_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/sound/midi/*.class > javax/sound/midi.list
+
+-include javax/sound/midi.deps
+
+javax/sound/midi/spi.list: $(javax_sound_midi_spi_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/sound/midi/spi/*.class > javax/sound/midi/spi.list
+
+-include javax/sound/midi/spi.deps
+
+javax/sound/sampled.list: $(javax_sound_sampled_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/sound/sampled/*.class > javax/sound/sampled.list
+
+-include javax/sound/sampled.deps
+
+javax/sound/sampled/spi.list: $(javax_sound_sampled_spi_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/sound/sampled/spi/*.class > javax/sound/sampled/spi.list
+
+-include javax/sound/sampled/spi.deps
+
 javax/sql.list: $(javax_sql_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_sql_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/sql.list
+       echo $(srcdir)/classpath/lib/javax/sql/*.class > javax/sql.list
 
 -include javax/sql.deps
 
 javax/swing.list: $(javax_swing_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing.list
+       echo $(srcdir)/classpath/lib/javax/swing/*.class > javax/swing.list
 
 -include javax/swing.deps
 
 javax/swing/border.list: $(javax_swing_border_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_border_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/border.list
+       echo $(srcdir)/classpath/lib/javax/swing/border/*.class > javax/swing/border.list
 
 -include javax/swing/border.deps
 
 javax/swing/colorchooser.list: $(javax_swing_colorchooser_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_colorchooser_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/colorchooser.list
+       echo $(srcdir)/classpath/lib/javax/swing/colorchooser/*.class > javax/swing/colorchooser.list
 
 -include javax/swing/colorchooser.deps
 
 javax/swing/event.list: $(javax_swing_event_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_event_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/event.list
+       echo $(srcdir)/classpath/lib/javax/swing/event/*.class > javax/swing/event.list
 
 -include javax/swing/event.deps
 
 javax/swing/filechooser.list: $(javax_swing_filechooser_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_filechooser_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/filechooser.list
+       echo $(srcdir)/classpath/lib/javax/swing/filechooser/*.class > javax/swing/filechooser.list
 
 -include javax/swing/filechooser.deps
 
 javax/swing/plaf.list: $(javax_swing_plaf_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_plaf_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/plaf.list
+       echo $(srcdir)/classpath/lib/javax/swing/plaf/*.class > javax/swing/plaf.list
 
 -include javax/swing/plaf.deps
 
 javax/swing/plaf/basic.list: $(javax_swing_plaf_basic_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_plaf_basic_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/plaf/basic.list
+       echo $(srcdir)/classpath/lib/javax/swing/plaf/basic/*.class > javax/swing/plaf/basic.list
 
 -include javax/swing/plaf/basic.deps
 
 javax/swing/plaf/metal.list: $(javax_swing_plaf_metal_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_plaf_metal_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/plaf/metal.list
+       echo $(srcdir)/classpath/lib/javax/swing/plaf/metal/*.class > javax/swing/plaf/metal.list
 
 -include javax/swing/plaf/metal.deps
 
+javax/swing/plaf/multi.list: $(javax_swing_plaf_multi_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/swing/plaf/multi/*.class > javax/swing/plaf/multi.list
+
+-include javax/swing/plaf/multi.deps
+
+javax/swing/plaf/synth.list: $(javax_swing_plaf_synth_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/swing/plaf/synth/*.class > 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 \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/table.list
+       echo $(srcdir)/classpath/lib/javax/swing/table/*.class > javax/swing/table.list
 
 -include javax/swing/table.deps
 
 javax/swing/text.list: $(javax_swing_text_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_text_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/text.list
+       echo $(srcdir)/classpath/lib/javax/swing/text/*.class > javax/swing/text.list
 
 -include javax/swing/text.deps
 
 javax/swing/text/html.list: $(javax_swing_text_html_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_text_html_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/text/html.list
+       echo $(srcdir)/classpath/lib/javax/swing/text/html/*.class > javax/swing/text/html.list
 
 -include javax/swing/text/html.deps
 
 javax/swing/text/html/parser.list: $(javax_swing_text_html_parser_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_text_html_parser_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/text/html/parser.list
+       echo $(srcdir)/classpath/lib/javax/swing/text/html/parser/*.class > javax/swing/text/html/parser.list
 
 -include javax/swing/text/html/parser.deps
 
 javax/swing/text/rtf.list: $(javax_swing_text_rtf_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_text_rtf_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/text/rtf.list
+       echo $(srcdir)/classpath/lib/javax/swing/text/rtf/*.class > javax/swing/text/rtf.list
 
 -include javax/swing/text/rtf.deps
 
 javax/swing/tree.list: $(javax_swing_tree_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_tree_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/tree.list
+       echo $(srcdir)/classpath/lib/javax/swing/tree/*.class > javax/swing/tree.list
 
 -include javax/swing/tree.deps
 
 javax/swing/undo.list: $(javax_swing_undo_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_undo_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/undo.list
+       echo $(srcdir)/classpath/lib/javax/swing/undo/*.class > javax/swing/undo.list
 
 -include javax/swing/undo.deps
 
 javax/transaction.list: $(javax_transaction_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_transaction_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/transaction.list
+       echo $(srcdir)/classpath/lib/javax/transaction/*.class > javax/transaction.list
 
 -include javax/transaction.deps
 
 javax/transaction/xa.list: $(javax_transaction_xa_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_transaction_xa_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/transaction/xa.list
+       echo $(srcdir)/classpath/lib/javax/transaction/xa/*.class > javax/transaction/xa.list
 
 -include javax/transaction/xa.deps
 
 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
+       @find $(srcdir)/classpath/lib/javax/xml -name '*.class' > 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)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(org_ietf_jgss_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > org/ietf/jgss.list
+       echo $(srcdir)/classpath/lib/org/ietf/jgss/*.class > org/ietf/jgss.list
 
 -include org/ietf/jgss.deps
 
+org-omg.lo: $(org_omg_source_files)
+       @find $(srcdir)/classpath/lib/org/omg -name '*.class' > 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 $(srcdir)/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
+       @find $(srcdir)/classpath/lib/org/w3c -name '*.class' > 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
+       @find $(srcdir)/classpath/lib/org/xml -name '*.class' > 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
-       name=`echo $< | sed -e 's/\.class$$//' -e 's,classpath/lib/,,'`; \
-       $(mkinstalldirs) `dirname $$name`; \
-       $(GCJH) -d . -classpath '' -bootclasspath classpath/lib $$name
-
-java/lang/ClassLoader.h: classpath/lib/java/lang/ClassLoader.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-               -prepend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \
-               -prepend 'void _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \
-               -friend 'jclass (::_Jv_FindClass) (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \
-               -friend 'void ::_Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \
-               java/lang/ClassLoader
-
-java/lang/Thread.h: classpath/lib/java/lang/Thread.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-               -prepend 'class _Jv_JNIEnv;' \
-               -prepend '#define _JV_NOT_OWNER 1' \
-               -prepend '#define _JV_INTERRUPTED 2' \
-               -prepend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \
-               -prepend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
-               -prepend 'void _Jv_ThreadRun (java::lang::Thread* thread);' \
-               -prepend 'jint _Jv_AttachCurrentThread(java::lang::Thread* thread);' \
-               -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 ();' \
-               -friend '_Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();' \
-               -friend 'void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
-               -friend 'void ::_Jv_ThreadRun (java::lang::Thread* thread);' \
-               -friend 'jint (::_Jv_AttachCurrentThread) (java::lang::Thread* thread);' \
-               -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) ();' \
-               java/lang/Thread
-
-java/lang/String.h: classpath/lib/java/lang/String.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-           -prepend 'jchar* _Jv_GetStringChars (jstring str);' \
-           -prepend 'jstring* _Jv_StringFindSlot (jchar*, jint, jint);' \
-           -prepend 'jstring* _Jv_StringGetSlot (jstring);' \
-           -prepend 'jstring _Jv_NewStringUtf8Const (_Jv_Utf8Const* str);' \
-           -prepend 'jstring _Jv_NewStringLatin1 (const char*, jsize);' \
-           -prepend 'jstring _Jv_AllocString (jsize);' \
-           -friend 'jchar* ::_Jv_GetStringChars (jstring str);' \
-           -friend 'jstring* ::_Jv_StringFindSlot (jchar*, jint, jint);' \
-           -friend 'jstring* ::_Jv_StringGetSlot (jstring);' \
-           -friend 'jstring (::_Jv_NewStringUtf8Const) (_Jv_Utf8Const* str);' \
-           -friend 'jstring (::_Jv_NewStringLatin1) (const char*, jsize);' \
-           -friend 'jstring (::_Jv_AllocString) (jsize);' \
-           java/lang/String
-
-java/lang/reflect/Constructor.h: classpath/lib/java/lang/reflect/Constructor.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-           -prepend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \
-           -prepend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-           -friend 'jmethodID (::_Jv_FromReflectedConstructor) (java::lang::reflect::Constructor *);' \
-           -friend 'jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-           -friend 'class java::lang::Class;' \
-           java/lang/reflect/Constructor
-
-java/lang/reflect/Field.h: classpath/lib/java/lang/reflect/Field.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-           -prepend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \
-           -prepend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
-           -friend 'jfieldID (::_Jv_FromReflectedField) (java::lang::reflect::Field *);' \
-           -friend 'jobject (::_Jv_JNI_ToReflectedField) (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
-           -friend 'class java::lang::Class;' \
-           java/lang/reflect/Field
-
-java/lang/reflect/Method.h: classpath/lib/java/lang/reflect/Method.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-           -prepend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \
-           -prepend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-           -friend 'jmethodID (::_Jv_FromReflectedMethod) (java::lang::reflect::Method *);' \
-           -friend 'jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-           -friend 'class java::lang::Class;' \
-           -friend 'class java::io::ObjectInputStream;' \
-           java/lang/reflect/Method
-
-java/lang/reflect/Proxy.h: classpath/lib/java/lang/reflect/Proxy.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-           java/lang/reflect/Proxy
-
-java/lang/reflect/Proxy$$ProxyData.h: classpath/lib/java/lang/reflect/Proxy.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/lang/reflect/Proxy$$ProxyData'
-
-java/lang/reflect/Proxy$$ProxyType.h: classpath/lib/java/lang/reflect/Proxy.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/lang/reflect/Proxy$$ProxyType'
-
-gnu/gcj/runtime/ExtensionClassLoader.h: classpath/lib/gnu/gcj/runtime/ExtensionClassLoader.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-           -friend 'class ::java::lang::ClassLoader;' \
-           gnu/gcj/runtime/ExtensionClassLoader
-
-java/io/ObjectInputStream$$GetField.h: classpath/lib/java/io/ObjectInputStream.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/io/ObjectInputStream$$GetField'
-
-java/io/ObjectOutputStream$$PutField.h: classpath/lib/java/io/ObjectOutputStream.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/io/ObjectOutputStream$$PutField'
-
-java/nio/DirectByteBufferImpl$$ReadWrite.h: classpath/lib/java/nio/DirectByteBufferImpl.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/nio/DirectByteBufferImpl$$ReadWrite'
-
-java/nio/channels/Pipe$$SinkChannel.h: classpath/lib/java/nio/channels/Pipe.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/nio/channels/Pipe$$SinkChannel'
-
-java/nio/channels/Pipe$$SourceChannel.h: classpath/lib/java/nio/channels/Pipe.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/nio/channels/Pipe$$SourceChannel'
-
-gnu/java/net/PlainSocketImpl$$SocketInputStream.h: classpath/lib/gnu/java/net/PlainSocketImpl.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'gnu/java/net/PlainSocketImpl$$SocketInputStream'
-
-gnu/java/net/PlainSocketImpl$$SocketOutputStream.h: classpath/lib/gnu/java/net/PlainSocketImpl.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'gnu/java/net/PlainSocketImpl$$SocketOutputStream'
-
-gnu/java/nio/PipeImpl$$SinkChannelImpl.h: classpath/lib/gnu/java/nio/PipeImpl.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'gnu/java/nio/PipeImpl$$SinkChannelImpl'
-
-gnu/java/nio/PipeImpl$$SourceChannelImpl.h: classpath/lib/gnu/java/nio/PipeImpl.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'gnu/java/nio/PipeImpl$$SourceChannelImpl'
-
-java/lang/ConcreteProcess$$ProcessManager.h: classpath/lib/java/lang/ConcreteProcess.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/lang/ConcreteProcess$$ProcessManager'
+sun/misc.list: $(sun_misc_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/sun/misc/*.class > sun/misc.list
+
+-include sun/misc.deps
+
+sun/reflect.list: $(sun_reflect_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/sun/reflect/*.class > sun/reflect.list
+
+-include sun/reflect.deps
+
+sun/reflect/annotation.list: $(sun_reflect_annotation_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/sun/reflect/annotation/*.class > sun/reflect/annotation.list
+
+-include sun/reflect/annotation.deps
+
+sun/reflect/misc.list: $(sun_reflect_misc_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/sun/reflect/misc/*.class > sun/reflect/misc.list
+
+-include sun/reflect/misc.deps
+
+java/process-Ecos.list: java/lang/EcosProcess.java
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/lang/EcosProcess*.class > java/process-Ecos.list
+
+-include java/process-Ecos.deps
+
+java/process-Win32.list: java/lang/Win32Process.java
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/lang/Win32Process*.class > java/process-Win32.list
+
+-include java/process-Win32.deps
+
+java/process-Posix.list: java/lang/PosixProcess.java
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/lang/PosixProcess*.class > java/process-Posix.list
+
+-include java/process-Posix.deps
+
+$(generic_header_files): gcjh.stamp
+
+gcjh.stamp: classpath/lib/compile-classes
+@JAVA_MAINTAINER_MODE_TRUE@    $(MYGCJH) --cni --all $(srcdir)/classpath/lib \
+@JAVA_MAINTAINER_MODE_TRUE@        --cmdfile=$(srcdir)/headers.txt -d $(srcdir) --force
+       echo > gcjh.stamp
 
 $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h:
        @:
 
+install-exec-hook: install-toolexeclibLTLIBRARIES install-libexecsubPROGRAMS
+@USE_LIBGCJ_BC_TRUE@   @echo Installing dummy lib libgcj_bc.so.1.0.0; \
+@USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
+@USE_LIBGCJ_BC_TRUE@   mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
+@USE_LIBGCJ_BC_TRUE@   $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
+@USE_LIBGCJ_BC_TRUE@   -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
+@USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
+@USE_LIBGCJ_BC_TRUE@   $(LN_S) libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
+@USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.la;
+@BUILD_ECJ1_TRUE@@NATIVE_TRUE@ mv $(DESTDIR)$(libexecsubdir)/ecjx$(EXEEXT) $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
+@BUILD_ECJ1_TRUE@@NATIVE_FALSE@        mv $(DESTDIR)$(libexecsubdir)/$(target_noncanonical)-ecjx$(EXEEXT) $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
+
 install-data-local:
        $(PRE_INSTALL)
+       @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
+       file="libgcj-$${pc_version}.pc"; \
+       $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
+       echo "  $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
+       $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file
        @echo Creating list of headers to install...
        @: $(call write_entries_to_file,$(nat_headers_install) $(extra_headers),tmp-ilist)
        @cat tmp-ilist | while read f; do \
@@ -7968,22 +11554,16 @@ install-data-local:
          $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f; \
        done
        -@rm -f tmp-ilist
-       $(mkinstalldirs) $(DESTDIR)$(secdir)
-       @for f in classpath.security libgcj.security; do \
-         echo " $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f"; \
-         $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f; \
-       done
-       $(INSTALL_DATA) $(srcdir)/java/util/logging/logging.properties $(DESTDIR)$(propdir)/logging.properties
-       $(INSTALL_DATA) 'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
-       $(INSTALL_DATA) 'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
-       $(INSTALL_DATA) 'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/
-       $(INSTALL_DATA) 'java/nio/channels/Pipe$$SourceChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/
-       $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/
-       $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/
-       $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/
-       $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/
-       $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/
-       $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/
+       $(INSTALL_DATA) $(srcdir)/'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
+       $(INSTALL_DATA) $(srcdir)/'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
+       $(INSTALL_DATA) $(srcdir)/'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/
+       $(INSTALL_DATA) $(srcdir)/'java/nio/channels/Pipe$$SourceChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/
+       $(INSTALL_DATA) $(srcdir)/'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/
+       $(INSTALL_DATA) $(srcdir)/'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/
+       $(INSTALL_DATA) $(srcdir)/'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/
+       $(INSTALL_DATA) $(srcdir)/'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/
+       $(INSTALL_DATA) $(srcdir)/'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/
+       $(INSTALL_DATA) $(srcdir)/'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/
 
 maintainer-check: libgcj.la
        $(NM) .libs/libgcj.a | grep ' T ' \
@@ -8055,15 +11635,55 @@ write-entries-to-file-check:
 src.zip:
        -rm -f src.zip
        here=`pwd`; \
-       ( ( cd $(srcdir); \
-         find java gnu javax org -name '*.java' -print | \
+       ( \
+         ( cd $(srcdir)/classpath; \
+         find java gnu javax org sun -name '*.java' -print | \
+         while read file; do \
+           echo "x-C" | sed -e 's/^.//'; \
+           echo $(srcdir)/classpath; \
+           echo $$file; \
+         done ); \
+         ( cd $(srcdir)/classpath/external/sax; \
+         find org -name '*.java' -print | \
+         while read file; do \
+           echo "x-C" | sed -e 's/^.//'; \
+           echo $(srcdir)/classpath/external/sax; \
+           echo $$file; \
+         done ); \
+         ( cd $(srcdir)/classpath/external/relaxngDatatype; \
+         find org -name '*.java' -print | \
+         while read file; do \
+           echo "x-C" | sed -e 's/^.//'; \
+           echo $(srcdir)/classpath/external/relaxngDatatype; \
+           echo $$file; \
+         done ); \
+         ( cd $(srcdir)/classpath/external/w3c_dom; \
+         find org -name '*.java' -print | \
+         while read file; do \
+           echo "x-C" | sed -e 's/^.//'; \
+           echo $(srcdir)/classpath/external/w3c_dom; \
+           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
@@ -8078,6 +11698,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 \