OSDN Git Service

* c-typeck.c (c_begin_vm_scope): Fix file_scope processing.
[pf3gnuchains/gcc-fork.git] / libjava / Makefile.in
index 3089e17..e17fd0a 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) $(lib_gnu_java_awt_peer_qt_la_SOURCES) $(libgcj_la_SOURCES) $(libgcjawt_la_SOURCES) $(libgij_la_SOURCES) $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -44,20 +42,19 @@ host_triplet = @host@
 target_triplet = @target@
 @TESTSUBDIR_TRUE@am__append_1 = testsuite
 @XLIB_AWT_TRUE@am__append_2 = lib-gnu-awt-xlib.la
-@GTK_AWT_TRUE@am__append_3 = lib-gnu-java-awt-peer-gtk.la libgcjawt.la
-@QT_AWT_TRUE@am__append_4 = lib-gnu-java-awt-peer-qt.la
 @NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \
 @NATIVE_TRUE@  grmic$(EXEEXT) grmiregistry$(EXEEXT) \
 @NATIVE_TRUE@  gcj-dbtool$(EXEEXT)
-@USING_GCC_TRUE@am__append_5 = $(WARNINGS)
-@USING_BOEHMGC_TRUE@am__append_6 = boehm.cc
-@USING_NOGC_TRUE@am__append_7 = nogc.cc
-@USING_POSIX_PLATFORM_TRUE@am__append_8 = posix.cc
-@USING_WIN32_PLATFORM_TRUE@am__append_9 = win32.cc
-@USING_DARWIN_CRT_TRUE@am__append_10 = darwin.cc
-@USING_POSIX_THREADS_TRUE@am__append_11 = posix-threads.cc
-@USING_WIN32_THREADS_TRUE@am__append_12 = win32-threads.cc
-@USING_NO_THREADS_TRUE@am__append_13 = no-threads.cc
+@BASH_JAR_TRUE@am__append_3 = scripts/jar
+@USING_GCC_TRUE@am__append_4 = $(WARNINGS)
+@USING_BOEHMGC_TRUE@am__append_5 = boehm.cc
+@USING_NOGC_TRUE@am__append_6 = nogc.cc
+@USING_POSIX_PLATFORM_TRUE@am__append_7 = posix.cc
+@USING_WIN32_PLATFORM_TRUE@am__append_8 = win32.cc
+@USING_DARWIN_CRT_TRUE@am__append_9 = darwin.cc
+@USING_POSIX_THREADS_TRUE@am__append_10 = posix-threads.cc
+@USING_WIN32_THREADS_TRUE@am__append_11 = win32-threads.cc
+@USING_NO_THREADS_TRUE@am__append_12 = no-threads.cc
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
        $(srcdir)/../config.guess $(srcdir)/../config.sub \
        $(srcdir)/../depcomp $(srcdir)/../install-sh \
@@ -65,11 +62,11 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
        $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(srcdir)/libgcj-test.spec.in \
        $(srcdir)/libgcj.pc.in $(srcdir)/libgcj.spec.in \
-       $(srcdir)/sources.am $(top_srcdir)/configure COPYING ChangeLog \
-       NEWS THANKS
+       $(srcdir)/sources.am $(top_srcdir)/configure \
+       $(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@noinst_PROGRAMS =  \
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gen-from-JIS$(EXEEXT)
-@XLIB_AWT_TRUE@am__append_14 = $(xlib_nat_headers)
+@XLIB_AWT_TRUE@am__append_13 = $(xlib_nat_headers)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
@@ -93,7 +90,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 CONFIG_HEADER = $(top_builddir)/include/config.h \
        $(top_builddir)/gcj/libgcj-config.h
 CONFIG_CLEAN_FILES = libgcj.pc libgcj.spec libgcj-test.spec \
-       java/io/natFile.cc java/lang/ConcreteProcess.java \
+       scripts/jar java/io/natFile.cc java/lang/ConcreteProcess.java \
        java/lang/natConcreteProcess.cc java/net/natInetAddress.cc \
        java/net/natVMNetworkInterface.cc \
        gnu/java/net/natPlainSocketImpl.cc \
@@ -137,18 +134,7 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo \
 am_lib_gnu_awt_xlib_la_OBJECTS = $(am__objects_1)
 lib_gnu_awt_xlib_la_OBJECTS = $(am_lib_gnu_awt_xlib_la_OBJECTS)
 @XLIB_AWT_TRUE@am_lib_gnu_awt_xlib_la_rpath = -rpath $(toolexeclibdir)
-am__DEPENDENCIES_1 =
-am_lib_gnu_java_awt_peer_gtk_la_OBJECTS =
-lib_gnu_java_awt_peer_gtk_la_OBJECTS =  \
-       $(am_lib_gnu_java_awt_peer_gtk_la_OBJECTS)
-@GTK_AWT_TRUE@am_lib_gnu_java_awt_peer_gtk_la_rpath = -rpath \
-@GTK_AWT_TRUE@ $(toolexeclibdir)
-am_lib_gnu_java_awt_peer_qt_la_OBJECTS =
-lib_gnu_java_awt_peer_qt_la_OBJECTS =  \
-       $(am_lib_gnu_java_awt_peer_qt_la_OBJECTS)
-@QT_AWT_TRUE@am_lib_gnu_java_awt_peer_qt_la_rpath = -rpath \
-@QT_AWT_TRUE@  $(toolexeclibdir)
-am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
+am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
        gnu/classpath/debug.lo gnu/classpath/jdwp.lo \
        gnu/classpath/jdwp/event.lo \
        gnu/classpath/jdwp/event/filters.lo \
@@ -157,25 +143,31 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
        gnu/classpath/jdwp/transport.lo gnu/classpath/jdwp/util.lo \
        gnu/gcj.lo gnu/gcj/convert.lo gnu/gcj/io.lo gnu/gcj/runtime.lo \
        gnu/gcj/util.lo gnu/java/awt.lo gnu/java/awt/color.lo \
-       gnu/java/awt/image.lo gnu/java/awt/peer.lo gnu/java/io.lo \
-       gnu/java/lang.lo gnu/java/lang/reflect.lo gnu/java/locale.lo \
-       gnu/java/math.lo gnu/java/net.lo gnu/java/net/protocol/file.lo \
-       gnu/java/net/protocol/ftp.lo gnu/java/net/protocol/http.lo \
-       gnu/java/net/protocol/https.lo gnu/java/net/protocol/jar.lo \
-       gnu/java/nio.lo gnu/java/nio/channels.lo \
-       gnu/java/nio/charset.lo gnu/java/rmi.lo gnu/java/rmi/dgc.lo \
-       gnu/java/rmi/registry.lo gnu/java/rmi/server.lo \
-       gnu/java/security.lo gnu/java/security/action.lo \
-       gnu/java/security/ber.lo gnu/java/security/der.lo \
-       gnu/java/security/hash.lo gnu/java/security/jce/hash.lo \
-       gnu/java/security/jce/prng.lo gnu/java/security/jce/sig.lo \
-       gnu/java/security/key.lo gnu/java/security/key/dss.lo \
-       gnu/java/security/key/rsa.lo gnu/java/security/pkcs.lo \
-       gnu/java/security/prng.lo gnu/java/security/provider.lo \
-       gnu/java/security/sig.lo gnu/java/security/sig/dss.lo \
-       gnu/java/security/sig/rsa.lo gnu/java/security/util.lo \
-       gnu/java/security/x509.lo gnu/java/security/x509/ext.lo \
-       gnu/java/text.lo gnu/java/util.lo gnu/java/util/prefs.lo \
+       gnu/java/awt/font.lo gnu/java/awt/font/opentype.lo \
+       gnu/java/awt/font/opentype/truetype.lo gnu/java/awt/image.lo \
+       gnu/java/awt/java2d.lo gnu/java/awt/peer.lo \
+       gnu/java/awt/print.lo gnu/java/io.lo gnu/java/lang.lo \
+       gnu/java/lang/reflect.lo gnu/java/locale.lo gnu/java/math.lo \
+       gnu/java/net.lo gnu/java/net/local.lo \
+       gnu/java/net/protocol/core.lo gnu/java/net/protocol/file.lo \
+       gnu/java/net/protocol/ftp.lo gnu/java/net/protocol/gcjlib.lo \
+       gnu/java/net/protocol/http.lo gnu/java/net/protocol/https.lo \
+       gnu/java/net/protocol/jar.lo gnu/java/nio.lo \
+       gnu/java/nio/channels.lo gnu/java/nio/charset.lo \
+       gnu/java/rmi.lo gnu/java/rmi/activation.lo gnu/java/rmi/dgc.lo \
+       gnu/java/rmi/registry.lo gnu/java/rmi/rmic.lo \
+       gnu/java/rmi/server.lo gnu/java/security.lo \
+       gnu/java/security/action.lo gnu/java/security/ber.lo \
+       gnu/java/security/der.lo gnu/java/security/hash.lo \
+       gnu/java/security/jce/hash.lo gnu/java/security/jce/prng.lo \
+       gnu/java/security/jce/sig.lo gnu/java/security/key.lo \
+       gnu/java/security/key/dss.lo gnu/java/security/key/rsa.lo \
+       gnu/java/security/pkcs.lo gnu/java/security/prng.lo \
+       gnu/java/security/provider.lo gnu/java/security/sig.lo \
+       gnu/java/security/sig/dss.lo gnu/java/security/sig/rsa.lo \
+       gnu/java/security/util.lo gnu/java/security/x509.lo \
+       gnu/java/security/x509/ext.lo gnu/java/text.lo \
+       gnu/java/util.lo gnu/java/util/jar.lo gnu/java/util/prefs.lo \
        gnu/javax/crypto.lo gnu/javax/crypto/assembly.lo \
        gnu/javax/crypto/cipher.lo gnu/javax/crypto/jce.lo \
        gnu/javax/crypto/jce/cipher.lo gnu/javax/crypto/jce/key.lo \
@@ -190,56 +182,67 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
        gnu/javax/crypto/sasl/crammd5.lo \
        gnu/javax/crypto/sasl/plain.lo gnu/javax/crypto/sasl/srp.lo \
        gnu/javax/imageio/bmp.lo gnu/javax/net/ssl.lo \
-       gnu/javax/net/ssl/provider.lo gnu/javax/security/auth.lo \
-       gnu/javax/security/auth/callback.lo \
-       gnu/javax/security/auth/login.lo \
+       gnu/javax/net/ssl/provider.lo gnu/javax/print.lo \
+       gnu/javax/print/ipp.lo gnu/javax/print/ipp/attribute.lo \
+       gnu/javax/print/ipp/attribute/defaults.lo \
+       gnu/javax/print/ipp/attribute/job.lo \
+       gnu/javax/print/ipp/attribute/printer.lo \
+       gnu/javax/print/ipp/attribute/supported.lo \
+       gnu/javax/security/auth.lo gnu/javax/security/auth/callback.lo \
+       gnu/javax/security/auth/login.lo gnu/javax/swing/plaf/gnu.lo \
+       gnu/javax/swing/plaf/metal.lo gnu/javax/swing/text/html.lo \
        gnu/javax/swing/text/html/parser.lo \
        gnu/javax/swing/text/html/parser/models.lo \
        gnu/javax/swing/text/html/parser/support.lo \
-       gnu/javax/swing/text/html/parser/support/low.lo gnu/regexp.lo \
-       java/applet.lo java/awt.lo java/awt/color.lo \
-       java/awt/datatransfer.lo java/awt/dnd.lo java/awt/dnd/peer.lo \
-       java/awt/event.lo java/awt/font.lo java/awt/geom.lo \
-       java/awt/im.lo java/awt/im/spi.lo java/awt/image.lo \
+       gnu/javax/swing/text/html/parser/support/low.lo \
+       gnu/javax/swing/tree.lo gnu/regexp.lo java/applet.lo \
+       java/awt.lo java/awt/color.lo java/awt/datatransfer.lo \
+       java/awt/dnd.lo java/awt/dnd/peer.lo java/awt/event.lo \
+       java/awt/font.lo java/awt/geom.lo java/awt/im.lo \
+       java/awt/im/spi.lo java/awt/image.lo \
        java/awt/image/renderable.lo java/awt/peer.lo \
        java/awt/print.lo java/beans.lo java/beans/beancontext.lo \
        java/io.lo java/lang.lo java/lang/annotation.lo \
-       java/lang/ref.lo java/lang/reflect.lo java/math.lo java/net.lo \
-       java/nio.lo java/nio/channels.lo java/nio/channels/spi.lo \
-       java/nio/charset.lo java/nio/charset/spi.lo java/rmi.lo \
-       java/rmi/activation.lo java/rmi/dgc.lo java/rmi/registry.lo \
-       java/rmi/server.lo java/security.lo java/security/acl.lo \
-       java/security/cert.lo java/security/interfaces.lo \
-       java/security/spec.lo java/sql.lo java/text.lo java/util.lo \
-       java/util/jar.lo java/util/logging.lo java/util/prefs.lo \
-       java/util/regex.lo java/util/zip.lo javax/accessibility.lo \
-       javax/crypto.lo javax/crypto/interfaces.lo \
-       javax/crypto/spec.lo javax/management.lo javax/naming.lo \
-       javax/naming/directory.lo javax/naming/event.lo \
-       javax/naming/ldap.lo javax/naming/spi.lo javax/net.lo \
-       javax/net/ssl.lo javax/print.lo javax/print/attribute.lo \
-       javax/print/attribute/standard.lo javax/print/event.lo \
-       javax/security/auth.lo javax/security/auth/callback.lo \
-       javax/security/auth/login.lo javax/security/auth/spi.lo \
-       javax/security/auth/x500.lo javax/security/cert.lo \
-       javax/security/sasl.lo javax/sound/midi.lo \
-       javax/sound/midi/spi.lo javax/sound/sampled.lo \
-       javax/sound/sampled/spi.lo javax/sql.lo javax/swing.lo \
-       javax/swing/border.lo javax/swing/colorchooser.lo \
-       javax/swing/event.lo javax/swing/filechooser.lo \
-       javax/swing/plaf.lo javax/swing/plaf/basic.lo \
-       javax/swing/plaf/metal.lo javax/swing/plaf/multi.lo \
-       javax/swing/plaf/synth.lo javax/swing/table.lo \
-       javax/swing/text.lo javax/swing/text/html.lo \
-       javax/swing/text/html/parser.lo javax/swing/text/rtf.lo \
-       javax/swing/tree.lo javax/swing/undo.lo javax/transaction.lo \
+       java/lang/instrument.lo java/lang/ref.lo java/lang/reflect.lo \
+       java/math.lo java/net.lo java/nio.lo java/nio/channels.lo \
+       java/nio/channels/spi.lo java/nio/charset.lo \
+       java/nio/charset/spi.lo java/rmi.lo java/rmi/activation.lo \
+       java/rmi/dgc.lo java/rmi/registry.lo java/rmi/server.lo \
+       java/security.lo java/security/acl.lo java/security/cert.lo \
+       java/security/interfaces.lo java/security/spec.lo java/sql.lo \
+       java/text.lo java/util.lo java/util/jar.lo \
+       java/util/logging.lo java/util/prefs.lo java/util/regex.lo \
+       java/util/zip.lo javax/accessibility.lo javax/crypto.lo \
+       javax/crypto/interfaces.lo javax/crypto/spec.lo \
+       javax/management.lo javax/naming.lo javax/naming/directory.lo \
+       javax/naming/event.lo javax/naming/ldap.lo javax/naming/spi.lo \
+       javax/net.lo javax/net/ssl.lo javax/print.lo \
+       javax/print/attribute.lo javax/print/attribute/standard.lo \
+       javax/print/event.lo javax/security/auth.lo \
+       javax/security/auth/callback.lo \
+       javax/security/auth/kerberos.lo javax/security/auth/login.lo \
+       javax/security/auth/spi.lo javax/security/auth/x500.lo \
+       javax/security/cert.lo javax/security/sasl.lo \
+       javax/sound/midi.lo javax/sound/midi/spi.lo \
+       javax/sound/sampled.lo javax/sound/sampled/spi.lo javax/sql.lo \
+       javax/swing.lo javax/swing/border.lo \
+       javax/swing/colorchooser.lo javax/swing/event.lo \
+       javax/swing/filechooser.lo javax/swing/plaf.lo \
+       javax/swing/plaf/basic.lo javax/swing/plaf/metal.lo \
+       javax/swing/plaf/multi.lo javax/swing/plaf/synth.lo \
+       javax/swing/table.lo javax/swing/text.lo \
+       javax/swing/text/html.lo javax/swing/text/html/parser.lo \
+       javax/swing/text/rtf.lo javax/swing/tree.lo \
+       javax/swing/undo.lo javax/transaction.lo \
        javax/transaction/xa.lo org/ietf/jgss.lo
-am__DEPENDENCIES_3 = gnu-CORBA.lo gnu-java-awt-peer-swing.lo \
+am__DEPENDENCIES_2 = gnu-CORBA.lo gnu-java-awt-peer-gtk.lo \
+       gnu-java-awt-peer-qt.lo gnu-java-awt-peer-swing.lo \
        gnu-java-beans.lo gnu-javax-rmi.lo gnu-javax-sound-midi.lo \
        gnu-xml.lo javax-imageio.lo javax-rmi.lo javax-xml.lo \
        org-omg.lo org-relaxng.lo org-w3c.lo org-xml.lo
-am__DEPENDENCIES_4 = $(patsubst classpath/resource/%,%,$(addsuffix \
+am__DEPENDENCIES_3 = $(patsubst classpath/resource/%,%,$(addsuffix \
        .lo,$(property_files)))
+am__DEPENDENCIES_4 =
 am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
        stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \
        java/lang/Class.java java/lang/Object.java \
@@ -277,7 +280,7 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
        java/lang/reflect/natConstructor.cc \
        java/lang/reflect/natField.cc java/lang/reflect/natMethod.cc \
        java/net/natVMNetworkInterface.cc java/net/natInetAddress.cc \
-       java/nio/channels/natChannels.cc \
+       java/nio/channels/natVMChannels.cc \
        java/nio/natDirectByteBufferImpl.cc java/text/natCollator.cc \
        java/util/natResourceBundle.cc java/util/natVMTimeZone.cc \
        java/util/logging/natLogger.cc java/util/zip/natDeflater.cc \
@@ -318,7 +321,7 @@ am__objects_2 = gnu/classpath/natSystemProperties.lo \
        java/lang/reflect/natConstructor.lo \
        java/lang/reflect/natField.lo java/lang/reflect/natMethod.lo \
        java/net/natVMNetworkInterface.lo java/net/natInetAddress.lo \
-       java/nio/channels/natChannels.lo \
+       java/nio/channels/natVMChannels.lo \
        java/nio/natDirectByteBufferImpl.lo java/text/natCollator.lo \
        java/util/natResourceBundle.lo java/util/natVMTimeZone.lo \
        java/util/logging/natLogger.lo java/util/zip/natDeflater.lo \
@@ -338,10 +341,6 @@ am_libgcj_la_OBJECTS = prims.lo jni.lo exception.lo stacktrace.lo \
        $(am__objects_6) $(am__objects_7) $(am__objects_8) \
        $(am__objects_9) $(am__objects_10)
 libgcj_la_OBJECTS = $(am_libgcj_la_OBJECTS)
-libgcjawt_la_DEPENDENCIES = lib-gnu-java-awt-peer-gtk.la
-am_libgcjawt_la_OBJECTS = classpath/native/jawt/libgcjawt_la-jawt.lo
-libgcjawt_la_OBJECTS = $(am_libgcjawt_la_OBJECTS)
-@GTK_AWT_TRUE@am_libgcjawt_la_rpath = -rpath $(toolexeclibdir)
 am_libgij_la_OBJECTS = gij.lo
 libgij_la_OBJECTS = $(am_libgij_la_OBJECTS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -388,19 +387,15 @@ GCJCOMPILE = $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)
 LTGCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) $(AM_GCJFLAGS) \
        $(GCJFLAGS)
 GCJLD = $(GCJ)
-SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
-       $(lib_gnu_java_awt_peer_gtk_la_SOURCES) \
-       $(lib_gnu_java_awt_peer_qt_la_SOURCES) $(libgcj_la_SOURCES) \
-       $(libgcjawt_la_SOURCES) $(libgij_la_SOURCES) \
-       $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) \
-       $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
-DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
-       $(lib_gnu_java_awt_peer_gtk_la_SOURCES) \
-       $(lib_gnu_java_awt_peer_qt_la_SOURCES) \
-       $(am__libgcj_la_SOURCES_DIST) $(libgcjawt_la_SOURCES) \
+SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(libgcj_la_SOURCES) \
        $(libgij_la_SOURCES) $(gcj_dbtool_SOURCES) \
-       $(am__gen_from_JIS_SOURCES_DIST) $(gij_SOURCES) \
-       $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
+       $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) \
+       $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
+DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
+       $(am__libgcj_la_SOURCES_DIST) $(libgij_la_SOURCES) \
+       $(gcj_dbtool_SOURCES) $(am__gen_from_JIS_SOURCES_DIST) \
+       $(gij_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) \
+       $(jv_convert_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        html-recursive info-recursive install-data-recursive \
        install-exec-recursive install-info-recursive \
@@ -439,6 +434,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BACKTRACESPEC = @BACKTRACESPEC@
+BASH_JAR_FALSE = @BASH_JAR_FALSE@
+BASH_JAR_TRUE = @BASH_JAR_TRUE@
 CAIRO_CFLAGS = @CAIRO_CFLAGS@
 CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
@@ -476,8 +473,6 @@ GCSPEC = @GCSPEC@
 GCTESTSPEC = @GCTESTSPEC@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
-GTK_AWT_FALSE = @GTK_AWT_FALSE@
-GTK_AWT_TRUE = @GTK_AWT_TRUE@
 GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
 GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -538,8 +533,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_INNER_NAT_HDRS = @PLATFORM_INNER_NAT_HDRS@
-QT_AWT_FALSE = @QT_AWT_FALSE@
-QT_AWT_TRUE = @QT_AWT_TRUE@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -556,6 +549,7 @@ THREADLDFLAGS = @THREADLDFLAGS@
 THREADLIBS = @THREADLIBS@
 THREADSPEC = @THREADSPEC@
 TOOLKIT = @TOOLKIT@
+UNZIP = @UNZIP@
 USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
 USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@
 USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@
@@ -582,6 +576,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 ZINCS = @ZINCS@
+ZIP = @ZIP@
 ZLIBS = @ZLIBS@
 ZLIBSPEC = @ZLIBSPEC@
 ZLIBTESTSPEC = @ZLIBTESTSPEC@
@@ -671,8 +666,7 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach o
 
 # This is required by TL_AC_GXX_INCLUDE_DIR.
 libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
-toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) \
-       $(am__append_3) $(am__append_4)
+toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2)
 toolexecmainlib_DATA = libgcj.spec
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgcj.pc
@@ -687,7 +681,7 @@ propdir = $(libdir)
 db_name = classmap.db
 db_pathtail = gcj-$(gcc_version)/$(db_name)
 @NATIVE_TRUE@dbexec_DATA = $(db_name)
-bin_SCRIPTS = addr2name.awk
+bin_SCRIPTS = addr2name.awk $(am__append_3)
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
 GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
           $(LDFLAGS) -o $@
@@ -713,6 +707,8 @@ AM_CXXFLAGS = \
         -DBOOT_CLASS_PATH="\"$(BOOT_CLASS_PATH_DIR)\"" \
        -DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \
        -DGCJ_ENDORSED_DIRS="\"$(jardir)/gcj-endorsed\"" \
+       -DGCJ_VERSIONED_LIBDIR="\"$(libdir)/gcj-$(gcc_version)\"" \
+       -DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
        -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
        -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \
        -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\""
@@ -723,7 +719,7 @@ AM_GCJFLAGS = \
        --encoding=UTF-8 \
        -Wno-deprecated -fbootstrap-classes
 
-AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_5)
+AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_4)
 PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long
 JCFLAGS = -g
 JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
@@ -747,10 +743,10 @@ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
 
 libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \
        defineclass.cc interpret.cc verify.cc java/lang/Class.java \
-       java/lang/Object.java $(nat_source_files) $(am__append_6) \
-       $(am__append_7) $(am__append_8) $(am__append_9) \
-       $(am__append_10) $(am__append_11) $(am__append_12) \
-       $(am__append_13)
+       java/lang/Object.java $(nat_source_files) $(am__append_5) \
+       $(am__append_6) $(am__append_7) $(am__append_8) \
+       $(am__append_9) $(am__append_10) $(am__append_11) \
+       $(am__append_12)
 nat_files = $(nat_source_files:.cc=.lo)
 xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
 
@@ -772,43 +768,6 @@ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
        $(LIBLTDL) $(libgcj_la_LIBADD)
 
 libgcj_la_LINK = $(LIBLINK)
-lib_gnu_java_awt_peer_gtk_la_SOURCES = 
-lib_gnu_java_awt_peer_gtk_la_LIBADD = \
-       gnu-java-awt-peer-gtk.lo \
-       classpath/native/jni/gtk-peer/libgtkpeer.la \
-       $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)
-
-lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gnu-java-awt-peer-gtk.lo \
-       classpath/native/jni/gtk-peer/libgtkpeer.la \
-       libgcj-$(gcc_version).jar libgcj.la libgcj.spec
-
-lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) $(X_LIBS) -lXtst
-
-lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
-libgcjawt_la_SOURCES = classpath/native/jawt/jawt.c
-libgcjawt_la_CFLAGS = -I$(srcdir)/classpath/native/jni/classpath \
-       $(PEDANTIC_CFLAGS) $(X_CFLAGS)
-
-libgcjawt_la_LIBADD = -L$(here)/.libs lib-gnu-java-awt-peer-gtk.la
-libgcjawt_la_LDFLAGS = \
-       -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
-       $(LIBGCJ_LD_SYMBOLIC)
-
-libgcjawt_la_LINK = $(LIBLINK)
-lib_gnu_java_awt_peer_qt_la_SOURCES = 
-lib_gnu_java_awt_peer_qt_la_LIBADD = \
-       gnu-java-awt-peer-qt.lo \
-       classpath/native/jni/qt-peer/libqtpeer.la
-
-lib_gnu_java_awt_peer_qt_la_DEPENDENCIES = gnu-java-awt-peer-qt.lo \
-       classpath/native/jni/qt-peer/libqtpeer.la \
-       libgcj-$(gcc_version).jar libgcj.la libgcj.spec
-
-lib_gnu_java_awt_peer_qt_la_LDFLAGS = \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) $(X_LIBS) -lXtst
-
-lib_gnu_java_awt_peer_qt_la_LINK = $(LIBLINK)
 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 \
@@ -827,18 +786,6 @@ lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \
         -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
 
 lib_gnu_awt_xlib_la_LINK = $(LIBLINK)
-property_files = \
-classpath/resource/org/ietf/jgss/MessagesBundle.properties \
-classpath/resource/java/util/iso4217.properties        \
-classpath/resource/gnu/java/awt/peer/gtk/font.properties \
-classpath/resource/gnu/regexp/MessagesBundle_it.properties \
-classpath/resource/gnu/regexp/MessagesBundle_fr.properties \
-classpath/resource/gnu/regexp/MessagesBundle.properties        \
-classpath/resource/META-INF/services/org.xml.sax.driver        \
-classpath/resource/META-INF/services/javax.xml.parsers.SAXParserFactory        \
-classpath/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory \
-classpath/resource/META-INF/services/javax.xml.parsers.TransformerFactory
-
 propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files)))
 CLEANFILES = libgcj-$(gcc_version).jar
 DISTCLEANFILES = native.dirs
@@ -1035,6 +982,7 @@ gnu_awt_xlib_header_files = $(patsubst %.java,%.h,$(gnu_awt_xlib_source_files))
 gnu_classpath_source_files = \
 classpath/gnu/classpath/ByteArray.java \
 classpath/gnu/classpath/Configuration.java \
+classpath/gnu/classpath/NotImplementedException.java \
 classpath/gnu/classpath/Pointer.java \
 classpath/gnu/classpath/Pointer32.java \
 classpath/gnu/classpath/Pointer64.java \
@@ -1055,10 +1003,12 @@ classpath/gnu/classpath/jdwp/Jdwp.java \
 classpath/gnu/classpath/jdwp/JdwpConstants.java \
 gnu/classpath/jdwp/VMFrame.java \
 gnu/classpath/jdwp/VMIdManager.java \
+gnu/classpath/jdwp/VMMethod.java \
 gnu/classpath/jdwp/VMVirtualMachine.java
 
 gnu_classpath_jdwp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_source_files)))
 gnu_classpath_jdwp_event_source_files = \
+classpath/gnu/classpath/jdwp/event/BreakpointEvent.java \
 classpath/gnu/classpath/jdwp/event/ClassPrepareEvent.java \
 classpath/gnu/classpath/jdwp/event/Event.java \
 classpath/gnu/classpath/jdwp/event/EventManager.java \
@@ -1099,6 +1049,7 @@ classpath/gnu/classpath/jdwp/exception/InvalidThreadGroupException.java \
 classpath/gnu/classpath/jdwp/exception/JdwpException.java \
 classpath/gnu/classpath/jdwp/exception/JdwpIllegalArgumentException.java \
 classpath/gnu/classpath/jdwp/exception/JdwpInternalErrorException.java \
+classpath/gnu/classpath/jdwp/exception/NativeMethodException.java \
 classpath/gnu/classpath/jdwp/exception/NotImplementedException.java \
 classpath/gnu/classpath/jdwp/exception/VmDeadException.java
 
@@ -1270,11 +1221,52 @@ classpath/gnu/java/awt/color/TagEntry.java \
 classpath/gnu/java/awt/color/ToneReproductionCurve.java
 
 gnu_java_awt_color_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_color_source_files)))
+gnu_java_awt_font_source_files = \
+classpath/gnu/java/awt/font/FontDelegate.java \
+classpath/gnu/java/awt/font/FontFactory.java \
+classpath/gnu/java/awt/font/GNUGlyphVector.java
+
+gnu_java_awt_font_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_font_source_files)))
+gnu_java_awt_font_opentype_source_files = \
+classpath/gnu/java/awt/font/opentype/CharGlyphMap.java \
+classpath/gnu/java/awt/font/opentype/GlyphNamer.java \
+classpath/gnu/java/awt/font/opentype/MacResourceFork.java \
+classpath/gnu/java/awt/font/opentype/NameDecoder.java \
+classpath/gnu/java/awt/font/opentype/OpenTypeFont.java \
+classpath/gnu/java/awt/font/opentype/OpenTypeFontFactory.java \
+classpath/gnu/java/awt/font/opentype/Scaler.java
+
+gnu_java_awt_font_opentype_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_font_opentype_source_files)))
+gnu_java_awt_font_opentype_truetype_source_files = \
+classpath/gnu/java/awt/font/opentype/truetype/Fixed.java \
+classpath/gnu/java/awt/font/opentype/truetype/GlyphLoader.java \
+classpath/gnu/java/awt/font/opentype/truetype/GlyphLocator.java \
+classpath/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.java \
+classpath/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.java \
+classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java \
+classpath/gnu/java/awt/font/opentype/truetype/Zone.java \
+classpath/gnu/java/awt/font/opentype/truetype/ZonePathIterator.java
+
+gnu_java_awt_font_opentype_truetype_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_font_opentype_truetype_source_files)))
 gnu_java_awt_image_source_files = \
 classpath/gnu/java/awt/image/ImageDecoder.java \
 classpath/gnu/java/awt/image/XBMDecoder.java
 
 gnu_java_awt_image_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_image_source_files)))
+gnu_java_awt_java2d_source_files = \
+classpath/gnu/java/awt/java2d/AbstractGraphics2D.java \
+classpath/gnu/java/awt/java2d/AlphaCompositeContext.java \
+classpath/gnu/java/awt/java2d/CubicSegment.java \
+classpath/gnu/java/awt/java2d/ImagePaint.java \
+classpath/gnu/java/awt/java2d/LineSegment.java \
+classpath/gnu/java/awt/java2d/PolyEdge.java \
+classpath/gnu/java/awt/java2d/PolyEdgeComparator.java \
+classpath/gnu/java/awt/java2d/QuadSegment.java \
+classpath/gnu/java/awt/java2d/RasterGraphics.java \
+classpath/gnu/java/awt/java2d/Segment.java \
+classpath/gnu/java/awt/java2d/TexturePaintContext.java
+
+gnu_java_awt_java2d_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_java2d_source_files)))
 gnu_java_awt_peer_source_files = \
 classpath/gnu/java/awt/peer/ClasspathFontPeer.java \
 classpath/gnu/java/awt/peer/ClasspathTextLayoutPeer.java \
@@ -1283,13 +1275,17 @@ classpath/gnu/java/awt/peer/GLightweightPeer.java
 
 gnu_java_awt_peer_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_peer_source_files)))
 gnu_java_awt_peer_gtk_source_files = \
+classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java \
+classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java \
+classpath/gnu/java/awt/peer/gtk/CairoSurface.java \
+classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java \
+classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java \
+classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java \
+classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java \
 classpath/gnu/java/awt/peer/gtk/GThreadMutex.java \
 classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java \
 classpath/gnu/java/awt/peer/gtk/GdkFontMetrics.java \
 classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java \
-classpath/gnu/java/awt/peer/gtk/GdkGlyphVector.java \
-classpath/gnu/java/awt/peer/gtk/GdkGraphics.java \
-classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java \
 classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java \
 classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java \
 classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java \
@@ -1306,10 +1302,10 @@ classpath/gnu/java/awt/peer/gtk/GtkClipboard.java \
 classpath/gnu/java/awt/peer/gtk/GtkClipboardNotifier.java \
 classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkContainerPeer.java \
+classpath/gnu/java/awt/peer/gtk/GtkCursor.java \
 classpath/gnu/java/awt/peer/gtk/GtkDialogPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java \
-classpath/gnu/java/awt/peer/gtk/GtkFontPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkFramePeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkGenericPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkImage.java \
@@ -1329,7 +1325,8 @@ classpath/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkToolkit.java \
 classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java \
-classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java
+classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java \
+classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java
 
 gnu_java_awt_peer_qt_source_files = \
 classpath/gnu/java/awt/peer/qt/MainQtThread.java \
@@ -1392,6 +1389,13 @@ classpath/gnu/java/awt/peer/swing/SwingTextFieldPeer.java \
 classpath/gnu/java/awt/peer/swing/SwingToolkit.java \
 classpath/gnu/java/awt/peer/swing/SwingWindowPeer.java
 
+gnu_java_awt_print_source_files = \
+classpath/gnu/java/awt/print/JavaPrinterGraphics.java \
+classpath/gnu/java/awt/print/JavaPrinterJob.java \
+classpath/gnu/java/awt/print/PostScriptGraphics2D.java \
+classpath/gnu/java/awt/print/SpooledDocument.java
+
+gnu_java_awt_print_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_print_source_files)))
 gnu_java_beans_source_files = \
 classpath/gnu/java/beans/BeanInfoEmbryo.java \
 classpath/gnu/java/beans/DefaultExceptionListener.java \
@@ -1489,10 +1493,17 @@ gnu_java_lang_source_files = \
 classpath/gnu/java/lang/ArrayHelper.java \
 classpath/gnu/java/lang/CharData.java \
 classpath/gnu/java/lang/ClassHelper.java \
-gnu/java/lang/MainThread.java
+classpath/gnu/java/lang/InstrumentationImpl.java \
+gnu/java/lang/MainThread.java \
+gnu/java/lang/VMInstrumentationImpl.java
 
 gnu_java_lang_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_source_files)))
 gnu_java_lang_reflect_source_files = \
+classpath/gnu/java/lang/reflect/ClassSignatureParser.java \
+classpath/gnu/java/lang/reflect/FieldSignatureParser.java \
+classpath/gnu/java/lang/reflect/GenericSignatureParser.java \
+classpath/gnu/java/lang/reflect/MethodSignatureParser.java \
+classpath/gnu/java/lang/reflect/TypeImpl.java \
 classpath/gnu/java/lang/reflect/TypeSignature.java
 
 gnu_java_lang_reflect_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_reflect_source_files)))
@@ -1501,6 +1512,7 @@ gnu/java/locale/Calendar.java \
 gnu/java/locale/Calendar_de.java \
 gnu/java/locale/Calendar_en.java \
 gnu/java/locale/Calendar_nl.java \
+classpath/gnu/java/locale/LocaleData.java \
 classpath/gnu/java/locale/LocaleHelper.java \
 gnu/java/locale/LocaleInformation.java \
 gnu/java/locale/LocaleInformation_af_ZA.java \
@@ -1647,21 +1659,29 @@ gnu_java_net_source_files = \
 classpath/gnu/java/net/BASE64.java \
 classpath/gnu/java/net/CRLFInputStream.java \
 classpath/gnu/java/net/CRLFOutputStream.java \
-gnu/java/net/DefaultContentHandlerFactory.java \
+classpath/gnu/java/net/DefaultContentHandlerFactory.java \
 classpath/gnu/java/net/EmptyX509TrustManager.java \
 classpath/gnu/java/net/GetLocalHostAction.java \
 classpath/gnu/java/net/HeaderFieldHelper.java \
 classpath/gnu/java/net/LineInputStream.java \
 gnu/java/net/PlainDatagramSocketImpl.java \
 gnu/java/net/PlainSocketImpl.java \
-classpath/gnu/java/net/URLParseError.java \
+classpath/gnu/java/net/URLParseError.java
+
+gnu_java_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_source_files)))
+gnu_java_net_local_source_files = \
+classpath/gnu/java/net/local/LocalServerSocket.java \
+classpath/gnu/java/net/local/LocalSocket.java \
+classpath/gnu/java/net/local/LocalSocketAddress.java \
+gnu/java/net/local/LocalSocketImpl.java
+
+gnu_java_net_local_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_local_source_files)))
+gnu_java_net_protocol_core_source_files = \
 gnu/java/net/protocol/core/Connection.java \
 gnu/java/net/protocol/core/CoreInputStream.java \
-gnu/java/net/protocol/core/Handler.java \
-gnu/java/net/protocol/gcjlib/Connection.java \
-gnu/java/net/protocol/gcjlib/Handler.java
+gnu/java/net/protocol/core/Handler.java
 
-gnu_java_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_source_files)))
+gnu_java_net_protocol_core_header_files = $(patsubst %.java,%.h,$(gnu_java_net_protocol_core_source_files))
 gnu_java_net_protocol_file_source_files = \
 classpath/gnu/java/net/protocol/file/Connection.java \
 classpath/gnu/java/net/protocol/file/Handler.java
@@ -1686,6 +1706,11 @@ classpath/gnu/java/net/protocol/ftp/StreamInputStream.java \
 classpath/gnu/java/net/protocol/ftp/StreamOutputStream.java
 
 gnu_java_net_protocol_ftp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_ftp_source_files)))
+gnu_java_net_protocol_gcjlib_source_files = \
+gnu/java/net/protocol/gcjlib/Connection.java \
+gnu/java/net/protocol/gcjlib/Handler.java
+
+gnu_java_net_protocol_gcjlib_header_files = $(patsubst %.java,%.h,$(gnu_java_net_protocol_gcjlib_source_files))
 gnu_java_net_protocol_http_source_files = \
 classpath/gnu/java/net/protocol/http/Authenticator.java \
 classpath/gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.java \
@@ -1719,6 +1744,7 @@ gnu_java_nio_source_files = \
 classpath/gnu/java/nio/ChannelInputStream.java \
 classpath/gnu/java/nio/ChannelOutputStream.java \
 classpath/gnu/java/nio/ChannelReader.java \
+classpath/gnu/java/nio/ChannelWriter.java \
 gnu/java/nio/DatagramChannelImpl.java \
 gnu/java/nio/DatagramChannelSelectionKey.java \
 classpath/gnu/java/nio/FileLockImpl.java \
@@ -1810,21 +1836,21 @@ classpath/gnu/java/nio/charset/Windows1258.java
 gnu_java_nio_charset_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_nio_charset_source_files)))
 gnu_java_rmi_source_files = \
 classpath/gnu/java/rmi/RMIMarshalledObjectInputStream.java \
-classpath/gnu/java/rmi/RMIMarshalledObjectOutputStream.java \
-gnu/java/rmi/rmic/Compile_gcj.java \
-gnu/java/rmi/rmic/Compile_jikes.java \
-gnu/java/rmi/rmic/Compile_kjc.java \
-gnu/java/rmi/rmic/Compiler.java \
-gnu/java/rmi/rmic/CompilerProcess.java \
-gnu/java/rmi/rmic/RMIC.java \
-gnu/java/rmi/rmic/RMICException.java \
-gnu/java/rmi/rmic/TabbedWriter.java
+classpath/gnu/java/rmi/RMIMarshalledObjectOutputStream.java
 
 gnu_java_rmi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_source_files)))
+gnu_java_rmi_activation_source_files = \
+classpath/gnu/java/rmi/activation/ActivationSystemTransient.java \
+classpath/gnu/java/rmi/activation/BidiTable.java \
+classpath/gnu/java/rmi/activation/DefaultActivationGroup.java \
+classpath/gnu/java/rmi/activation/DefaultActivationSystem.java
+
+gnu_java_rmi_activation_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_activation_source_files)))
 gnu_java_rmi_dgc_source_files = \
 classpath/gnu/java/rmi/dgc/DGCImpl.java \
 classpath/gnu/java/rmi/dgc/DGCImpl_Skel.java \
-classpath/gnu/java/rmi/dgc/DGCImpl_Stub.java
+classpath/gnu/java/rmi/dgc/DGCImpl_Stub.java \
+classpath/gnu/java/rmi/dgc/LeaseRenewingTask.java
 
 gnu_java_rmi_dgc_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_dgc_source_files)))
 gnu_java_rmi_registry_source_files = \
@@ -1833,7 +1859,20 @@ classpath/gnu/java/rmi/registry/RegistryImpl_Skel.java \
 classpath/gnu/java/rmi/registry/RegistryImpl_Stub.java
 
 gnu_java_rmi_registry_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_registry_source_files)))
+gnu_java_rmi_rmic_source_files = \
+gnu/java/rmi/rmic/Compile_gcj.java \
+gnu/java/rmi/rmic/Compile_jikes.java \
+gnu/java/rmi/rmic/Compile_kjc.java \
+gnu/java/rmi/rmic/Compiler.java \
+gnu/java/rmi/rmic/CompilerProcess.java \
+gnu/java/rmi/rmic/RMIC.java \
+gnu/java/rmi/rmic/RMICException.java \
+gnu/java/rmi/rmic/TabbedWriter.java
+
+gnu_java_rmi_rmic_header_files = $(patsubst %.java,%.h,$(gnu_java_rmi_rmic_source_files))
 gnu_java_rmi_server_source_files = \
+classpath/gnu/java/rmi/server/ActivatableRef.java \
+classpath/gnu/java/rmi/server/ActivatableServerRef.java \
 classpath/gnu/java/rmi/server/CombinedClassLoader.java \
 classpath/gnu/java/rmi/server/ConnectionRunnerPool.java \
 classpath/gnu/java/rmi/server/ProtocolConstants.java \
@@ -1983,6 +2022,7 @@ classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
 
 gnu_java_security_key_rsa_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_key_rsa_source_files)))
 gnu_java_security_pkcs_source_files = \
+classpath/gnu/java/security/pkcs/PKCS7Data.java \
 classpath/gnu/java/security/pkcs/PKCS7SignedData.java \
 classpath/gnu/java/security/pkcs/SignerInfo.java
 
@@ -2000,7 +2040,6 @@ classpath/gnu/java/security/prng/RandomEventListener.java
 gnu_java_security_prng_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_prng_source_files)))
 gnu_java_security_provider_source_files = \
 classpath/gnu/java/security/provider/CollectionCertStoreImpl.java \
-classpath/gnu/java/security/provider/DSAParameterGenerator.java \
 classpath/gnu/java/security/provider/DefaultPolicy.java \
 classpath/gnu/java/security/provider/Gnu.java \
 classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java \
@@ -2096,6 +2135,10 @@ 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 \
@@ -2442,10 +2485,13 @@ classpath/gnu/javax/crypto/sasl/srp/StoreEntry.java
 gnu_javax_crypto_sasl_srp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_sasl_srp_source_files)))
 gnu_javax_imageio_bmp_source_files = \
 classpath/gnu/javax/imageio/bmp/BMPDecoder.java \
+classpath/gnu/javax/imageio/bmp/BMPEncoder.java \
 classpath/gnu/javax/imageio/bmp/BMPException.java \
 classpath/gnu/javax/imageio/bmp/BMPFileHeader.java \
 classpath/gnu/javax/imageio/bmp/BMPImageReader.java \
 classpath/gnu/javax/imageio/bmp/BMPImageReaderSpi.java \
+classpath/gnu/javax/imageio/bmp/BMPImageWriter.java \
+classpath/gnu/javax/imageio/bmp/BMPImageWriterSpi.java \
 classpath/gnu/javax/imageio/bmp/BMPInfoHeader.java \
 classpath/gnu/javax/imageio/bmp/DecodeBF16.java \
 classpath/gnu/javax/imageio/bmp/DecodeBF32.java \
@@ -2454,7 +2500,15 @@ classpath/gnu/javax/imageio/bmp/DecodeRGB24.java \
 classpath/gnu/javax/imageio/bmp/DecodeRGB4.java \
 classpath/gnu/javax/imageio/bmp/DecodeRGB8.java \
 classpath/gnu/javax/imageio/bmp/DecodeRLE4.java \
-classpath/gnu/javax/imageio/bmp/DecodeRLE8.java
+classpath/gnu/javax/imageio/bmp/DecodeRLE8.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB1.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB16.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB24.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB32.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB4.java \
+classpath/gnu/javax/imageio/bmp/EncodeRGB8.java \
+classpath/gnu/javax/imageio/bmp/EncodeRLE4.java \
+classpath/gnu/javax/imageio/bmp/EncodeRLE8.java
 
 gnu_javax_imageio_bmp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_imageio_bmp_source_files)))
 gnu_javax_net_ssl_source_files = \
@@ -2531,6 +2585,105 @@ classpath/gnu/javax/net/ssl/provider/X509TrustManagerFactory.java \
 classpath/gnu/javax/net/ssl/provider/XMLSessionContext.java
 
 gnu_javax_net_ssl_provider_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_net_ssl_provider_source_files)))
+gnu_javax_print_source_files = \
+classpath/gnu/javax/print/CupsIppOperation.java \
+classpath/gnu/javax/print/CupsMediaMapping.java \
+classpath/gnu/javax/print/CupsPrintService.java \
+classpath/gnu/javax/print/CupsPrintServiceLookup.java \
+classpath/gnu/javax/print/CupsServer.java \
+classpath/gnu/javax/print/PrintAttributeException.java \
+classpath/gnu/javax/print/PrintFlavorException.java \
+classpath/gnu/javax/print/PrintUriException.java \
+classpath/gnu/javax/print/PrinterDialog.java
+
+gnu_javax_print_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_source_files)))
+gnu_javax_print_ipp_source_files = \
+classpath/gnu/javax/print/ipp/DocPrintJobImpl.java \
+classpath/gnu/javax/print/ipp/IppDelimiterTag.java \
+classpath/gnu/javax/print/ipp/IppException.java \
+classpath/gnu/javax/print/ipp/IppMultiDocPrintService.java \
+classpath/gnu/javax/print/ipp/IppPrintService.java \
+classpath/gnu/javax/print/ipp/IppRequest.java \
+classpath/gnu/javax/print/ipp/IppResponse.java \
+classpath/gnu/javax/print/ipp/IppStatusCode.java \
+classpath/gnu/javax/print/ipp/IppUtilities.java \
+classpath/gnu/javax/print/ipp/IppValueTag.java \
+classpath/gnu/javax/print/ipp/MultiDocPrintJobImpl.java
+
+gnu_javax_print_ipp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_ipp_source_files)))
+gnu_javax_print_ipp_attribute_source_files = \
+classpath/gnu/javax/print/ipp/attribute/CharsetSyntax.java \
+classpath/gnu/javax/print/ipp/attribute/DefaultValueAttribute.java \
+classpath/gnu/javax/print/ipp/attribute/DetailedStatusMessage.java \
+classpath/gnu/javax/print/ipp/attribute/DocumentAccessError.java \
+classpath/gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.java \
+classpath/gnu/javax/print/ipp/attribute/RequestedAttributes.java \
+classpath/gnu/javax/print/ipp/attribute/StatusMessage.java \
+classpath/gnu/javax/print/ipp/attribute/UnknownAttribute.java
+
+gnu_javax_print_ipp_attribute_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_ipp_attribute_source_files)))
+gnu_javax_print_ipp_attribute_defaults_source_files = \
+classpath/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/MediaDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java \
+classpath/gnu/javax/print/ipp/attribute/defaults/SidesDefault.java
+
+gnu_javax_print_ipp_attribute_defaults_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_ipp_attribute_defaults_source_files)))
+gnu_javax_print_ipp_attribute_job_source_files = \
+classpath/gnu/javax/print/ipp/attribute/job/AttributesCharset.java \
+classpath/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobId.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobMoreInfo.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobPrinterUri.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobStateMessage.java \
+classpath/gnu/javax/print/ipp/attribute/job/JobUri.java
+
+gnu_javax_print_ipp_attribute_job_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_ipp_attribute_job_source_files)))
+gnu_javax_print_ipp_attribute_printer_source_files = \
+classpath/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java \
+classpath/gnu/javax/print/ipp/attribute/printer/DocumentFormat.java \
+classpath/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java \
+classpath/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java \
+classpath/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java \
+classpath/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java \
+classpath/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java \
+classpath/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java
+
+gnu_javax_print_ipp_attribute_printer_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_ipp_attribute_printer_source_files)))
+gnu_javax_print_ipp_attribute_supported_source_files = \
+classpath/gnu/javax/print/ipp/attribute/supported/CharsetSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/CompressionSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/MediaSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/OperationsSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/SidesSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.java \
+classpath/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.java
+
+gnu_javax_print_ipp_attribute_supported_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_print_ipp_attribute_supported_source_files)))
 gnu_javax_rmi_source_files = \
 classpath/gnu/javax/rmi/CORBA/CorbaInput.java \
 classpath/gnu/javax/rmi/CORBA/CorbaOutput.java \
@@ -2572,8 +2725,23 @@ classpath/gnu/javax/sound/midi/alsa/AlsaPortDevice.java \
 classpath/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java \
 classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
 
+gnu_javax_swing_plaf_gnu_source_files = \
+classpath/gnu/javax/swing/plaf/gnu/GNULookAndFeel.java
+
+gnu_javax_swing_plaf_gnu_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_plaf_gnu_source_files)))
+gnu_javax_swing_plaf_metal_source_files = \
+classpath/gnu/javax/swing/plaf/metal/CustomizableTheme.java
+
+gnu_javax_swing_plaf_metal_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_plaf_metal_source_files)))
+gnu_javax_swing_text_html_source_files = \
+classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java \
+classpath/gnu/javax/swing/text/html/CombinedAttributes.java \
+classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java
+
+gnu_javax_swing_text_html_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_text_html_source_files)))
 gnu_javax_swing_text_html_parser_source_files = \
 classpath/gnu/javax/swing/text/html/parser/HTML_401F.java \
+classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java \
 classpath/gnu/javax/swing/text/html/parser/gnuDTD.java \
 classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java \
 classpath/gnu/javax/swing/text/html/parser/htmlValidator.java
@@ -2607,9 +2775,15 @@ classpath/gnu/javax/swing/text/html/parser/support/low/node.java \
 classpath/gnu/javax/swing/text/html/parser/support/low/pattern.java
 
 gnu_javax_swing_text_html_parser_support_low_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_text_html_parser_support_low_source_files)))
+gnu_javax_swing_tree_source_files = \
+classpath/gnu/javax/swing/tree/GnuPath.java
+
+gnu_javax_swing_tree_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_tree_source_files)))
 gnu_regexp_source_files = \
+classpath/gnu/regexp/BacktrackStack.java \
 classpath/gnu/regexp/CharIndexed.java \
 classpath/gnu/regexp/CharIndexedCharArray.java \
+classpath/gnu/regexp/CharIndexedCharSequence.java \
 classpath/gnu/regexp/CharIndexedInputStream.java \
 classpath/gnu/regexp/CharIndexedString.java \
 classpath/gnu/regexp/CharIndexedStringBuffer.java \
@@ -2624,6 +2798,7 @@ classpath/gnu/regexp/RETokenAny.java \
 classpath/gnu/regexp/RETokenBackRef.java \
 classpath/gnu/regexp/RETokenChar.java \
 classpath/gnu/regexp/RETokenEnd.java \
+classpath/gnu/regexp/RETokenEndOfPreviousMatch.java \
 classpath/gnu/regexp/RETokenEndSub.java \
 classpath/gnu/regexp/RETokenIndependent.java \
 classpath/gnu/regexp/RETokenLookAhead.java \
@@ -2692,6 +2867,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 \
@@ -3594,6 +3770,7 @@ classpath/java/lang/Comparable.java \
 classpath/java/lang/Compiler.java \
 java/lang/ConcreteProcess.java \
 classpath/java/lang/Double.java \
+classpath/java/lang/Enum.java \
 classpath/java/lang/EnumConstantNotPresentException.java \
 classpath/java/lang/Error.java \
 classpath/java/lang/Exception.java \
@@ -3613,6 +3790,7 @@ classpath/java/lang/InstantiationException.java \
 classpath/java/lang/Integer.java \
 classpath/java/lang/InternalError.java \
 classpath/java/lang/InterruptedException.java \
+classpath/java/lang/Iterable.java \
 classpath/java/lang/LinkageError.java \
 classpath/java/lang/Long.java \
 java/lang/Math.java \
@@ -3666,10 +3844,19 @@ classpath/java/lang/Void.java
 
 java_lang_header_files = $(filter-out java/lang/Object.h java/lang/Class.h,$(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_source_files))))
 java_lang_annotation_source_files = \
+classpath/java/lang/annotation/Annotation.java \
 classpath/java/lang/annotation/AnnotationFormatError.java \
 classpath/java/lang/annotation/AnnotationTypeMismatchException.java
 
 java_lang_annotation_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_annotation_source_files)))
+java_lang_instrument_source_files = \
+classpath/java/lang/instrument/ClassDefinition.java \
+classpath/java/lang/instrument/ClassFileTransformer.java \
+classpath/java/lang/instrument/IllegalClassFormatException.java \
+classpath/java/lang/instrument/Instrumentation.java \
+classpath/java/lang/instrument/UnmodifiableClassException.java
+
+java_lang_instrument_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_instrument_source_files)))
 java_lang_ref_source_files = \
 classpath/java/lang/ref/PhantomReference.java \
 java/lang/ref/Reference.java \
@@ -3680,13 +3867,16 @@ classpath/java/lang/ref/WeakReference.java
 java_lang_ref_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_ref_source_files)))
 java_lang_reflect_source_files = \
 classpath/java/lang/reflect/AccessibleObject.java \
+classpath/java/lang/reflect/AnnotatedElement.java \
 java/lang/reflect/Array.java \
 java/lang/reflect/Constructor.java \
 java/lang/reflect/Field.java \
 classpath/java/lang/reflect/GenericArrayType.java \
+classpath/java/lang/reflect/GenericDeclaration.java \
 classpath/java/lang/reflect/GenericSignatureFormatError.java \
 classpath/java/lang/reflect/InvocationHandler.java \
 classpath/java/lang/reflect/InvocationTargetException.java \
+classpath/java/lang/reflect/MalformedParameterizedTypeException.java \
 classpath/java/lang/reflect/Member.java \
 java/lang/reflect/Method.java \
 java/lang/reflect/Modifier.java \
@@ -3694,6 +3884,7 @@ classpath/java/lang/reflect/ParameterizedType.java \
 classpath/java/lang/reflect/Proxy.java \
 classpath/java/lang/reflect/ReflectPermission.java \
 classpath/java/lang/reflect/Type.java \
+classpath/java/lang/reflect/TypeVariable.java \
 classpath/java/lang/reflect/UndeclaredThrowableException.java \
 java/lang/reflect/VMProxy.java \
 classpath/java/lang/reflect/WildcardType.java
@@ -3743,7 +3934,7 @@ classpath/java/net/URI.java \
 classpath/java/net/URISyntaxException.java \
 java/net/URL.java \
 java/net/URLClassLoader.java \
-java/net/URLConnection.java \
+classpath/java/net/URLConnection.java \
 classpath/java/net/URLDecoder.java \
 classpath/java/net/URLEncoder.java \
 classpath/java/net/URLStreamHandler.java \
@@ -3793,7 +3984,7 @@ classpath/java/nio/channels/AsynchronousCloseException.java \
 classpath/java/nio/channels/ByteChannel.java \
 classpath/java/nio/channels/CancelledKeyException.java \
 classpath/java/nio/channels/Channel.java \
-java/nio/channels/Channels.java \
+classpath/java/nio/channels/Channels.java \
 classpath/java/nio/channels/ClosedByInterruptException.java \
 classpath/java/nio/channels/ClosedChannelException.java \
 classpath/java/nio/channels/ClosedSelectorException.java \
@@ -3822,6 +4013,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)))
@@ -4001,7 +4193,8 @@ 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/VMSecureRandom.java
 
 java_security_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_security_source_files)))
 java_security_acl_source_files = \
@@ -4137,7 +4330,7 @@ classpath/java/text/ChoiceFormat.java \
 classpath/java/text/CollationElementIterator.java \
 classpath/java/text/CollationKey.java \
 java/text/Collator.java \
-java/text/DateFormat.java \
+classpath/java/text/DateFormat.java \
 java/text/DateFormatSymbols.java \
 classpath/java/text/DecimalFormat.java \
 java/text/DecimalFormatSymbols.java \
@@ -4188,7 +4381,6 @@ classpath/java/util/List.java \
 classpath/java/util/ListIterator.java \
 classpath/java/util/ListResourceBundle.java \
 java/util/Locale.java \
-classpath/java/util/LocaleData.java \
 classpath/java/util/Map.java \
 classpath/java/util/MissingResourceException.java \
 classpath/java/util/NoSuchElementException.java \
@@ -4236,7 +4428,7 @@ classpath/java/util/logging/Filter.java \
 classpath/java/util/logging/Formatter.java \
 classpath/java/util/logging/Handler.java \
 classpath/java/util/logging/Level.java \
-classpath/java/util/logging/LogManager.java \
+java/util/logging/LogManager.java \
 classpath/java/util/logging/LogRecord.java \
 java/util/logging/Logger.java \
 classpath/java/util/logging/LoggingPermission.java \
@@ -4290,12 +4482,14 @@ java_util_zip_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(ja
 javax_accessibility_source_files = \
 classpath/javax/accessibility/Accessible.java \
 classpath/javax/accessibility/AccessibleAction.java \
+classpath/javax/accessibility/AccessibleAttributeSequence.java \
 classpath/javax/accessibility/AccessibleBundle.java \
 classpath/javax/accessibility/AccessibleComponent.java \
 classpath/javax/accessibility/AccessibleContext.java \
 classpath/javax/accessibility/AccessibleEditableText.java \
 classpath/javax/accessibility/AccessibleExtendedComponent.java \
 classpath/javax/accessibility/AccessibleExtendedTable.java \
+classpath/javax/accessibility/AccessibleExtendedText.java \
 classpath/javax/accessibility/AccessibleHyperlink.java \
 classpath/javax/accessibility/AccessibleHypertext.java \
 classpath/javax/accessibility/AccessibleIcon.java \
@@ -4307,9 +4501,11 @@ classpath/javax/accessibility/AccessibleRole.java \
 classpath/javax/accessibility/AccessibleSelection.java \
 classpath/javax/accessibility/AccessibleState.java \
 classpath/javax/accessibility/AccessibleStateSet.java \
+classpath/javax/accessibility/AccessibleStreamable.java \
 classpath/javax/accessibility/AccessibleTable.java \
 classpath/javax/accessibility/AccessibleTableModelChange.java \
 classpath/javax/accessibility/AccessibleText.java \
+classpath/javax/accessibility/AccessibleTextSequence.java \
 classpath/javax/accessibility/AccessibleValue.java
 
 javax_accessibility_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_accessibility_source_files)))
@@ -4386,6 +4582,10 @@ classpath/javax/imageio/metadata/IIOMetadataFormat.java \
 classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java \
 classpath/javax/imageio/metadata/IIOMetadataNode.java \
 classpath/javax/imageio/plugins/bmp/BMPImageWriteParam.java \
+classpath/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java \
+classpath/javax/imageio/plugins/jpeg/JPEGImageReadParam.java \
+classpath/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java \
+classpath/javax/imageio/plugins/jpeg/JPEGQTable.java \
 classpath/javax/imageio/spi/IIORegistry.java \
 classpath/javax/imageio/spi/IIOServiceProvider.java \
 classpath/javax/imageio/spi/ImageInputStreamSpi.java \
@@ -4496,6 +4696,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
@@ -4568,6 +4770,7 @@ classpath/javax/print/MultiDocPrintService.java \
 classpath/javax/print/PrintException.java \
 classpath/javax/print/PrintService.java \
 classpath/javax/print/PrintServiceLookup.java \
+classpath/javax/print/ServiceUI.java \
 classpath/javax/print/ServiceUIFactory.java \
 classpath/javax/print/SimpleDoc.java \
 classpath/javax/print/StreamPrintService.java \
@@ -4724,6 +4927,15 @@ classpath/javax/security/auth/callback/TextOutputCallback.java \
 classpath/javax/security/auth/callback/UnsupportedCallbackException.java
 
 javax_security_auth_callback_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_security_auth_callback_source_files)))
+javax_security_auth_kerberos_source_files = \
+classpath/javax/security/auth/kerberos/DelegationPermission.java \
+classpath/javax/security/auth/kerberos/KerberosKey.java \
+classpath/javax/security/auth/kerberos/KerberosPrincipal.java \
+classpath/javax/security/auth/kerberos/KerberosTicket.java \
+classpath/javax/security/auth/kerberos/KeyImpl.java \
+classpath/javax/security/auth/kerberos/ServicePermission.java
+
+javax_security_auth_kerberos_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_security_auth_kerberos_source_files)))
 javax_security_auth_login_source_files = \
 classpath/javax/security/auth/login/AccountException.java \
 classpath/javax/security/auth/login/AccountExpiredException.java \
@@ -4874,6 +5086,7 @@ classpath/javax/swing/CellEditor.java \
 classpath/javax/swing/CellRendererPane.java \
 classpath/javax/swing/ComboBoxEditor.java \
 classpath/javax/swing/ComboBoxModel.java \
+classpath/javax/swing/CompatibilityFocusTraversalPolicy.java \
 classpath/javax/swing/ComponentInputMap.java \
 classpath/javax/swing/DebugGraphics.java \
 classpath/javax/swing/DefaultBoundedRangeModel.java \
@@ -5162,7 +5375,8 @@ classpath/javax/swing/plaf/basic/BasicToolTipUI.java \
 classpath/javax/swing/plaf/basic/BasicTreeUI.java \
 classpath/javax/swing/plaf/basic/BasicViewportUI.java \
 classpath/javax/swing/plaf/basic/ComboPopup.java \
-classpath/javax/swing/plaf/basic/DefaultMenuLayout.java
+classpath/javax/swing/plaf/basic/DefaultMenuLayout.java \
+classpath/javax/swing/plaf/basic/SharedUIDefaults.java
 
 javax_swing_plaf_basic_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_plaf_basic_source_files)))
 javax_swing_plaf_metal_source_files = \
@@ -5340,7 +5554,10 @@ classpath/javax/swing/text/html/HTMLDocument.java \
 classpath/javax/swing/text/html/HTMLEditorKit.java \
 classpath/javax/swing/text/html/HTMLFrameHyperlinkEvent.java \
 classpath/javax/swing/text/html/HTMLTableView.java \
+classpath/javax/swing/text/html/ImageView.java \
 classpath/javax/swing/text/html/InlineView.java \
+classpath/javax/swing/text/html/ListView.java \
+classpath/javax/swing/text/html/MinimalHTMLWriter.java \
 classpath/javax/swing/text/html/NullView.java \
 classpath/javax/swing/text/html/ObjectView.java \
 classpath/javax/swing/text/html/Option.java \
@@ -5498,6 +5715,7 @@ classpath/javax/xml/transform/stream/StreamResult.java \
 classpath/javax/xml/transform/stream/StreamSource.java \
 classpath/javax/xml/validation/Schema.java \
 classpath/javax/xml/validation/SchemaFactory.java \
+classpath/javax/xml/validation/SchemaFactoryLoader.java \
 classpath/javax/xml/validation/TypeInfoProvider.java \
 classpath/javax/xml/validation/Validator.java \
 classpath/javax/xml/validation/ValidatorHandler.java \
@@ -5955,7 +6173,6 @@ classpath/org/omg/PortableInterceptor/ObjectIdHelper.java \
 classpath/org/omg/PortableInterceptor/ObjectReferenceFactory.java \
 classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java \
 classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java \
-classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryOperations.java \
 classpath/org/omg/PortableInterceptor/ObjectReferenceTemplate.java \
 classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java \
 classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java \
@@ -6278,16 +6495,24 @@ all_packages_source_files = \
   gnu/gcj/util.list \
   gnu/java/awt.list \
   gnu/java/awt/color.list \
+  gnu/java/awt/font.list \
+  gnu/java/awt/font/opentype.list \
+  gnu/java/awt/font/opentype/truetype.list \
   gnu/java/awt/image.list \
+  gnu/java/awt/java2d.list \
   gnu/java/awt/peer.list \
+  gnu/java/awt/print.list \
   gnu/java/io.list \
   gnu/java/lang.list \
   gnu/java/lang/reflect.list \
   gnu/java/locale.list \
   gnu/java/math.list \
   gnu/java/net.list \
+  gnu/java/net/local.list \
+  gnu/java/net/protocol/core.list \
   gnu/java/net/protocol/file.list \
   gnu/java/net/protocol/ftp.list \
+  gnu/java/net/protocol/gcjlib.list \
   gnu/java/net/protocol/http.list \
   gnu/java/net/protocol/https.list \
   gnu/java/net/protocol/jar.list \
@@ -6295,8 +6520,10 @@ all_packages_source_files = \
   gnu/java/nio/channels.list \
   gnu/java/nio/charset.list \
   gnu/java/rmi.list \
+  gnu/java/rmi/activation.list \
   gnu/java/rmi/dgc.list \
   gnu/java/rmi/registry.list \
+  gnu/java/rmi/rmic.list \
   gnu/java/rmi/server.list \
   gnu/java/security.list \
   gnu/java/security/action.list \
@@ -6320,6 +6547,7 @@ all_packages_source_files = \
   gnu/java/security/x509/ext.list \
   gnu/java/text.list \
   gnu/java/util.list \
+  gnu/java/util/jar.list \
   gnu/java/util/prefs.list \
   gnu/javax/crypto.list \
   gnu/javax/crypto/assembly.list \
@@ -6349,13 +6577,24 @@ all_packages_source_files = \
   gnu/javax/imageio/bmp.list \
   gnu/javax/net/ssl.list \
   gnu/javax/net/ssl/provider.list \
+  gnu/javax/print.list \
+  gnu/javax/print/ipp.list \
+  gnu/javax/print/ipp/attribute.list \
+  gnu/javax/print/ipp/attribute/defaults.list \
+  gnu/javax/print/ipp/attribute/job.list \
+  gnu/javax/print/ipp/attribute/printer.list \
+  gnu/javax/print/ipp/attribute/supported.list \
   gnu/javax/security/auth.list \
   gnu/javax/security/auth/callback.list \
   gnu/javax/security/auth/login.list \
+  gnu/javax/swing/plaf/gnu.list \
+  gnu/javax/swing/plaf/metal.list \
+  gnu/javax/swing/text/html.list \
   gnu/javax/swing/text/html/parser.list \
   gnu/javax/swing/text/html/parser/models.list \
   gnu/javax/swing/text/html/parser/support.list \
   gnu/javax/swing/text/html/parser/support/low.list \
+  gnu/javax/swing/tree.list \
   gnu/regexp.list \
   java/applet.list \
   java/awt.list \
@@ -6377,6 +6616,7 @@ all_packages_source_files = \
   java/io.list \
   java/lang.list \
   java/lang/annotation.list \
+  java/lang/instrument.list \
   java/lang/ref.list \
   java/lang/reflect.list \
   java/math.list \
@@ -6422,6 +6662,7 @@ all_packages_source_files = \
   javax/print/event.list \
   javax/security/auth.list \
   javax/security/auth/callback.list \
+  javax/security/auth/kerberos.list \
   javax/security/auth/login.list \
   javax/security/auth/spi.list \
   javax/security/auth/x500.list \
@@ -6473,16 +6714,24 @@ ordinary_header_files = \
   $(gnu_gcj_util_header_files) \
   $(gnu_java_awt_header_files) \
   $(gnu_java_awt_color_header_files) \
+  $(gnu_java_awt_font_header_files) \
+  $(gnu_java_awt_font_opentype_header_files) \
+  $(gnu_java_awt_font_opentype_truetype_header_files) \
   $(gnu_java_awt_image_header_files) \
+  $(gnu_java_awt_java2d_header_files) \
   $(gnu_java_awt_peer_header_files) \
+  $(gnu_java_awt_print_header_files) \
   $(gnu_java_io_header_files) \
   $(gnu_java_lang_header_files) \
   $(gnu_java_lang_reflect_header_files) \
   $(gnu_java_locale_header_files) \
   $(gnu_java_math_header_files) \
   $(gnu_java_net_header_files) \
+  $(gnu_java_net_local_header_files) \
+  $(gnu_java_net_protocol_core_header_files) \
   $(gnu_java_net_protocol_file_header_files) \
   $(gnu_java_net_protocol_ftp_header_files) \
+  $(gnu_java_net_protocol_gcjlib_header_files) \
   $(gnu_java_net_protocol_http_header_files) \
   $(gnu_java_net_protocol_https_header_files) \
   $(gnu_java_net_protocol_jar_header_files) \
@@ -6490,8 +6739,10 @@ ordinary_header_files = \
   $(gnu_java_nio_channels_header_files) \
   $(gnu_java_nio_charset_header_files) \
   $(gnu_java_rmi_header_files) \
+  $(gnu_java_rmi_activation_header_files) \
   $(gnu_java_rmi_dgc_header_files) \
   $(gnu_java_rmi_registry_header_files) \
+  $(gnu_java_rmi_rmic_header_files) \
   $(gnu_java_rmi_server_header_files) \
   $(gnu_java_security_header_files) \
   $(gnu_java_security_action_header_files) \
@@ -6515,6 +6766,7 @@ ordinary_header_files = \
   $(gnu_java_security_x509_ext_header_files) \
   $(gnu_java_text_header_files) \
   $(gnu_java_util_header_files) \
+  $(gnu_java_util_jar_header_files) \
   $(gnu_java_util_prefs_header_files) \
   $(gnu_javax_crypto_header_files) \
   $(gnu_javax_crypto_assembly_header_files) \
@@ -6544,13 +6796,24 @@ ordinary_header_files = \
   $(gnu_javax_imageio_bmp_header_files) \
   $(gnu_javax_net_ssl_header_files) \
   $(gnu_javax_net_ssl_provider_header_files) \
+  $(gnu_javax_print_header_files) \
+  $(gnu_javax_print_ipp_header_files) \
+  $(gnu_javax_print_ipp_attribute_header_files) \
+  $(gnu_javax_print_ipp_attribute_defaults_header_files) \
+  $(gnu_javax_print_ipp_attribute_job_header_files) \
+  $(gnu_javax_print_ipp_attribute_printer_header_files) \
+  $(gnu_javax_print_ipp_attribute_supported_header_files) \
   $(gnu_javax_security_auth_header_files) \
   $(gnu_javax_security_auth_callback_header_files) \
   $(gnu_javax_security_auth_login_header_files) \
+  $(gnu_javax_swing_plaf_gnu_header_files) \
+  $(gnu_javax_swing_plaf_metal_header_files) \
+  $(gnu_javax_swing_text_html_header_files) \
   $(gnu_javax_swing_text_html_parser_header_files) \
   $(gnu_javax_swing_text_html_parser_models_header_files) \
   $(gnu_javax_swing_text_html_parser_support_header_files) \
   $(gnu_javax_swing_text_html_parser_support_low_header_files) \
+  $(gnu_javax_swing_tree_header_files) \
   $(gnu_regexp_header_files) \
   $(java_applet_header_files) \
   $(java_awt_header_files) \
@@ -6572,6 +6835,7 @@ ordinary_header_files = \
   $(java_io_header_files) \
   $(java_lang_header_files) \
   $(java_lang_annotation_header_files) \
+  $(java_lang_instrument_header_files) \
   $(java_lang_ref_header_files) \
   $(java_lang_reflect_header_files) \
   $(java_math_header_files) \
@@ -6617,6 +6881,7 @@ ordinary_header_files = \
   $(javax_print_event_header_files) \
   $(javax_security_auth_header_files) \
   $(javax_security_auth_callback_header_files) \
+  $(javax_security_auth_kerberos_header_files) \
   $(javax_security_auth_login_header_files) \
   $(javax_security_auth_spi_header_files) \
   $(javax_security_auth_x500_header_files) \
@@ -6650,6 +6915,8 @@ ordinary_header_files = \
 
 bc_objects = \
   gnu-CORBA.lo \
+  gnu-java-awt-peer-gtk.lo \
+  gnu-java-awt-peer-qt.lo \
   gnu-java-awt-peer-swing.lo \
   gnu-java-beans.lo \
   gnu-javax-rmi.lo \
@@ -6663,6 +6930,26 @@ bc_objects = \
   org-w3c.lo \
   org-xml.lo
 
+property_files = \
+  classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties \
+  classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties \
+  classpath/resource/gnu/java/awt/peer/gtk/font.properties \
+  classpath/resource/gnu/javax/print/PrinterDialog.properties \
+  classpath/resource/gnu/javax/print/PrinterDialog_de.properties \
+  classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
+  classpath/resource/gnu/regexp/MessagesBundle.properties \
+  classpath/resource/gnu/regexp/MessagesBundle_fr.properties \
+  classpath/resource/gnu/regexp/MessagesBundle_it.properties \
+  classpath/resource/java/util/iso4217.properties \
+  classpath/resource/javax/imageio/plugins/jpeg/MessagesBundle.properties \
+  classpath/resource/org/ietf/jgss/MessagesBundle.properties \
+  classpath/resource/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider \
+  classpath/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory \
+  classpath/resource/META-INF/services/javax.xml.parsers.SAXParserFactory \
+  classpath/resource/META-INF/services/javax.xml.parsers.TransformerFactory \
+  classpath/resource/META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory \
+  classpath/resource/META-INF/services/org.xml.sax.driver
+
 omitted_headers = java/lang/ClassLoader.h java/lang/Thread.h \
        java/lang/String.h java/lang/reflect/Constructor.h \
        java/lang/reflect/Field.h java/lang/reflect/Method.h \
@@ -6718,7 +7005,9 @@ gcj_dbtool_LINK = $(GCJLINK)
 gcj_dbtool_LDADD = -L$(here)/.libs libgcj.la
 gcj_dbtool_DEPENDENCIES = libgcj.la libgcj.spec
 gij_SOURCES = 
-gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+gij_LDFLAGS = -rpath $(libdir)/gcj-$(gcc_version) -rpath $(toolexeclibdir) \
+       -shared-libgcc $(THREADLDFLAGS)
+
 gij_LINK = $(GCJLINK)
 gij_LDADD = -L$(here)/.libs libgij.la
 gij_DEPENDENCIES = libgij.la
@@ -6789,7 +7078,7 @@ java/lang/reflect/natField.cc \
 java/lang/reflect/natMethod.cc \
 java/net/natVMNetworkInterface.cc \
 java/net/natInetAddress.cc \
-java/nio/channels/natChannels.cc \
+java/nio/channels/natVMChannels.cc \
 java/nio/natDirectByteBufferImpl.cc \
 java/text/natCollator.cc \
 java/util/natResourceBundle.cc \
@@ -6821,7 +7110,7 @@ gnu/gcj/xlib/natXImage.cc \
 gnu/gcj/xlib/natXUnmapEvent.cc
 
 sourcesdir = $(jardir)
-headers_to_make = $(nat_headers) $(am__append_14)
+headers_to_make = $(nat_headers) $(am__append_13)
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
@@ -6918,6 +7207,8 @@ 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-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        test -z "$(toolexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexeclibdir)"
@@ -7011,10 +7302,6 @@ gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo:  \
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo:  \
        gnu/gcj/xlib/$(am__dirstamp) \
        gnu/gcj/xlib/$(DEPDIR)/$(am__dirstamp)
-lib-gnu-java-awt-peer-gtk.la: $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES) 
-       $(lib_gnu_java_awt_peer_gtk_la_LINK) $(am_lib_gnu_java_awt_peer_gtk_la_rpath) $(lib_gnu_java_awt_peer_gtk_la_LDFLAGS) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_LIBADD) $(LIBS)
-lib-gnu-java-awt-peer-qt.la: $(lib_gnu_java_awt_peer_qt_la_OBJECTS) $(lib_gnu_java_awt_peer_qt_la_DEPENDENCIES) 
-       $(lib_gnu_java_awt_peer_qt_la_LINK) $(am_lib_gnu_java_awt_peer_qt_la_rpath) $(lib_gnu_java_awt_peer_qt_la_LDFLAGS) $(lib_gnu_java_awt_peer_qt_la_OBJECTS) $(lib_gnu_java_awt_peer_qt_la_LIBADD) $(LIBS)
 java/lang/$(am__dirstamp):
        @$(mkdir_p) java/lang
        @: > java/lang/$(am__dirstamp)
@@ -7234,7 +7521,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
@@ -7282,17 +7569,6 @@ java/util/zip/natInflater.lo: java/util/zip/$(am__dirstamp) \
        java/util/zip/$(DEPDIR)/$(am__dirstamp)
 libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) 
        $(libgcj_la_LINK) -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(libgcj_la_OBJECTS) $(libgcj_la_LIBADD) $(LIBS)
-classpath/native/jawt/$(am__dirstamp):
-       @$(mkdir_p) classpath/native/jawt
-       @: > classpath/native/jawt/$(am__dirstamp)
-classpath/native/jawt/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) classpath/native/jawt/$(DEPDIR)
-       @: > classpath/native/jawt/$(DEPDIR)/$(am__dirstamp)
-classpath/native/jawt/libgcjawt_la-jawt.lo:  \
-       classpath/native/jawt/$(am__dirstamp) \
-       classpath/native/jawt/$(DEPDIR)/$(am__dirstamp)
-libgcjawt.la: $(libgcjawt_la_OBJECTS) $(libgcjawt_la_DEPENDENCIES) 
-       $(libgcjawt_la_LINK) $(am_libgcjawt_la_rpath) $(libgcjawt_la_LDFLAGS) $(libgcjawt_la_OBJECTS) $(libgcjawt_la_LIBADD) $(LIBS)
 libgij.la: $(libgij_la_OBJECTS) $(libgij_la_DEPENDENCIES) 
        $(CXXLINK) -rpath $(toolexeclibdir) $(libgij_la_LDFLAGS) $(libgij_la_OBJECTS) $(libgij_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
@@ -7387,8 +7663,6 @@ uninstall-binSCRIPTS:
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f classpath/native/jawt/libgcjawt_la-jawt.$(OBJEXT)
-       -rm -f classpath/native/jawt/libgcjawt_la-jawt.lo
        -rm -f gnu/classpath/natSystemProperties.$(OBJEXT)
        -rm -f gnu/classpath/natSystemProperties.lo
        -rm -f gnu/gcj/convert/JIS0208_to_Unicode.$(OBJEXT)
@@ -7541,8 +7815,8 @@ mostlyclean-compile:
        -rm -f java/net/natInetAddress.lo
        -rm -f java/net/natVMNetworkInterface.$(OBJEXT)
        -rm -f java/net/natVMNetworkInterface.lo
-       -rm -f java/nio/channels/natChannels.$(OBJEXT)
-       -rm -f java/nio/channels/natChannels.lo
+       -rm -f java/nio/channels/natVMChannels.$(OBJEXT)
+       -rm -f java/nio/channels/natVMChannels.lo
        -rm -f java/nio/natDirectByteBufferImpl.$(OBJEXT)
        -rm -f java/nio/natDirectByteBufferImpl.lo
        -rm -f java/text/natCollator.$(OBJEXT)
@@ -7578,7 +7852,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verify.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32-threads.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@classpath/native/jawt/$(DEPDIR)/libgcjawt_la-jawt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/$(DEPDIR)/natSystemProperties.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/$(DEPDIR)/natCore.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/JIS0208_to_Unicode.Plo@am__quote@
@@ -7658,7 +7931,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natInetAddress.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natVMNetworkInterface.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/nio/$(DEPDIR)/natDirectByteBufferImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/nio/channels/$(DEPDIR)/natChannels.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/nio/channels/$(DEPDIR)/natVMChannels.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/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@
@@ -7690,13 +7963,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
-classpath/native/jawt/libgcjawt_la-jawt.lo: classpath/native/jawt/jawt.c
-@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgcjawt_la_CFLAGS) $(CFLAGS) -MT classpath/native/jawt/libgcjawt_la-jawt.lo -MD -MP -MF "classpath/native/jawt/$(DEPDIR)/libgcjawt_la-jawt.Tpo" -c -o classpath/native/jawt/libgcjawt_la-jawt.lo `test -f 'classpath/native/jawt/jawt.c' || echo '$(srcdir)/'`classpath/native/jawt/jawt.c; \
-@am__fastdepCC_TRUE@   then mv -f "classpath/native/jawt/$(DEPDIR)/libgcjawt_la-jawt.Tpo" "classpath/native/jawt/$(DEPDIR)/libgcjawt_la-jawt.Plo"; else rm -f "classpath/native/jawt/$(DEPDIR)/libgcjawt_la-jawt.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='classpath/native/jawt/jawt.c' object='classpath/native/jawt/libgcjawt_la-jawt.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgcjawt_la_CFLAGS) $(CFLAGS) -c -o classpath/native/jawt/libgcjawt_la-jawt.lo `test -f 'classpath/native/jawt/jawt.c' || echo '$(srcdir)/'`classpath/native/jawt/jawt.c
-
 .cc.o:
 @am__fastdepCXX_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
 @am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
@@ -7890,7 +8156,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf classpath/native/jawt/.libs classpath/native/jawt/_libs
        -rm -rf gnu/classpath/.libs gnu/classpath/_libs
        -rm -rf gnu/gcj/.libs gnu/gcj/_libs
        -rm -rf gnu/gcj/convert/.libs gnu/gcj/convert/_libs
@@ -7994,7 +8259,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 \
@@ -8006,7 +8277,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; \
@@ -8014,7 +8285,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)' ;; \
@@ -8035,7 +8312,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 \
@@ -8110,7 +8387,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 \
@@ -8278,8 +8555,6 @@ clean-generic:
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -rm -f classpath/native/jawt/$(DEPDIR)/$(am__dirstamp)
-       -rm -f classpath/native/jawt/$(am__dirstamp)
        -rm -f gnu/classpath/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/classpath/$(am__dirstamp)
        -rm -f gnu/gcj/$(DEPDIR)/$(am__dirstamp)
@@ -8341,7 +8616,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libtool \
 
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf ./$(DEPDIR) classpath/native/jawt/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-libtool distclean-local distclean-tags
@@ -8372,7 +8647,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
-       -rm -rf ./$(DEPDIR) classpath/native/jawt/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -8426,8 +8701,6 @@ $(db_name): gcj-dbtool$(EXEEXT)
        @rm -f $(db_name)
        ./gcj-dbtool -n $(db_name) || touch $(db_name)
 
-$(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES)
-
 $(propertyo_files): %.lo: classpath/resource/%
        $(mkinstalldirs) `dirname $@`; \
        $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,$(@:.lo=)
@@ -8670,6 +8943,36 @@ gnu/java/awt/color.list: $(gnu_java_awt_color_source_files)
 
 -include gnu/java/awt/color.deps
 
+gnu/java/awt/font.list: $(gnu_java_awt_font_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_awt_font_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/awt/font.list
+
+-include gnu/java/awt/font.deps
+
+gnu/java/awt/font/opentype.list: $(gnu_java_awt_font_opentype_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_awt_font_opentype_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/awt/font/opentype.list
+
+-include gnu/java/awt/font/opentype.deps
+
+gnu/java/awt/font/opentype/truetype.list: $(gnu_java_awt_font_opentype_truetype_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_awt_font_opentype_truetype_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/awt/font/opentype/truetype.list
+
+-include gnu/java/awt/font/opentype/truetype.deps
+
 gnu/java/awt/image.list: $(gnu_java_awt_image_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_awt_image_source_files); do \
@@ -8680,6 +8983,16 @@ gnu/java/awt/image.list: $(gnu_java_awt_image_source_files)
 
 -include gnu/java/awt/image.deps
 
+gnu/java/awt/java2d.list: $(gnu_java_awt_java2d_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_awt_java2d_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/awt/java2d.list
+
+-include gnu/java/awt/java2d.deps
+
 gnu/java/awt/peer.list: $(gnu_java_awt_peer_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_awt_peer_source_files); do \
@@ -8705,6 +9018,16 @@ gnu-java-awt-peer-swing.lo: $(gnu_java_awt_peer_swing_source_files)
        $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-swing.lo @gnu-java-awt-peer-swing.list
        @rm -f gnu-java-awt-peer-swing.list
 
+gnu/java/awt/print.list: $(gnu_java_awt_print_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_awt_print_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/awt/print.list
+
+-include gnu/java/awt/print.deps
+
 gnu-java-beans.lo: $(gnu_java_beans_source_files)
        @find classpath/lib/gnu/java/beans -name '*.class' > gnu-java-beans.list
        $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-beans.lo @gnu-java-beans.list
@@ -8770,6 +9093,26 @@ gnu/java/net.list: $(gnu_java_net_source_files)
 
 -include gnu/java/net.deps
 
+gnu/java/net/local.list: $(gnu_java_net_local_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_net_local_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/net/local.list
+
+-include gnu/java/net/local.deps
+
+gnu/java/net/protocol/core.list: $(gnu_java_net_protocol_core_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_net_protocol_core_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/net/protocol/core.list
+
+-include gnu/java/net/protocol/core.deps
+
 gnu/java/net/protocol/file.list: $(gnu_java_net_protocol_file_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_net_protocol_file_source_files); do \
@@ -8790,6 +9133,16 @@ gnu/java/net/protocol/ftp.list: $(gnu_java_net_protocol_ftp_source_files)
 
 -include gnu/java/net/protocol/ftp.deps
 
+gnu/java/net/protocol/gcjlib.list: $(gnu_java_net_protocol_gcjlib_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_net_protocol_gcjlib_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/net/protocol/gcjlib.list
+
+-include gnu/java/net/protocol/gcjlib.deps
+
 gnu/java/net/protocol/http.list: $(gnu_java_net_protocol_http_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_net_protocol_http_source_files); do \
@@ -8860,6 +9213,16 @@ gnu/java/rmi.list: $(gnu_java_rmi_source_files)
 
 -include gnu/java/rmi.deps
 
+gnu/java/rmi/activation.list: $(gnu_java_rmi_activation_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_rmi_activation_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/rmi/activation.list
+
+-include gnu/java/rmi/activation.deps
+
 gnu/java/rmi/dgc.list: $(gnu_java_rmi_dgc_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_rmi_dgc_source_files); do \
@@ -8880,6 +9243,16 @@ gnu/java/rmi/registry.list: $(gnu_java_rmi_registry_source_files)
 
 -include gnu/java/rmi/registry.deps
 
+gnu/java/rmi/rmic.list: $(gnu_java_rmi_rmic_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_rmi_rmic_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/rmi/rmic.list
+
+-include gnu/java/rmi/rmic.deps
+
 gnu/java/rmi/server.list: $(gnu_java_rmi_server_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_rmi_server_source_files); do \
@@ -9110,6 +9483,16 @@ gnu/java/util.list: $(gnu_java_util_source_files)
 
 -include gnu/java/util.deps
 
+gnu/java/util/jar.list: $(gnu_java_util_jar_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_java_util_jar_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/java/util/jar.list
+
+-include gnu/java/util/jar.deps
+
 gnu/java/util/prefs.list: $(gnu_java_util_prefs_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_java_util_prefs_source_files); do \
@@ -9400,6 +9783,76 @@ gnu/javax/net/ssl/provider.list: $(gnu_javax_net_ssl_provider_source_files)
 
 -include gnu/javax/net/ssl/provider.deps
 
+gnu/javax/print.list: $(gnu_javax_print_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print.list
+
+-include gnu/javax/print.deps
+
+gnu/javax/print/ipp.list: $(gnu_javax_print_ipp_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_ipp_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print/ipp.list
+
+-include gnu/javax/print/ipp.deps
+
+gnu/javax/print/ipp/attribute.list: $(gnu_javax_print_ipp_attribute_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_ipp_attribute_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print/ipp/attribute.list
+
+-include gnu/javax/print/ipp/attribute.deps
+
+gnu/javax/print/ipp/attribute/defaults.list: $(gnu_javax_print_ipp_attribute_defaults_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_ipp_attribute_defaults_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print/ipp/attribute/defaults.list
+
+-include gnu/javax/print/ipp/attribute/defaults.deps
+
+gnu/javax/print/ipp/attribute/job.list: $(gnu_javax_print_ipp_attribute_job_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_ipp_attribute_job_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print/ipp/attribute/job.list
+
+-include gnu/javax/print/ipp/attribute/job.deps
+
+gnu/javax/print/ipp/attribute/printer.list: $(gnu_javax_print_ipp_attribute_printer_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_ipp_attribute_printer_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print/ipp/attribute/printer.list
+
+-include gnu/javax/print/ipp/attribute/printer.deps
+
+gnu/javax/print/ipp/attribute/supported.list: $(gnu_javax_print_ipp_attribute_supported_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_print_ipp_attribute_supported_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/print/ipp/attribute/supported.list
+
+-include gnu/javax/print/ipp/attribute/supported.deps
+
 gnu-javax-rmi.lo: $(gnu_javax_rmi_source_files)
        @find classpath/lib/gnu/javax/rmi -name '*.class' > gnu-javax-rmi.list
        $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-rmi.lo @gnu-javax-rmi.list
@@ -9440,6 +9893,36 @@ gnu-javax-sound-midi.lo: $(gnu_javax_sound_midi_source_files)
        $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-sound-midi.lo @gnu-javax-sound-midi.list
        @rm -f gnu-javax-sound-midi.list
 
+gnu/javax/swing/plaf/gnu.list: $(gnu_javax_swing_plaf_gnu_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_swing_plaf_gnu_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/swing/plaf/gnu.list
+
+-include gnu/javax/swing/plaf/gnu.deps
+
+gnu/javax/swing/plaf/metal.list: $(gnu_javax_swing_plaf_metal_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_swing_plaf_metal_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/swing/plaf/metal.list
+
+-include gnu/javax/swing/plaf/metal.deps
+
+gnu/javax/swing/text/html.list: $(gnu_javax_swing_text_html_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_swing_text_html_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/swing/text/html.list
+
+-include gnu/javax/swing/text/html.deps
+
 gnu/javax/swing/text/html/parser.list: $(gnu_javax_swing_text_html_parser_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_javax_swing_text_html_parser_source_files); do \
@@ -9480,6 +9963,16 @@ gnu/javax/swing/text/html/parser/support/low.list: $(gnu_javax_swing_text_html_p
 
 -include gnu/javax/swing/text/html/parser/support/low.deps
 
+gnu/javax/swing/tree.list: $(gnu_javax_swing_tree_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(gnu_javax_swing_tree_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > gnu/javax/swing/tree.list
+
+-include gnu/javax/swing/tree.deps
+
 gnu/regexp.list: $(gnu_regexp_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(gnu_regexp_source_files); do \
@@ -9695,6 +10188,16 @@ java/lang/annotation.list: $(java_lang_annotation_source_files)
 
 -include java/lang/annotation.deps
 
+java/lang/instrument.list: $(java_lang_instrument_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(java_lang_instrument_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > java/lang/instrument.list
+
+-include java/lang/instrument.deps
+
 java/lang/ref.list: $(java_lang_ref_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(java_lang_ref_source_files); do \
@@ -10155,6 +10658,16 @@ javax/security/auth/callback.list: $(javax_security_auth_callback_source_files)
 
 -include javax/security/auth/callback.deps
 
+javax/security/auth/kerberos.list: $(javax_security_auth_kerberos_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       @for file in $(javax_security_auth_kerberos_source_files); do \
+         if test -f $(srcdir)/$$file; then \
+           echo $(srcdir)/$$file; \
+         else echo $$file; fi; \
+       done > javax/security/auth/kerberos.list
+
+-include javax/security/auth/kerberos.deps
+
 javax/security/auth/login.list: $(javax_security_auth_login_source_files)
        @$(mkinstalldirs) $(dir $@)
        @for file in $(javax_security_auth_login_source_files); do \
@@ -10760,6 +11273,10 @@ create-headers: $(headers_to_make)
 $(libgcj_la_OBJECTS) $(gcj_dbtool_OBJECTS) $(xlib_nat_files): headers.stamp
 $(libgij_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 \
        maintainer-clean-multi