OSDN Git Service

Update to Automake 1.11.1.
[pf3gnuchains/gcc-fork.git] / libjava / Makefile.in
index aeec439..c781cc5 100644 (file)
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -41,79 +39,124 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 @TESTSUBDIR_TRUE@am__append_1 = testsuite
-@USE_LIBGCJ_BC_TRUE@am__append_2 = libgcj_bc.la
-@XLIB_AWT_TRUE@am__append_3 = lib-gnu-awt-xlib.la
-@NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \
-@NATIVE_TRUE@  grmic$(EXEEXT) grmiregistry$(EXEEXT) \
-@NATIVE_TRUE@  gcj-dbtool$(EXEEXT) gappletviewer$(EXEEXT) \
-@NATIVE_TRUE@  gjarsigner$(EXEEXT) gkeytool$(EXEEXT)
-@BASH_JAR_TRUE@am__append_4 = scripts/jar
-@USING_GCC_TRUE@am__append_5 = $(WARNINGS)
-@USING_BOEHMGC_TRUE@am__append_6 = boehm.cc
-@USING_NOGC_TRUE@am__append_7 = nogc.cc
-@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
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
-       $(srcdir)/../config.guess $(srcdir)/../config.sub \
-       $(srcdir)/../depcomp $(srcdir)/../install-sh \
-       $(srcdir)/../ltmain.sh $(srcdir)/../missing \
-       $(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 \
-       $(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)
+@BUILD_SUBLIBS_TRUE@am__append_2 = libgcj-noncore.la
+@USE_LIBGCJ_BC_TRUE@am__append_3 = libgcj_bc.la
+@XLIB_AWT_TRUE@am__append_4 = lib-gnu-awt-xlib.la
+@INSTALL_ECJ_JAR_TRUE@am__append_5 = $(ECJ_BUILD_JAR)
+@CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__append_6 = gjdoc
+@NATIVE_TRUE@noinst_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4)
+@INSTALL_BINARIES_TRUE@@NATIVE_TRUE@bin_PROGRAMS = $(am__EXEEXT_2)
+@INSTALL_BINARIES_FALSE@@NATIVE_TRUE@am__append_7 = $(bin_programs)
+@INSTALL_AOT_RPM_TRUE@am__append_8 = contrib/aot-compile-rpm
+@BUILD_ECJ1_TRUE@libexecsub_PROGRAMS = ecjx$(EXEEXT)
+@ANONVERSCRIPT_TRUE@am__append_9 = -Wl,--version-script=$(srcdir)/libgcj.ver
+@USING_GCC_TRUE@am__append_10 = $(WARNINGS)
+@BUILD_SUBLIBS_TRUE@am__append_11 = libgcj-noncore.la
+@USING_BOEHMGC_TRUE@am__append_12 = boehm.cc
+@USING_NOGC_TRUE@am__append_13 = nogc.cc
+@USING_POSIX_PLATFORM_TRUE@am__append_14 = posix.cc
+@USING_WIN32_PLATFORM_TRUE@am__append_15 = win32.cc
+@USING_DARWIN_CRT_TRUE@am__append_16 = darwin.cc
+@USING_POSIX_THREADS_TRUE@am__append_17 = posix-threads.cc
+@USING_WIN32_THREADS_TRUE@am__append_18 = win32-threads.cc
+@USING_NO_THREADS_TRUE@am__append_19 = no-threads.cc
+@ANONVERSCRIPT_TRUE@am__append_20 = $(srcdir)/libgcj.ver
+@ANONVERSCRIPT_TRUE@@BUILD_SUBLIBS_TRUE@am__append_21 = $(srcdir)/libgcj.ver
+@BUILD_SUBLIBS_TRUE@am__append_22 = libgcj-noncore.la
+@BUILD_SUBLIBS_TRUE@am__append_23 = libgcj-noncore.la
+@BUILD_SUBLIBS_TRUE@am__append_24 = libgcj-noncore.la
+DIST_COMMON = $(srcdir)/sources.am NEWS README ChangeLog THANKS \
+       $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+       $(top_srcdir)/configure $(am__configure_deps) \
+       $(srcdir)/../mkinstalldirs $(srcdir)/libgcj.pc.in \
+       $(srcdir)/libgcj.spec.in $(srcdir)/libgcj-test.spec.in \
+       $(top_srcdir)/contrib/aotcompile.py.in \
+       $(top_srcdir)/contrib/aot-compile.in \
+       $(top_srcdir)/contrib/aot-compile-rpm.in \
+       $(top_srcdir)/contrib/generate-cacerts.pl.in \
+       $(top_srcdir)/contrib/rebuild-gcj-db.in \
+       $(top_srcdir)/scripts/jar.in \
+       $(top_srcdir)/java/lang/nat${PLATFORM}Process.cc \
+       $(top_srcdir)/gnu/java/nio/natVMPipe${PLATFORM}.cc \
+       $(top_srcdir)/gnu/java/nio/natVMSelector${PLATFORM}.cc \
+       $(srcdir)/../depcomp
+@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am__append_25 = gen-from-JIS
+@BUILD_SUBLIBS_TRUE@am__append_26 = libgcj-noncore.la
+@BUILD_SUBLIBS_TRUE@am__append_27 = libgcj-noncore.la
+@BUILD_SUBLIBS_TRUE@am__append_28 = libgcj-noncore.la
+@BUILD_SUBLIBS_TRUE@@NATIVE_TRUE@am__append_29 = libgcj-noncore.la
+@NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_30 = libgcj_bc.la
+@NATIVE_TRUE@@USE_LIBGCJ_BC_FALSE@am__append_31 = libgcj.la
+@XLIB_AWT_TRUE@am__append_32 = $(xlib_nat_headers)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \
+       $(top_srcdir)/../config/acx.m4 \
        $(top_srcdir)/../config/depstand.m4 \
        $(top_srcdir)/../config/enable.m4 \
        $(top_srcdir)/../config/gxx-include-dir.m4 \
        $(top_srcdir)/../config/iconv.m4 \
        $(top_srcdir)/../config/lcmessage.m4 \
+       $(top_srcdir)/../config/ld-symbolic.m4 \
        $(top_srcdir)/../config/lead-dot.m4 \
        $(top_srcdir)/../config/lib-ld.m4 \
        $(top_srcdir)/../config/lib-link.m4 \
        $(top_srcdir)/../config/lib-prefix.m4 \
+       $(top_srcdir)/../config/multi.m4 \
        $(top_srcdir)/../config/no-executables.m4 \
+       $(top_srcdir)/../config/override.m4 \
        $(top_srcdir)/../config/tls.m4 \
        $(top_srcdir)/../config/unwind_ipinfo.m4 \
-       $(top_srcdir)/../libtool.m4 $(top_srcdir)/mingwld.m4 \
-       $(top_srcdir)/pkg.m4 $(top_srcdir)/shlibpath.m4 \
-       $(top_srcdir)/configure.ac
+       $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltgcc.m4 \
+       $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
+       $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
+       $(top_srcdir)/mingwld.m4 $(top_srcdir)/pkg.m4 \
+       $(top_srcdir)/shlibpath.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 CONFIG_HEADER = $(top_builddir)/include/config.h \
        $(top_builddir)/gcj/libgcj-config.h
 CONFIG_CLEAN_FILES = libgcj.pc libgcj.spec libgcj-test.spec \
-       scripts/jar java/io/natFile.cc java/lang/ConcreteProcess.java \
+       contrib/aotcompile.py contrib/aot-compile \
+       contrib/aot-compile-rpm contrib/generate-cacerts.pl \
+       contrib/rebuild-gcj-db scripts/jar java/io/natFile.cc \
        java/lang/natConcreteProcess.cc java/net/natVMInetAddress.cc \
        java/net/natVMNetworkInterface.cc \
        gnu/java/net/natPlainSocketImpl.cc \
        gnu/java/net/natPlainDatagramSocketImpl.cc \
-       gnu/java/nio/natPipeImpl.cc gnu/java/nio/natSelectorImpl.cc \
-       gnu/java/nio/channels/natFileChannelImpl.cc sysdep/locks.h \
+       gnu/java/nio/natVMPipe.cc gnu/java/nio/natVMSelector.cc \
+       gnu/java/nio/channels/natFileChannelImpl.cc \
+       gnu/java/security/jce/prng/natVMSecureRandom.cc sysdep/locks.h \
        sysdep/backtrace.h sysdep/descriptor.h
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(dbexecdir)" \
        "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" \
-       "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbexecdir)" \
-       "$(DESTDIR)$(jardir)" "$(DESTDIR)$(toolexecmainlibdir)"
-dbexecLTLIBRARIES_INSTALL = $(INSTALL)
-toolexeclibLTLIBRARIES_INSTALL = $(INSTALL)
+       "$(DESTDIR)$(libexecsubdir)" "$(DESTDIR)$(bindir)" \
+       "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(jardir)" \
+       "$(DESTDIR)$(toolexecmainlibdir)"
 LTLIBRARIES = $(dbexec_LTLIBRARIES) $(toolexeclib_LTLIBRARIES)
 am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo \
@@ -139,46 +182,53 @@ 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)
-libgcj_tools_la_LIBADD =
+am_libgcj_noncore_la_OBJECTS =
+libgcj_noncore_la_OBJECTS = $(am_libgcj_noncore_la_OBJECTS)
+@BUILD_SUBLIBS_TRUE@am_libgcj_noncore_la_rpath = -rpath \
+@BUILD_SUBLIBS_TRUE@   $(toolexeclibdir)
 am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo
 libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS)
-am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
-       gnu/classpath/debug.lo gnu/classpath/jdwp.lo \
-       gnu/classpath/jdwp/event.lo \
-       gnu/classpath/jdwp/event/filters.lo \
-       gnu/classpath/jdwp/exception.lo gnu/classpath/jdwp/id.lo \
-       gnu/classpath/jdwp/processor.lo \
-       gnu/classpath/jdwp/transport.lo gnu/classpath/jdwp/util.lo \
-       gnu/gcj.lo gnu/gcj/convert.lo gnu/gcj/io.lo gnu/gcj/jvmti.lo \
-       gnu/gcj/runtime.lo gnu/gcj/util.lo gnu/java/awt.lo \
-       gnu/java/awt/color.lo gnu/java/awt/dnd.lo gnu/java/awt/font.lo \
-       gnu/java/awt/font/opentype.lo \
+@INTERPRETER_TRUE@am__DEPENDENCIES_1 = gnu/classpath/jdwp.lo \
+@INTERPRETER_TRUE@     gnu/classpath/jdwp/event.lo \
+@INTERPRETER_TRUE@     gnu/classpath/jdwp/event/filters.lo \
+@INTERPRETER_TRUE@     gnu/classpath/jdwp/exception.lo \
+@INTERPRETER_TRUE@     gnu/classpath/jdwp/id.lo \
+@INTERPRETER_TRUE@     gnu/classpath/jdwp/processor.lo \
+@INTERPRETER_TRUE@     gnu/classpath/jdwp/transport.lo \
+@INTERPRETER_TRUE@     gnu/classpath/jdwp/util.lo \
+@INTERPRETER_TRUE@     gnu/classpath/jdwp/value.lo gnu/gcj/jvmti.lo
+am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
+       gnu/classpath/debug.lo gnu/classpath/toolkit.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/dnd.lo gnu/java/awt/font.lo \
+       gnu/java/awt/font/autofit.lo gnu/java/awt/font/opentype.lo \
        gnu/java/awt/font/opentype/truetype.lo gnu/java/awt/image.lo \
        gnu/java/awt/java2d.lo gnu/java/awt/peer.lo \
-       gnu/java/awt/print.lo gnu/java/io.lo gnu/java/lang.lo \
-       gnu/java/lang/management.lo gnu/java/lang/reflect.lo \
-       gnu/java/locale.lo gnu/java/math.lo gnu/java/net.lo \
-       gnu/java/net/loader.lo gnu/java/net/local.lo \
-       gnu/java/net/protocol/core.lo gnu/java/net/protocol/file.lo \
-       gnu/java/net/protocol/ftp.lo gnu/java/net/protocol/gcjlib.lo \
-       gnu/java/net/protocol/http.lo gnu/java/net/protocol/https.lo \
-       gnu/java/net/protocol/jar.lo gnu/java/nio.lo \
-       gnu/java/nio/channels.lo gnu/java/nio/charset.lo \
-       gnu/java/rmi.lo gnu/java/rmi/activation.lo gnu/java/rmi/dgc.lo \
-       gnu/java/rmi/registry.lo gnu/java/rmi/rmic.lo \
-       gnu/java/rmi/server.lo gnu/java/security.lo \
-       gnu/java/security/action.lo gnu/java/security/ber.lo \
-       gnu/java/security/der.lo gnu/java/security/hash.lo \
-       gnu/java/security/jce/hash.lo gnu/java/security/jce/prng.lo \
-       gnu/java/security/jce/sig.lo gnu/java/security/key.lo \
-       gnu/java/security/key/dss.lo gnu/java/security/key/rsa.lo \
-       gnu/java/security/pkcs.lo gnu/java/security/prng.lo \
-       gnu/java/security/provider.lo gnu/java/security/sig.lo \
-       gnu/java/security/sig/dss.lo gnu/java/security/sig/rsa.lo \
-       gnu/java/security/util.lo gnu/java/security/x509.lo \
-       gnu/java/security/x509/ext.lo gnu/java/text.lo \
-       gnu/java/util.lo gnu/java/util/jar.lo gnu/java/util/prefs.lo \
-       gnu/java/util/regex.lo gnu/javax/crypto.lo \
+       gnu/java/awt/peer/headless.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/net.lo gnu/java/net/loader.lo \
+       gnu/java/net/local.lo gnu/java/net/protocol/core.lo \
+       gnu/java/net/protocol/file.lo gnu/java/net/protocol/ftp.lo \
+       gnu/java/net/protocol/gcjlib.lo gnu/java/net/protocol/http.lo \
+       gnu/java/net/protocol/https.lo gnu/java/net/protocol/jar.lo \
+       gnu/java/nio.lo gnu/java/nio/channels.lo \
+       gnu/java/nio/charset.lo gnu/java/rmi.lo \
+       gnu/java/rmi/activation.lo gnu/java/rmi/dgc.lo \
+       gnu/java/rmi/registry.lo gnu/java/rmi/server.lo \
+       gnu/java/security.lo gnu/java/security/action.lo \
+       gnu/java/security/ber.lo gnu/java/security/der.lo \
+       gnu/java/security/hash.lo gnu/java/security/jce/hash.lo \
+       gnu/java/security/jce/prng.lo gnu/java/security/jce/sig.lo \
+       gnu/java/security/key.lo gnu/java/security/key/dss.lo \
+       gnu/java/security/key/rsa.lo gnu/java/security/pkcs.lo \
+       gnu/java/security/prng.lo gnu/java/security/provider.lo \
+       gnu/java/security/sig.lo gnu/java/security/sig/dss.lo \
+       gnu/java/security/sig/rsa.lo gnu/java/security/util.lo \
+       gnu/java/security/x509.lo gnu/java/security/x509/ext.lo \
+       gnu/java/text.lo gnu/java/util.lo gnu/java/util/jar.lo \
+       gnu/java/util/prefs.lo gnu/java/util/regex.lo \
+       gnu/javax/activation/viewers.lo gnu/javax/crypto.lo \
        gnu/javax/crypto/assembly.lo gnu/javax/crypto/cipher.lo \
        gnu/javax/crypto/jce.lo gnu/javax/crypto/jce/cipher.lo \
        gnu/javax/crypto/jce/key.lo gnu/javax/crypto/jce/keyring.lo \
@@ -194,7 +244,10 @@ am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
        gnu/javax/crypto/sasl/plain.lo gnu/javax/crypto/sasl/srp.lo \
        gnu/javax/imageio.lo gnu/javax/imageio/bmp.lo \
        gnu/javax/imageio/gif.lo gnu/javax/imageio/jpeg.lo \
-       gnu/javax/imageio/png.lo gnu/javax/net/ssl.lo \
+       gnu/javax/imageio/png.lo gnu/javax/naming/giop.lo \
+       gnu/javax/naming/ictxImpl/trans.lo \
+       gnu/javax/naming/jndi/url/corbaname.lo \
+       gnu/javax/naming/jndi/url/rmi.lo gnu/javax/net/ssl.lo \
        gnu/javax/net/ssl/provider.lo gnu/javax/print.lo \
        gnu/javax/print/ipp.lo gnu/javax/print/ipp/attribute.lo \
        gnu/javax/print/ipp/attribute/defaults.lo \
@@ -202,10 +255,16 @@ am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
        gnu/javax/print/ipp/attribute/printer.lo \
        gnu/javax/print/ipp/attribute/supported.lo \
        gnu/javax/security/auth.lo gnu/javax/security/auth/callback.lo \
-       gnu/javax/security/auth/login.lo gnu/javax/sound/sampled/AU.lo \
-       gnu/javax/sound/sampled/WAV.lo gnu/javax/swing/plaf/gnu.lo \
-       gnu/javax/swing/plaf/metal.lo gnu/javax/swing/text/html.lo \
-       gnu/javax/swing/text/html/parser.lo \
+       gnu/javax/security/auth/login.lo gnu/javax/sound.lo \
+       gnu/javax/sound/sampled/AU.lo gnu/javax/sound/sampled/WAV.lo \
+       gnu/javax/swing/plaf/gnu.lo gnu/javax/swing/plaf/metal.lo \
+       gnu/javax/swing/text/html.lo gnu/javax/swing/text/html/css.lo \
+       gnu/javax/swing/text/html/parser/GnuParserDelegator.lo \
+       gnu/javax/swing/text/html/parser/HTML_401F.lo \
+       gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.lo \
+       gnu/javax/swing/text/html/parser/gnuDTD.lo \
+       gnu/javax/swing/text/html/parser/htmlAttributeSet.lo \
+       gnu/javax/swing/text/html/parser/htmlValidator.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 \
@@ -217,18 +276,22 @@ am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
        java/awt/peer.lo java/awt/print.lo java/beans.lo \
        java/beans/beancontext.lo java/io.lo java/lang.lo \
        java/lang/annotation.lo java/lang/instrument.lo \
-       java/lang/management.lo java/lang/ref.lo java/lang/reflect.lo \
-       java/math.lo java/net.lo java/nio.lo java/nio/channels.lo \
-       java/nio/channels/spi.lo java/nio/charset.lo \
-       java/nio/charset/spi.lo java/rmi.lo java/rmi/activation.lo \
-       java/rmi/dgc.lo java/rmi/registry.lo java/rmi/server.lo \
-       java/security.lo java/security/acl.lo java/security/cert.lo \
-       java/security/interfaces.lo java/security/spec.lo java/sql.lo \
-       java/text.lo java/util.lo java/util/jar.lo \
-       java/util/logging.lo java/util/prefs.lo java/util/regex.lo \
-       java/util/zip.lo javax/accessibility.lo javax/crypto.lo \
-       javax/crypto/interfaces.lo javax/crypto/spec.lo \
-       javax/management.lo javax/management/openmbean.lo \
+       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/text/spi.lo java/util.lo java/util/concurrent.lo \
+       java/util/concurrent/atomic.lo java/util/concurrent/locks.lo \
+       java/util/jar.lo java/util/logging.lo java/util/prefs.lo \
+       java/util/regex.lo java/util/spi.lo java/util/zip.lo \
+       javax/accessibility.lo javax/activation.lo javax/activity.lo \
+       javax/crypto.lo javax/crypto/interfaces.lo \
+       javax/crypto/spec.lo javax/management.lo \
+       javax/management/loading.lo javax/management/openmbean.lo \
+       javax/management/remote.lo javax/management/remote/rmi.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 \
@@ -248,25 +311,24 @@ am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.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_2 = gnu-CORBA.lo gnu-java-awt-dnd-peer-gtk.lo \
-       gnu-java-awt-peer-gtk.lo gnu-java-awt-peer-qt.lo \
-       gnu-java-awt-peer-swing.lo gnu-java-beans.lo \
-       gnu-java-util-prefs-gconf.lo gnu-javax-rmi.lo \
-       gnu-javax-sound-midi.lo gnu-xml.lo javax-imageio.lo \
-       javax-rmi.lo javax-xml.lo org-omg.lo org-relaxng.lo org-w3c.lo \
-       org-xml.lo
-am__DEPENDENCIES_3 = $(patsubst classpath/resource/%,%,$(addsuffix \
-       .lo,$(property_files)))
-am__DEPENDENCIES_4 =
-am__libgcj_la_SOURCES_DIST = prims.cc jni.cc jvmti.cc exception.cc \
-       stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \
-       java/lang/Class.java java/lang/Object.java \
-       gnu/classpath/natSystemProperties.cc \
-       gnu/classpath/jdwp/natVMFrame.cc \
+       javax/swing/undo.lo javax/tools.lo javax/transaction.lo \
+       javax/transaction/xa.lo org/ietf/jgss.lo sun/awt.lo \
+       sun/misc.lo sun/reflect.lo sun/reflect/annotation.lo \
+       sun/reflect/misc.lo $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(propertyo_files) \
+       $(bc_objects)
+@BUILD_SUBLIBS_FALSE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
+@BUILD_SUBLIBS_TRUE@am__DEPENDENCIES_4 =  \
+@BUILD_SUBLIBS_TRUE@   $(CORE_PACKAGE_SOURCE_FILES_LO)
+am__DEPENDENCIES_5 =
+am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
+       stacktrace.cc link.cc defineclass.cc verify.cc jvmti.cc \
+       interpret.cc gnu/classpath/jdwp/natVMFrame.cc \
        gnu/classpath/jdwp/natVMMethod.cc \
-       gnu/classpath/jdwp/natVMVirtualMachine.cc gnu/gcj/natCore.cc \
+       gnu/classpath/jdwp/natVMVirtualMachine.cc \
+       gnu/classpath/natConfiguration.cc \
+       gnu/classpath/natSystemProperties.cc \
+       gnu/classpath/natVMStackWalker.cc gnu/gcj/natCore.cc \
        gnu/gcj/convert/JIS0208_to_Unicode.cc \
        gnu/gcj/convert/JIS0212_to_Unicode.cc \
        gnu/gcj/convert/Unicode_to_JIS.cc gnu/gcj/convert/natIconv.cc \
@@ -276,45 +338,64 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc jvmti.cc exception.cc \
        gnu/gcj/convert/natOutput_SJIS.cc \
        gnu/gcj/io/natSimpleSHSStream.cc gnu/gcj/io/shs.cc \
        gnu/gcj/jvmti/natBreakpoint.cc \
+       gnu/gcj/jvmti/natNormalBreakpoint.cc \
        gnu/gcj/runtime/natFinalizerThread.cc \
        gnu/gcj/runtime/natSharedLibLoader.cc \
        gnu/gcj/runtime/natSystemClassLoader.cc \
        gnu/gcj/runtime/natStringBuffer.cc gnu/gcj/util/natDebug.cc \
-       gnu/java/lang/natMainThread.cc \
+       gnu/gcj/util/natGCInfo.cc gnu/java/lang/natMainThread.cc \
+       gnu/java/lang/management/natVMClassLoadingMXBeanImpl.cc \
+       gnu/java/lang/management/natVMCompilationMXBeanImpl.cc \
+       gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.cc \
+       gnu/java/lang/management/natVMMemoryMXBeanImpl.cc \
+       gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.cc \
+       gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc \
+       gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc \
+       gnu/java/lang/management/natVMRuntimeMXBeanImpl.cc \
+       gnu/java/lang/management/natVMThreadMXBeanImpl.cc \
        gnu/java/net/natPlainDatagramSocketImpl.cc \
        gnu/java/net/natPlainSocketImpl.cc \
        gnu/java/net/protocol/core/natCoreInputStream.cc \
-       gnu/java/nio/natPipeImpl.cc gnu/java/nio/natSelectorImpl.cc \
+       gnu/java/nio/natVMPipe.cc gnu/java/nio/natVMSelector.cc \
        gnu/java/nio/natNIOServerSocket.cc \
-       gnu/java/nio/channels/natFileChannelImpl.cc java/io/natFile.cc \
-       java/io/natObjectInputStream.cc \
+       gnu/java/nio/natVMChannel.cc \
+       gnu/java/nio/channels/natFileChannelImpl.cc \
+       gnu/java/security/jce/prng/natVMSecureRandom.cc \
+       java/io/natFile.cc java/io/natVMObjectInputStream.cc \
        java/io/natVMObjectStreamClass.cc java/lang/natCharacter.cc \
        java/lang/natClass.cc java/lang/natClassLoader.cc \
-       java/lang/natConcreteProcess.cc java/lang/natDouble.cc \
-       java/lang/natFloat.cc java/lang/natMath.cc \
+       java/lang/natConcreteProcess.cc java/lang/natVMDouble.cc \
+       java/lang/natVMFloat.cc java/lang/natMath.cc \
        java/lang/natObject.cc java/lang/natRuntime.cc \
-       java/lang/natString.cc java/lang/natStringBuffer.cc \
-       java/lang/natStringBuilder.cc java/lang/natSystem.cc \
-       java/lang/natThread.cc java/lang/natVMClassLoader.cc \
-       java/lang/natVMSecurityManager.cc java/lang/natVMThrowable.cc \
+       java/lang/natString.cc java/lang/natAbstractStringBuffer.cc \
+       java/lang/natSystem.cc java/lang/natThread.cc \
+       java/lang/natThreadLocal.cc java/lang/natVMClassLoader.cc \
+       java/lang/natVMProcess.cc java/lang/natVMThrowable.cc \
        java/lang/ref/natReference.cc java/lang/reflect/natArray.cc \
        java/lang/reflect/natConstructor.cc \
        java/lang/reflect/natField.cc java/lang/reflect/natMethod.cc \
-       java/net/natVMNetworkInterface.cc java/net/natVMInetAddress.cc \
-       java/net/natURLClassLoader.cc \
+       java/lang/reflect/natVMProxy.cc java/net/natVMInetAddress.cc \
+       java/net/natVMNetworkInterface.cc \
+       java/net/natVMURLConnection.cc \
        java/nio/channels/natVMChannels.cc \
-       java/nio/natDirectByteBufferImpl.cc \
+       java/nio/natVMDirectByteBufferImpl.cc \
        java/security/natVMAccessController.cc \
        java/security/natVMAccessControlState.cc \
-       java/text/natCollator.cc java/util/natResourceBundle.cc \
-       java/util/natVMTimeZone.cc java/util/logging/natLogger.cc \
-       java/util/zip/natDeflater.cc java/util/zip/natInflater.cc \
-       boehm.cc nogc.cc posix.cc win32.cc darwin.cc posix-threads.cc \
+       java/text/natCollator.cc java/util/natVMTimeZone.cc \
+       java/util/concurrent/atomic/natAtomicLong.cc \
+       java/util/logging/natLogger.cc java/util/zip/natDeflater.cc \
+       java/util/zip/natInflater.cc sun/misc/natUnsafe.cc boehm.cc \
+       nogc.cc posix.cc win32.cc darwin.cc posix-threads.cc \
        win32-threads.cc no-threads.cc
-am__objects_2 = gnu/classpath/natSystemProperties.lo \
-       gnu/classpath/jdwp/natVMFrame.lo \
-       gnu/classpath/jdwp/natVMMethod.lo \
-       gnu/classpath/jdwp/natVMVirtualMachine.lo gnu/gcj/natCore.lo \
+@INTERPRETER_TRUE@am__objects_2 = jvmti.lo interpret.lo
+@INTERPRETER_TRUE@am__objects_3 = gnu/classpath/jdwp/natVMFrame.lo \
+@INTERPRETER_TRUE@     gnu/classpath/jdwp/natVMMethod.lo \
+@INTERPRETER_TRUE@     gnu/classpath/jdwp/natVMVirtualMachine.lo
+@INTERPRETER_TRUE@am__objects_4 = gnu/gcj/jvmti/natBreakpoint.lo \
+@INTERPRETER_TRUE@     gnu/gcj/jvmti/natNormalBreakpoint.lo
+am__objects_5 = $(am__objects_3) gnu/classpath/natConfiguration.lo \
+       gnu/classpath/natSystemProperties.lo \
+       gnu/classpath/natVMStackWalker.lo gnu/gcj/natCore.lo \
        gnu/gcj/convert/JIS0208_to_Unicode.lo \
        gnu/gcj/convert/JIS0212_to_Unicode.lo \
        gnu/gcj/convert/Unicode_to_JIS.lo gnu/gcj/convert/natIconv.lo \
@@ -323,55 +404,67 @@ am__objects_2 = gnu/classpath/natSystemProperties.lo \
        gnu/gcj/convert/natOutput_EUCJIS.lo \
        gnu/gcj/convert/natOutput_SJIS.lo \
        gnu/gcj/io/natSimpleSHSStream.lo gnu/gcj/io/shs.lo \
-       gnu/gcj/jvmti/natBreakpoint.lo \
-       gnu/gcj/runtime/natFinalizerThread.lo \
+       $(am__objects_4) gnu/gcj/runtime/natFinalizerThread.lo \
        gnu/gcj/runtime/natSharedLibLoader.lo \
        gnu/gcj/runtime/natSystemClassLoader.lo \
        gnu/gcj/runtime/natStringBuffer.lo gnu/gcj/util/natDebug.lo \
-       gnu/java/lang/natMainThread.lo \
+       gnu/gcj/util/natGCInfo.lo gnu/java/lang/natMainThread.lo \
+       gnu/java/lang/management/natVMClassLoadingMXBeanImpl.lo \
+       gnu/java/lang/management/natVMCompilationMXBeanImpl.lo \
+       gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.lo \
+       gnu/java/lang/management/natVMMemoryMXBeanImpl.lo \
+       gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.lo \
+       gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.lo \
+       gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.lo \
+       gnu/java/lang/management/natVMRuntimeMXBeanImpl.lo \
+       gnu/java/lang/management/natVMThreadMXBeanImpl.lo \
        gnu/java/net/natPlainDatagramSocketImpl.lo \
        gnu/java/net/natPlainSocketImpl.lo \
        gnu/java/net/protocol/core/natCoreInputStream.lo \
-       gnu/java/nio/natPipeImpl.lo gnu/java/nio/natSelectorImpl.lo \
+       gnu/java/nio/natVMPipe.lo gnu/java/nio/natVMSelector.lo \
        gnu/java/nio/natNIOServerSocket.lo \
-       gnu/java/nio/channels/natFileChannelImpl.lo java/io/natFile.lo \
-       java/io/natObjectInputStream.lo \
+       gnu/java/nio/natVMChannel.lo \
+       gnu/java/nio/channels/natFileChannelImpl.lo \
+       gnu/java/security/jce/prng/natVMSecureRandom.lo \
+       java/io/natFile.lo java/io/natVMObjectInputStream.lo \
        java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \
        java/lang/natClass.lo java/lang/natClassLoader.lo \
-       java/lang/natConcreteProcess.lo java/lang/natDouble.lo \
-       java/lang/natFloat.lo java/lang/natMath.lo \
+       java/lang/natConcreteProcess.lo java/lang/natVMDouble.lo \
+       java/lang/natVMFloat.lo java/lang/natMath.lo \
        java/lang/natObject.lo java/lang/natRuntime.lo \
-       java/lang/natString.lo java/lang/natStringBuffer.lo \
-       java/lang/natStringBuilder.lo java/lang/natSystem.lo \
-       java/lang/natThread.lo java/lang/natVMClassLoader.lo \
-       java/lang/natVMSecurityManager.lo java/lang/natVMThrowable.lo \
+       java/lang/natString.lo java/lang/natAbstractStringBuffer.lo \
+       java/lang/natSystem.lo java/lang/natThread.lo \
+       java/lang/natThreadLocal.lo java/lang/natVMClassLoader.lo \
+       java/lang/natVMProcess.lo java/lang/natVMThrowable.lo \
        java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \
        java/lang/reflect/natConstructor.lo \
        java/lang/reflect/natField.lo java/lang/reflect/natMethod.lo \
-       java/net/natVMNetworkInterface.lo java/net/natVMInetAddress.lo \
-       java/net/natURLClassLoader.lo \
+       java/lang/reflect/natVMProxy.lo java/net/natVMInetAddress.lo \
+       java/net/natVMNetworkInterface.lo \
+       java/net/natVMURLConnection.lo \
        java/nio/channels/natVMChannels.lo \
-       java/nio/natDirectByteBufferImpl.lo \
+       java/nio/natVMDirectByteBufferImpl.lo \
        java/security/natVMAccessController.lo \
        java/security/natVMAccessControlState.lo \
-       java/text/natCollator.lo java/util/natResourceBundle.lo \
-       java/util/natVMTimeZone.lo java/util/logging/natLogger.lo \
-       java/util/zip/natDeflater.lo java/util/zip/natInflater.lo
-@USING_BOEHMGC_TRUE@am__objects_3 = boehm.lo
-@USING_NOGC_TRUE@am__objects_4 = nogc.lo
-@USING_POSIX_PLATFORM_TRUE@am__objects_5 = posix.lo
-@USING_WIN32_PLATFORM_TRUE@am__objects_6 = win32.lo
-@USING_DARWIN_CRT_TRUE@am__objects_7 = darwin.lo
-@USING_POSIX_THREADS_TRUE@am__objects_8 = posix-threads.lo
-@USING_WIN32_THREADS_TRUE@am__objects_9 = win32-threads.lo
-@USING_NO_THREADS_TRUE@am__objects_10 = no-threads.lo
-am_libgcj_la_OBJECTS = prims.lo jni.lo jvmti.lo exception.lo \
-       stacktrace.lo link.lo defineclass.lo interpret.lo verify.lo \
-       java/lang/Class.lo java/lang/Object.lo $(am__objects_2) \
-       $(am__objects_3) $(am__objects_4) $(am__objects_5) \
-       $(am__objects_6) $(am__objects_7) $(am__objects_8) \
-       $(am__objects_9) $(am__objects_10)
+       java/text/natCollator.lo java/util/natVMTimeZone.lo \
+       java/util/concurrent/atomic/natAtomicLong.lo \
+       java/util/logging/natLogger.lo java/util/zip/natDeflater.lo \
+       java/util/zip/natInflater.lo sun/misc/natUnsafe.lo
+@USING_BOEHMGC_TRUE@am__objects_6 = boehm.lo
+@USING_NOGC_TRUE@am__objects_7 = nogc.lo
+@USING_POSIX_PLATFORM_TRUE@am__objects_8 = posix.lo
+@USING_WIN32_PLATFORM_TRUE@am__objects_9 = win32.lo
+@USING_DARWIN_CRT_TRUE@am__objects_10 = darwin.lo
+@USING_POSIX_THREADS_TRUE@am__objects_11 = posix-threads.lo
+@USING_WIN32_THREADS_TRUE@am__objects_12 = win32-threads.lo
+@USING_NO_THREADS_TRUE@am__objects_13 = no-threads.lo
+am_libgcj_la_OBJECTS = prims.lo jni.lo exception.lo stacktrace.lo \
+       link.lo defineclass.lo verify.lo $(am__objects_2) \
+       $(am__objects_5) $(am__objects_6) $(am__objects_7) \
+       $(am__objects_8) $(am__objects_9) $(am__objects_10) \
+       $(am__objects_11) $(am__objects_12) $(am__objects_13)
 libgcj_la_OBJECTS = $(am_libgcj_la_OBJECTS)
+libgcj_bc_la_LIBADD =
 am_libgcj_bc_la_OBJECTS = libgcj_bc.lo
 libgcj_bc_la_OBJECTS = $(am_libgcj_bc_la_OBJECTS)
 @USE_LIBGCJ_BC_TRUE@am_libgcj_bc_la_rpath = -rpath $(toolexeclibdir)
@@ -379,108 +472,124 @@ am_libgij_la_OBJECTS = gij.lo
 libgij_la_OBJECTS = $(am_libgij_la_OBJECTS)
 am_libjvm_la_OBJECTS = jni-libjvm.lo
 libjvm_la_OBJECTS = $(am_libjvm_la_OBJECTS)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+@CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__EXEEXT_1 = gjdoc$(EXEEXT)
+@NATIVE_TRUE@am__EXEEXT_2 = jv-convert$(EXEEXT) gij$(EXEEXT) \
+@NATIVE_TRUE@  grmic$(EXEEXT) grmiregistry$(EXEEXT) \
+@NATIVE_TRUE@  gcj-dbtool$(EXEEXT) gappletviewer$(EXEEXT) \
+@NATIVE_TRUE@  gjarsigner$(EXEEXT) gkeytool$(EXEEXT) \
+@NATIVE_TRUE@  gjar$(EXEEXT) gcjh$(EXEEXT) gjavah$(EXEEXT) \
+@NATIVE_TRUE@  gnative2ascii$(EXEEXT) gorbd$(EXEEXT) \
+@NATIVE_TRUE@  grmid$(EXEEXT) gserialver$(EXEEXT) \
+@NATIVE_TRUE@  gtnameserv$(EXEEXT) gc-analyze$(EXEEXT) \
+@NATIVE_TRUE@  $(am__EXEEXT_1)
+@INSTALL_BINARIES_FALSE@@NATIVE_TRUE@am__EXEEXT_3 = $(am__EXEEXT_2)
+@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am__EXEEXT_4 =  \
+@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gen-from-JIS$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(libexecsub_PROGRAMS) $(noinst_PROGRAMS)
+am_ecjx_OBJECTS = ecjx.$(OBJEXT)
+ecjx_OBJECTS = $(am_ecjx_OBJECTS)
 am_gappletviewer_OBJECTS =
 gappletviewer_OBJECTS = $(am_gappletviewer_OBJECTS)
-am_gcj_dbtool_OBJECTS = gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT) \
-       gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT)
+am_gc_analyze_OBJECTS =
+gc_analyze_OBJECTS = $(am_gc_analyze_OBJECTS)
+am_gcj_dbtool_OBJECTS = gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT)
 gcj_dbtool_OBJECTS = $(am_gcj_dbtool_OBJECTS)
-am__gen_from_JIS_SOURCES_DIST = gnu/gcj/convert/gen-from-JIS.c \
-       gnu/gcj/convert/make-trie.c
+am_gcjh_OBJECTS =
+gcjh_OBJECTS = $(am_gcjh_OBJECTS)
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am_gen_from_JIS_OBJECTS = gnu/gcj/convert/gen-from-JIS.$(OBJEXT) \
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gnu/gcj/convert/make-trie.$(OBJEXT)
 gen_from_JIS_OBJECTS = $(am_gen_from_JIS_OBJECTS)
 gen_from_JIS_LDADD = $(LDADD)
 am_gij_OBJECTS =
 gij_OBJECTS = $(am_gij_OBJECTS)
+am_gjar_OBJECTS =
+gjar_OBJECTS = $(am_gjar_OBJECTS)
 am_gjarsigner_OBJECTS =
 gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS)
+am_gjavah_OBJECTS =
+gjavah_OBJECTS = $(am_gjavah_OBJECTS)
+am_gjdoc_OBJECTS =
+gjdoc_OBJECTS = $(am_gjdoc_OBJECTS)
 am_gkeytool_OBJECTS =
 gkeytool_OBJECTS = $(am_gkeytool_OBJECTS)
+am_gnative2ascii_OBJECTS =
+gnative2ascii_OBJECTS = $(am_gnative2ascii_OBJECTS)
+am_gorbd_OBJECTS =
+gorbd_OBJECTS = $(am_gorbd_OBJECTS)
 am_grmic_OBJECTS =
 grmic_OBJECTS = $(am_grmic_OBJECTS)
+am_grmid_OBJECTS =
+grmid_OBJECTS = $(am_grmid_OBJECTS)
 am_grmiregistry_OBJECTS =
 grmiregistry_OBJECTS = $(am_grmiregistry_OBJECTS)
+am_gserialver_OBJECTS =
+gserialver_OBJECTS = $(am_gserialver_OBJECTS)
+am_gtnameserv_OBJECTS =
+gtnameserv_OBJECTS = $(am_gtnameserv_OBJECTS)
 am_jv_convert_OBJECTS =
 jv_convert_OBJECTS = $(am_jv_convert_OBJECTS)
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/gcj
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include -I$(top_builddir)/gcj
 depcomp = $(SHELL) $(top_srcdir)/../depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
-       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-       $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+       $(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-       $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
 GCJCOMPILE = $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)
-LTGCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) $(AM_GCJFLAGS) \
-       $(GCJFLAGS)
+LTGCJCOMPILE = $(LIBTOOL) --tag=GCJ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=compile $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)
 GCJLD = $(GCJ)
-SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(libgcj_tools_la_SOURCES) \
-       $(libgcj_la_SOURCES) $(libgcj_bc_la_SOURCES) \
-       $(libgij_la_SOURCES) $(libjvm_la_SOURCES) \
-       $(gappletviewer_SOURCES) $(gcj_dbtool_SOURCES) \
-       $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(gjarsigner_SOURCES) \
-       $(gkeytool_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) \
-       $(jv_convert_SOURCES)
-DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
-       $(libgcj_tools_la_SOURCES) $(am__libgcj_la_SOURCES_DIST) \
-       $(libgcj_bc_la_SOURCES) $(libgij_la_SOURCES) \
-       $(libjvm_la_SOURCES) $(gappletviewer_SOURCES) \
-       $(gcj_dbtool_SOURCES) $(am__gen_from_JIS_SOURCES_DIST) \
-       $(gij_SOURCES) $(gjarsigner_SOURCES) $(gkeytool_SOURCES) \
-       $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
+SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(libgcj_noncore_la_SOURCES) \
+       $(libgcj_tools_la_SOURCES) $(libgcj_la_SOURCES) \
+       $(EXTRA_libgcj_la_SOURCES) $(libgcj_bc_la_SOURCES) \
+       $(libgij_la_SOURCES) $(libjvm_la_SOURCES) $(ecjx_SOURCES) \
+       $(gappletviewer_SOURCES) $(gc_analyze_SOURCES) \
+       $(gcj_dbtool_SOURCES) $(gcjh_SOURCES) $(gen_from_JIS_SOURCES) \
+       $(gij_SOURCES) $(gjar_SOURCES) $(gjarsigner_SOURCES) \
+       $(gjavah_SOURCES) $(gjdoc_SOURCES) $(gkeytool_SOURCES) \
+       $(gnative2ascii_SOURCES) $(gorbd_SOURCES) $(grmic_SOURCES) \
+       $(grmid_SOURCES) $(grmiregistry_SOURCES) $(gserialver_SOURCES) \
+       $(gtnameserv_SOURCES) $(jv_convert_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        html-recursive info-recursive install-data-recursive \
-       install-exec-recursive install-info-recursive \
-       install-recursive installcheck-recursive installdirs-recursive \
-       pdf-recursive ps-recursive uninstall-info-recursive \
-       uninstall-recursive
-dbexecDATA_INSTALL = $(INSTALL_DATA)
-jarDATA_INSTALL = $(INSTALL_DATA)
-toolexecmainlibDATA_INSTALL = $(INSTALL_DATA)
+       install-dvi-recursive install-exec-recursive \
+       install-html-recursive install-info-recursive \
+       install-pdf-recursive install-ps-recursive install-recursive \
+       installcheck-recursive installdirs-recursive pdf-recursive \
+       ps-recursive uninstall-recursive
 DATA = $(dbexec_DATA) $(jar_DATA) $(toolexecmainlib_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = @DIRLTDL@ gcj include classpath testsuite
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+ANTLR_JAR = @ANTLR_JAR@
 AR = @AR@
 AS = @AS@
+ATOMICSPEC = @ATOMICSPEC@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BACKTRACESPEC = @BACKTRACESPEC@
-BASH_JAR_FALSE = @BASH_JAR_FALSE@
-BASH_JAR_TRUE = @BASH_JAR_TRUE@
+BUILD_VERSION = @BUILD_VERSION@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -488,6 +597,7 @@ CHECKREFSPEC = @CHECKREFSPEC@
 CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CPU = @CPU@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -497,12 +607,18 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIRLTDL = @DIRLTDL@
 DIVIDESPEC = @DIVIDESPEC@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+ECJ_BUILD_JAR = @ECJ_BUILD_JAR@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 EXCEPTIONSPEC = @EXCEPTIONSPEC@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
 GCDEPS = @GCDEPS@
 GCINCS = @GCINCS@
@@ -511,16 +627,20 @@ GCJDEPMODE = @GCJDEPMODE@
 GCJFLAGS = @GCJFLAGS@
 GCJH = @GCJH@
 GCJVERSION = @GCJVERSION@
+GCJ_BIN_DIR = @GCJ_BIN_DIR@
+GCJ_FOR_ECJX = @GCJ_FOR_ECJX@
 GCLIBS = @GCLIBS@
 GCSPEC = @GCSPEC@
 GCTESTSPEC = @GCTESTSPEC@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
 IEEESPEC = @IEEESPEC@
 INCLTDL = @INCLTDL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -528,60 +648,79 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTERPRETER = @INTERPRETER@
 JAR = @JAR@
 JAVA_HOME = @JAVA_HOME@
-JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@
-JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
+JAVA_VERSION = @JAVA_VERSION@
 JC1GCSPEC = @JC1GCSPEC@
+JRE_BIN_DIR = @JRE_BIN_DIR@
+JRE_DIR = @JRE_DIR@
+JRE_LIB_DIR = @JRE_LIB_DIR@
+JRE_LNK = @JRE_LNK@
+JVM_JAR_DIR = @JVM_JAR_DIR@
+JVM_JAR_ROOT_DIR = @JVM_JAR_ROOT_DIR@
+JVM_ROOT_DIR = @JVM_ROOT_DIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
 LIBART_CFLAGS = @LIBART_CFLAGS@
 LIBART_LIBS = @LIBART_LIBS@
+LIBDIR = @LIBDIR@
 LIBFFI = @LIBFFI@
 LIBFFIINCS = @LIBFFIINCS@
 LIBGCJDEBUG = @LIBGCJDEBUG@
 LIBGCJTESTSPEC = @LIBGCJTESTSPEC@
+LIBGCJ_BC_SPEC = @LIBGCJ_BC_SPEC@
 LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
 LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
 LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
 LIBGCJ_LD_SYMBOLIC = @LIBGCJ_LD_SYMBOLIC@
+LIBGCJ_LD_SYMBOLIC_FUNCTIONS = @LIBGCJ_LD_SYMBOLIC_FUNCTIONS@
 LIBGCJ_SPEC = @LIBGCJ_SPEC@
+LIBGCJ_SUBLIB_CORE_EXTRA_DEPS = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
+LIBGCJ_SUBLIB_LTFLAGS = @LIBGCJ_SUBLIB_LTFLAGS@
 LIBICONV = @LIBICONV@
 LIBLTDL = @LIBLTDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBSTDCXXSPEC = @LIBSTDCXXSPEC@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
-NATIVE_FALSE = @NATIVE_FALSE@
-NATIVE_TRUE = @NATIVE_TRUE@
-NEEDS_DATA_START_FALSE = @NEEDS_DATA_START_FALSE@
-NEEDS_DATA_START_TRUE = @NEEDS_DATA_START_TRUE@
+MKDIR_P = @MKDIR_P@
+NM = nm
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PLATFORM_INNER_NAT_HDRS = @PLATFORM_INNER_NAT_HDRS@
+PLATFORM = @PLATFORM@
 RANLIB = @RANLIB@
+SDK_BIN_DIR = @SDK_BIN_DIR@
+SDK_INCLUDE_DIR = @SDK_INCLUDE_DIR@
+SDK_LIB_DIR = @SDK_LIB_DIR@
+SDK_LNK = @SDK_LNK@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSDEP_SOURCES = @SYSDEP_SOURCES@
 SYSTEMSPEC = @SYSTEMSPEC@
 SYS_ZLIBS = @SYS_ZLIBS@
-TESTSUBDIR_FALSE = @TESTSUBDIR_FALSE@
-TESTSUBDIR_TRUE = @TESTSUBDIR_TRUE@
 THREADCXXFLAGS = @THREADCXXFLAGS@
 THREADDEPS = @THREADDEPS@
 THREADINCS = @THREADINCS@
@@ -591,29 +730,8 @@ THREADSPEC = @THREADSPEC@
 THREADSTARTFILESPEC = @THREADSTARTFILESPEC@
 TOOLKIT = @TOOLKIT@
 UNZIP = @UNZIP@
-USE_LIBGCJ_BC_FALSE = @USE_LIBGCJ_BC_FALSE@
-USE_LIBGCJ_BC_TRUE = @USE_LIBGCJ_BC_TRUE@
-USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
-USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@
-USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@
-USING_DARWIN_CRT_TRUE = @USING_DARWIN_CRT_TRUE@
-USING_GCC_FALSE = @USING_GCC_FALSE@
-USING_GCC_TRUE = @USING_GCC_TRUE@
-USING_NOGC_FALSE = @USING_NOGC_FALSE@
-USING_NOGC_TRUE = @USING_NOGC_TRUE@
-USING_NO_THREADS_FALSE = @USING_NO_THREADS_FALSE@
-USING_NO_THREADS_TRUE = @USING_NO_THREADS_TRUE@
-USING_POSIX_PLATFORM_FALSE = @USING_POSIX_PLATFORM_FALSE@
-USING_POSIX_PLATFORM_TRUE = @USING_POSIX_PLATFORM_TRUE@
-USING_POSIX_THREADS_FALSE = @USING_POSIX_THREADS_FALSE@
-USING_POSIX_THREADS_TRUE = @USING_POSIX_THREADS_TRUE@
-USING_WIN32_PLATFORM_FALSE = @USING_WIN32_PLATFORM_FALSE@
-USING_WIN32_PLATFORM_TRUE = @USING_WIN32_PLATFORM_TRUE@
-USING_WIN32_THREADS_FALSE = @USING_WIN32_THREADS_FALSE@
-USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@
 VERSION = @VERSION@
-XLIB_AWT_FALSE = @XLIB_AWT_FALSE@
-XLIB_AWT_TRUE = @XLIB_AWT_TRUE@
+XMKMF = @XMKMF@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
@@ -623,20 +741,14 @@ ZIP = @ZIP@
 ZLIBS = @ZLIBS@
 ZLIBSPEC = @ZLIBSPEC@
 ZLIBTESTSPEC = @ZLIBTESTSPEC@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 ac_ct_GCJ = @ac_ct_GCJ@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__fastdepGCJ_FALSE = @am__fastdepGCJ_FALSE@
-am__fastdepGCJ_TRUE = @am__fastdepGCJ_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -650,34 +762,49 @@ build_libsubdir = @build_libsubdir@
 build_os = @build_os@
 build_subdir = @build_subdir@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dbexecdir = @dbexecdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_ldflags_libjava = @extra_ldflags_libjava@
+extra_ldflags = @extra_ldflags@
+extra_ldflags_libjava = @extra_ldflags_libjava@ $(am__append_9)
+gcc_suffix = @gcc_suffix@
+gcjsubdir = @gcjsubdir@
 gxx_include_dir = @gxx_include_dir@
 here = @here@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
+host_exeext = @host_exeext@
 host_os = @host_os@
 host_subdir = @host_subdir@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libgcj_basedir = @libgcj_basedir@
 libstdcxx_incdir = @libstdcxx_incdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 mkinstalldirs = @mkinstalldirs@
+multi_basedir = @multi_basedir@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
+python_mod_dir = @python_mod_dir@
+python_mod_dir_expanded = @python_mod_dir_expanded@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target = @target@
@@ -692,45 +819,215 @@ target_vendor = @target_vendor@
 toolexecdir = @toolexecdir@
 toolexeclibdir = @toolexeclibdir@
 toolexecmainlibdir = @toolexecmainlibdir@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign subdir-objects
-ACLOCAL_AMFLAGS = -I . -I .. -I ../config
+ACLOCAL_AMFLAGS = -I . -I .. -I ../config -I libltdl
 
 # May be used by various substitution variables.
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 SUBDIRS = $(DIRLTDL) gcj include classpath $(am__append_1)
 
 # write_entries_to_file - writes each entry in a list
-# to the specified file. Each entry is written individually
-# to accomodate systems with severe command-line-length
-# limitations.
+# to the specified file.  Entries are written in chunks of
+# $(write_entries_to_file_split) to accomodate systems with
+# severe command-line-length limitations.
 # Parameters:
 # $(1): variable containing entries to iterate over
 # $(2): output file
-write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach object,$(1),$(shell echo $(object) >> $(2)))
+write_entries_to_file_split = 50
+write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) \
+       $(foreach range, \
+         $(shell i=1; while test $$i -le $(words $(1)); do \
+            echo $$i; i=`expr $$i + $(write_entries_to_file_split)`; done), \
+         $(shell echo $(wordlist $(range), \
+                         $(shell expr $(range) + $(write_entries_to_file_split) - 1), $(1)) \
+            | tr ' ' '\012' >> $(2)))
+
 
 # This is required by TL_AC_GXX_INCLUDE_DIR.
 libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
+libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
 toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la \
-       $(am__append_2) $(am__append_3)
+       $(am__append_2) $(am__append_3) $(am__append_4)
 toolexecmainlib_DATA = libgcj.spec
+LOWER_PACKAGE_FILES_LO = \
+       $(propertyo_files) \
+       gnu-CORBA.lo \
+       gnu-java-awt-dnd-peer-gtk.lo \
+       gnu-java-awt-peer-gtk.lo \
+       gnu-java-awt-peer-swing.lo \
+       gnu-java-lang-management.lo \
+       gnu-javax-management.lo \
+       gnu-javax-rmi.lo \
+       gnu-javax-sound-midi.lo \
+       gnu-xml-aelfred2.lo \
+       gnu-xml-dom.lo \
+       gnu-xml-libxmlj.lo \
+       gnu-xml-pipeline.lo \
+       gnu-xml-stream.lo \
+       gnu-xml-transform.lo \
+       gnu-xml-util.lo \
+       gnu-xml-validation.lo \
+       gnu-xml-xpath.lo \
+       java-lang-management.lo \
+       javax-imageio.lo \
+       javax-rmi.lo \
+       jni-libjvm.lo \
+       org-omg-CORBA.lo \
+       org-omg-CORBA_2_3.lo \
+       org-omg-CosNaming.lo \
+       org-omg-Dynamic.lo \
+       org-omg-DynamicAny.lo \
+       org-omg-IOP.lo \
+       org-omg-Messaging.lo \
+       org-omg-PortableInterceptor.lo \
+       org-omg-PortableServer.lo \
+       org-omg-SendingContext.lo \
+       org-omg-stub.lo \
+       org-relaxng.lo \
+       org-xml.lo \
+       META-INF/services/java.util.prefs.PreferencesFactory.in.lo \
+       META-INF/services/java.util.prefs.PreferencesFactory.lo \
+       META-INF/services/javax.sound.midi.spi.MidiDeviceProvider.lo \
+       META-INF/services/javax.sound.midi.spi.MidiFileReader.lo \
+       META-INF/services/javax.sound.midi.spi.MidiFileWriter.lo \
+       META-INF/services/javax.sound.sampled.spi.AudioFileReader.lo \
+       classpath/native/jni/classpath/jcl.lo \
+       classpath/native/jni/classpath/jnilink.lo \
+       classpath/native/jni/java-math/gnu_java_math_GMP.lo \
+       classpath/tools/libgcj_tools_la-tools.lo \
+       gnu/awt.lo \
+       gnu/awt/j2d.lo \
+       gnu/gcj/io.lo \
+       gnu/gcj/io/natSimpleSHSStream.lo \
+       gnu/gcj/io/shs.lo \
+       gnu/gcj/tools/gcj_dbtool.lo \
+       gnu/gcj/util/natDebug.lo \
+       gnu/gcj/util/natGCInfo.lo \
+       gnu/java/awt/dnd.lo \
+       gnu/java/awt/font.lo \
+       gnu/java/awt/image.lo \
+       gnu/java/awt/print.lo \
+       gnu/java/awt/font/autofit.lo \
+       gnu/java/awt/font/opentype.lo \
+       gnu/java/awt/font/opentype/truetype.lo \
+       gnu/java/lang/management/natVMClassLoadingMXBeanImpl.lo \
+       gnu/java/lang/management/natVMCompilationMXBeanImpl.lo \
+       gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.lo \
+       gnu/java/lang/management/natVMMemoryMXBeanImpl.lo \
+       gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.lo \
+       gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.lo \
+       gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.lo \
+       gnu/java/lang/management/natVMRuntimeMXBeanImpl.lo \
+       gnu/java/lang/management/natVMThreadMXBeanImpl.lo \
+       gnu/java/net/local.lo \
+       gnu/java/net/protocol/ftp.lo \
+       gnu/java/net/protocol/gcjlib.lo \
+       gnu/java/net/protocol/https.lo \
+       gnu/javax/imageio.lo \
+       gnu/javax/print.lo \
+       gnu/javax/sound.lo \
+       gnu/javax/activation/viewers.lo \
+       gnu/javax/imageio/bmp.lo \
+       gnu/javax/imageio/gif.lo \
+       gnu/javax/imageio/jpeg.lo \
+       gnu/javax/imageio/png.lo \
+       gnu/javax/naming/giop.lo \
+       gnu/javax/naming/ictxImpl/trans.lo \
+       gnu/javax/naming/jndi/url/corbaname.lo \
+       gnu/javax/naming/jndi/url/rmi.lo \
+       gnu/javax/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/login.lo \
+       gnu/javax/sound/sampled/AU.lo \
+       gnu/javax/sound/sampled/WAV.lo \
+       gnu/javax/swing/plaf/gnu.lo \
+       gnu/javax/swing/plaf/metal.lo \
+       java/sql.lo \
+       java/awt/im.lo \
+       java/awt/print.lo \
+       java/awt/im/spi.lo \
+       java/security/acl.lo \
+       javax/activation.lo \
+       javax/activity.lo \
+       javax/management.lo \
+       javax/naming.lo \
+       javax/print.lo \
+       javax/sql.lo \
+       javax/tools.lo \
+       javax/transaction.lo \
+       javax/management/loading.lo \
+       javax/management/openmbean.lo \
+       javax/management/remote.lo \
+       javax/management/remote/rmi.lo \
+       javax/naming/directory.lo \
+       javax/naming/event.lo \
+       javax/naming/ldap.lo \
+       javax/naming/spi.lo \
+       javax/print/attribute.lo \
+       javax/print/event.lo \
+       javax/print/attribute/standard.lo \
+       javax/security/cert.lo \
+       javax/security/auth/kerberos.lo \
+       javax/security/auth/login.lo \
+       javax/security/auth/spi.lo \
+       javax/sound/midi.lo \
+       javax/sound/midi/spi.lo \
+       javax/swing/plaf/multi.lo \
+       javax/swing/plaf/synth.lo \
+       javax/swing/text/rtf.lo \
+       javax/swing/text/html/default.css.lo \
+       javax/transaction/xa.lo \
+       org/ietf/jgss.lo \
+       sun/awt.lo
+
+ALL_PACKAGE_SOURCE_FILES_LO = $(all_packages_source_files:.list=.lo) $(propertyo_files) $(bc_objects)
+NONCORE_PACKAGE_SOURCE_FILES_LO = $(filter $(LOWER_PACKAGE_FILES_LO),$(ALL_PACKAGE_SOURCE_FILES_LO))
+CORE_PACKAGE_SOURCE_FILES_LO = $(filter-out $(LOWER_PACKAGE_FILES_LO),$(ALL_PACKAGE_SOURCE_FILES_LO))
+@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_LIBADD_SUBOBJECTS = $(NONCORE_PACKAGE_SOURCE_FILES_LO)
+# If not building sublibraries, everything goes in libgcj,
+# and it cannot be usefully built shared on PE platforms.
+@BUILD_SUBLIBS_FALSE@libgcj_la_LIBADD_SUBOBJECTS = $(ALL_PACKAGE_SOURCE_FILES_LO)
+@BUILD_SUBLIBS_TRUE@libgcj_la_LIBADD_SUBOBJECTS = $(CORE_PACKAGE_SOURCE_FILES_LO)
+@BUILD_SUBLIBS_FALSE@LIBJAVA_LDFLAGS_NOUNDEF = 
+@BUILD_SUBLIBS_TRUE@LIBJAVA_LDFLAGS_NOUNDEF = $(LIBGCJ_SUBLIB_LTFLAGS)
+@BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
+@BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
 dbexec_LTLIBRARIES = libjvm.la
 pkgconfigdir = $(libdir)/pkgconfig
 jardir = $(datadir)/java
-jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
+jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
+       $(am__append_5)
 @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
 @JAVA_HOME_SET_TRUE@JAVA_HOME_DIR = $(JAVA_HOME)
 @JAVA_HOME_SET_FALSE@BOOT_CLASS_PATH_DIR = $(jardir)/libgcj-$(gcc_version).jar
 @JAVA_HOME_SET_TRUE@BOOT_CLASS_PATH_DIR = $(JAVA_HOME)/lib/rt.jar
 db_name = classmap.db
-db_pathtail = gcj-$(gcc_version)/$(db_name)
+db_pathtail = $(gcjsubdir)/$(db_name)
+@NATIVE_TRUE@bin_programs = jv-convert gij grmic grmiregistry \
+@NATIVE_TRUE@  gcj-dbtool gappletviewer gjarsigner gkeytool gjar \
+@NATIVE_TRUE@  gcjh gjavah gnative2ascii gorbd grmid gserialver \
+@NATIVE_TRUE@  gtnameserv gc-analyze $(am__append_6)
 @NATIVE_TRUE@dbexec_DATA = $(db_name)
-bin_SCRIPTS = addr2name.awk $(am__append_4)
+bin_SCRIPTS = contrib/rebuild-gcj-db contrib/aot-compile \
+       $(am__append_8)
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
-GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
-          $(LDFLAGS) -o $@
+LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
+GCJLINK = $(LIBTOOL) --tag=GCJ $(LIBTOOLFLAGS) --mode=link $(GCJ) -L$(here) \
+         $(JC1FLAGS) $(LTLDFLAGS) -o $@
+
+GCJ_FOR_ECJX_LINK = $(GCJ_FOR_ECJX) -o $@
+LIBLINK = $(LIBTOOL) --tag=CXX $(LIBTOOLFLAGS) --mode=link $(CXX) -L$(here) \
+         $(JC1FLAGS) $(LTLDFLAGS) $(extra_ldflags_libjava) $(extra_ldflags) -o $@
 
-LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) \
-          $(LDFLAGS) $(extra_ldflags_libjava) -o $@
+CXXLINK = $(LIBTOOL) --tag=CXX $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+         $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LTLDFLAGS) -o $@
 
 WARNINGS = -Wextra -Wall
 AM_CXXFLAGS = \
@@ -751,6 +1048,7 @@ AM_CXXFLAGS = \
        -DGCJ_ENDORSED_DIRS="\"$(jardir)/gcj-endorsed\"" \
        -DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
        -DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
+       -DECJ_JAR_FILE="\"$(ECJ_JAR)\"" \
        -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
        -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\""
 
@@ -760,7 +1058,11 @@ AM_GCJFLAGS = \
        --encoding=UTF-8 \
        -Wno-deprecated -fbootstrap-classes
 
-AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_5)
+AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_10)
+@SUPPRESS_LIBGCJ_BC_FALSE@LIBGCJ_BC_FLAGS = -findirect-dispatch -fno-indirect-classes
+@SUPPRESS_LIBGCJ_BC_TRUE@LIBGCJ_BC_FLAGS = 
+@BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE@LIBGCJ_REDUCED_REFLECTION_FLAGS = 
+@BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE@LIBGCJ_REDUCED_REFLECTION_FLAGS = -freduced-reflection
 PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long
 JCFLAGS = -g
 JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
@@ -772,57 +1074,83 @@ AM_CPPFLAGS = -I$(top_srcdir) \
        $(GCINCS) $(THREADINCS) $(INCLTDL) \
        $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS)
 
-BOOTCLASSPATH = $(here)/classpath/lib
+BOOTCLASSPATH = $(srcdir)/classpath/lib
 libgij_la_SOURCES = gij.cc
-libgij_la_DEPENDENCIES = libgcj.la libgcj.spec
+libgij_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_11)
 libgij_la_LIBADD = -L$(here)/.libs libgcj.la
-libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
+libgij_la_LDFLAGS = -rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \
         -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
 
-libgcj_la_SOURCES = prims.cc jni.cc jvmti.cc exception.cc \
-       stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \
-       java/lang/Class.java java/lang/Object.java $(nat_source_files) \
-       $(am__append_6) $(am__append_7) $(am__append_8) \
-       $(am__append_9) $(am__append_10) $(am__append_11) \
-       $(am__append_12) $(am__append_13)
+libgij_la_LINK = $(CXXLINK) $(libgij_la_LDFLAGS)
+@INTERPRETER_FALSE@libgcj_interpret_source_files = 
+@INTERPRETER_TRUE@libgcj_interpret_source_files = jvmti.cc interpret.cc
+libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \
+       defineclass.cc verify.cc $(libgcj_interpret_source_files) \
+       $(nat_source_files) $(am__append_12) $(am__append_13) \
+       $(am__append_14) $(am__append_15) $(am__append_16) \
+       $(am__append_17) $(am__append_18) $(am__append_19)
 nat_files = $(nat_source_files:.cc=.lo)
 xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
 
 # Include THREADLIBS here to ensure that the correct version of
 # certain linuxthread functions get linked:
-libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
-       $(LIBLTDL) $(SYS_ZLIBS) \
-       -version-info `grep -v '^\#' $(srcdir)/libtool-version`
+libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \
+       $(LIBLTDL) $(SYS_ZLIBS) $(LIBJAVA_LDFLAGS_NOUNDEF) \
+       -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
+       $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
 
 libgcj_la_LIBADD = \
        classpath/native/fdlibm/libfdlibm.la \
-       $(all_packages_source_files:.list=.lo) \
-       $(bc_objects) \
-       $(propertyo_files) \
+       java/lang/Object.lo \
+       java/lang/Class.lo \
+       java/process-$(PLATFORM).lo \
+       $(libgcj_la_LIBADD_SUBOBJECTS) \
        $(LIBFFI) $(ZLIBS) $(GCLIBS)
 
-libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
-       $(all_packages_source_files:.list=.lo) \
-       $(LIBLTDL) $(libgcj_la_LIBADD)
+libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar java/lang/Object.lo \
+       java/lang/Class.lo java/process-$(PLATFORM).lo \
+       $(ALL_PACKAGE_SOURCE_FILES_LO) $(LIBLTDL) $(libgcj_la_LIBADD) \
+       $(LIBJAVA_CORE_EXTRA) $(am__append_20)
+libgcj_la_LINK = $(LIBLINK) $(libgcj_la_LDFLAGS)
+EXTRA_libgcj_la_SOURCES = java/lang/Object.java
+@BUILD_SUBLIBS_TRUE@DLL_VERSION = `expr \`grep -v '^\#' $(srcdir)/libtool-version | sed -e 's/\(.*\):\(.*\):.*/\1 + \2/'\``
+@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_SOURCES = 
+@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_LDFLAGS = $(libgcj_la_LDFLAGS)
+@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_LIBADD = $(libgcj_noncore_la_LIBADD_SUBOBJECTS) libgcj.la
+@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_DEPENDENCIES =  \
+@BUILD_SUBLIBS_TRUE@   libgcj-$(gcc_version).jar $(LIBLTDL) \
+@BUILD_SUBLIBS_TRUE@   $(libgcj_noncore_la_LIBADD) libgcj.la \
+@BUILD_SUBLIBS_TRUE@   $(am__append_21)
+@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_LINK = $(libgcj_la_LINK)
+
+# We compile libgcj_tools with -findirect-dispatch so that they can
+# depend on external classes: in particular, gjdoc uses antlr.  In
+# addition, -fno-bootstrap-classes ensures that the tools are loaded
+# by the system class loader rather than the bootstrap class loader:
+# only core library classes should be loaded by the bootstrap loader.
+libgcj_tools_la_SOURCES = classpath/tools/tools.zip
+libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \
+ -fno-bootstrap-classes -fno-indirect-classes \
+ -fsource-filename=$(here)/classpath/tools/all-classes.lst
 
-libgcj_la_LINK = $(LIBLINK)
-libgcj_tools_la_SOURCES = classpath/tools/tools.jar
-libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes
 libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
- -version-info `grep -v '^\#' $(srcdir)/libtool-version`
+ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
+ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF)
 
-libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
-libgcj_tools_la_LINK = $(LIBLINK)
+libgcj_tools_la_LIBADD = libgcj.la -lm
+libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_22)
+libgcj_tools_la_LINK = $(LIBLINK) $(libgcj_tools_la_LDFLAGS)
 libjvm_la_SOURCES = jni-libjvm.cc
-libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec
+libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_23)
 libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
-libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC)
+libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC) \
+ $(LIBJAVA_LDFLAGS_NOUNDEF)
+
+libjvm_la_LINK = $(CXXLINK) $(libjvm_la_LDFLAGS)
 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 \
-       libgcj.la libgcj.spec \
-       $(lib_gnu_awt_xlib_la_LIBADD)
-
+lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar libgcj.la \
+       libgcj.spec $(lib_gnu_awt_xlib_la_LIBADD) $(am__append_24)
 lib_gnu_awt_xlib_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -I../libstdc++-v3/include \
@@ -831,15 +1159,16 @@ lib_gnu_awt_xlib_la_CPPFLAGS = \
 
 lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \
        @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
-        -rpath $(toolexeclibdir) \
+        -rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \
         -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
 
-lib_gnu_awt_xlib_la_LINK = $(LIBLINK)
+lib_gnu_awt_xlib_la_LINK = $(LIBLINK) $(lib_gnu_awt_xlib_la_LDFLAGS)
 libgcj_bc_la_SOURCES = libgcj_bc.c
-libgcj_bc_la_LDFLAGS = -rpath $(toolexeclibdir) -no-static -version-info 1:0:0
-libgcj_bc_la_LIBADD = libgcj.la
+libgcj_bc_la_LDFLAGS = -rpath $(toolexeclibdir) -no-static -version-info 1:0:0 \
+       $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF)
+
 libgcj_bc_la_DEPENDENCIES = libgcj.la
-libgcj_bc_la_LINK = $(LIBLINK)
+libgcj_bc_la_LINK = $(LIBLINK) $(libgcj_bc_la_LDFLAGS)
 libgcj_bc_dummy_LINK = $(CC) -L$(here)/.libs $(CFLAGS) $(LDFLAGS) -shared \
        -fPIC -nostdlib
 
@@ -873,6 +1202,7 @@ classpath/gnu/CORBA/CDR/Vio.java \
 classpath/gnu/CORBA/CDR/gnuRuntime.java \
 classpath/gnu/CORBA/CDR/gnuValueStream.java \
 classpath/gnu/CORBA/CdrEncapsCodecImpl.java \
+classpath/gnu/CORBA/CollocatedOrbs.java \
 classpath/gnu/CORBA/Connected_objects.java \
 classpath/gnu/CORBA/CorbaList.java \
 classpath/gnu/CORBA/DefaultSocketFactory.java \
@@ -881,7 +1211,7 @@ classpath/gnu/CORBA/DuplicateNameHolder.java \
 classpath/gnu/CORBA/DynAn/AbstractAny.java \
 classpath/gnu/CORBA/DynAn/DivideableAny.java \
 classpath/gnu/CORBA/DynAn/NameValuePairHolder.java \
-gnu/CORBA/DynAn/RecordAny.java \
+classpath/gnu/CORBA/DynAn/RecordAny.java \
 classpath/gnu/CORBA/DynAn/UndivideableAny.java \
 classpath/gnu/CORBA/DynAn/ValueChangeListener.java \
 classpath/gnu/CORBA/DynAn/gnuDynAny.java \
@@ -892,7 +1222,7 @@ classpath/gnu/CORBA/DynAn/gnuDynFixed.java \
 classpath/gnu/CORBA/DynAn/gnuDynSequence.java \
 classpath/gnu/CORBA/DynAn/gnuDynStruct.java \
 classpath/gnu/CORBA/DynAn/gnuDynUnion.java \
-gnu/CORBA/DynAn/gnuDynValue.java \
+classpath/gnu/CORBA/DynAn/gnuDynValue.java \
 classpath/gnu/CORBA/DynAn/gnuDynValueBox.java \
 classpath/gnu/CORBA/DynAnySeqHolder.java \
 classpath/gnu/CORBA/EmptyExceptionHolder.java \
@@ -941,7 +1271,7 @@ classpath/gnu/CORBA/NamingService/NameValidator.java \
 classpath/gnu/CORBA/NamingService/NamingMap.java \
 classpath/gnu/CORBA/NamingService/NamingServiceTransient.java \
 classpath/gnu/CORBA/NamingService/TransientContext.java \
-gnu/CORBA/ObjectCreator.java \
+classpath/gnu/CORBA/ObjectCreator.java \
 classpath/gnu/CORBA/OctetHolder.java \
 classpath/gnu/CORBA/OrbFocused.java \
 classpath/gnu/CORBA/OrbFunctional.java \
@@ -973,6 +1303,7 @@ classpath/gnu/CORBA/Poa/gnuServantRetentionPolicy.java \
 classpath/gnu/CORBA/Poa/gnuThreadPolicy.java \
 classpath/gnu/CORBA/RawReply.java \
 classpath/gnu/CORBA/ResponseHandlerImpl.java \
+classpath/gnu/CORBA/SafeForDirectCalls.java \
 classpath/gnu/CORBA/ServiceDetailHolder.java \
 classpath/gnu/CORBA/ServiceRequestAdapter.java \
 classpath/gnu/CORBA/SetOverrideTypeHolder.java \
@@ -1039,12 +1370,14 @@ gnu_awt_xlib_header_files = $(patsubst %.java,%.h,$(gnu_awt_xlib_source_files))
 gnu_classpath_source_files = \
 classpath/gnu/classpath/Configuration.java \
 classpath/gnu/classpath/NotImplementedException.java \
+classpath/gnu/classpath/Pair.java \
 classpath/gnu/classpath/Pointer.java \
 classpath/gnu/classpath/Pointer32.java \
 classpath/gnu/classpath/Pointer64.java \
 classpath/gnu/classpath/ServiceFactory.java \
 classpath/gnu/classpath/ServiceProviderLoadingAction.java \
-gnu/classpath/SystemProperties.java
+gnu/classpath/SystemProperties.java \
+gnu/classpath/VMStackWalker.java
 
 gnu_classpath_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_source_files)))
 gnu_classpath_debug_source_files = \
@@ -1100,15 +1433,19 @@ classpath/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java
 
 gnu_classpath_jdwp_event_filters_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_event_filters_source_files)))
 gnu_classpath_jdwp_exception_source_files = \
+classpath/gnu/classpath/jdwp/exception/AbsentInformationException.java \
 classpath/gnu/classpath/jdwp/exception/InvalidClassException.java \
 classpath/gnu/classpath/jdwp/exception/InvalidClassLoaderException.java \
 classpath/gnu/classpath/jdwp/exception/InvalidCountException.java \
 classpath/gnu/classpath/jdwp/exception/InvalidEventTypeException.java \
 classpath/gnu/classpath/jdwp/exception/InvalidFieldException.java \
+classpath/gnu/classpath/jdwp/exception/InvalidFrameException.java \
 classpath/gnu/classpath/jdwp/exception/InvalidLocationException.java \
 classpath/gnu/classpath/jdwp/exception/InvalidMethodException.java \
 classpath/gnu/classpath/jdwp/exception/InvalidObjectException.java \
+classpath/gnu/classpath/jdwp/exception/InvalidSlotException.java \
 classpath/gnu/classpath/jdwp/exception/InvalidStringException.java \
+classpath/gnu/classpath/jdwp/exception/InvalidTagException.java \
 classpath/gnu/classpath/jdwp/exception/InvalidThreadException.java \
 classpath/gnu/classpath/jdwp/exception/InvalidThreadGroupException.java \
 classpath/gnu/classpath/jdwp/exception/JdwpException.java \
@@ -1116,6 +1453,7 @@ 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/TypeMismatchException.java \
 classpath/gnu/classpath/jdwp/exception/VmDeadException.java
 
 gnu_classpath_jdwp_exception_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_exception_source_files)))
@@ -1127,6 +1465,7 @@ classpath/gnu/classpath/jdwp/id/ClassObjectId.java \
 classpath/gnu/classpath/jdwp/id/ClassReferenceTypeId.java \
 classpath/gnu/classpath/jdwp/id/InterfaceReferenceTypeId.java \
 classpath/gnu/classpath/jdwp/id/JdwpId.java \
+classpath/gnu/classpath/jdwp/id/NullObjectId.java \
 classpath/gnu/classpath/jdwp/id/ObjectId.java \
 classpath/gnu/classpath/jdwp/id/ReferenceTypeId.java \
 classpath/gnu/classpath/jdwp/id/StringId.java \
@@ -1171,11 +1510,33 @@ classpath/gnu/classpath/jdwp/util/JdwpString.java \
 classpath/gnu/classpath/jdwp/util/LineTable.java \
 classpath/gnu/classpath/jdwp/util/Location.java \
 classpath/gnu/classpath/jdwp/util/MethodResult.java \
+classpath/gnu/classpath/jdwp/util/MonitorInfo.java \
+classpath/gnu/classpath/jdwp/util/NullObject.java \
 classpath/gnu/classpath/jdwp/util/Signature.java \
-classpath/gnu/classpath/jdwp/util/Value.java \
 classpath/gnu/classpath/jdwp/util/VariableTable.java
 
 gnu_classpath_jdwp_util_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_util_source_files)))
+gnu_classpath_jdwp_value_source_files = \
+classpath/gnu/classpath/jdwp/value/ArrayValue.java \
+classpath/gnu/classpath/jdwp/value/BooleanValue.java \
+classpath/gnu/classpath/jdwp/value/ByteValue.java \
+classpath/gnu/classpath/jdwp/value/CharValue.java \
+classpath/gnu/classpath/jdwp/value/DoubleValue.java \
+classpath/gnu/classpath/jdwp/value/FloatValue.java \
+classpath/gnu/classpath/jdwp/value/IntValue.java \
+classpath/gnu/classpath/jdwp/value/LongValue.java \
+classpath/gnu/classpath/jdwp/value/ObjectValue.java \
+classpath/gnu/classpath/jdwp/value/ShortValue.java \
+classpath/gnu/classpath/jdwp/value/StringValue.java \
+classpath/gnu/classpath/jdwp/value/Value.java \
+classpath/gnu/classpath/jdwp/value/ValueFactory.java \
+classpath/gnu/classpath/jdwp/value/VoidValue.java
+
+gnu_classpath_jdwp_value_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_jdwp_value_source_files)))
+gnu_classpath_toolkit_source_files = \
+classpath/gnu/classpath/toolkit/DefaultDaemonThreadFactory.java
+
+gnu_classpath_toolkit_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_toolkit_source_files)))
 gnu_gcj_source_files = \
 gnu/gcj/Core.java \
 gnu/gcj/RawData.java \
@@ -1209,15 +1570,14 @@ gnu/gcj/convert/UnicodeToBytes.java
 
 gnu_gcj_convert_header_files = $(patsubst %.java,%.h,$(gnu_gcj_convert_source_files))
 gnu_gcj_io_source_files = \
-gnu/gcj/io/DefaultMimeTypes.java \
-gnu/gcj/io/MimeTypes.java \
 gnu/gcj/io/SimpleSHSStream.java
 
 gnu_gcj_io_header_files = $(patsubst %.java,%.h,$(gnu_gcj_io_source_files))
 gnu_gcj_jvmti_source_files = \
 gnu/gcj/jvmti/Breakpoint.java \
 gnu/gcj/jvmti/BreakpointManager.java \
-gnu/gcj/jvmti/Location.java
+gnu/gcj/jvmti/Location.java \
+gnu/gcj/jvmti/NormalBreakpoint.java
 
 gnu_gcj_jvmti_header_files = $(patsubst %.java,%.h,$(gnu_gcj_jvmti_source_files))
 gnu_gcj_runtime_source_files = \
@@ -1234,8 +1594,14 @@ gnu/gcj/runtime/StringBuffer.java \
 gnu/gcj/runtime/SystemClassLoader.java
 
 gnu_gcj_runtime_header_files = $(patsubst %.java,%.h,$(gnu_gcj_runtime_source_files))
+gnu_gcj_tools_gcj_dbtool_source_files = \
+gnu/gcj/tools/gcj_dbtool/Main.java
+
+gnu_gcj_tools_gcj_dbtool_header_files = $(patsubst %.java,%.h,$(gnu_gcj_tools_gcj_dbtool_source_files))
 gnu_gcj_util_source_files = \
-gnu/gcj/util/Debug.java
+gnu/gcj/util/Debug.java \
+gnu/gcj/util/GCInfo.java \
+gnu/gcj/util/UtilPermission.java
 
 gnu_gcj_util_header_files = $(patsubst %.java,%.h,$(gnu_gcj_util_source_files))
 gnu_gcj_xlib_source_files = \
@@ -1269,11 +1635,14 @@ classpath/gnu/java/awt/AWTUtilities.java \
 classpath/gnu/java/awt/BitMaskExtent.java \
 classpath/gnu/java/awt/BitwiseXORComposite.java \
 classpath/gnu/java/awt/Buffers.java \
+classpath/gnu/java/awt/ClasspathGraphicsEnvironment.java \
 classpath/gnu/java/awt/ClasspathToolkit.java \
 classpath/gnu/java/awt/ComponentDataBlitOp.java \
+classpath/gnu/java/awt/ComponentReshapeEvent.java \
 classpath/gnu/java/awt/EmbeddedWindow.java \
 classpath/gnu/java/awt/EventModifier.java \
-classpath/gnu/java/awt/GradientPaintContext.java
+classpath/gnu/java/awt/GradientPaintContext.java \
+classpath/gnu/java/awt/LowPriorityEvent.java
 
 gnu_java_awt_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_source_files)))
 gnu_java_awt_color_source_files = \
@@ -1304,12 +1673,32 @@ classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.java
 gnu_java_awt_font_source_files = \
 classpath/gnu/java/awt/font/FontDelegate.java \
 classpath/gnu/java/awt/font/FontFactory.java \
-classpath/gnu/java/awt/font/GNUGlyphVector.java
+classpath/gnu/java/awt/font/GNUGlyphVector.java \
+classpath/gnu/java/awt/font/OpenTypeFontPeer.java
 
 gnu_java_awt_font_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_font_source_files)))
+gnu_java_awt_font_autofit_source_files = \
+classpath/gnu/java/awt/font/autofit/AutoHinter.java \
+classpath/gnu/java/awt/font/autofit/AxisHints.java \
+classpath/gnu/java/awt/font/autofit/Constants.java \
+classpath/gnu/java/awt/font/autofit/Edge.java \
+classpath/gnu/java/awt/font/autofit/GlyphHints.java \
+classpath/gnu/java/awt/font/autofit/HintScaler.java \
+classpath/gnu/java/awt/font/autofit/Latin.java \
+classpath/gnu/java/awt/font/autofit/LatinAxis.java \
+classpath/gnu/java/awt/font/autofit/LatinBlue.java \
+classpath/gnu/java/awt/font/autofit/LatinMetrics.java \
+classpath/gnu/java/awt/font/autofit/Script.java \
+classpath/gnu/java/awt/font/autofit/ScriptMetrics.java \
+classpath/gnu/java/awt/font/autofit/Segment.java \
+classpath/gnu/java/awt/font/autofit/Utils.java \
+classpath/gnu/java/awt/font/autofit/Width.java
+
+gnu_java_awt_font_autofit_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_font_autofit_source_files)))
 gnu_java_awt_font_opentype_source_files = \
 classpath/gnu/java/awt/font/opentype/CharGlyphMap.java \
 classpath/gnu/java/awt/font/opentype/GlyphNamer.java \
+classpath/gnu/java/awt/font/opentype/Hinter.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 \
@@ -1322,6 +1711,7 @@ 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/Point.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 \
@@ -1329,31 +1719,47 @@ 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/AsyncImage.java \
+classpath/gnu/java/awt/image/ImageConverter.java \
 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/ActiveEdges.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/PixelCoverage.java \
+classpath/gnu/java/awt/java2d/Pixelizer.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/Scanline.java \
+classpath/gnu/java/awt/java2d/ScanlineConverter.java \
+classpath/gnu/java/awt/java2d/ScanlineCoverage.java \
 classpath/gnu/java/awt/java2d/Segment.java \
+classpath/gnu/java/awt/java2d/ShapeCache.java \
+classpath/gnu/java/awt/java2d/ShapeWrapper.java \
+classpath/gnu/java/awt/java2d/TextCacheKey.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/ClasspathDesktopPeer.java \
 classpath/gnu/java/awt/peer/ClasspathFontPeer.java \
 classpath/gnu/java/awt/peer/EmbeddedWindowPeer.java \
-classpath/gnu/java/awt/peer/GLightweightPeer.java
+classpath/gnu/java/awt/peer/GLightweightPeer.java \
+classpath/gnu/java/awt/peer/GnomeDesktopPeer.java \
+classpath/gnu/java/awt/peer/KDEDesktopPeer.java \
+classpath/gnu/java/awt/peer/NativeEventLoopRunningEvent.java
 
 gnu_java_awt_peer_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_peer_source_files)))
 gnu_java_awt_peer_gtk_source_files = \
+classpath/gnu/java/awt/peer/gtk/AsyncImage.java \
 classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java \
 classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java \
 classpath/gnu/java/awt/peer/gtk/CairoSurface.java \
@@ -1361,9 +1767,6 @@ 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/GdkGraphicsConfiguration.java \
 classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java \
@@ -1389,6 +1792,7 @@ classpath/gnu/java/awt/peer/gtk/GtkImage.java \
 classpath/gnu/java/awt/peer/gtk/GtkImageConsumer.java \
 classpath/gnu/java/awt/peer/gtk/GtkLabelPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkListPeer.java \
+classpath/gnu/java/awt/peer/gtk/GtkMainThread.java \
 classpath/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java \
 classpath/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java \
@@ -1406,6 +1810,11 @@ classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java \
 classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java \
 classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java
 
+gnu_java_awt_peer_headless_source_files = \
+classpath/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.java \
+classpath/gnu/java/awt/peer/headless/HeadlessToolkit.java
+
+gnu_java_awt_peer_headless_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_awt_peer_headless_source_files)))
 gnu_java_awt_peer_qt_source_files = \
 classpath/gnu/java/awt/peer/qt/MainQtThread.java \
 classpath/gnu/java/awt/peer/qt/NativeWrapper.java \
@@ -1454,19 +1863,39 @@ classpath/gnu/java/awt/peer/qt/QtWindowPeer.java
 gnu_java_awt_peer_swing_source_files = \
 classpath/gnu/java/awt/peer/swing/SwingButtonPeer.java \
 classpath/gnu/java/awt/peer/swing/SwingCanvasPeer.java \
+classpath/gnu/java/awt/peer/swing/SwingCheckboxPeer.java \
 classpath/gnu/java/awt/peer/swing/SwingComponent.java \
 classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java \
 classpath/gnu/java/awt/peer/swing/SwingContainerPeer.java \
 classpath/gnu/java/awt/peer/swing/SwingFramePeer.java \
 classpath/gnu/java/awt/peer/swing/SwingLabelPeer.java \
+classpath/gnu/java/awt/peer/swing/SwingListPeer.java \
 classpath/gnu/java/awt/peer/swing/SwingMenuBarPeer.java \
 classpath/gnu/java/awt/peer/swing/SwingMenuItemPeer.java \
 classpath/gnu/java/awt/peer/swing/SwingMenuPeer.java \
 classpath/gnu/java/awt/peer/swing/SwingPanelPeer.java \
+classpath/gnu/java/awt/peer/swing/SwingTextAreaPeer.java \
 classpath/gnu/java/awt/peer/swing/SwingTextFieldPeer.java \
 classpath/gnu/java/awt/peer/swing/SwingToolkit.java \
 classpath/gnu/java/awt/peer/swing/SwingWindowPeer.java
 
+gnu_java_awt_peer_x_source_files = \
+classpath/gnu/java/awt/peer/x/GLGraphics.java \
+classpath/gnu/java/awt/peer/x/KeyboardMapping.java \
+classpath/gnu/java/awt/peer/x/PixmapVolatileImage.java \
+classpath/gnu/java/awt/peer/x/XDialogPeer.java \
+classpath/gnu/java/awt/peer/x/XEventPump.java \
+classpath/gnu/java/awt/peer/x/XFontPeer.java \
+classpath/gnu/java/awt/peer/x/XFramePeer.java \
+classpath/gnu/java/awt/peer/x/XGraphics2D.java \
+classpath/gnu/java/awt/peer/x/XGraphicsConfiguration.java \
+classpath/gnu/java/awt/peer/x/XGraphicsDevice.java \
+classpath/gnu/java/awt/peer/x/XGraphicsEnvironment.java \
+classpath/gnu/java/awt/peer/x/XImage.java \
+classpath/gnu/java/awt/peer/x/XToolkit.java \
+classpath/gnu/java/awt/peer/x/XWindowPeer.java \
+classpath/gnu/java/awt/peer/x/ZPixmapDataBuffer.java
+
 gnu_java_awt_print_source_files = \
 classpath/gnu/java/awt/print/JavaPrinterGraphics.java \
 classpath/gnu/java/awt/print/JavaPrinterJob.java \
@@ -1563,16 +1992,19 @@ classpath/gnu/java/io/ASN1ParsingException.java \
 classpath/gnu/java/io/Base64InputStream.java \
 classpath/gnu/java/io/ClassLoaderObjectInputStream.java \
 classpath/gnu/java/io/NullOutputStream.java \
+classpath/gnu/java/io/ObjectIdentityMap2Int.java \
 classpath/gnu/java/io/ObjectIdentityWrapper.java \
 classpath/gnu/java/io/PlatformHelper.java
 
 gnu_java_io_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_io_source_files)))
 gnu_java_lang_source_files = \
 classpath/gnu/java/lang/ArrayHelper.java \
+classpath/gnu/java/lang/CPStringBuilder.java \
 classpath/gnu/java/lang/CharData.java \
 classpath/gnu/java/lang/ClassHelper.java \
 classpath/gnu/java/lang/InstrumentationImpl.java \
 gnu/java/lang/MainThread.java \
+gnu/java/lang/VMCPStringBuilder.java \
 gnu/java/lang/VMInstrumentationImpl.java
 
 gnu_java_lang_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_source_files)))
@@ -1593,6 +2025,7 @@ gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java \
 gnu/java/lang/management/VMMemoryMXBeanImpl.java \
 gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java \
 gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java \
+gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java \
 gnu/java/lang/management/VMRuntimeMXBeanImpl.java \
 gnu/java/lang/management/VMThreadMXBeanImpl.java
 
@@ -1607,158 +2040,20 @@ classpath/gnu/java/lang/reflect/TypeSignature.java
 
 gnu_java_lang_reflect_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_reflect_source_files)))
 gnu_java_locale_source_files = \
-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 \
-gnu/java/locale/LocaleInformation_ar_AE.java \
-gnu/java/locale/LocaleInformation_ar_BH.java \
-gnu/java/locale/LocaleInformation_ar_DZ.java \
-gnu/java/locale/LocaleInformation_ar_EG.java \
-gnu/java/locale/LocaleInformation_ar_IN.java \
-gnu/java/locale/LocaleInformation_ar_IQ.java \
-gnu/java/locale/LocaleInformation_ar_JO.java \
-gnu/java/locale/LocaleInformation_ar_KW.java \
-gnu/java/locale/LocaleInformation_ar_LB.java \
-gnu/java/locale/LocaleInformation_ar_LY.java \
-gnu/java/locale/LocaleInformation_ar_MA.java \
-gnu/java/locale/LocaleInformation_ar_OM.java \
-gnu/java/locale/LocaleInformation_ar_QA.java \
-gnu/java/locale/LocaleInformation_ar_SD.java \
-gnu/java/locale/LocaleInformation_ar_SY.java \
-gnu/java/locale/LocaleInformation_ar_TN.java \
-gnu/java/locale/LocaleInformation_ar_YE.java \
-gnu/java/locale/LocaleInformation_be_BY.java \
-gnu/java/locale/LocaleInformation_bn_IN.java \
-gnu/java/locale/LocaleInformation_br_FR.java \
-gnu/java/locale/LocaleInformation_bs_BA.java \
-gnu/java/locale/LocaleInformation_ca_ES.java \
-gnu/java/locale/LocaleInformation_cs_CZ.java \
-gnu/java/locale/LocaleInformation_cy_GB.java \
-gnu/java/locale/LocaleInformation_da_DK.java \
-gnu/java/locale/LocaleInformation_de.java \
-gnu/java/locale/LocaleInformation_de_AT.java \
-gnu/java/locale/LocaleInformation_de_BE.java \
-gnu/java/locale/LocaleInformation_de_CH.java \
-gnu/java/locale/LocaleInformation_de_DE.java \
-gnu/java/locale/LocaleInformation_de_LU.java \
-gnu/java/locale/LocaleInformation_el_GR.java \
-gnu/java/locale/LocaleInformation_en.java \
-gnu/java/locale/LocaleInformation_en_AU.java \
-gnu/java/locale/LocaleInformation_en_BW.java \
-gnu/java/locale/LocaleInformation_en_CA.java \
-gnu/java/locale/LocaleInformation_en_DK.java \
-gnu/java/locale/LocaleInformation_en_GB.java \
-gnu/java/locale/LocaleInformation_en_HK.java \
-gnu/java/locale/LocaleInformation_en_IE.java \
-gnu/java/locale/LocaleInformation_en_IN.java \
-gnu/java/locale/LocaleInformation_en_NZ.java \
-gnu/java/locale/LocaleInformation_en_PH.java \
-gnu/java/locale/LocaleInformation_en_SG.java \
-gnu/java/locale/LocaleInformation_en_US.java \
-gnu/java/locale/LocaleInformation_en_ZA.java \
-gnu/java/locale/LocaleInformation_en_ZW.java \
-gnu/java/locale/LocaleInformation_es_AR.java \
-gnu/java/locale/LocaleInformation_es_BO.java \
-gnu/java/locale/LocaleInformation_es_CL.java \
-gnu/java/locale/LocaleInformation_es_CO.java \
-gnu/java/locale/LocaleInformation_es_CR.java \
-gnu/java/locale/LocaleInformation_es_DO.java \
-gnu/java/locale/LocaleInformation_es_EC.java \
-gnu/java/locale/LocaleInformation_es_ES.java \
-gnu/java/locale/LocaleInformation_es_GT.java \
-gnu/java/locale/LocaleInformation_es_HN.java \
-gnu/java/locale/LocaleInformation_es_MX.java \
-gnu/java/locale/LocaleInformation_es_NI.java \
-gnu/java/locale/LocaleInformation_es_PA.java \
-gnu/java/locale/LocaleInformation_es_PE.java \
-gnu/java/locale/LocaleInformation_es_PR.java \
-gnu/java/locale/LocaleInformation_es_PY.java \
-gnu/java/locale/LocaleInformation_es_SV.java \
-gnu/java/locale/LocaleInformation_es_US.java \
-gnu/java/locale/LocaleInformation_es_UY.java \
-gnu/java/locale/LocaleInformation_es_VE.java \
-gnu/java/locale/LocaleInformation_et_EE.java \
-gnu/java/locale/LocaleInformation_eu_ES.java \
-gnu/java/locale/LocaleInformation_fa_IR.java \
-gnu/java/locale/LocaleInformation_fi_FI.java \
-gnu/java/locale/LocaleInformation_fo_FO.java \
-gnu/java/locale/LocaleInformation_fr_BE.java \
-gnu/java/locale/LocaleInformation_fr_CA.java \
-gnu/java/locale/LocaleInformation_fr_CH.java \
-gnu/java/locale/LocaleInformation_fr_FR.java \
-gnu/java/locale/LocaleInformation_fr_LU.java \
-gnu/java/locale/LocaleInformation_ga_IE.java \
-gnu/java/locale/LocaleInformation_gd_GB.java \
-gnu/java/locale/LocaleInformation_gl_ES.java \
-gnu/java/locale/LocaleInformation_gv_GB.java \
-gnu/java/locale/LocaleInformation_he_IL.java \
-gnu/java/locale/LocaleInformation_hi_IN.java \
-gnu/java/locale/LocaleInformation_hr_HR.java \
-gnu/java/locale/LocaleInformation_hu_HU.java \
-gnu/java/locale/LocaleInformation_id_ID.java \
-gnu/java/locale/LocaleInformation_it_CH.java \
-gnu/java/locale/LocaleInformation_it_IT.java \
-gnu/java/locale/LocaleInformation_iw_IL.java \
-gnu/java/locale/LocaleInformation_ja_JP.java \
-gnu/java/locale/LocaleInformation_ka_GE.java \
-gnu/java/locale/LocaleInformation_kl_GL.java \
-gnu/java/locale/LocaleInformation_ko_KR.java \
-gnu/java/locale/LocaleInformation_kw_GB.java \
-gnu/java/locale/LocaleInformation_lt_LT.java \
-gnu/java/locale/LocaleInformation_lv_LV.java \
-gnu/java/locale/LocaleInformation_mi_NZ.java \
-gnu/java/locale/LocaleInformation_mk_MK.java \
-gnu/java/locale/LocaleInformation_mr_IN.java \
-gnu/java/locale/LocaleInformation_mt_MT.java \
-gnu/java/locale/LocaleInformation_nl.java \
-gnu/java/locale/LocaleInformation_nl_BE.java \
-gnu/java/locale/LocaleInformation_nl_NL.java \
-gnu/java/locale/LocaleInformation_nn_NO.java \
-gnu/java/locale/LocaleInformation_no_NO.java \
-gnu/java/locale/LocaleInformation_oc_FR.java \
-gnu/java/locale/LocaleInformation_pl_PL.java \
-gnu/java/locale/LocaleInformation_pt_BR.java \
-gnu/java/locale/LocaleInformation_pt_PT.java \
-gnu/java/locale/LocaleInformation_ro_RO.java \
-gnu/java/locale/LocaleInformation_ru_RU.java \
-gnu/java/locale/LocaleInformation_ru_UA.java \
-gnu/java/locale/LocaleInformation_se_NO.java \
-gnu/java/locale/LocaleInformation_sk_SK.java \
-gnu/java/locale/LocaleInformation_sl_SI.java \
-gnu/java/locale/LocaleInformation_sq_AL.java \
-gnu/java/locale/LocaleInformation_sr_YU.java \
-gnu/java/locale/LocaleInformation_sv_FI.java \
-gnu/java/locale/LocaleInformation_sv_SE.java \
-gnu/java/locale/LocaleInformation_ta_IN.java \
-gnu/java/locale/LocaleInformation_te_IN.java \
-gnu/java/locale/LocaleInformation_tg_TJ.java \
-gnu/java/locale/LocaleInformation_tl_PH.java \
-gnu/java/locale/LocaleInformation_tr_TR.java \
-gnu/java/locale/LocaleInformation_uk_UA.java \
-gnu/java/locale/LocaleInformation_ur_PK.java \
-gnu/java/locale/LocaleInformation_uz_UZ.java \
-gnu/java/locale/LocaleInformation_vi_VN.java \
-gnu/java/locale/LocaleInformation_yi_US.java \
-gnu/java/locale/LocaleInformation_zh_CN.java \
-gnu/java/locale/LocaleInformation_zh_HK.java \
-gnu/java/locale/LocaleInformation_zh_SG.java \
-gnu/java/locale/LocaleInformation_zh_TW.java
+classpath/gnu/java/locale/LocaleHelper.java
 
 gnu_java_locale_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_locale_source_files)))
 gnu_java_math_source_files = \
+classpath/gnu/java/math/Fixed.java \
+classpath/gnu/java/math/GMP.java \
 classpath/gnu/java/math/MPN.java
 
-gnu_java_math_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_math_source_files)))
 gnu_java_net_source_files = \
-classpath/gnu/java/net/BASE64.java \
 classpath/gnu/java/net/CRLFInputStream.java \
 classpath/gnu/java/net/CRLFOutputStream.java \
 classpath/gnu/java/net/DefaultContentHandlerFactory.java \
+classpath/gnu/java/net/DefaultProxySelector.java \
 classpath/gnu/java/net/EmptyX509TrustManager.java \
 classpath/gnu/java/net/GetLocalHostAction.java \
 classpath/gnu/java/net/HeaderFieldHelper.java \
@@ -1774,6 +2069,7 @@ classpath/gnu/java/net/loader/FileResource.java \
 classpath/gnu/java/net/loader/FileURLLoader.java \
 classpath/gnu/java/net/loader/JarURLLoader.java \
 classpath/gnu/java/net/loader/JarURLResource.java \
+gnu/java/net/loader/Load_gcjlib.java \
 classpath/gnu/java/net/loader/RemoteResource.java \
 classpath/gnu/java/net/loader/RemoteURLLoader.java \
 classpath/gnu/java/net/loader/Resource.java \
@@ -1859,23 +2155,24 @@ classpath/gnu/java/nio/ChannelReader.java \
 classpath/gnu/java/nio/ChannelWriter.java \
 gnu/java/nio/DatagramChannelImpl.java \
 gnu/java/nio/DatagramChannelSelectionKey.java \
-classpath/gnu/java/nio/FileLockImpl.java \
+gnu/java/nio/FileLockImpl.java \
 classpath/gnu/java/nio/InputStreamChannel.java \
 classpath/gnu/java/nio/NIOConstants.java \
 classpath/gnu/java/nio/NIODatagramSocket.java \
 gnu/java/nio/NIOServerSocket.java \
-classpath/gnu/java/nio/NIOSocket.java \
+gnu/java/nio/NIOSocket.java \
 classpath/gnu/java/nio/OutputStreamChannel.java \
-classpath/gnu/java/nio/PipeImpl.java \
+gnu/java/nio/PipeImpl.java \
 classpath/gnu/java/nio/SelectionKeyImpl.java \
 classpath/gnu/java/nio/SelectorImpl.java \
-classpath/gnu/java/nio/SelectorProviderImpl.java \
+gnu/java/nio/SelectorProviderImpl.java \
 gnu/java/nio/ServerSocketChannelImpl.java \
 gnu/java/nio/ServerSocketChannelSelectionKey.java \
 gnu/java/nio/SocketChannelImpl.java \
 gnu/java/nio/SocketChannelSelectionKey.java \
-classpath/gnu/java/nio/SocketChannelSelectionKeyImpl.java \
+gnu/java/nio/SocketChannelSelectionKeyImpl.java \
 gnu/java/nio/VMChannel.java \
+classpath/gnu/java/nio/VMChannelOwner.java \
 gnu/java/nio/VMPipe.java \
 gnu/java/nio/VMSelector.java
 
@@ -1886,6 +2183,8 @@ gnu/java/nio/channels/FileChannelImpl.java
 gnu_java_nio_channels_header_files = $(patsubst %.java,%.h,$(gnu_java_nio_channels_source_files))
 gnu_java_nio_charset_source_files = \
 classpath/gnu/java/nio/charset/ByteCharset.java \
+classpath/gnu/java/nio/charset/ByteDecodeLoopHelper.java \
+classpath/gnu/java/nio/charset/ByteEncodeLoopHelper.java \
 classpath/gnu/java/nio/charset/Cp424.java \
 classpath/gnu/java/nio/charset/Cp437.java \
 classpath/gnu/java/nio/charset/Cp737.java \
@@ -1973,17 +2272,6 @@ 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 \
@@ -2012,7 +2300,8 @@ classpath/gnu/java/security/Engine.java \
 classpath/gnu/java/security/OID.java \
 classpath/gnu/java/security/PolicyFile.java \
 classpath/gnu/java/security/Properties.java \
-classpath/gnu/java/security/Registry.java
+classpath/gnu/java/security/Registry.java \
+classpath/gnu/java/security/Requires.java
 
 gnu_java_security_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_source_files)))
 gnu_java_security_action_source_files = \
@@ -2084,6 +2373,7 @@ classpath/gnu/java/security/jce/prng/Sha256RandomSpi.java \
 classpath/gnu/java/security/jce/prng/Sha384RandomSpi.java \
 classpath/gnu/java/security/jce/prng/Sha512RandomSpi.java \
 classpath/gnu/java/security/jce/prng/TigerRandomSpi.java \
+gnu/java/security/jce/prng/VMSecureRandom.java \
 classpath/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java
 
 gnu_java_security_jce_prng_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_jce_prng_source_files)))
@@ -2189,8 +2479,8 @@ classpath/gnu/java/security/sig/rsa/RSASignatureFactory.java
 
 gnu_java_security_sig_rsa_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_sig_rsa_source_files)))
 gnu_java_security_util_source_files = \
-classpath/gnu/java/security/util/Base64.java \
 classpath/gnu/java/security/util/ByteArray.java \
+classpath/gnu/java/security/util/ByteBufferOutputStream.java \
 classpath/gnu/java/security/util/DerUtil.java \
 classpath/gnu/java/security/util/ExpirableObject.java \
 classpath/gnu/java/security/util/FormatUtil.java \
@@ -2222,9 +2512,12 @@ classpath/gnu/java/security/x509/ext/CRLNumber.java \
 classpath/gnu/java/security/x509/ext/CertificatePolicies.java \
 classpath/gnu/java/security/x509/ext/ExtendedKeyUsage.java \
 classpath/gnu/java/security/x509/ext/Extension.java \
+classpath/gnu/java/security/x509/ext/GeneralName.java \
 classpath/gnu/java/security/x509/ext/GeneralNames.java \
+classpath/gnu/java/security/x509/ext/GeneralSubtree.java \
 classpath/gnu/java/security/x509/ext/IssuerAlternativeNames.java \
 classpath/gnu/java/security/x509/ext/KeyUsage.java \
+classpath/gnu/java/security/x509/ext/NameConstraints.java \
 classpath/gnu/java/security/x509/ext/PolicyConstraint.java \
 classpath/gnu/java/security/x509/ext/PolicyMappings.java \
 classpath/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java \
@@ -2246,9 +2539,12 @@ classpath/gnu/java/text/WordBreakIterator.java
 
 gnu_java_text_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_text_source_files)))
 gnu_java_util_source_files = \
+classpath/gnu/java/util/Base64.java \
 classpath/gnu/java/util/DoubleEnumeration.java \
 classpath/gnu/java/util/EmptyEnumeration.java \
-classpath/gnu/java/util/WeakIdentityHashMap.java
+classpath/gnu/java/util/LRUCache.java \
+classpath/gnu/java/util/WeakIdentityHashMap.java \
+classpath/gnu/java/util/ZoneInfo.java
 
 gnu_java_util_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_source_files)))
 gnu_java_util_jar_source_files = \
@@ -2256,7 +2552,6 @@ classpath/gnu/java/util/jar/JarUtils.java
 
 gnu_java_util_jar_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_jar_source_files)))
 gnu_java_util_prefs_source_files = \
-classpath/gnu/java/util/prefs/EventDispatcher.java \
 classpath/gnu/java/util/prefs/FileBasedFactory.java \
 classpath/gnu/java/util/prefs/FileBasedPreferences.java \
 classpath/gnu/java/util/prefs/GConfBasedFactory.java \
@@ -2304,6 +2599,12 @@ classpath/gnu/java/util/regex/RETokenWordBoundary.java \
 classpath/gnu/java/util/regex/UncheckedRE.java
 
 gnu_java_util_regex_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_regex_source_files)))
+gnu_javax_activation_viewers_source_files = \
+classpath/gnu/javax/activation/viewers/ImageViewer.java \
+classpath/gnu/javax/activation/viewers/TextEditor.java \
+classpath/gnu/javax/activation/viewers/TextViewer.java
+
+gnu_javax_activation_viewers_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_activation_viewers_source_files)))
 gnu_javax_crypto_source_files = \
 classpath/gnu/javax/crypto/RSACipherImpl.java
 
@@ -2463,6 +2764,7 @@ classpath/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java
 gnu_javax_crypto_jce_spec_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_crypto_jce_spec_source_files)))
 gnu_javax_crypto_key_source_files = \
 classpath/gnu/javax/crypto/key/BaseKeyAgreementParty.java \
+classpath/gnu/javax/crypto/key/GnuPBEKey.java \
 classpath/gnu/javax/crypto/key/GnuSecretKey.java \
 classpath/gnu/javax/crypto/key/IKeyAgreementParty.java \
 classpath/gnu/javax/crypto/key/IncomingMessage.java \
@@ -2727,78 +3029,148 @@ classpath/gnu/javax/imageio/png/PNGPhys.java \
 classpath/gnu/javax/imageio/png/PNGTime.java
 
 gnu_javax_imageio_png_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_imageio_png_source_files)))
+gnu_javax_management_source_files = \
+classpath/gnu/javax/management/ListenerData.java \
+classpath/gnu/javax/management/Server.java \
+classpath/gnu/javax/management/Translator.java
+
+gnu_javax_naming_giop_source_files = \
+classpath/gnu/javax/naming/giop/ContextContinuation.java \
+classpath/gnu/javax/naming/giop/CorbalocParser.java \
+classpath/gnu/javax/naming/giop/GiopNamingEnumeration.java \
+classpath/gnu/javax/naming/giop/GiopNamingServiceFactory.java \
+classpath/gnu/javax/naming/giop/GiopNamingServiceURLContext.java \
+classpath/gnu/javax/naming/giop/ListBindingsEnumeration.java \
+classpath/gnu/javax/naming/giop/ListEnumeration.java
+
+gnu_javax_naming_giop_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_naming_giop_source_files)))
+gnu_javax_naming_ictxImpl_trans_source_files = \
+classpath/gnu/javax/naming/ictxImpl/trans/GnuName.java
+
+gnu_javax_naming_ictxImpl_trans_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_naming_ictxImpl_trans_source_files)))
+gnu_javax_naming_jndi_url_corbaname_source_files = \
+classpath/gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.java
+
+gnu_javax_naming_jndi_url_corbaname_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_naming_jndi_url_corbaname_source_files)))
+gnu_javax_naming_jndi_url_rmi_source_files = \
+classpath/gnu/javax/naming/jndi/url/rmi/ContextContinuation.java \
+classpath/gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.java \
+classpath/gnu/javax/naming/jndi/url/rmi/ListEnumeration.java \
+classpath/gnu/javax/naming/jndi/url/rmi/RmiContinuation.java \
+classpath/gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.java \
+classpath/gnu/javax/naming/jndi/url/rmi/rmiURLContext.java \
+classpath/gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.java
+
+gnu_javax_naming_jndi_url_rmi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_naming_jndi_url_rmi_source_files)))
 gnu_javax_net_ssl_source_files = \
-classpath/gnu/javax/net/ssl/Base64.java \
+classpath/gnu/javax/net/ssl/AbstractSessionContext.java \
 classpath/gnu/javax/net/ssl/EntropySource.java \
 classpath/gnu/javax/net/ssl/NullManagerParameters.java \
+classpath/gnu/javax/net/ssl/PreSharedKeyManager.java \
+classpath/gnu/javax/net/ssl/PreSharedKeyManagerParameters.java \
 classpath/gnu/javax/net/ssl/PrivateCredentials.java \
 classpath/gnu/javax/net/ssl/SRPManagerParameters.java \
 classpath/gnu/javax/net/ssl/SRPTrustManager.java \
+classpath/gnu/javax/net/ssl/SSLCipherSuite.java \
+classpath/gnu/javax/net/ssl/SSLProtocolVersion.java \
+classpath/gnu/javax/net/ssl/SSLRecordHandler.java \
+classpath/gnu/javax/net/ssl/Session.java \
+classpath/gnu/javax/net/ssl/SessionStoreException.java \
 classpath/gnu/javax/net/ssl/StaticTrustAnchors.java
 
 gnu_javax_net_ssl_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_net_ssl_source_files)))
 gnu_javax_net_ssl_provider_source_files = \
+classpath/gnu/javax/net/ssl/provider/AbstractHandshake.java \
 classpath/gnu/javax/net/ssl/provider/Alert.java \
 classpath/gnu/javax/net/ssl/provider/AlertException.java \
+classpath/gnu/javax/net/ssl/provider/Builder.java \
 classpath/gnu/javax/net/ssl/provider/Certificate.java \
+classpath/gnu/javax/net/ssl/provider/CertificateBuilder.java \
 classpath/gnu/javax/net/ssl/provider/CertificateRequest.java \
+classpath/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java \
+classpath/gnu/javax/net/ssl/provider/CertificateStatusRequest.java \
+classpath/gnu/javax/net/ssl/provider/CertificateStatusType.java \
 classpath/gnu/javax/net/ssl/provider/CertificateType.java \
+classpath/gnu/javax/net/ssl/provider/CertificateURL.java \
 classpath/gnu/javax/net/ssl/provider/CertificateVerify.java \
+classpath/gnu/javax/net/ssl/provider/CipherAlgorithm.java \
 classpath/gnu/javax/net/ssl/provider/CipherSuite.java \
+classpath/gnu/javax/net/ssl/provider/CipherSuiteList.java \
+classpath/gnu/javax/net/ssl/provider/ClientCertificateTypeList.java \
+classpath/gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.java \
+classpath/gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.java \
+classpath/gnu/javax/net/ssl/provider/ClientHandshake.java \
 classpath/gnu/javax/net/ssl/provider/ClientHello.java \
+classpath/gnu/javax/net/ssl/provider/ClientHelloBuilder.java \
+classpath/gnu/javax/net/ssl/provider/ClientHelloV2.java \
 classpath/gnu/javax/net/ssl/provider/ClientKeyExchange.java \
+classpath/gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.java \
+classpath/gnu/javax/net/ssl/provider/ClientPSKParameters.java \
+classpath/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java \
 classpath/gnu/javax/net/ssl/provider/CompressionMethod.java \
+classpath/gnu/javax/net/ssl/provider/CompressionMethodList.java \
 classpath/gnu/javax/net/ssl/provider/Constructed.java \
 classpath/gnu/javax/net/ssl/provider/ContentType.java \
-classpath/gnu/javax/net/ssl/provider/Context.java \
+classpath/gnu/javax/net/ssl/provider/Debug.java \
+classpath/gnu/javax/net/ssl/provider/DelegatedTask.java \
 classpath/gnu/javax/net/ssl/provider/DiffieHellman.java \
-classpath/gnu/javax/net/ssl/provider/DigestInputStream.java \
-classpath/gnu/javax/net/ssl/provider/DigestOutputStream.java \
-classpath/gnu/javax/net/ssl/provider/Enumerated.java \
+classpath/gnu/javax/net/ssl/provider/EmptyExchangeKeys.java \
+classpath/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java \
+classpath/gnu/javax/net/ssl/provider/ExchangeKeys.java \
 classpath/gnu/javax/net/ssl/provider/Extension.java \
-classpath/gnu/javax/net/ssl/provider/Extensions.java \
+classpath/gnu/javax/net/ssl/provider/ExtensionList.java \
 classpath/gnu/javax/net/ssl/provider/Finished.java \
-classpath/gnu/javax/net/ssl/provider/GNUSecurityParameters.java \
 classpath/gnu/javax/net/ssl/provider/Handshake.java \
-classpath/gnu/javax/net/ssl/provider/JCESecurityParameters.java \
-classpath/gnu/javax/net/ssl/provider/JDBCSessionContext.java \
+classpath/gnu/javax/net/ssl/provider/HelloRequest.java \
+classpath/gnu/javax/net/ssl/provider/InputSecurityParameters.java \
 classpath/gnu/javax/net/ssl/provider/Jessie.java \
-classpath/gnu/javax/net/ssl/provider/JessieDHPrivateKey.java \
-classpath/gnu/javax/net/ssl/provider/JessieDHPublicKey.java \
-classpath/gnu/javax/net/ssl/provider/JessieRSAPrivateKey.java \
-classpath/gnu/javax/net/ssl/provider/JessieRSAPublicKey.java \
-classpath/gnu/javax/net/ssl/provider/KeyPool.java \
+classpath/gnu/javax/net/ssl/provider/KeyExchangeAlgorithm.java \
+classpath/gnu/javax/net/ssl/provider/MacAlgorithm.java \
 classpath/gnu/javax/net/ssl/provider/MacException.java \
-classpath/gnu/javax/net/ssl/provider/OverflowException.java \
+classpath/gnu/javax/net/ssl/provider/MaxFragmentLength.java \
+classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java \
+classpath/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.java \
 classpath/gnu/javax/net/ssl/provider/ProtocolVersion.java \
 classpath/gnu/javax/net/ssl/provider/Random.java \
-classpath/gnu/javax/net/ssl/provider/RecordInput.java \
-classpath/gnu/javax/net/ssl/provider/RecordInputStream.java \
-classpath/gnu/javax/net/ssl/provider/RecordOutputStream.java \
-classpath/gnu/javax/net/ssl/provider/RecordingInputStream.java \
+classpath/gnu/javax/net/ssl/provider/Record.java \
 classpath/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java \
+classpath/gnu/javax/net/ssl/provider/SSLContextImpl.java \
+classpath/gnu/javax/net/ssl/provider/SSLEngineImpl.java \
 classpath/gnu/javax/net/ssl/provider/SSLHMac.java \
-classpath/gnu/javax/net/ssl/provider/SSLRSASignature.java \
+classpath/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java \
 classpath/gnu/javax/net/ssl/provider/SSLRandom.java \
-classpath/gnu/javax/net/ssl/provider/SSLServerSocket.java \
-classpath/gnu/javax/net/ssl/provider/SSLServerSocketFactory.java \
-classpath/gnu/javax/net/ssl/provider/SSLSocket.java \
-classpath/gnu/javax/net/ssl/provider/SSLSocketFactory.java \
-classpath/gnu/javax/net/ssl/provider/SSLSocketInputStream.java \
-classpath/gnu/javax/net/ssl/provider/SSLSocketOutputStream.java \
-classpath/gnu/javax/net/ssl/provider/SecurityParameters.java \
+classpath/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.java \
+classpath/gnu/javax/net/ssl/provider/SSLServerSocketImpl.java \
+classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java \
+classpath/gnu/javax/net/ssl/provider/SSLSocketImpl.java \
+classpath/gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.java \
+classpath/gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.java \
+classpath/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java \
+classpath/gnu/javax/net/ssl/provider/ServerDHParams.java \
+classpath/gnu/javax/net/ssl/provider/ServerHandshake.java \
 classpath/gnu/javax/net/ssl/provider/ServerHello.java \
+classpath/gnu/javax/net/ssl/provider/ServerHelloBuilder.java \
+classpath/gnu/javax/net/ssl/provider/ServerHelloDone.java \
 classpath/gnu/javax/net/ssl/provider/ServerKeyExchange.java \
-classpath/gnu/javax/net/ssl/provider/Session.java \
-classpath/gnu/javax/net/ssl/provider/SessionContext.java \
+classpath/gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.java \
+classpath/gnu/javax/net/ssl/provider/ServerKeyExchangeParams.java \
+classpath/gnu/javax/net/ssl/provider/ServerNameList.java \
+classpath/gnu/javax/net/ssl/provider/ServerPSKParameters.java \
+classpath/gnu/javax/net/ssl/provider/ServerRSAParams.java \
+classpath/gnu/javax/net/ssl/provider/ServerRSA_PSKParameters.java \
+classpath/gnu/javax/net/ssl/provider/SessionImpl.java \
 classpath/gnu/javax/net/ssl/provider/Signature.java \
-classpath/gnu/javax/net/ssl/provider/SynchronizedRandom.java \
+classpath/gnu/javax/net/ssl/provider/SignatureAlgorithm.java \
+classpath/gnu/javax/net/ssl/provider/SimpleSessionContext.java \
 classpath/gnu/javax/net/ssl/provider/TLSHMac.java \
 classpath/gnu/javax/net/ssl/provider/TLSRandom.java \
+classpath/gnu/javax/net/ssl/provider/TruncatedHMAC.java \
+classpath/gnu/javax/net/ssl/provider/TrustedAuthorities.java \
+classpath/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java \
 classpath/gnu/javax/net/ssl/provider/Util.java \
+classpath/gnu/javax/net/ssl/provider/X500PrincipalList.java \
 classpath/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java \
-classpath/gnu/javax/net/ssl/provider/X509TrustManagerFactory.java \
-classpath/gnu/javax/net/ssl/provider/XMLSessionContext.java
+classpath/gnu/javax/net/ssl/provider/X509TrustManagerFactory.java
 
 gnu_javax_net_ssl_provider_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_net_ssl_provider_source_files)))
 gnu_javax_print_source_files = \
@@ -2920,6 +3292,7 @@ gnu_javax_security_auth_header_files = $(patsubst classpath/%,%,$(patsubst %.jav
 gnu_javax_security_auth_callback_source_files = \
 classpath/gnu/javax/security/auth/callback/AWTCallbackHandler.java \
 classpath/gnu/javax/security/auth/callback/AbstractCallbackHandler.java \
+classpath/gnu/javax/security/auth/callback/CertificateCallback.java \
 classpath/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java \
 classpath/gnu/javax/security/auth/callback/DefaultCallbackHandler.java \
 classpath/gnu/javax/security/auth/callback/GnuCallbacks.java \
@@ -2932,6 +3305,10 @@ classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java \
 classpath/gnu/javax/security/auth/login/GnuConfiguration.java
 
 gnu_javax_security_auth_login_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_security_auth_login_source_files)))
+gnu_javax_sound_source_files = \
+classpath/gnu/javax/sound/AudioSecurityManager.java
+
+gnu_javax_sound_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_sound_source_files)))
 gnu_javax_sound_midi_source_files = \
 classpath/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.java \
 classpath/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.java \
@@ -2968,10 +3345,25 @@ classpath/gnu/javax/swing/text/html/CombinedAttributes.java \
 classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java
 
 gnu_javax_swing_text_html_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_text_html_source_files)))
+gnu_javax_swing_text_html_css_source_files = \
+classpath/gnu/javax/swing/text/html/css/BorderStyle.java \
+classpath/gnu/javax/swing/text/html/css/BorderWidth.java \
+classpath/gnu/javax/swing/text/html/css/CSSColor.java \
+classpath/gnu/javax/swing/text/html/css/CSSLexicalException.java \
+classpath/gnu/javax/swing/text/html/css/CSSParser.java \
+classpath/gnu/javax/swing/text/html/css/CSSParserCallback.java \
+classpath/gnu/javax/swing/text/html/css/CSSParserException.java \
+classpath/gnu/javax/swing/text/html/css/CSSScanner.java \
+classpath/gnu/javax/swing/text/html/css/FontSize.java \
+classpath/gnu/javax/swing/text/html/css/FontStyle.java \
+classpath/gnu/javax/swing/text/html/css/FontWeight.java \
+classpath/gnu/javax/swing/text/html/css/Length.java \
+classpath/gnu/javax/swing/text/html/css/Selector.java
+
+gnu_javax_swing_text_html_css_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_text_html_css_source_files)))
 gnu_javax_swing_text_html_parser_source_files = \
 classpath/gnu/javax/swing/text/html/parser/GnuParserDelegator.java \
 classpath/gnu/javax/swing/text/html/parser/HTML_401F.java \
-classpath/gnu/javax/swing/text/html/parser/HTML_401Swing.java \
 classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java \
 classpath/gnu/javax/swing/text/html/parser/gnuDTD.java \
 classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java \
@@ -3010,11 +3402,13 @@ gnu_javax_swing_tree_source_files = \
 classpath/gnu/javax/swing/tree/GnuPath.java
 
 gnu_javax_swing_tree_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_swing_tree_source_files)))
-gnu_xml_source_files = \
+gnu_xml_aelfred2_source_files = \
 classpath/gnu/xml/aelfred2/JAXPFactory.java \
 classpath/gnu/xml/aelfred2/SAXDriver.java \
 classpath/gnu/xml/aelfred2/XmlParser.java \
-classpath/gnu/xml/aelfred2/XmlReader.java \
+classpath/gnu/xml/aelfred2/XmlReader.java
+
+gnu_xml_dom_source_files = \
 classpath/gnu/xml/dom/Consumer.java \
 classpath/gnu/xml/dom/DTDAttributeTypeInfo.java \
 classpath/gnu/xml/dom/DTDElementTypeInfo.java \
@@ -3116,7 +3510,9 @@ classpath/gnu/xml/dom/ls/DomLSSerializer.java \
 classpath/gnu/xml/dom/ls/FilteredSAXEventSink.java \
 classpath/gnu/xml/dom/ls/ReaderInputStream.java \
 classpath/gnu/xml/dom/ls/SAXEventSink.java \
-classpath/gnu/xml/dom/ls/WriterOutputStream.java \
+classpath/gnu/xml/dom/ls/WriterOutputStream.java
+
+gnu_xml_libxmlj_source_files = \
 classpath/gnu/xml/libxmlj/dom/GnomeAttr.java \
 classpath/gnu/xml/libxmlj/dom/GnomeCDATASection.java \
 classpath/gnu/xml/libxmlj/dom/GnomeCharacterData.java \
@@ -3157,7 +3553,9 @@ classpath/gnu/xml/libxmlj/util/EmptyNodeList.java \
 classpath/gnu/xml/libxmlj/util/NamedInputStream.java \
 classpath/gnu/xml/libxmlj/util/StandaloneDocumentType.java \
 classpath/gnu/xml/libxmlj/util/StandaloneLocator.java \
-classpath/gnu/xml/libxmlj/util/XMLJ.java \
+classpath/gnu/xml/libxmlj/util/XMLJ.java
+
+gnu_xml_pipeline_source_files = \
 classpath/gnu/xml/pipeline/CallFilter.java \
 classpath/gnu/xml/pipeline/DomConsumer.java \
 classpath/gnu/xml/pipeline/EventConsumer.java \
@@ -3170,7 +3568,9 @@ classpath/gnu/xml/pipeline/TextConsumer.java \
 classpath/gnu/xml/pipeline/ValidationConsumer.java \
 classpath/gnu/xml/pipeline/WellFormednessFilter.java \
 classpath/gnu/xml/pipeline/XIncludeFilter.java \
-classpath/gnu/xml/pipeline/XsltFilter.java \
+classpath/gnu/xml/pipeline/XsltFilter.java
+
+gnu_xml_stream_source_files = \
 classpath/gnu/xml/stream/AttributeImpl.java \
 classpath/gnu/xml/stream/BufferedReader.java \
 classpath/gnu/xml/stream/CRLFReader.java \
@@ -3200,7 +3600,9 @@ classpath/gnu/xml/stream/XMLEventWriterImpl.java \
 classpath/gnu/xml/stream/XMLInputFactoryImpl.java \
 classpath/gnu/xml/stream/XMLOutputFactoryImpl.java \
 classpath/gnu/xml/stream/XMLParser.java \
-classpath/gnu/xml/stream/XMLStreamWriterImpl.java \
+classpath/gnu/xml/stream/XMLStreamWriterImpl.java
+
+gnu_xml_transform_source_files = \
 classpath/gnu/xml/transform/AbstractNumberNode.java \
 classpath/gnu/xml/transform/ApplyImportsNode.java \
 classpath/gnu/xml/transform/ApplyTemplatesNode.java \
@@ -3234,6 +3636,8 @@ classpath/gnu/xml/transform/OtherwiseNode.java \
 classpath/gnu/xml/transform/ParameterNode.java \
 classpath/gnu/xml/transform/ProcessingInstructionNode.java \
 classpath/gnu/xml/transform/SAXSerializer.java \
+classpath/gnu/xml/transform/SAXTemplatesHandler.java \
+classpath/gnu/xml/transform/SAXTransformerHandler.java \
 classpath/gnu/xml/transform/SortKey.java \
 classpath/gnu/xml/transform/StreamSerializer.java \
 classpath/gnu/xml/transform/StrippingInstruction.java \
@@ -3252,14 +3656,18 @@ classpath/gnu/xml/transform/ValueOfNode.java \
 classpath/gnu/xml/transform/WhenNode.java \
 classpath/gnu/xml/transform/WithParam.java \
 classpath/gnu/xml/transform/XSLComparator.java \
-classpath/gnu/xml/transform/XSLURIResolver.java \
+classpath/gnu/xml/transform/XSLURIResolver.java
+
+gnu_xml_util_source_files = \
 classpath/gnu/xml/util/DoParse.java \
 classpath/gnu/xml/util/DomParser.java \
 classpath/gnu/xml/util/Resolver.java \
 classpath/gnu/xml/util/SAXNullTransformerFactory.java \
 classpath/gnu/xml/util/XCat.java \
 classpath/gnu/xml/util/XHTMLWriter.java \
-classpath/gnu/xml/util/XMLWriter.java \
+classpath/gnu/xml/util/XMLWriter.java
+
+gnu_xml_validation_source_files = \
 classpath/gnu/xml/validation/datatype/Annotation.java \
 classpath/gnu/xml/validation/datatype/AnySimpleType.java \
 classpath/gnu/xml/validation/datatype/AnyType.java \
@@ -3369,7 +3777,9 @@ classpath/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.java \
 classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.java \
 classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.java \
 classpath/gnu/xml/validation/xmlschema/XMLSchemaValidator.java \
-classpath/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java \
+classpath/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java
+
+gnu_xml_xpath_source_files = \
 classpath/gnu/xml/xpath/AndExpr.java \
 classpath/gnu/xml/xpath/ArithmeticExpr.java \
 classpath/gnu/xml/xpath/BooleanFunction.java \
@@ -3465,6 +3875,7 @@ classpath/java/awt/ContainerOrderFocusTraversalPolicy.java \
 classpath/java/awt/Cursor.java \
 classpath/java/awt/DefaultFocusTraversalPolicy.java \
 classpath/java/awt/DefaultKeyboardFocusManager.java \
+classpath/java/awt/Desktop.java \
 classpath/java/awt/Dialog.java \
 classpath/java/awt/Dimension.java \
 classpath/java/awt/DisplayMode.java \
@@ -3558,6 +3969,7 @@ classpath/java/awt/datatransfer/FlavorEvent.java \
 classpath/java/awt/datatransfer/FlavorListener.java \
 classpath/java/awt/datatransfer/FlavorMap.java \
 classpath/java/awt/datatransfer/FlavorTable.java \
+classpath/java/awt/datatransfer/MimeType.java \
 classpath/java/awt/datatransfer/MimeTypeParseException.java \
 classpath/java/awt/datatransfer/StringSelection.java \
 classpath/java/awt/datatransfer/SystemFlavorMap.java \
@@ -3769,6 +4181,7 @@ classpath/java/awt/peer/CheckboxPeer.java \
 classpath/java/awt/peer/ChoicePeer.java \
 classpath/java/awt/peer/ComponentPeer.java \
 classpath/java/awt/peer/ContainerPeer.java \
+classpath/java/awt/peer/DesktopPeer.java \
 classpath/java/awt/peer/DialogPeer.java \
 classpath/java/awt/peer/FileDialogPeer.java \
 classpath/java/awt/peer/FontPeer.java \
@@ -3811,6 +4224,7 @@ classpath/java/beans/AppletInitializer.java \
 classpath/java/beans/BeanDescriptor.java \
 classpath/java/beans/BeanInfo.java \
 classpath/java/beans/Beans.java \
+classpath/java/beans/ConstructorProperties.java \
 classpath/java/beans/Customizer.java \
 classpath/java/beans/DefaultPersistenceDelegate.java \
 classpath/java/beans/DesignMode.java \
@@ -3886,11 +4300,11 @@ classpath/java/io/DeleteFileHelper.java \
 classpath/java/io/EOFException.java \
 classpath/java/io/Externalizable.java \
 java/io/File.java \
-classpath/java/io/FileDescriptor.java \
+java/io/FileDescriptor.java \
 classpath/java/io/FileFilter.java \
-classpath/java/io/FileInputStream.java \
+java/io/FileInputStream.java \
 classpath/java/io/FileNotFoundException.java \
-classpath/java/io/FileOutputStream.java \
+java/io/FileOutputStream.java \
 classpath/java/io/FilePermission.java \
 classpath/java/io/FileReader.java \
 classpath/java/io/FileWriter.java \
@@ -3911,7 +4325,7 @@ classpath/java/io/LineNumberReader.java \
 classpath/java/io/NotActiveException.java \
 classpath/java/io/NotSerializableException.java \
 classpath/java/io/ObjectInput.java \
-java/io/ObjectInputStream.java \
+classpath/java/io/ObjectInputStream.java \
 classpath/java/io/ObjectInputValidation.java \
 classpath/java/io/ObjectOutput.java \
 classpath/java/io/ObjectOutputStream.java \
@@ -3930,7 +4344,7 @@ java/io/PrintStream.java \
 classpath/java/io/PrintWriter.java \
 classpath/java/io/PushbackInputStream.java \
 classpath/java/io/PushbackReader.java \
-classpath/java/io/RandomAccessFile.java \
+java/io/RandomAccessFile.java \
 classpath/java/io/Reader.java \
 classpath/java/io/SequenceInputStream.java \
 classpath/java/io/Serializable.java \
@@ -3943,6 +4357,7 @@ classpath/java/io/StringWriter.java \
 classpath/java/io/SyncFailedException.java \
 classpath/java/io/UTFDataFormatException.java \
 classpath/java/io/UnsupportedEncodingException.java \
+java/io/VMObjectInputStream.java \
 java/io/VMObjectStreamClass.java \
 classpath/java/io/WriteAbortedException.java \
 classpath/java/io/Writer.java
@@ -3950,6 +4365,7 @@ classpath/java/io/Writer.java
 java_io_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_io_source_files)))
 java_lang_source_files = \
 classpath/java/lang/AbstractMethodError.java \
+java/lang/AbstractStringBuffer.java \
 classpath/java/lang/Appendable.java \
 classpath/java/lang/ArithmeticException.java \
 classpath/java/lang/ArrayIndexOutOfBoundsException.java \
@@ -3959,6 +4375,7 @@ classpath/java/lang/Boolean.java \
 classpath/java/lang/Byte.java \
 classpath/java/lang/CharSequence.java \
 java/lang/Character.java \
+java/lang/Class.java \
 classpath/java/lang/ClassCastException.java \
 classpath/java/lang/ClassCircularityError.java \
 classpath/java/lang/ClassFormatError.java \
@@ -3968,8 +4385,9 @@ classpath/java/lang/CloneNotSupportedException.java \
 classpath/java/lang/Cloneable.java \
 classpath/java/lang/Comparable.java \
 classpath/java/lang/Compiler.java \
-java/lang/ConcreteProcess.java \
+classpath/java/lang/Deprecated.java \
 classpath/java/lang/Double.java \
+java/lang/EcosProcess.java \
 classpath/java/lang/Enum.java \
 classpath/java/lang/EnumConstantNotPresentException.java \
 classpath/java/lang/Error.java \
@@ -4003,16 +4421,20 @@ classpath/java/lang/NoSuchMethodException.java \
 classpath/java/lang/NullPointerException.java \
 classpath/java/lang/Number.java \
 classpath/java/lang/NumberFormatException.java \
+java/lang/Object.java \
 classpath/java/lang/OutOfMemoryError.java \
-java/lang/Package.java \
+classpath/java/lang/Override.java \
+classpath/java/lang/Package.java \
+java/lang/PosixProcess.java \
 classpath/java/lang/Process.java \
+classpath/java/lang/ProcessBuilder.java \
 classpath/java/lang/Readable.java \
 classpath/java/lang/Runnable.java \
 java/lang/Runtime.java \
 classpath/java/lang/RuntimeException.java \
 classpath/java/lang/RuntimePermission.java \
 classpath/java/lang/SecurityException.java \
-java/lang/SecurityManager.java \
+classpath/java/lang/SecurityManager.java \
 classpath/java/lang/Short.java \
 classpath/java/lang/StackOverflowError.java \
 classpath/java/lang/StackTraceElement.java \
@@ -4021,11 +4443,13 @@ java/lang/String.java \
 java/lang/StringBuffer.java \
 java/lang/StringBuilder.java \
 classpath/java/lang/StringIndexOutOfBoundsException.java \
+classpath/java/lang/SuppressWarnings.java \
 java/lang/System.java \
 java/lang/Thread.java \
 classpath/java/lang/ThreadDeath.java \
 classpath/java/lang/ThreadGroup.java \
-classpath/java/lang/ThreadLocal.java \
+java/lang/ThreadLocal.java \
+classpath/java/lang/ThreadLocalMap.java \
 classpath/java/lang/Throwable.java \
 classpath/java/lang/TypeNotPresentException.java \
 classpath/java/lang/UnknownError.java \
@@ -4036,18 +4460,25 @@ java/lang/VMClassLoader.java \
 java/lang/VMCompiler.java \
 java/lang/VMDouble.java \
 java/lang/VMFloat.java \
-java/lang/VMSecurityManager.java \
+java/lang/VMProcess.java \
 java/lang/VMThrowable.java \
 classpath/java/lang/VerifyError.java \
 classpath/java/lang/VirtualMachineError.java \
-classpath/java/lang/Void.java
+classpath/java/lang/Void.java \
+java/lang/Win32Process.java
 
 java_lang_header_files = $(filter-out java/lang/Object.h java/lang/Class.h,$(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_source_files))))
 java_lang_annotation_source_files = \
 classpath/java/lang/annotation/Annotation.java \
 classpath/java/lang/annotation/AnnotationFormatError.java \
 classpath/java/lang/annotation/AnnotationTypeMismatchException.java \
-classpath/java/lang/annotation/IncompleteAnnotationException.java
+classpath/java/lang/annotation/Documented.java \
+classpath/java/lang/annotation/ElementType.java \
+classpath/java/lang/annotation/IncompleteAnnotationException.java \
+classpath/java/lang/annotation/Inherited.java \
+classpath/java/lang/annotation/Retention.java \
+classpath/java/lang/annotation/RetentionPolicy.java \
+classpath/java/lang/annotation/Target.java
 
 java_lang_annotation_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_annotation_source_files)))
 java_lang_instrument_source_files = \
@@ -4062,20 +4493,22 @@ java_lang_management_source_files = \
 classpath/java/lang/management/ClassLoadingMXBean.java \
 classpath/java/lang/management/CompilationMXBean.java \
 classpath/java/lang/management/GarbageCollectorMXBean.java \
+classpath/java/lang/management/LockInfo.java \
 classpath/java/lang/management/ManagementFactory.java \
 classpath/java/lang/management/ManagementPermission.java \
 classpath/java/lang/management/MemoryMXBean.java \
 classpath/java/lang/management/MemoryManagerMXBean.java \
 classpath/java/lang/management/MemoryNotificationInfo.java \
 classpath/java/lang/management/MemoryPoolMXBean.java \
+classpath/java/lang/management/MemoryType.java \
 classpath/java/lang/management/MemoryUsage.java \
+classpath/java/lang/management/MonitorInfo.java \
 classpath/java/lang/management/OperatingSystemMXBean.java \
 classpath/java/lang/management/RuntimeMXBean.java \
 classpath/java/lang/management/ThreadInfo.java \
 classpath/java/lang/management/ThreadMXBean.java \
 java/lang/management/VMManagementFactory.java
 
-java_lang_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_management_source_files)))
 java_lang_ref_source_files = \
 classpath/java/lang/ref/PhantomReference.java \
 java/lang/ref/Reference.java \
@@ -4112,7 +4545,8 @@ java_lang_reflect_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,
 java_math_source_files = \
 classpath/java/math/BigDecimal.java \
 classpath/java/math/BigInteger.java \
-classpath/java/math/MathContext.java
+classpath/java/math/MathContext.java \
+classpath/java/math/RoundingMode.java
 
 java_math_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_math_source_files)))
 java_net_source_files = \
@@ -4134,13 +4568,15 @@ classpath/java/net/InetSocketAddress.java \
 classpath/java/net/JarURLConnection.java \
 classpath/java/net/MalformedURLException.java \
 classpath/java/net/MimeTypeMapper.java \
-classpath/java/net/MulticastSocket.java \
+java/net/MulticastSocket.java \
 classpath/java/net/NetPermission.java \
-classpath/java/net/NetworkInterface.java \
+java/net/NetworkInterface.java \
 classpath/java/net/NoRouteToHostException.java \
 classpath/java/net/PasswordAuthentication.java \
 classpath/java/net/PortUnreachableException.java \
 classpath/java/net/ProtocolException.java \
+classpath/java/net/Proxy.java \
+classpath/java/net/ProxySelector.java \
 classpath/java/net/ResolverCache.java \
 classpath/java/net/ServerSocket.java \
 classpath/java/net/Socket.java \
@@ -4153,8 +4589,8 @@ classpath/java/net/SocketPermission.java \
 classpath/java/net/SocketTimeoutException.java \
 classpath/java/net/URI.java \
 classpath/java/net/URISyntaxException.java \
-java/net/URL.java \
-java/net/URLClassLoader.java \
+classpath/java/net/URL.java \
+classpath/java/net/URLClassLoader.java \
 classpath/java/net/URLConnection.java \
 classpath/java/net/URLDecoder.java \
 classpath/java/net/URLEncoder.java \
@@ -4177,6 +4613,7 @@ classpath/java/nio/ByteBufferImpl.java \
 classpath/java/nio/ByteOrder.java \
 classpath/java/nio/CharBuffer.java \
 classpath/java/nio/CharBufferImpl.java \
+classpath/java/nio/CharSequenceBuffer.java \
 classpath/java/nio/CharViewBufferImpl.java \
 java/nio/DirectByteBufferImpl.java \
 classpath/java/nio/DoubleBuffer.java \
@@ -4192,7 +4629,7 @@ classpath/java/nio/InvalidMarkException.java \
 classpath/java/nio/LongBuffer.java \
 classpath/java/nio/LongBufferImpl.java \
 classpath/java/nio/LongViewBufferImpl.java \
-java/nio/MappedByteBuffer.java \
+classpath/java/nio/MappedByteBuffer.java \
 java/nio/MappedByteBufferImpl.java \
 classpath/java/nio/ReadOnlyBufferException.java \
 classpath/java/nio/ShortBuffer.java \
@@ -4408,7 +4845,7 @@ classpath/java/security/PublicKey.java \
 classpath/java/security/SecureClassLoader.java \
 classpath/java/security/SecureRandom.java \
 classpath/java/security/SecureRandomSpi.java \
-java/security/Security.java \
+classpath/java/security/Security.java \
 classpath/java/security/SecurityPermission.java \
 classpath/java/security/Signature.java \
 classpath/java/security/SignatureException.java \
@@ -4418,8 +4855,7 @@ classpath/java/security/Signer.java \
 classpath/java/security/UnrecoverableKeyException.java \
 classpath/java/security/UnresolvedPermission.java \
 java/security/VMAccessControlState.java \
-java/security/VMAccessController.java \
-java/security/VMSecureRandom.java
+java/security/VMAccessController.java
 
 java_security_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_security_source_files)))
 java_security_acl_source_files = \
@@ -4556,9 +4992,9 @@ classpath/java/text/CollationElementIterator.java \
 classpath/java/text/CollationKey.java \
 java/text/Collator.java \
 classpath/java/text/DateFormat.java \
-java/text/DateFormatSymbols.java \
+classpath/java/text/DateFormatSymbols.java \
 classpath/java/text/DecimalFormat.java \
-java/text/DecimalFormatSymbols.java \
+classpath/java/text/DecimalFormatSymbols.java \
 classpath/java/text/FieldPosition.java \
 classpath/java/text/Format.java \
 classpath/java/text/MessageFormat.java \
@@ -4570,25 +5006,39 @@ classpath/java/text/SimpleDateFormat.java \
 classpath/java/text/StringCharacterIterator.java
 
 java_text_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_text_source_files)))
+java_text_spi_source_files = \
+classpath/java/text/spi/BreakIteratorProvider.java \
+classpath/java/text/spi/CollatorProvider.java \
+classpath/java/text/spi/DateFormatProvider.java \
+classpath/java/text/spi/DateFormatSymbolsProvider.java \
+classpath/java/text/spi/DecimalFormatSymbolsProvider.java \
+classpath/java/text/spi/NumberFormatProvider.java
+
+java_text_spi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_text_spi_source_files)))
 java_util_source_files = \
 classpath/java/util/AbstractCollection.java \
 classpath/java/util/AbstractList.java \
 classpath/java/util/AbstractMap.java \
+classpath/external/jsr166/java/util/AbstractQueue.java \
 classpath/java/util/AbstractSequentialList.java \
 classpath/java/util/AbstractSet.java \
+classpath/external/jsr166/java/util/ArrayDeque.java \
 classpath/java/util/ArrayList.java \
 classpath/java/util/Arrays.java \
 classpath/java/util/BitSet.java \
-java/util/Calendar.java \
+classpath/java/util/Calendar.java \
 classpath/java/util/Collection.java \
 classpath/java/util/Collections.java \
 classpath/java/util/Comparator.java \
 classpath/java/util/ConcurrentModificationException.java \
-java/util/Currency.java \
+classpath/java/util/Currency.java \
 classpath/java/util/Date.java \
+classpath/external/jsr166/java/util/Deque.java \
 classpath/java/util/Dictionary.java \
 classpath/java/util/DuplicateFormatFlagsException.java \
 classpath/java/util/EmptyStackException.java \
+classpath/java/util/EnumMap.java \
+classpath/java/util/EnumSet.java \
 classpath/java/util/Enumeration.java \
 classpath/java/util/EventListener.java \
 classpath/java/util/EventListenerProxy.java \
@@ -4598,7 +5048,7 @@ classpath/java/util/Formattable.java \
 classpath/java/util/FormattableFlags.java \
 classpath/java/util/Formatter.java \
 classpath/java/util/FormatterClosedException.java \
-java/util/GregorianCalendar.java \
+classpath/java/util/GregorianCalendar.java \
 classpath/java/util/HashMap.java \
 classpath/java/util/HashSet.java \
 classpath/java/util/Hashtable.java \
@@ -4618,21 +5068,28 @@ classpath/java/util/LinkedList.java \
 classpath/java/util/List.java \
 classpath/java/util/ListIterator.java \
 classpath/java/util/ListResourceBundle.java \
-java/util/Locale.java \
+classpath/java/util/Locale.java \
 classpath/java/util/Map.java \
 classpath/java/util/MissingFormatArgumentException.java \
 classpath/java/util/MissingFormatWidthException.java \
 classpath/java/util/MissingResourceException.java \
+classpath/external/jsr166/java/util/NavigableMap.java \
+classpath/external/jsr166/java/util/NavigableSet.java \
 classpath/java/util/NoSuchElementException.java \
 classpath/java/util/Observable.java \
 classpath/java/util/Observer.java \
+classpath/java/util/PriorityQueue.java \
 classpath/java/util/Properties.java \
 classpath/java/util/PropertyPermission.java \
 classpath/java/util/PropertyPermissionCollection.java \
 classpath/java/util/PropertyResourceBundle.java \
+classpath/external/jsr166/java/util/Queue.java \
 classpath/java/util/Random.java \
 classpath/java/util/RandomAccess.java \
-java/util/ResourceBundle.java \
+classpath/java/util/ResourceBundle.java \
+classpath/java/util/Scanner.java \
+classpath/java/util/ServiceConfigurationError.java \
+classpath/java/util/ServiceLoader.java \
 classpath/java/util/Set.java \
 classpath/java/util/SimpleTimeZone.java \
 classpath/java/util/SortedMap.java \
@@ -4652,7 +5109,81 @@ java/util/VMTimeZone.java \
 classpath/java/util/Vector.java \
 classpath/java/util/WeakHashMap.java
 
-java_util_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_util_source_files)))
+java_util_header_files = $(patsubst classpath/%,%,$(patsubst classpath/external/jsr166/%,%,$(patsubst %.java,%.h,$(java_util_source_files))))
+java_util_concurrent_source_files = \
+classpath/external/jsr166/java/util/concurrent/AbstractExecutorService.java \
+classpath/external/jsr166/java/util/concurrent/ArrayBlockingQueue.java \
+classpath/external/jsr166/java/util/concurrent/BlockingDeque.java \
+classpath/external/jsr166/java/util/concurrent/BlockingQueue.java \
+classpath/external/jsr166/java/util/concurrent/BrokenBarrierException.java \
+classpath/external/jsr166/java/util/concurrent/Callable.java \
+classpath/external/jsr166/java/util/concurrent/CancellationException.java \
+classpath/external/jsr166/java/util/concurrent/CompletionService.java \
+classpath/external/jsr166/java/util/concurrent/ConcurrentHashMap.java \
+classpath/external/jsr166/java/util/concurrent/ConcurrentLinkedQueue.java \
+classpath/external/jsr166/java/util/concurrent/ConcurrentMap.java \
+classpath/external/jsr166/java/util/concurrent/ConcurrentNavigableMap.java \
+classpath/external/jsr166/java/util/concurrent/ConcurrentSkipListMap.java \
+classpath/external/jsr166/java/util/concurrent/ConcurrentSkipListSet.java \
+classpath/java/util/concurrent/CopyOnWriteArrayList.java \
+classpath/external/jsr166/java/util/concurrent/CopyOnWriteArraySet.java \
+classpath/external/jsr166/java/util/concurrent/CountDownLatch.java \
+classpath/external/jsr166/java/util/concurrent/CyclicBarrier.java \
+classpath/external/jsr166/java/util/concurrent/DelayQueue.java \
+classpath/external/jsr166/java/util/concurrent/Delayed.java \
+classpath/external/jsr166/java/util/concurrent/Exchanger.java \
+classpath/external/jsr166/java/util/concurrent/ExecutionException.java \
+classpath/external/jsr166/java/util/concurrent/Executor.java \
+classpath/external/jsr166/java/util/concurrent/ExecutorCompletionService.java \
+classpath/external/jsr166/java/util/concurrent/ExecutorService.java \
+classpath/external/jsr166/java/util/concurrent/Executors.java \
+classpath/external/jsr166/java/util/concurrent/Future.java \
+classpath/external/jsr166/java/util/concurrent/FutureTask.java \
+classpath/external/jsr166/java/util/concurrent/LinkedBlockingDeque.java \
+classpath/external/jsr166/java/util/concurrent/LinkedBlockingQueue.java \
+classpath/external/jsr166/java/util/concurrent/PriorityBlockingQueue.java \
+classpath/external/jsr166/java/util/concurrent/RejectedExecutionException.java \
+classpath/external/jsr166/java/util/concurrent/RejectedExecutionHandler.java \
+classpath/external/jsr166/java/util/concurrent/RunnableFuture.java \
+classpath/external/jsr166/java/util/concurrent/RunnableScheduledFuture.java \
+classpath/external/jsr166/java/util/concurrent/ScheduledExecutorService.java \
+classpath/external/jsr166/java/util/concurrent/ScheduledFuture.java \
+classpath/external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java \
+classpath/external/jsr166/java/util/concurrent/Semaphore.java \
+classpath/external/jsr166/java/util/concurrent/SynchronousQueue.java \
+classpath/external/jsr166/java/util/concurrent/ThreadFactory.java \
+classpath/external/jsr166/java/util/concurrent/ThreadPoolExecutor.java \
+classpath/external/jsr166/java/util/concurrent/TimeUnit.java \
+classpath/external/jsr166/java/util/concurrent/TimeoutException.java
+
+java_util_concurrent_header_files = $(patsubst classpath/%,%,$(patsubst classpath/external/jsr166/%,%,$(patsubst %.java,%.h,$(java_util_concurrent_source_files))))
+java_util_concurrent_atomic_source_files = \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicBoolean.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicInteger.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicIntegerArray.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicLong.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicLongArray.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicLongFieldUpdater.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicMarkableReference.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicReference.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicReferenceArray.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java \
+classpath/external/jsr166/java/util/concurrent/atomic/AtomicStampedReference.java
+
+java_util_concurrent_atomic_header_files = $(patsubst classpath/external/jsr166/%,%,$(patsubst %.java,%.h,$(java_util_concurrent_atomic_source_files)))
+java_util_concurrent_locks_source_files = \
+classpath/external/jsr166/java/util/concurrent/locks/AbstractOwnableSynchronizer.java \
+classpath/external/jsr166/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java \
+classpath/external/jsr166/java/util/concurrent/locks/AbstractQueuedSynchronizer.java \
+classpath/external/jsr166/java/util/concurrent/locks/Condition.java \
+classpath/external/jsr166/java/util/concurrent/locks/Lock.java \
+classpath/external/jsr166/java/util/concurrent/locks/LockSupport.java \
+classpath/external/jsr166/java/util/concurrent/locks/ReadWriteLock.java \
+classpath/external/jsr166/java/util/concurrent/locks/ReentrantLock.java \
+classpath/external/jsr166/java/util/concurrent/locks/ReentrantReadWriteLock.java
+
+java_util_concurrent_locks_header_files = $(patsubst classpath/external/jsr166/%,%,$(patsubst %.java,%.h,$(java_util_concurrent_locks_source_files)))
 java_util_jar_source_files = \
 classpath/java/util/jar/Attributes.java \
 classpath/java/util/jar/JarEntry.java \
@@ -4702,6 +5233,13 @@ classpath/java/util/regex/Pattern.java \
 classpath/java/util/regex/PatternSyntaxException.java
 
 java_util_regex_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_util_regex_source_files)))
+java_util_spi_source_files = \
+classpath/java/util/spi/CurrencyNameProvider.java \
+classpath/java/util/spi/LocaleNameProvider.java \
+classpath/java/util/spi/LocaleServiceProvider.java \
+classpath/java/util/spi/TimeZoneNameProvider.java
+
+java_util_spi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_util_spi_source_files)))
 java_util_zip_source_files = \
 classpath/java/util/zip/Adler32.java \
 classpath/java/util/zip/CRC32.java \
@@ -4753,6 +5291,35 @@ classpath/javax/accessibility/AccessibleTextSequence.java \
 classpath/javax/accessibility/AccessibleValue.java
 
 javax_accessibility_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_accessibility_source_files)))
+javax_activation_source_files = \
+classpath/javax/activation/ActivationDataFlavor.java \
+classpath/javax/activation/CommandInfo.java \
+classpath/javax/activation/CommandMap.java \
+classpath/javax/activation/CommandObject.java \
+classpath/javax/activation/DataContentHandler.java \
+classpath/javax/activation/DataContentHandlerFactory.java \
+classpath/javax/activation/DataHandler.java \
+classpath/javax/activation/DataHandlerDataSource.java \
+classpath/javax/activation/DataSource.java \
+classpath/javax/activation/DataSourceDataContentHandler.java \
+classpath/javax/activation/FileDataSource.java \
+classpath/javax/activation/FileTypeMap.java \
+classpath/javax/activation/MailcapCommandMap.java \
+classpath/javax/activation/MimeType.java \
+classpath/javax/activation/MimeTypeParameterList.java \
+classpath/javax/activation/MimeTypeParseException.java \
+classpath/javax/activation/MimetypesFileTypeMap.java \
+classpath/javax/activation/ObjectDataContentHandler.java \
+classpath/javax/activation/URLDataSource.java \
+classpath/javax/activation/UnsupportedDataTypeException.java
+
+javax_activation_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_activation_source_files)))
+javax_activity_source_files = \
+classpath/javax/activity/ActivityCompletedException.java \
+classpath/javax/activity/ActivityRequiredException.java \
+classpath/javax/activity/InvalidActivityException.java
+
+javax_activity_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_activity_source_files)))
 javax_crypto_source_files = \
 classpath/javax/crypto/BadPaddingException.java \
 classpath/javax/crypto/Cipher.java \
@@ -4854,13 +5421,27 @@ classpath/javax/imageio/stream/MemoryCacheImageOutputStream.java
 
 javax_management_source_files = \
 classpath/javax/management/Attribute.java \
+classpath/javax/management/AttributeChangeNotification.java \
+classpath/javax/management/AttributeChangeNotificationFilter.java \
 classpath/javax/management/AttributeList.java \
 classpath/javax/management/AttributeNotFoundException.java \
+classpath/javax/management/AttributeValueExp.java \
+classpath/javax/management/BadAttributeValueExpException.java \
+classpath/javax/management/BadBinaryOpValueExpException.java \
+classpath/javax/management/BadStringOperationException.java \
+classpath/javax/management/DefaultLoaderRepository.java \
+classpath/javax/management/Descriptor.java \
+classpath/javax/management/DescriptorAccess.java \
+classpath/javax/management/DescriptorRead.java \
 classpath/javax/management/DynamicMBean.java \
+classpath/javax/management/InstanceAlreadyExistsException.java \
+classpath/javax/management/InstanceNotFoundException.java \
 classpath/javax/management/IntrospectionException.java \
+classpath/javax/management/InvalidApplicationException.java \
 classpath/javax/management/InvalidAttributeValueException.java \
 classpath/javax/management/JMException.java \
 classpath/javax/management/JMRuntimeException.java \
+classpath/javax/management/JMX.java \
 classpath/javax/management/ListenerNotFoundException.java \
 classpath/javax/management/MBeanAttributeInfo.java \
 classpath/javax/management/MBeanConstructorInfo.java \
@@ -4870,31 +5451,87 @@ classpath/javax/management/MBeanInfo.java \
 classpath/javax/management/MBeanNotificationInfo.java \
 classpath/javax/management/MBeanOperationInfo.java \
 classpath/javax/management/MBeanParameterInfo.java \
+classpath/javax/management/MBeanPermission.java \
+classpath/javax/management/MBeanRegistration.java \
+classpath/javax/management/MBeanRegistrationException.java \
+classpath/javax/management/MBeanServer.java \
+classpath/javax/management/MBeanServerBuilder.java \
+classpath/javax/management/MBeanServerConnection.java \
+classpath/javax/management/MBeanServerDelegate.java \
+classpath/javax/management/MBeanServerDelegateMBean.java \
+classpath/javax/management/MBeanServerFactory.java \
+classpath/javax/management/MBeanServerInvocationHandler.java \
+classpath/javax/management/MBeanServerNotification.java \
+classpath/javax/management/MBeanServerPermission.java \
+classpath/javax/management/MBeanTrustPermission.java \
+classpath/javax/management/MXBean.java \
+classpath/javax/management/MalformedObjectNameException.java \
 classpath/javax/management/NotCompliantMBeanException.java \
 classpath/javax/management/Notification.java \
 classpath/javax/management/NotificationBroadcaster.java \
+classpath/javax/management/NotificationBroadcasterSupport.java \
 classpath/javax/management/NotificationEmitter.java \
 classpath/javax/management/NotificationFilter.java \
+classpath/javax/management/NotificationFilterSupport.java \
 classpath/javax/management/NotificationListener.java \
+classpath/javax/management/ObjectInstance.java \
+classpath/javax/management/ObjectName.java \
 classpath/javax/management/OperationsException.java \
+classpath/javax/management/PersistentMBean.java \
+classpath/javax/management/Query.java \
+classpath/javax/management/QueryEval.java \
+classpath/javax/management/QueryExp.java \
 classpath/javax/management/ReflectionException.java \
+classpath/javax/management/RuntimeErrorException.java \
+classpath/javax/management/RuntimeMBeanException.java \
 classpath/javax/management/RuntimeOperationsException.java \
-classpath/javax/management/StandardMBean.java
+classpath/javax/management/ServiceNotFoundException.java \
+classpath/javax/management/StandardMBean.java \
+classpath/javax/management/StringValueExp.java \
+classpath/javax/management/ValueExp.java
 
 javax_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_management_source_files)))
+javax_management_loading_source_files = \
+classpath/javax/management/loading/ClassLoaderRepository.java
+
+javax_management_loading_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_management_loading_source_files)))
 javax_management_openmbean_source_files = \
 classpath/javax/management/openmbean/ArrayType.java \
 classpath/javax/management/openmbean/CompositeData.java \
+classpath/javax/management/openmbean/CompositeDataInvocationHandler.java \
 classpath/javax/management/openmbean/CompositeDataSupport.java \
 classpath/javax/management/openmbean/CompositeType.java \
 classpath/javax/management/openmbean/InvalidKeyException.java \
+classpath/javax/management/openmbean/InvalidOpenTypeException.java \
+classpath/javax/management/openmbean/KeyAlreadyExistsException.java \
 classpath/javax/management/openmbean/OpenDataException.java \
+classpath/javax/management/openmbean/OpenMBeanAttributeInfo.java \
+classpath/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java \
+classpath/javax/management/openmbean/OpenMBeanConstructorInfo.java \
+classpath/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java \
+classpath/javax/management/openmbean/OpenMBeanInfo.java \
+classpath/javax/management/openmbean/OpenMBeanInfoSupport.java \
+classpath/javax/management/openmbean/OpenMBeanOperationInfo.java \
+classpath/javax/management/openmbean/OpenMBeanOperationInfoSupport.java \
+classpath/javax/management/openmbean/OpenMBeanParameterInfo.java \
+classpath/javax/management/openmbean/OpenMBeanParameterInfoSupport.java \
 classpath/javax/management/openmbean/OpenType.java \
 classpath/javax/management/openmbean/SimpleType.java \
 classpath/javax/management/openmbean/TabularData.java \
+classpath/javax/management/openmbean/TabularDataSupport.java \
 classpath/javax/management/openmbean/TabularType.java
 
 javax_management_openmbean_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_management_openmbean_source_files)))
+javax_management_remote_source_files = \
+classpath/javax/management/remote/NotificationResult.java \
+classpath/javax/management/remote/TargetedNotification.java
+
+javax_management_remote_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_management_remote_source_files)))
+javax_management_remote_rmi_source_files = \
+classpath/javax/management/remote/rmi/RMIConnection.java \
+classpath/javax/management/remote/rmi/RMIServer.java
+
+javax_management_remote_rmi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_management_remote_rmi_source_files)))
 javax_naming_source_files = \
 classpath/javax/naming/AuthenticationException.java \
 classpath/javax/naming/AuthenticationNotSupportedException.java \
@@ -4992,7 +5629,7 @@ classpath/javax/naming/spi/DirStateFactory.java \
 classpath/javax/naming/spi/DirectoryManager.java \
 classpath/javax/naming/spi/InitialContextFactory.java \
 classpath/javax/naming/spi/InitialContextFactoryBuilder.java \
-javax/naming/spi/NamingManager.java \
+classpath/javax/naming/spi/NamingManager.java \
 classpath/javax/naming/spi/ObjectFactory.java \
 classpath/javax/naming/spi/ObjectFactoryBuilder.java \
 classpath/javax/naming/spi/ResolveResult.java \
@@ -5008,6 +5645,7 @@ classpath/javax/net/VanillaSocketFactory.java
 
 javax_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_net_source_files)))
 javax_net_ssl_source_files = \
+classpath/javax/net/ssl/CertPathTrustManagerParameters.java \
 classpath/javax/net/ssl/HandshakeCompletedEvent.java \
 classpath/javax/net/ssl/HandshakeCompletedListener.java \
 classpath/javax/net/ssl/HostnameVerifier.java \
@@ -5015,9 +5653,12 @@ classpath/javax/net/ssl/HttpsURLConnection.java \
 classpath/javax/net/ssl/KeyManager.java \
 classpath/javax/net/ssl/KeyManagerFactory.java \
 classpath/javax/net/ssl/KeyManagerFactorySpi.java \
+classpath/javax/net/ssl/KeyStoreBuilderParameters.java \
 classpath/javax/net/ssl/ManagerFactoryParameters.java \
 classpath/javax/net/ssl/SSLContext.java \
 classpath/javax/net/ssl/SSLContextSpi.java \
+classpath/javax/net/ssl/SSLEngine.java \
+classpath/javax/net/ssl/SSLEngineResult.java \
 classpath/javax/net/ssl/SSLException.java \
 classpath/javax/net/ssl/SSLHandshakeException.java \
 classpath/javax/net/ssl/SSLKeyException.java \
@@ -5036,6 +5677,7 @@ classpath/javax/net/ssl/TrivialHostnameVerifier.java \
 classpath/javax/net/ssl/TrustManager.java \
 classpath/javax/net/ssl/TrustManagerFactory.java \
 classpath/javax/net/ssl/TrustManagerFactorySpi.java \
+classpath/javax/net/ssl/X509ExtendedKeyManager.java \
 classpath/javax/net/ssl/X509KeyManager.java \
 classpath/javax/net/ssl/X509TrustManager.java
 
@@ -5827,30 +6469,44 @@ classpath/javax/swing/text/TextAction.java \
 classpath/javax/swing/text/Utilities.java \
 classpath/javax/swing/text/View.java \
 classpath/javax/swing/text/ViewFactory.java \
-classpath/javax/swing/text/WrappedPlainView.java
+classpath/javax/swing/text/WrappedPlainView.java \
+classpath/javax/swing/text/ZoneView.java
 
 javax_swing_text_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_text_source_files)))
 javax_swing_text_html_source_files = \
 classpath/javax/swing/text/html/BRView.java \
 classpath/javax/swing/text/html/BlockView.java \
 classpath/javax/swing/text/html/CSS.java \
+classpath/javax/swing/text/html/CSSBorder.java \
 classpath/javax/swing/text/html/CSSParser.java \
+classpath/javax/swing/text/html/FormSubmitEvent.java \
 classpath/javax/swing/text/html/FormView.java \
+classpath/javax/swing/text/html/FrameSetView.java \
+classpath/javax/swing/text/html/FrameView.java \
 classpath/javax/swing/text/html/HRuleView.java \
 classpath/javax/swing/text/html/HTML.java \
 classpath/javax/swing/text/html/HTMLDocument.java \
 classpath/javax/swing/text/html/HTMLEditorKit.java \
 classpath/javax/swing/text/html/HTMLFrameHyperlinkEvent.java \
+classpath/javax/swing/text/html/HTMLWriter.java \
 classpath/javax/swing/text/html/ImageView.java \
 classpath/javax/swing/text/html/InlineView.java \
 classpath/javax/swing/text/html/ListView.java \
 classpath/javax/swing/text/html/MinimalHTMLWriter.java \
+classpath/javax/swing/text/html/MultiAttributeSet.java \
+classpath/javax/swing/text/html/MultiStyle.java \
 classpath/javax/swing/text/html/NullView.java \
 classpath/javax/swing/text/html/ObjectView.java \
 classpath/javax/swing/text/html/Option.java \
 classpath/javax/swing/text/html/ParagraphView.java \
+classpath/javax/swing/text/html/ResetableModel.java \
+classpath/javax/swing/text/html/ResetablePlainDocument.java \
+classpath/javax/swing/text/html/ResetableToggleButtonModel.java \
+classpath/javax/swing/text/html/SelectComboBoxModel.java \
+classpath/javax/swing/text/html/SelectListModel.java \
 classpath/javax/swing/text/html/StyleSheet.java \
-classpath/javax/swing/text/html/TableView.java
+classpath/javax/swing/text/html/TableView.java \
+classpath/javax/swing/text/html/ViewAttributeSet.java
 
 javax_swing_text_html_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_text_html_source_files)))
 javax_swing_text_html_parser_source_files = \
@@ -5908,6 +6564,12 @@ classpath/javax/swing/undo/UndoableEdit.java \
 classpath/javax/swing/undo/UndoableEditSupport.java
 
 javax_swing_undo_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_undo_source_files)))
+javax_tools_source_files = \
+classpath/javax/tools/Diagnostic.java \
+classpath/javax/tools/DiagnosticListener.java \
+classpath/javax/tools/FileObject.java
+
+javax_tools_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_tools_source_files)))
 javax_transaction_source_files = \
 classpath/javax/transaction/HeuristicCommitException.java \
 classpath/javax/transaction/HeuristicMixedException.java \
@@ -6030,7 +6692,7 @@ classpath/org/ietf/jgss/MessageProp.java \
 classpath/org/ietf/jgss/Oid.java
 
 org_ietf_jgss_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(org_ietf_jgss_source_files)))
-org_omg_source_files = \
+org_omg_CORBA_source_files = \
 classpath/org/omg/CORBA/ACTIVITY_COMPLETED.java \
 classpath/org/omg/CORBA/ACTIVITY_REQUIRED.java \
 classpath/org/omg/CORBA/ARG_IN.java \
@@ -6248,12 +6910,16 @@ classpath/org/omg/CORBA/portable/Streamable.java \
 classpath/org/omg/CORBA/portable/StreamableValue.java \
 classpath/org/omg/CORBA/portable/UnknownException.java \
 classpath/org/omg/CORBA/portable/ValueBase.java \
-classpath/org/omg/CORBA/portable/ValueFactory.java \
+classpath/org/omg/CORBA/portable/ValueFactory.java
+
+org_omg_CORBA_2_3_source_files = \
 classpath/org/omg/CORBA_2_3/ORB.java \
 classpath/org/omg/CORBA_2_3/portable/Delegate.java \
 classpath/org/omg/CORBA_2_3/portable/InputStream.java \
 classpath/org/omg/CORBA_2_3/portable/ObjectImpl.java \
-classpath/org/omg/CORBA_2_3/portable/OutputStream.java \
+classpath/org/omg/CORBA_2_3/portable/OutputStream.java
+
+org_omg_CosNaming_source_files = \
 classpath/org/omg/CosNaming/Binding.java \
 classpath/org/omg/CosNaming/BindingHelper.java \
 classpath/org/omg/CosNaming/BindingHolder.java \
@@ -6312,8 +6978,12 @@ classpath/org/omg/CosNaming/_BindingIteratorStub.java \
 classpath/org/omg/CosNaming/_NamingContextExtImplBase.java \
 classpath/org/omg/CosNaming/_NamingContextExtStub.java \
 classpath/org/omg/CosNaming/_NamingContextImplBase.java \
-classpath/org/omg/CosNaming/_NamingContextStub.java \
-classpath/org/omg/Dynamic/Parameter.java \
+classpath/org/omg/CosNaming/_NamingContextStub.java
+
+org_omg_Dynamic_source_files = \
+classpath/org/omg/Dynamic/Parameter.java
+
+org_omg_DynamicAny_source_files = \
 classpath/org/omg/DynamicAny/AnySeqHelper.java \
 classpath/org/omg/DynamicAny/DynAny.java \
 classpath/org/omg/DynamicAny/DynAnyFactory.java \
@@ -6368,7 +7038,9 @@ classpath/org/omg/DynamicAny/_DynFixedStub.java \
 classpath/org/omg/DynamicAny/_DynSequenceStub.java \
 classpath/org/omg/DynamicAny/_DynStructStub.java \
 classpath/org/omg/DynamicAny/_DynUnionStub.java \
-classpath/org/omg/DynamicAny/_DynValueStub.java \
+classpath/org/omg/DynamicAny/_DynValueStub.java
+
+org_omg_IOP_source_files = \
 classpath/org/omg/IOP/CodeSets.java \
 classpath/org/omg/IOP/Codec.java \
 classpath/org/omg/IOP/CodecFactory.java \
@@ -6414,9 +7086,13 @@ classpath/org/omg/IOP/TaggedComponentHolder.java \
 classpath/org/omg/IOP/TaggedProfile.java \
 classpath/org/omg/IOP/TaggedProfileHelper.java \
 classpath/org/omg/IOP/TaggedProfileHolder.java \
-classpath/org/omg/IOP/TransactionService.java \
+classpath/org/omg/IOP/TransactionService.java
+
+org_omg_Messaging_source_files = \
 classpath/org/omg/Messaging/SYNC_WITH_TRANSPORT.java \
-classpath/org/omg/Messaging/SyncScopeHelper.java \
+classpath/org/omg/Messaging/SyncScopeHelper.java
+
+org_omg_PortableInterceptor_source_files = \
 classpath/org/omg/PortableInterceptor/ACTIVE.java \
 classpath/org/omg/PortableInterceptor/AdapterManagerIdHelper.java \
 classpath/org/omg/PortableInterceptor/AdapterNameHelper.java \
@@ -6479,7 +7155,9 @@ classpath/org/omg/PortableInterceptor/ServerRequestInterceptor.java \
 classpath/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java \
 classpath/org/omg/PortableInterceptor/TRANSPORT_RETRY.java \
 classpath/org/omg/PortableInterceptor/USER_EXCEPTION.java \
-classpath/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.java \
+classpath/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.java
+
+org_omg_PortableServer_source_files = \
 classpath/org/omg/PortableServer/AdapterActivator.java \
 classpath/org/omg/PortableServer/AdapterActivatorOperations.java \
 classpath/org/omg/PortableServer/Current.java \
@@ -6560,9 +7238,13 @@ classpath/org/omg/PortableServer/ThreadPolicyOperations.java \
 classpath/org/omg/PortableServer/ThreadPolicyValue.java \
 classpath/org/omg/PortableServer/_ServantActivatorStub.java \
 classpath/org/omg/PortableServer/_ServantLocatorStub.java \
-classpath/org/omg/PortableServer/portable/Delegate.java \
+classpath/org/omg/PortableServer/portable/Delegate.java
+
+org_omg_SendingContext_source_files = \
 classpath/org/omg/SendingContext/RunTime.java \
-classpath/org/omg/SendingContext/RunTimeOperations.java \
+classpath/org/omg/SendingContext/RunTimeOperations.java
+
+org_omg_stub_source_files = \
 classpath/org/omg/stub/java/rmi/_Remote_Stub.java
 
 org_relaxng_source_files = \
@@ -6763,41 +7445,85 @@ classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java \
 classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java \
 classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java
 
+sun_awt_source_files = \
+classpath/sun/awt/CausedFocusEvent.java
+
+sun_awt_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(sun_awt_source_files)))
+sun_misc_source_files = \
+classpath/sun/misc/Service.java \
+classpath/sun/misc/ServiceConfigurationError.java \
+sun/misc/Unsafe.java
+
+sun_misc_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(sun_misc_source_files)))
+sun_reflect_source_files = \
+sun/reflect/Reflection.java
+
+sun_reflect_header_files = $(patsubst %.java,%.h,$(sun_reflect_source_files))
+sun_reflect_annotation_source_files = \
+sun/reflect/annotation/AnnotationInvocationHandler.java \
+classpath/sun/reflect/annotation/AnnotationParser.java \
+classpath/sun/reflect/annotation/AnnotationType.java \
+classpath/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java \
+classpath/sun/reflect/annotation/ExceptionProxy.java
+
+sun_reflect_annotation_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(sun_reflect_annotation_source_files)))
+sun_reflect_misc_source_files = \
+sun/reflect/misc/ReflectUtil.java
+
+sun_reflect_misc_header_files = $(patsubst %.java,%.h,$(sun_reflect_misc_source_files))
+@INTERPRETER_FALSE@interpreter_packages_source_files = 
+@INTERPRETER_TRUE@interpreter_packages_source_files = \
+@INTERPRETER_TRUE@  gnu/classpath/jdwp.list \
+@INTERPRETER_TRUE@  gnu/classpath/jdwp/event.list \
+@INTERPRETER_TRUE@  gnu/classpath/jdwp/event/filters.list \
+@INTERPRETER_TRUE@  gnu/classpath/jdwp/exception.list \
+@INTERPRETER_TRUE@  gnu/classpath/jdwp/id.list \
+@INTERPRETER_TRUE@  gnu/classpath/jdwp/processor.list \
+@INTERPRETER_TRUE@  gnu/classpath/jdwp/transport.list \
+@INTERPRETER_TRUE@  gnu/classpath/jdwp/util.list \
+@INTERPRETER_TRUE@  gnu/classpath/jdwp/value.list \
+@INTERPRETER_TRUE@  gnu/gcj/jvmti.list
+
+@INTERPRETER_FALSE@interpreter_header_files = 
+@INTERPRETER_TRUE@interpreter_header_files = \
+@INTERPRETER_TRUE@  $(gnu_classpath_jdwp_header_files) \
+@INTERPRETER_TRUE@  $(gnu_classpath_jdwp_event_header_files) \
+@INTERPRETER_TRUE@  $(gnu_classpath_jdwp_event_filters_header_files) \
+@INTERPRETER_TRUE@  $(gnu_classpath_jdwp_exception_header_files) \
+@INTERPRETER_TRUE@  $(gnu_classpath_jdwp_id_header_files) \
+@INTERPRETER_TRUE@  $(gnu_classpath_jdwp_processor_header_files) \
+@INTERPRETER_TRUE@  $(gnu_classpath_jdwp_transport_header_files) \
+@INTERPRETER_TRUE@  $(gnu_classpath_jdwp_util_header_files) \
+@INTERPRETER_TRUE@  $(gnu_classpath_jdwp_value_header_files) \
+@INTERPRETER_TRUE@  $(gnu_gcj_jvmti_header_files)
+
 all_packages_source_files = \
   gnu/awt.list \
   gnu/awt/j2d.list \
   gnu/classpath.list \
   gnu/classpath/debug.list \
-  gnu/classpath/jdwp.list \
-  gnu/classpath/jdwp/event.list \
-  gnu/classpath/jdwp/event/filters.list \
-  gnu/classpath/jdwp/exception.list \
-  gnu/classpath/jdwp/id.list \
-  gnu/classpath/jdwp/processor.list \
-  gnu/classpath/jdwp/transport.list \
-  gnu/classpath/jdwp/util.list \
+  gnu/classpath/toolkit.list \
   gnu/gcj.list \
   gnu/gcj/convert.list \
   gnu/gcj/io.list \
-  gnu/gcj/jvmti.list \
   gnu/gcj/runtime.list \
   gnu/gcj/util.list \
   gnu/java/awt.list \
   gnu/java/awt/color.list \
   gnu/java/awt/dnd.list \
   gnu/java/awt/font.list \
+  gnu/java/awt/font/autofit.list \
   gnu/java/awt/font/opentype.list \
   gnu/java/awt/font/opentype/truetype.list \
   gnu/java/awt/image.list \
   gnu/java/awt/java2d.list \
   gnu/java/awt/peer.list \
+  gnu/java/awt/peer/headless.list \
   gnu/java/awt/print.list \
   gnu/java/io.list \
   gnu/java/lang.list \
-  gnu/java/lang/management.list \
   gnu/java/lang/reflect.list \
   gnu/java/locale.list \
-  gnu/java/math.list \
   gnu/java/net.list \
   gnu/java/net/loader.list \
   gnu/java/net/local.list \
@@ -6815,7 +7541,6 @@ all_packages_source_files = \
   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 \
@@ -6842,6 +7567,7 @@ all_packages_source_files = \
   gnu/java/util/jar.list \
   gnu/java/util/prefs.list \
   gnu/java/util/regex.list \
+  gnu/javax/activation/viewers.list \
   gnu/javax/crypto.list \
   gnu/javax/crypto/assembly.list \
   gnu/javax/crypto/cipher.list \
@@ -6873,6 +7599,10 @@ all_packages_source_files = \
   gnu/javax/imageio/gif.list \
   gnu/javax/imageio/jpeg.list \
   gnu/javax/imageio/png.list \
+  gnu/javax/naming/giop.list \
+  gnu/javax/naming/ictxImpl/trans.list \
+  gnu/javax/naming/jndi/url/corbaname.list \
+  gnu/javax/naming/jndi/url/rmi.list \
   gnu/javax/net/ssl.list \
   gnu/javax/net/ssl/provider.list \
   gnu/javax/print.list \
@@ -6885,12 +7615,19 @@ all_packages_source_files = \
   gnu/javax/security/auth.list \
   gnu/javax/security/auth/callback.list \
   gnu/javax/security/auth/login.list \
+  gnu/javax/sound.list \
   gnu/javax/sound/sampled/AU.list \
   gnu/javax/sound/sampled/WAV.list \
   gnu/javax/swing/plaf/gnu.list \
   gnu/javax/swing/plaf/metal.list \
   gnu/javax/swing/text/html.list \
-  gnu/javax/swing/text/html/parser.list \
+  gnu/javax/swing/text/html/css.list \
+  gnu/javax/swing/text/html/parser/GnuParserDelegator.list \
+  gnu/javax/swing/text/html/parser/HTML_401F.list \
+  gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.list \
+  gnu/javax/swing/text/html/parser/gnuDTD.list \
+  gnu/javax/swing/text/html/parser/htmlAttributeSet.list \
+  gnu/javax/swing/text/html/parser/htmlValidator.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 \
@@ -6916,7 +7653,6 @@ all_packages_source_files = \
   java/lang.list \
   java/lang/annotation.list \
   java/lang/instrument.list \
-  java/lang/management.list \
   java/lang/ref.list \
   java/lang/reflect.list \
   java/math.list \
@@ -6938,18 +7674,28 @@ all_packages_source_files = \
   java/security/spec.list \
   java/sql.list \
   java/text.list \
+  java/text/spi.list \
   java/util.list \
+  java/util/concurrent.list \
+  java/util/concurrent/atomic.list \
+  java/util/concurrent/locks.list \
   java/util/jar.list \
   java/util/logging.list \
   java/util/prefs.list \
   java/util/regex.list \
+  java/util/spi.list \
   java/util/zip.list \
   javax/accessibility.list \
+  javax/activation.list \
+  javax/activity.list \
   javax/crypto.list \
   javax/crypto/interfaces.list \
   javax/crypto/spec.list \
   javax/management.list \
+  javax/management/loading.list \
   javax/management/openmbean.list \
+  javax/management/remote.list \
+  javax/management/remote/rmi.list \
   javax/naming.list \
   javax/naming/directory.list \
   javax/naming/event.list \
@@ -6991,45 +7737,46 @@ all_packages_source_files = \
   javax/swing/text/rtf.list \
   javax/swing/tree.list \
   javax/swing/undo.list \
+  javax/tools.list \
   javax/transaction.list \
   javax/transaction/xa.list \
-  org/ietf/jgss.list
+  org/ietf/jgss.list \
+  sun/awt.list \
+  sun/misc.list \
+  sun/reflect.list \
+  sun/reflect/annotation.list \
+  sun/reflect/misc.list \
+  $(interpreter_packages_source_files)
 
 ordinary_header_files = \
   $(gnu_awt_header_files) \
   $(gnu_awt_j2d_header_files) \
   $(gnu_classpath_header_files) \
   $(gnu_classpath_debug_header_files) \
-  $(gnu_classpath_jdwp_header_files) \
-  $(gnu_classpath_jdwp_event_header_files) \
-  $(gnu_classpath_jdwp_event_filters_header_files) \
-  $(gnu_classpath_jdwp_exception_header_files) \
-  $(gnu_classpath_jdwp_id_header_files) \
-  $(gnu_classpath_jdwp_processor_header_files) \
-  $(gnu_classpath_jdwp_transport_header_files) \
-  $(gnu_classpath_jdwp_util_header_files) \
+  $(gnu_classpath_toolkit_header_files) \
   $(gnu_gcj_header_files) \
   $(gnu_gcj_convert_header_files) \
   $(gnu_gcj_io_header_files) \
-  $(gnu_gcj_jvmti_header_files) \
   $(gnu_gcj_runtime_header_files) \
+  $(gnu_gcj_tools_gcj_dbtool_header_files) \
   $(gnu_gcj_util_header_files) \
   $(gnu_java_awt_header_files) \
   $(gnu_java_awt_color_header_files) \
   $(gnu_java_awt_dnd_header_files) \
   $(gnu_java_awt_font_header_files) \
+  $(gnu_java_awt_font_autofit_header_files) \
   $(gnu_java_awt_font_opentype_header_files) \
   $(gnu_java_awt_font_opentype_truetype_header_files) \
   $(gnu_java_awt_image_header_files) \
   $(gnu_java_awt_java2d_header_files) \
   $(gnu_java_awt_peer_header_files) \
+  $(gnu_java_awt_peer_headless_header_files) \
   $(gnu_java_awt_print_header_files) \
   $(gnu_java_io_header_files) \
   $(gnu_java_lang_header_files) \
   $(gnu_java_lang_management_header_files) \
   $(gnu_java_lang_reflect_header_files) \
   $(gnu_java_locale_header_files) \
-  $(gnu_java_math_header_files) \
   $(gnu_java_net_header_files) \
   $(gnu_java_net_loader_header_files) \
   $(gnu_java_net_local_header_files) \
@@ -7047,7 +7794,6 @@ ordinary_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) \
@@ -7074,6 +7820,7 @@ ordinary_header_files = \
   $(gnu_java_util_jar_header_files) \
   $(gnu_java_util_prefs_header_files) \
   $(gnu_java_util_regex_header_files) \
+  $(gnu_javax_activation_viewers_header_files) \
   $(gnu_javax_crypto_header_files) \
   $(gnu_javax_crypto_assembly_header_files) \
   $(gnu_javax_crypto_cipher_header_files) \
@@ -7105,6 +7852,10 @@ ordinary_header_files = \
   $(gnu_javax_imageio_gif_header_files) \
   $(gnu_javax_imageio_jpeg_header_files) \
   $(gnu_javax_imageio_png_header_files) \
+  $(gnu_javax_naming_giop_header_files) \
+  $(gnu_javax_naming_ictxImpl_trans_header_files) \
+  $(gnu_javax_naming_jndi_url_corbaname_header_files) \
+  $(gnu_javax_naming_jndi_url_rmi_header_files) \
   $(gnu_javax_net_ssl_header_files) \
   $(gnu_javax_net_ssl_provider_header_files) \
   $(gnu_javax_print_header_files) \
@@ -7117,11 +7868,13 @@ ordinary_header_files = \
   $(gnu_javax_security_auth_header_files) \
   $(gnu_javax_security_auth_callback_header_files) \
   $(gnu_javax_security_auth_login_header_files) \
+  $(gnu_javax_sound_header_files) \
   $(gnu_javax_sound_sampled_AU_header_files) \
   $(gnu_javax_sound_sampled_WAV_header_files) \
   $(gnu_javax_swing_plaf_gnu_header_files) \
   $(gnu_javax_swing_plaf_metal_header_files) \
   $(gnu_javax_swing_text_html_header_files) \
+  $(gnu_javax_swing_text_html_css_header_files) \
   $(gnu_javax_swing_text_html_parser_header_files) \
   $(gnu_javax_swing_text_html_parser_models_header_files) \
   $(gnu_javax_swing_text_html_parser_support_header_files) \
@@ -7148,7 +7901,6 @@ ordinary_header_files = \
   $(java_lang_header_files) \
   $(java_lang_annotation_header_files) \
   $(java_lang_instrument_header_files) \
-  $(java_lang_management_header_files) \
   $(java_lang_ref_header_files) \
   $(java_lang_reflect_header_files) \
   $(java_math_header_files) \
@@ -7170,18 +7922,28 @@ ordinary_header_files = \
   $(java_security_spec_header_files) \
   $(java_sql_header_files) \
   $(java_text_header_files) \
+  $(java_text_spi_header_files) \
   $(java_util_header_files) \
+  $(java_util_concurrent_header_files) \
+  $(java_util_concurrent_atomic_header_files) \
+  $(java_util_concurrent_locks_header_files) \
   $(java_util_jar_header_files) \
   $(java_util_logging_header_files) \
   $(java_util_prefs_header_files) \
   $(java_util_regex_header_files) \
+  $(java_util_spi_header_files) \
   $(java_util_zip_header_files) \
   $(javax_accessibility_header_files) \
+  $(javax_activation_header_files) \
+  $(javax_activity_header_files) \
   $(javax_crypto_header_files) \
   $(javax_crypto_interfaces_header_files) \
   $(javax_crypto_spec_header_files) \
   $(javax_management_header_files) \
+  $(javax_management_loading_header_files) \
   $(javax_management_openmbean_header_files) \
+  $(javax_management_remote_header_files) \
+  $(javax_management_remote_rmi_header_files) \
   $(javax_naming_header_files) \
   $(javax_naming_directory_header_files) \
   $(javax_naming_event_header_files) \
@@ -7223,92 +7985,437 @@ ordinary_header_files = \
   $(javax_swing_text_rtf_header_files) \
   $(javax_swing_tree_header_files) \
   $(javax_swing_undo_header_files) \
+  $(javax_tools_header_files) \
   $(javax_transaction_header_files) \
   $(javax_transaction_xa_header_files) \
-  $(org_ietf_jgss_header_files)
+  $(org_ietf_jgss_header_files) \
+  $(sun_awt_header_files) \
+  $(sun_misc_header_files) \
+  $(sun_reflect_header_files) \
+  $(sun_reflect_annotation_header_files) \
+  $(sun_reflect_misc_header_files) \
+  $(interpreter_header_files)
 
 bc_objects = \
   gnu-CORBA.lo \
   gnu-java-awt-dnd-peer-gtk.lo \
   gnu-java-awt-peer-gtk.lo \
-  gnu-java-awt-peer-qt.lo \
   gnu-java-awt-peer-swing.lo \
   gnu-java-beans.lo \
+  gnu-java-lang-management.lo \
+  gnu-java-math.lo \
   gnu-java-util-prefs-gconf.lo \
+  gnu-javax-management.lo \
   gnu-javax-rmi.lo \
   gnu-javax-sound-midi.lo \
-  gnu-xml.lo \
+  gnu-xml-aelfred2.lo \
+  gnu-xml-dom.lo \
+  gnu-xml-libxmlj.lo \
+  gnu-xml-pipeline.lo \
+  gnu-xml-stream.lo \
+  gnu-xml-transform.lo \
+  gnu-xml-util.lo \
+  gnu-xml-validation.lo \
+  gnu-xml-xpath.lo \
+  java-lang-management.lo \
   javax-imageio.lo \
   javax-rmi.lo \
   javax-xml.lo \
-  org-omg.lo \
+  org-omg-CORBA.lo \
+  org-omg-CORBA_2_3.lo \
+  org-omg-CosNaming.lo \
+  org-omg-Dynamic.lo \
+  org-omg-DynamicAny.lo \
+  org-omg-IOP.lo \
+  org-omg-Messaging.lo \
+  org-omg-PortableInterceptor.lo \
+  org-omg-PortableServer.lo \
+  org-omg-SendingContext.lo \
+  org-omg-stub.lo \
   org-relaxng.lo \
   org-w3c.lo \
   org-xml.lo
 
 property_files = \
-  classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle.properties \
-  classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle_de.properties \
-  classpath/resource/gnu/classpath/tools/getopt/Messages.properties \
-  classpath/resource/gnu/classpath/tools/jar/messages.properties \
-  classpath/resource/gnu/classpath/tools/jarsigner/messages.properties \
-  classpath/resource/gnu/classpath/tools/keytool/messages.properties \
-  classpath/resource/gnu/classpath/tools/native2ascii/messages.properties \
-  classpath/resource/gnu/classpath/tools/serialver/messages.properties \
+  classpath/resource/gnu/java/awt/font/fonts.properties \
   classpath/resource/gnu/java/awt/peer/gtk/font.properties \
   classpath/resource/gnu/java/awt/peer/x/fonts.properties \
+  classpath/resource/gnu/java/awt/peer/x/xfonts.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_aa.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_aa_DJ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_aa_ER.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_aa_ER_SAAHO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_aa_ET.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_af.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_af_NA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_af_ZA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ak.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_am.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_am_ET.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_DZ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_JO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_LB.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_MA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_QA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_SA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_SY.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_TN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_YE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_as.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_as_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_az.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_az_Cyrl.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_be.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_be_BY.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_bg.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_bg_BG.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_bn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_bn_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_bo.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_bs.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_byn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_byn_ER.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ca.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ca_ES.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_cch.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_cop.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_cs.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_cs_CZ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_cy.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_cy_GB.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_da.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_da_DK.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de_AT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de_BE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de_CH.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de_DE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de_LI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de_LU.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_dv.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_dv_MV.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_dz.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_dz_BT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ee.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_el.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_el_CY.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_el_GR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_AS.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_AU.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_BE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_BW.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_BZ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_CA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_Dsrt.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_GB.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_GU.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_HK.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_IE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_JM.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_MH.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_MP.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_MT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_NA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_NZ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_PH.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_PK.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_SG.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_Shaw.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_TT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_UM.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_US.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_US_POSIX.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_VI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_ZA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_ZW.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_eo.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_AR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_BO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_CL.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_CO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_CR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_DO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_EC.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_ES.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_GT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_HN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_MX.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_NI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_PA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_PE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_PR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_PY.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_SV.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_US.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_UY.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_VE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_et.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_et_EE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_eu.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_eu_ES.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fa.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fa_AF.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fa_IR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fi.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fi_FI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fil.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fo.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fo_FO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fr_BE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fr_CA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fr_CH.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fr_LU.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fur.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ga.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ga_IE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_gaa.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_gez.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_gez_ER.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_gez_ET.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_gl.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_gl_ES.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_gu.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_gu_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_gv.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_gv_GB.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ha.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ha_Arab.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_haw.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_haw_US.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_he.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_he_IL.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_hi.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_hi_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_hr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_hu.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_hu_HU.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_hy.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_hy_AM.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_hy_AM_REVISED.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ia.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_id.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_id_ID.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ig.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ii.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_is.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_is_IS.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_it.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_it_CH.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_it_IT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_iu.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ja.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ja_JP.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ka.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kaj.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kam.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kcg.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kfo.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kk.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kk_KZ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kl.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kl_GL.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_km.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_km_KH.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kn_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ko.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ko_KR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kok.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kok_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kpe.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ku.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ku_Arab.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ku_Latn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kw.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kw_GB.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ky.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ln.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_lo.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_lo_LA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_lt.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_lt_LT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_lv.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_lv_LV.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_mk.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ml.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ml_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_mn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_mr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_mr_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ms.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ms_BN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ms_MY.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_mt.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_mt_MT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_my.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_nb.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_nb_NO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ne.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_nl.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_nl_BE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_nl_NL.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_nn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_nn_NO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_nr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_nso.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ny.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_om.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_om_ET.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_om_KE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_or.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_or_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pa.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pa_Arab.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pa_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pl.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pl_PL.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ps.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ps_AF.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pt.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pt_BR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pt_PT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ro.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ro_RO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ru.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ru_RU.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ru_UA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_rw.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sa.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sa_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_se.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_se_FI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_si.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sid.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sid_ET.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sk.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sk_SK.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sl.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sl_SI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_so.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_so_DJ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_so_ET.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_so_KE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_so_SO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sq.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sq_AL.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sr_BA_Cyrl.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sr_BA_Latn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sr_Cyrl.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sr_Latn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sr_ME_Latn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sr_RS_Latn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ss.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ssy.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_st.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sv.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sv_FI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sv_SE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sw.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sw_KE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sw_TZ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_syr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_syr_SY.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ta.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ta_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_te.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_te_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_tg.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_th.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_th_TH.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ti.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ti_ER.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ti_ET.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_tig.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_tig_ER.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_tn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_to.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_tr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_tr_TR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_trv.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ts.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_tt.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_tt_RU.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ug.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_uk.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_uk_UA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ur.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ur_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_uz.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_uz_AF_Arab.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_uz_Arab.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_uz_Latn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ve.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_vi.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_wal.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_wal_ET.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_wo.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_xh.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_yo.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_zh.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_zh_CN_Hans.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_zh_HK_Hant.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_zh_Hant.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_zh_MO_Hant.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_zh_SG_Hans.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_zh_TW_Hant.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_zu.properties \
   classpath/resource/gnu/java/util/regex/MessagesBundle.properties \
   classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties \
   classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties \
   classpath/resource/gnu/javax/print/PrinterDialog.properties \
   classpath/resource/gnu/javax/print/PrinterDialog_de.properties \
   classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
+  classpath/resource/java/text/metazones.properties \
   classpath/resource/java/util/iso4217.properties \
+  classpath/resource/java/util/weeks.properties \
   classpath/resource/javax/imageio/plugins/jpeg/MessagesBundle.properties \
+  classpath/resource/javax/swing/text/html/default.css \
   classpath/resource/org/ietf/jgss/MessagesBundle.properties \
   classpath/resource/META-INF/services/java.util.prefs.PreferencesFactory \
   classpath/resource/META-INF/services/java.util.prefs.PreferencesFactory.in \
   classpath/resource/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider \
   classpath/resource/META-INF/services/javax.sound.midi.spi.MidiFileReader \
   classpath/resource/META-INF/services/javax.sound.midi.spi.MidiFileWriter \
-  classpath/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader \
-  classpath/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory \
-  classpath/resource/META-INF/services/javax.xml.parsers.SAXParserFactory \
-  classpath/resource/META-INF/services/javax.xml.parsers.TransformerFactory \
-  classpath/resource/META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory \
-  classpath/resource/META-INF/services/org.xml.sax.driver
+  classpath/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader
 
 omitted_headers = java/lang/ClassLoader.h java/lang/Thread.h \
        java/lang/String.h java/lang/reflect/Constructor.h \
        java/lang/reflect/Field.h java/lang/reflect/Method.h \
        java/lang/reflect/Proxy.h gnu/gcj/runtime/ExtensionClassLoader.h
 
-generic_header_files = $(filter-out $(omitted_headers),$(ordinary_header_files) $(xlib_nat_headers)) \
-       gnu/gcj/tools/gcj_dbtool/Main.h
-
 inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
        java/io/ObjectInputStream$$GetField.h \
        java/nio/DirectByteBufferImpl$$ReadWrite.h \
        java/nio/channels/Pipe$$SinkChannel.h \
        java/nio/channels/Pipe$$SourceChannel.h \
+       java/lang/VMProcess$ImmediateEOFInputStream.h \
        java/lang/reflect/Proxy$$ProxyData.h \
        java/lang/reflect/Proxy$$ProxyType.h \
        gnu/java/net/PlainSocketImpl$$SocketInputStream.h \
        gnu/java/net/PlainSocketImpl$$SocketOutputStream.h \
        gnu/java/nio/PipeImpl$$SinkChannelImpl.h \
-       gnu/java/nio/PipeImpl$$SourceChannelImpl.h \
-       $(PLATFORM_INNER_NAT_HDRS)
+       gnu/java/nio/PipeImpl$$SourceChannelImpl.h
 
-nat_headers = $(ordinary_header_files) $(inner_nat_headers) \
-       gnu/gcj/tools/gcj_dbtool/Main.h
+generic_header_files = $(ordinary_header_files) $(inner_nat_headers) \
+       $(xlib_nat_headers)
 
+MYGCJH = gjavah
+nat_headers = $(ordinary_header_files) $(inner_nat_headers)
 nat_headers_install = $(ordinary_header_files)
 xlib_nat_headers = $(gnu_awt_xlib_header_files) $(gnu_gcj_xlib_header_files)
 extra_headers = java/lang/Object.h java/lang/Class.h
-NM = nm
+install_data_local_split = 50
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@gen_from_JIS_SOURCES = \
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gnu/gcj/convert/gen-from-JIS.c \
-@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gnu/gcj/convert/make-trie.c
+@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gnu/gcj/convert/make-trie.c \
+@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gnu/gcj/convert/make-trie.h
 
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@gen_from_JIS_DEPENDENCIES = \
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gnu/gcj/convert/JIS0201.h \
@@ -7317,68 +8424,166 @@ NM = nm
 
 jv_convert_SOURCES = 
 jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
-jv_convert_LINK = $(GCJLINK)
+jv_convert_LINK = $(GCJLINK) $(jv_convert_LDFLAGS)
 jv_convert_LDADD = -L$(here)/.libs libgcj.la
-jv_convert_DEPENDENCIES = libgcj.la libgcj.spec
+jv_convert_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_26)
 gcj_dbtool_SOURCES = \
-gnu/gcj/tools/gcj_dbtool/Main.java \
 gnu/gcj/tools/gcj_dbtool/natMain.cc
 
 gcj_dbtool_LDFLAGS = --main=gnu.gcj.tools.gcj_dbtool.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-
-gcj_dbtool_LINK = $(GCJLINK)
-gcj_dbtool_LDADD = -L$(here)/.libs libgcj.la
-gcj_dbtool_DEPENDENCIES = libgcj.la libgcj.spec
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+gcj_dbtool_LINK = $(GCJLINK) $(gcj_dbtool_LDFLAGS)
+gcj_dbtool_LDADD = gnu/gcj/tools/gcj_dbtool.lo -L$(here)/.libs libgcj.la
+gcj_dbtool_DEPENDENCIES = gnu/gcj/tools/gcj_dbtool.lo libgcj.la \
+       libgcj.spec $(am__append_27)
+gc_analyze_SOURCES = 
+gc_analyze_LDFLAGS = --main=gnu.gcj.tools.gc_analyze.MemoryAnalyze \
+        -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+gc_analyze_LINK = $(GCJLINK) $(gc_analyze_LDFLAGS)
+gc_analyze_LDADD = -L$(here)/.libs libgcj-tools.la libgcj.la
+gc_analyze_DEPENDENCIES = libgcj-tools.la libgcj.la libgcj.spec \
+       $(am__append_28)
 gij_SOURCES = 
-gij_LDFLAGS = -rpath $(libdir)/gcj-$(gcc_version) -rpath $(toolexeclibdir) \
-       -shared-libgcc $(THREADLDFLAGS)
+gij_LDFLAGS = -rpath $(dbexecdir) -rpath $(toolexeclibdir) \
+       -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
-gij_LINK = $(GCJLINK)
+gij_LINK = $(GCJLINK) $(gij_LDFLAGS)
 gij_LDADD = -L$(here)/.libs libgij.la
 gij_DEPENDENCIES = libgij.la
-grmic_SOURCES = 
-grmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-
-grmic_LINK = $(GCJLINK)
-grmic_LDADD = -L$(here)/.libs libgcj.la
-grmic_DEPENDENCIES = libgcj.la libgcj.spec
-grmiregistry_SOURCES = 
-grmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-
-grmiregistry_LINK = $(GCJLINK)
-grmiregistry_LDADD = -L$(here)/.libs libgcj.la
-grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec
+ecjx_SOURCES = ecjx.cc
+ECJX_BASE_FLAGS = -findirect-dispatch \
+       --main=org.eclipse.jdt.internal.compiler.batch.GCCMain
+
+@NATIVE_FALSE@ecjx_LINK = $(GCJ_FOR_ECJX_LINK) $(ecjx_LDFLAGS)
+@NATIVE_TRUE@ecjx_LINK = $(GCJLINK) $(ecjx_LDFLAGS)
+@ENABLE_SHARED_FALSE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) -fbootclasspath=$(BOOTCLASSPATH)
+@ENABLE_SHARED_TRUE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR)
+@NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
+@NATIVE_FALSE@ecjx_LDADD = 
+@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs $(extra_ldflags) \
+@NATIVE_TRUE@  $(am__append_31)
+@NATIVE_FALSE@ecjx_DEPENDENCIES = 
+@NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \
+@NATIVE_TRUE@  $(am__append_29) $(am__append_30)
 gappletviewer_SOURCES = 
 gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
-gappletviewer_LINK = $(GCJLINK)
+gappletviewer_LINK = $(GCJLINK) $(gappletviewer_LDFLAGS)
 gappletviewer_LDADD = -L$(here)/.libs libgcj-tools.la
 gappletviewer_DEPENDENCIES = libgcj-tools.la
 gjarsigner_SOURCES = 
 gjarsigner_LDFLAGS = --main=gnu.classpath.tools.jarsigner.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
-gjarsigner_LINK = $(GCJLINK)
+gjarsigner_LINK = $(GCJLINK) $(gjarsigner_LDFLAGS)
 gjarsigner_LDADD = -L$(here)/.libs libgcj-tools.la
 gjarsigner_DEPENDENCIES = libgcj-tools.la
 gkeytool_SOURCES = 
 gkeytool_LDFLAGS = --main=gnu.classpath.tools.keytool.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
-gkeytool_LINK = $(GCJLINK)
+gkeytool_LINK = $(GCJLINK) $(gkeytool_LDFLAGS)
 gkeytool_LDADD = -L$(here)/.libs libgcj-tools.la
 gkeytool_DEPENDENCIES = libgcj-tools.la
+gjar_SOURCES = 
+gjar_LDFLAGS = --main=gnu.classpath.tools.jar.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+gjar_LINK = $(GCJLINK) $(gjar_LDFLAGS)
+gjar_LDADD = -L$(here)/.libs libgcj-tools.la
+gjar_DEPENDENCIES = libgcj-tools.la
+gjavah_SOURCES = 
+gjavah_LDFLAGS = --main=gnu.classpath.tools.javah.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+gjavah_LINK = $(GCJLINK) $(gjavah_LDFLAGS)
+gjavah_LDADD = -L$(here)/.libs libgcj-tools.la
+gjavah_DEPENDENCIES = libgcj-tools.la
+gcjh_SOURCES = 
+gcjh_LDFLAGS = --main=gnu.classpath.tools.javah.GcjhMain \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+gcjh_LINK = $(GCJLINK) $(gcjh_LDFLAGS)
+gcjh_LDADD = -L$(here)/.libs libgcj-tools.la
+gcjh_DEPENDENCIES = libgcj-tools.la
+gnative2ascii_SOURCES = 
+gnative2ascii_LDFLAGS = --main=gnu.classpath.tools.native2ascii.Native2ASCII \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+gnative2ascii_LINK = $(GCJLINK) $(gnative2ascii_LDFLAGS)
+gnative2ascii_LDADD = -L$(here)/.libs libgcj-tools.la
+gnative2ascii_DEPENDENCIES = libgcj-tools.la
+gorbd_SOURCES = 
+gorbd_LDFLAGS = --main=gnu.classpath.tools.orbd.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+gorbd_LINK = $(GCJLINK) $(gorbd_LDFLAGS)
+gorbd_LDADD = -L$(here)/.libs libgcj-tools.la
+gorbd_DEPENDENCIES = libgcj-tools.la
+grmid_SOURCES = 
+grmid_LDFLAGS = --main=gnu.classpath.tools.rmid.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+grmid_LINK = $(GCJLINK) $(grmid_LDFLAGS)
+grmid_LDADD = -L$(here)/.libs libgcj-tools.la
+grmid_DEPENDENCIES = libgcj-tools.la
+gserialver_SOURCES = 
+gserialver_LDFLAGS = --main=gnu.classpath.tools.serialver.SerialVer \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+gserialver_LINK = $(GCJLINK) $(gserialver_LDFLAGS)
+gserialver_LDADD = -L$(here)/.libs libgcj-tools.la
+gserialver_DEPENDENCIES = libgcj-tools.la
+gtnameserv_SOURCES = 
+gtnameserv_LDFLAGS = --main=gnu.classpath.tools.tnameserv.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+gtnameserv_LINK = $(GCJLINK) $(gtnameserv_LDFLAGS)
+gtnameserv_LDADD = -L$(here)/.libs libgcj-tools.la
+gtnameserv_DEPENDENCIES = libgcj-tools.la
+grmic_SOURCES = 
+grmic_LDFLAGS = --main=gnu.classpath.tools.rmic.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+grmic_LINK = $(GCJLINK) $(grmic_LDFLAGS)
+grmic_LDADD = -L$(here)/.libs libgcj-tools.la
+grmic_DEPENDENCIES = libgcj-tools.la
+grmiregistry_SOURCES = 
+grmiregistry_LDFLAGS = --main=gnu.classpath.tools.rmiregistry.Main \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+grmiregistry_LINK = $(GCJLINK) $(grmiregistry_LDFLAGS)
+grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la
+grmiregistry_DEPENDENCIES = libgcj-tools.la
+gjdoc_SOURCES = 
+gjdoc_LDFLAGS = --main=gnu.classpath.tools.gjdoc.Main \
+       -Djava.class.path=$(ANTLR_JAR) \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+gjdoc_LINK = $(GCJLINK) $(gjdoc_LDFLAGS)
+gjdoc_LDADD = -L$(here)/.libs libgcj-tools.la
+gjdoc_DEPENDENCIES = libgcj-tools.la
+@INTERPRETER_FALSE@nat_jdwp_source_files = 
+@INTERPRETER_TRUE@nat_jdwp_source_files = \
+@INTERPRETER_TRUE@gnu/classpath/jdwp/natVMFrame.cc \
+@INTERPRETER_TRUE@gnu/classpath/jdwp/natVMMethod.cc \
+@INTERPRETER_TRUE@gnu/classpath/jdwp/natVMVirtualMachine.cc
+
+@INTERPRETER_FALSE@nat_jvmti_source_files = 
+@INTERPRETER_TRUE@nat_jvmti_source_files = \
+@INTERPRETER_TRUE@gnu/gcj/jvmti/natBreakpoint.cc \
+@INTERPRETER_TRUE@gnu/gcj/jvmti/natNormalBreakpoint.cc
+
 nat_source_files = \
+$(nat_jdwp_source_files) \
+gnu/classpath/natConfiguration.cc \
 gnu/classpath/natSystemProperties.cc \
-gnu/classpath/jdwp/natVMFrame.cc \
-gnu/classpath/jdwp/natVMMethod.cc \
-gnu/classpath/jdwp/natVMVirtualMachine.cc \
+gnu/classpath/natVMStackWalker.cc \
 gnu/gcj/natCore.cc \
 gnu/gcj/convert/JIS0208_to_Unicode.cc \
 gnu/gcj/convert/JIS0212_to_Unicode.cc \
@@ -7390,58 +8595,72 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \
 gnu/gcj/convert/natOutput_SJIS.cc \
 gnu/gcj/io/natSimpleSHSStream.cc \
 gnu/gcj/io/shs.cc \
-gnu/gcj/jvmti/natBreakpoint.cc \
+$(nat_jvmti_source_files) \
 gnu/gcj/runtime/natFinalizerThread.cc \
 gnu/gcj/runtime/natSharedLibLoader.cc \
 gnu/gcj/runtime/natSystemClassLoader.cc \
 gnu/gcj/runtime/natStringBuffer.cc \
 gnu/gcj/util/natDebug.cc \
+gnu/gcj/util/natGCInfo.cc \
 gnu/java/lang/natMainThread.cc \
+gnu/java/lang/management/natVMClassLoadingMXBeanImpl.cc \
+gnu/java/lang/management/natVMCompilationMXBeanImpl.cc \
+gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.cc \
+gnu/java/lang/management/natVMMemoryMXBeanImpl.cc \
+gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.cc \
+gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc \
+gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc \
+gnu/java/lang/management/natVMRuntimeMXBeanImpl.cc \
+gnu/java/lang/management/natVMThreadMXBeanImpl.cc \
 gnu/java/net/natPlainDatagramSocketImpl.cc \
 gnu/java/net/natPlainSocketImpl.cc \
 gnu/java/net/protocol/core/natCoreInputStream.cc \
-gnu/java/nio/natPipeImpl.cc \
-gnu/java/nio/natSelectorImpl.cc \
+gnu/java/nio/natVMPipe.cc \
+gnu/java/nio/natVMSelector.cc \
 gnu/java/nio/natNIOServerSocket.cc \
+gnu/java/nio/natVMChannel.cc \
 gnu/java/nio/channels/natFileChannelImpl.cc \
+gnu/java/security/jce/prng/natVMSecureRandom.cc \
 java/io/natFile.cc \
-java/io/natObjectInputStream.cc \
+java/io/natVMObjectInputStream.cc \
 java/io/natVMObjectStreamClass.cc \
 java/lang/natCharacter.cc \
 java/lang/natClass.cc \
 java/lang/natClassLoader.cc \
 java/lang/natConcreteProcess.cc \
-java/lang/natDouble.cc \
-java/lang/natFloat.cc \
+java/lang/natVMDouble.cc \
+java/lang/natVMFloat.cc \
 java/lang/natMath.cc \
 java/lang/natObject.cc \
 java/lang/natRuntime.cc        \
 java/lang/natString.cc \
-java/lang/natStringBuffer.cc \
-java/lang/natStringBuilder.cc \
+java/lang/natAbstractStringBuffer.cc \
 java/lang/natSystem.cc \
 java/lang/natThread.cc \
+java/lang/natThreadLocal.cc \
 java/lang/natVMClassLoader.cc \
-java/lang/natVMSecurityManager.cc \
+java/lang/natVMProcess.cc \
 java/lang/natVMThrowable.cc \
 java/lang/ref/natReference.cc \
 java/lang/reflect/natArray.cc \
 java/lang/reflect/natConstructor.cc \
 java/lang/reflect/natField.cc \
 java/lang/reflect/natMethod.cc \
-java/net/natVMNetworkInterface.cc \
+java/lang/reflect/natVMProxy.cc \
 java/net/natVMInetAddress.cc \
-java/net/natURLClassLoader.cc \
+java/net/natVMNetworkInterface.cc \
+java/net/natVMURLConnection.cc \
 java/nio/channels/natVMChannels.cc \
-java/nio/natDirectByteBufferImpl.cc \
+java/nio/natVMDirectByteBufferImpl.cc \
 java/security/natVMAccessController.cc \
 java/security/natVMAccessControlState.cc \
 java/text/natCollator.cc \
-java/util/natResourceBundle.cc \
 java/util/natVMTimeZone.cc \
+java/util/concurrent/atomic/natAtomicLong.cc \
 java/util/logging/natLogger.cc \
 java/util/zip/natDeflater.cc \
-java/util/zip/natInflater.cc
+java/util/zip/natInflater.cc \
+sun/misc/natUnsafe.cc
 
 xlib_nat_source_files = \
 gnu/gcj/xlib/natClip.cc \
@@ -7466,7 +8685,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_32)
 
 # 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
@@ -7494,18 +8713,22 @@ AM_MAKEFLAGS = \
        "SHELL=$(SHELL)" \
        "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
        "exec_prefix=$(exec_prefix)" \
+       "datadir=$(datadir)" \
        "infodir=$(infodir)" \
        "libdir=$(libdir)" \
+       "mandir=$(mandir)" \
        "prefix=$(prefix)" \
        "gxx_include_dir=$(gxx_include_dir)" \
        "AR=$(AR)" \
        "AS=$(AS)" \
+       "DLLTOOL=$(DLLTOOL)" \
        "LD=$(LD)" \
        "LIBCFLAGS=$(LIBCFLAGS)" \
        "NM=$(NM)" \
        "PICFLAG=$(PICFLAG)" \
        "RANLIB=$(RANLIB)" \
-       "DESTDIR=$(DESTDIR)"
+       "DESTDIR=$(DESTDIR)" \
+       "JAR=$(JAR)"
 
 
 # Subdir rules rely on $(FLAGS_TO_PASS)
@@ -7523,22 +8746,22 @@ MULTICLEAN = true
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .class .java .h .properties .list .c .cc .jar .lo .o .obj
+.SUFFIXES: .class .java .h .properties .list .c .cc .lo .o .obj .zip
 am--refresh:
        @:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/sources.am $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
-             echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-             cd $(srcdir) && $(AUTOMAKE) --foreign  \
+             echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+             $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
                && exit 0; \
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-       cd $(top_srcdir) && \
-         $(AUTOMAKE) --foreign  Makefile
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+       $(am__cd) $(top_srcdir) && \
+         $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
@@ -7554,34 +8777,49 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
        $(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-       cd $(srcdir) && $(AUTOCONF)
+       $(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-       cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+       $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
 libgcj.pc: $(top_builddir)/config.status $(srcdir)/libgcj.pc.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
 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 $@
+contrib/aotcompile.py: $(top_builddir)/config.status $(top_srcdir)/contrib/aotcompile.py.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+contrib/aot-compile: $(top_builddir)/config.status $(top_srcdir)/contrib/aot-compile.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+contrib/aot-compile-rpm: $(top_builddir)/config.status $(top_srcdir)/contrib/aot-compile-rpm.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+contrib/generate-cacerts.pl: $(top_builddir)/config.status $(top_srcdir)/contrib/generate-cacerts.pl.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+contrib/rebuild-gcj-db: $(top_builddir)/config.status $(top_srcdir)/contrib/rebuild-gcj-db.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 scripts/jar: $(top_builddir)/config.status $(top_srcdir)/scripts/jar.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
 install-dbexecLTLIBRARIES: $(dbexec_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(dbexecdir)" || $(mkdir_p) "$(DESTDIR)$(dbexecdir)"
-       @list='$(dbexec_LTLIBRARIES)'; for p in $$list; do \
+       test -z "$(dbexecdir)" || $(MKDIR_P) "$(DESTDIR)$(dbexecdir)"
+       @list='$(dbexec_LTLIBRARIES)'; test -n "$(dbexecdir)" || list=; \
+       list2=; for p in $$list; do \
          if test -f $$p; then \
-           f=$(am__strip_dir) \
-           echo " $(LIBTOOL) --mode=install $(dbexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(dbexecdir)/$$f'"; \
-           $(LIBTOOL) --mode=install $(dbexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(dbexecdir)/$$f"; \
+           list2="$$list2 $$p"; \
          else :; fi; \
-       done
+       done; \
+       test -z "$$list2" || { \
+         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(dbexecdir)'"; \
+         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(dbexecdir)"; \
+       }
 
 uninstall-dbexecLTLIBRARIES:
        @$(NORMAL_UNINSTALL)
-       @set -x; list='$(dbexec_LTLIBRARIES)'; for p in $$list; do \
-         p=$(am__strip_dir) \
-         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(dbexecdir)/$$p'"; \
-         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(dbexecdir)/$$p"; \
+       @list='$(dbexec_LTLIBRARIES)'; test -n "$(dbexecdir)" || list=; \
+       for p in $$list; do \
+         $(am__strip_dir) \
+         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(dbexecdir)/$$f'"; \
+         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(dbexecdir)/$$f"; \
        done
 
 clean-dbexecLTLIBRARIES:
@@ -7594,21 +8832,25 @@ clean-dbexecLTLIBRARIES:
        done
 install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       test -z "$(toolexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexeclibdir)"
-       @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
+       test -z "$(toolexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibdir)"
+       @list='$(toolexeclib_LTLIBRARIES)'; test -n "$(toolexeclibdir)" || list=; \
+       list2=; for p in $$list; do \
          if test -f $$p; then \
-           f=$(am__strip_dir) \
-           echo " $(LIBTOOL) --mode=install $(toolexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(toolexeclibdir)/$$f'"; \
-           $(LIBTOOL) --mode=install $(toolexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(toolexeclibdir)/$$f"; \
+           list2="$$list2 $$p"; \
          else :; fi; \
-       done
+       done; \
+       test -z "$$list2" || { \
+         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(toolexeclibdir)'"; \
+         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(toolexeclibdir)"; \
+       }
 
 uninstall-toolexeclibLTLIBRARIES:
        @$(NORMAL_UNINSTALL)
-       @set -x; list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
-         p=$(am__strip_dir) \
-         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(toolexeclibdir)/$$p'"; \
-         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(toolexeclibdir)/$$p"; \
+       @list='$(toolexeclib_LTLIBRARIES)'; test -n "$(toolexeclibdir)" || list=; \
+       for p in $$list; do \
+         $(am__strip_dir) \
+         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(toolexeclibdir)/$$f'"; \
+         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(toolexeclibdir)/$$f"; \
        done
 
 clean-toolexeclibLTLIBRARIES:
@@ -7620,10 +8862,10 @@ clean-toolexeclibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 gnu/gcj/xlib/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/xlib
+       @$(MKDIR_P) gnu/gcj/xlib
        @: > gnu/gcj/xlib/$(am__dirstamp)
 gnu/gcj/xlib/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/xlib/$(DEPDIR)
+       @$(MKDIR_P) gnu/gcj/xlib/$(DEPDIR)
        @: > gnu/gcj/xlib/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo:  \
        gnu/gcj/xlib/$(am__dirstamp) \
@@ -7685,40 +8927,24 @@ 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)
+libgcj-noncore.la: $(libgcj_noncore_la_OBJECTS) $(libgcj_noncore_la_DEPENDENCIES) 
+       $(libgcj_noncore_la_LINK) $(am_libgcj_noncore_la_rpath) $(libgcj_noncore_la_OBJECTS) $(libgcj_noncore_la_LIBADD) $(LIBS)
 classpath/tools/$(am__dirstamp):
-       @$(mkdir_p) classpath/tools
+       @$(MKDIR_P) classpath/tools
        @: > classpath/tools/$(am__dirstamp)
 classpath/tools/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) classpath/tools/$(DEPDIR)
+       @$(MKDIR_P) classpath/tools/$(DEPDIR)
        @: > classpath/tools/$(DEPDIR)/$(am__dirstamp)
 classpath/tools/libgcj_tools_la-tools.lo:  \
        classpath/tools/$(am__dirstamp) \
        classpath/tools/$(DEPDIR)/$(am__dirstamp)
 libgcj-tools.la: $(libgcj_tools_la_OBJECTS) $(libgcj_tools_la_DEPENDENCIES) 
-       $(libgcj_tools_la_LINK) -rpath $(toolexeclibdir) $(libgcj_tools_la_LDFLAGS) $(libgcj_tools_la_OBJECTS) $(libgcj_tools_la_LIBADD) $(LIBS)
-java/lang/$(am__dirstamp):
-       @$(mkdir_p) java/lang
-       @: > java/lang/$(am__dirstamp)
-java/lang/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) java/lang/$(DEPDIR)
-       @: > java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/Class.lo: java/lang/$(am__dirstamp) \
-       java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/Object.lo: java/lang/$(am__dirstamp) \
-       java/lang/$(DEPDIR)/$(am__dirstamp)
-gnu/classpath/$(am__dirstamp):
-       @$(mkdir_p) gnu/classpath
-       @: > gnu/classpath/$(am__dirstamp)
-gnu/classpath/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/classpath/$(DEPDIR)
-       @: > gnu/classpath/$(DEPDIR)/$(am__dirstamp)
-gnu/classpath/natSystemProperties.lo: gnu/classpath/$(am__dirstamp) \
-       gnu/classpath/$(DEPDIR)/$(am__dirstamp)
+       $(libgcj_tools_la_LINK) -rpath $(toolexeclibdir) $(libgcj_tools_la_OBJECTS) $(libgcj_tools_la_LIBADD) $(LIBS)
 gnu/classpath/jdwp/$(am__dirstamp):
-       @$(mkdir_p) gnu/classpath/jdwp
+       @$(MKDIR_P) gnu/classpath/jdwp
        @: > gnu/classpath/jdwp/$(am__dirstamp)
 gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/classpath/jdwp/$(DEPDIR)
+       @$(MKDIR_P) gnu/classpath/jdwp/$(DEPDIR)
        @: > gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp)
 gnu/classpath/jdwp/natVMFrame.lo: gnu/classpath/jdwp/$(am__dirstamp) \
        gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp)
@@ -7727,19 +8953,31 @@ gnu/classpath/jdwp/natVMMethod.lo: gnu/classpath/jdwp/$(am__dirstamp) \
 gnu/classpath/jdwp/natVMVirtualMachine.lo:  \
        gnu/classpath/jdwp/$(am__dirstamp) \
        gnu/classpath/jdwp/$(DEPDIR)/$(am__dirstamp)
+gnu/classpath/$(am__dirstamp):
+       @$(MKDIR_P) gnu/classpath
+       @: > gnu/classpath/$(am__dirstamp)
+gnu/classpath/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) gnu/classpath/$(DEPDIR)
+       @: > gnu/classpath/$(DEPDIR)/$(am__dirstamp)
+gnu/classpath/natConfiguration.lo: gnu/classpath/$(am__dirstamp) \
+       gnu/classpath/$(DEPDIR)/$(am__dirstamp)
+gnu/classpath/natSystemProperties.lo: gnu/classpath/$(am__dirstamp) \
+       gnu/classpath/$(DEPDIR)/$(am__dirstamp)
+gnu/classpath/natVMStackWalker.lo: gnu/classpath/$(am__dirstamp) \
+       gnu/classpath/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj
+       @$(MKDIR_P) gnu/gcj
        @: > gnu/gcj/$(am__dirstamp)
 gnu/gcj/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/$(DEPDIR)
+       @$(MKDIR_P) gnu/gcj/$(DEPDIR)
        @: > gnu/gcj/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/natCore.lo: gnu/gcj/$(am__dirstamp) \
        gnu/gcj/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/convert/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/convert
+       @$(MKDIR_P) gnu/gcj/convert
        @: > gnu/gcj/convert/$(am__dirstamp)
 gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/convert/$(DEPDIR)
+       @$(MKDIR_P) gnu/gcj/convert/$(DEPDIR)
        @: > gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/convert/JIS0208_to_Unicode.lo:  \
        gnu/gcj/convert/$(am__dirstamp) \
@@ -7760,28 +8998,30 @@ gnu/gcj/convert/natOutput_EUCJIS.lo: gnu/gcj/convert/$(am__dirstamp) \
 gnu/gcj/convert/natOutput_SJIS.lo: gnu/gcj/convert/$(am__dirstamp) \
        gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/io/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/io
+       @$(MKDIR_P) gnu/gcj/io
        @: > gnu/gcj/io/$(am__dirstamp)
 gnu/gcj/io/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/io/$(DEPDIR)
+       @$(MKDIR_P) gnu/gcj/io/$(DEPDIR)
        @: > gnu/gcj/io/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/io/natSimpleSHSStream.lo: gnu/gcj/io/$(am__dirstamp) \
        gnu/gcj/io/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/io/shs.lo: gnu/gcj/io/$(am__dirstamp) \
        gnu/gcj/io/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/jvmti/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/jvmti
+       @$(MKDIR_P) gnu/gcj/jvmti
        @: > gnu/gcj/jvmti/$(am__dirstamp)
 gnu/gcj/jvmti/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/jvmti/$(DEPDIR)
+       @$(MKDIR_P) gnu/gcj/jvmti/$(DEPDIR)
        @: > gnu/gcj/jvmti/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/jvmti/natBreakpoint.lo: gnu/gcj/jvmti/$(am__dirstamp) \
        gnu/gcj/jvmti/$(DEPDIR)/$(am__dirstamp)
+gnu/gcj/jvmti/natNormalBreakpoint.lo: gnu/gcj/jvmti/$(am__dirstamp) \
+       gnu/gcj/jvmti/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/runtime/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/runtime
+       @$(MKDIR_P) gnu/gcj/runtime
        @: > gnu/gcj/runtime/$(am__dirstamp)
 gnu/gcj/runtime/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/runtime/$(DEPDIR)
+       @$(MKDIR_P) gnu/gcj/runtime/$(DEPDIR)
        @: > gnu/gcj/runtime/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/runtime/natFinalizerThread.lo:  \
        gnu/gcj/runtime/$(am__dirstamp) \
@@ -7795,26 +9035,61 @@ gnu/gcj/runtime/natSystemClassLoader.lo:  \
 gnu/gcj/runtime/natStringBuffer.lo: gnu/gcj/runtime/$(am__dirstamp) \
        gnu/gcj/runtime/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/util/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/util
+       @$(MKDIR_P) gnu/gcj/util
        @: > gnu/gcj/util/$(am__dirstamp)
 gnu/gcj/util/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/util/$(DEPDIR)
+       @$(MKDIR_P) gnu/gcj/util/$(DEPDIR)
        @: > gnu/gcj/util/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/util/natDebug.lo: gnu/gcj/util/$(am__dirstamp) \
        gnu/gcj/util/$(DEPDIR)/$(am__dirstamp)
+gnu/gcj/util/natGCInfo.lo: gnu/gcj/util/$(am__dirstamp) \
+       gnu/gcj/util/$(DEPDIR)/$(am__dirstamp)
 gnu/java/lang/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/lang
+       @$(MKDIR_P) gnu/java/lang
        @: > gnu/java/lang/$(am__dirstamp)
 gnu/java/lang/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/lang/$(DEPDIR)
+       @$(MKDIR_P) gnu/java/lang/$(DEPDIR)
        @: > gnu/java/lang/$(DEPDIR)/$(am__dirstamp)
 gnu/java/lang/natMainThread.lo: gnu/java/lang/$(am__dirstamp) \
        gnu/java/lang/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/$(am__dirstamp):
+       @$(MKDIR_P) gnu/java/lang/management
+       @: > gnu/java/lang/management/$(am__dirstamp)
+gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) gnu/java/lang/management/$(DEPDIR)
+       @: > gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMClassLoadingMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMCompilationMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMMemoryMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMRuntimeMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+gnu/java/lang/management/natVMThreadMXBeanImpl.lo:  \
+       gnu/java/lang/management/$(am__dirstamp) \
+       gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
 gnu/java/net/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/net
+       @$(MKDIR_P) gnu/java/net
        @: > gnu/java/net/$(am__dirstamp)
 gnu/java/net/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/net/$(DEPDIR)
+       @$(MKDIR_P) gnu/java/net/$(DEPDIR)
        @: > gnu/java/net/$(DEPDIR)/$(am__dirstamp)
 gnu/java/net/natPlainDatagramSocketImpl.lo:  \
        gnu/java/net/$(am__dirstamp) \
@@ -7822,47 +9097,64 @@ gnu/java/net/natPlainDatagramSocketImpl.lo:  \
 gnu/java/net/natPlainSocketImpl.lo: gnu/java/net/$(am__dirstamp) \
        gnu/java/net/$(DEPDIR)/$(am__dirstamp)
 gnu/java/net/protocol/core/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/net/protocol/core
+       @$(MKDIR_P) gnu/java/net/protocol/core
        @: > gnu/java/net/protocol/core/$(am__dirstamp)
 gnu/java/net/protocol/core/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/net/protocol/core/$(DEPDIR)
+       @$(MKDIR_P) gnu/java/net/protocol/core/$(DEPDIR)
        @: > gnu/java/net/protocol/core/$(DEPDIR)/$(am__dirstamp)
 gnu/java/net/protocol/core/natCoreInputStream.lo:  \
        gnu/java/net/protocol/core/$(am__dirstamp) \
        gnu/java/net/protocol/core/$(DEPDIR)/$(am__dirstamp)
 gnu/java/nio/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/nio
+       @$(MKDIR_P) gnu/java/nio
        @: > gnu/java/nio/$(am__dirstamp)
 gnu/java/nio/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/nio/$(DEPDIR)
+       @$(MKDIR_P) gnu/java/nio/$(DEPDIR)
        @: > gnu/java/nio/$(DEPDIR)/$(am__dirstamp)
-gnu/java/nio/natPipeImpl.lo: gnu/java/nio/$(am__dirstamp) \
+gnu/java/nio/natVMPipe.lo: gnu/java/nio/$(am__dirstamp) \
        gnu/java/nio/$(DEPDIR)/$(am__dirstamp)
-gnu/java/nio/natSelectorImpl.lo: gnu/java/nio/$(am__dirstamp) \
+gnu/java/nio/natVMSelector.lo: gnu/java/nio/$(am__dirstamp) \
        gnu/java/nio/$(DEPDIR)/$(am__dirstamp)
 gnu/java/nio/natNIOServerSocket.lo: gnu/java/nio/$(am__dirstamp) \
        gnu/java/nio/$(DEPDIR)/$(am__dirstamp)
+gnu/java/nio/natVMChannel.lo: gnu/java/nio/$(am__dirstamp) \
+       gnu/java/nio/$(DEPDIR)/$(am__dirstamp)
 gnu/java/nio/channels/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/nio/channels
+       @$(MKDIR_P) gnu/java/nio/channels
        @: > gnu/java/nio/channels/$(am__dirstamp)
 gnu/java/nio/channels/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/nio/channels/$(DEPDIR)
+       @$(MKDIR_P) gnu/java/nio/channels/$(DEPDIR)
        @: > gnu/java/nio/channels/$(DEPDIR)/$(am__dirstamp)
 gnu/java/nio/channels/natFileChannelImpl.lo:  \
        gnu/java/nio/channels/$(am__dirstamp) \
        gnu/java/nio/channels/$(DEPDIR)/$(am__dirstamp)
+gnu/java/security/jce/prng/$(am__dirstamp):
+       @$(MKDIR_P) gnu/java/security/jce/prng
+       @: > gnu/java/security/jce/prng/$(am__dirstamp)
+gnu/java/security/jce/prng/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) gnu/java/security/jce/prng/$(DEPDIR)
+       @: > gnu/java/security/jce/prng/$(DEPDIR)/$(am__dirstamp)
+gnu/java/security/jce/prng/natVMSecureRandom.lo:  \
+       gnu/java/security/jce/prng/$(am__dirstamp) \
+       gnu/java/security/jce/prng/$(DEPDIR)/$(am__dirstamp)
 java/io/$(am__dirstamp):
-       @$(mkdir_p) java/io
+       @$(MKDIR_P) java/io
        @: > java/io/$(am__dirstamp)
 java/io/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) java/io/$(DEPDIR)
+       @$(MKDIR_P) java/io/$(DEPDIR)
        @: > java/io/$(DEPDIR)/$(am__dirstamp)
 java/io/natFile.lo: java/io/$(am__dirstamp) \
        java/io/$(DEPDIR)/$(am__dirstamp)
-java/io/natObjectInputStream.lo: java/io/$(am__dirstamp) \
+java/io/natVMObjectInputStream.lo: java/io/$(am__dirstamp) \
        java/io/$(DEPDIR)/$(am__dirstamp)
 java/io/natVMObjectStreamClass.lo: java/io/$(am__dirstamp) \
        java/io/$(DEPDIR)/$(am__dirstamp)
+java/lang/$(am__dirstamp):
+       @$(MKDIR_P) java/lang
+       @: > java/lang/$(am__dirstamp)
+java/lang/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) java/lang/$(DEPDIR)
+       @: > java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natCharacter.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natClass.lo: java/lang/$(am__dirstamp) \
@@ -7871,9 +9163,9 @@ java/lang/natClassLoader.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natConcreteProcess.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/natDouble.lo: java/lang/$(am__dirstamp) \
+java/lang/natVMDouble.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/natFloat.lo: java/lang/$(am__dirstamp) \
+java/lang/natVMFloat.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natMath.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
@@ -7883,33 +9175,33 @@ java/lang/natRuntime.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natString.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/natStringBuffer.lo: java/lang/$(am__dirstamp) \
-       java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/natStringBuilder.lo: java/lang/$(am__dirstamp) \
+java/lang/natAbstractStringBuffer.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natSystem.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natThread.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
+java/lang/natThreadLocal.lo: java/lang/$(am__dirstamp) \
+       java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natVMClassLoader.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/natVMSecurityManager.lo: java/lang/$(am__dirstamp) \
+java/lang/natVMProcess.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natVMThrowable.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/ref/$(am__dirstamp):
-       @$(mkdir_p) java/lang/ref
+       @$(MKDIR_P) java/lang/ref
        @: > java/lang/ref/$(am__dirstamp)
 java/lang/ref/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) java/lang/ref/$(DEPDIR)
+       @$(MKDIR_P) java/lang/ref/$(DEPDIR)
        @: > java/lang/ref/$(DEPDIR)/$(am__dirstamp)
 java/lang/ref/natReference.lo: java/lang/ref/$(am__dirstamp) \
        java/lang/ref/$(DEPDIR)/$(am__dirstamp)
 java/lang/reflect/$(am__dirstamp):
-       @$(mkdir_p) java/lang/reflect
+       @$(MKDIR_P) java/lang/reflect
        @: > java/lang/reflect/$(am__dirstamp)
 java/lang/reflect/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) java/lang/reflect/$(DEPDIR)
+       @$(MKDIR_P) java/lang/reflect/$(DEPDIR)
        @: > java/lang/reflect/$(DEPDIR)/$(am__dirstamp)
 java/lang/reflect/natArray.lo: java/lang/reflect/$(am__dirstamp) \
        java/lang/reflect/$(DEPDIR)/$(am__dirstamp)
@@ -7920,39 +9212,41 @@ java/lang/reflect/natField.lo: java/lang/reflect/$(am__dirstamp) \
        java/lang/reflect/$(DEPDIR)/$(am__dirstamp)
 java/lang/reflect/natMethod.lo: java/lang/reflect/$(am__dirstamp) \
        java/lang/reflect/$(DEPDIR)/$(am__dirstamp)
+java/lang/reflect/natVMProxy.lo: java/lang/reflect/$(am__dirstamp) \
+       java/lang/reflect/$(DEPDIR)/$(am__dirstamp)
 java/net/$(am__dirstamp):
-       @$(mkdir_p) java/net
+       @$(MKDIR_P) java/net
        @: > java/net/$(am__dirstamp)
 java/net/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) java/net/$(DEPDIR)
+       @$(MKDIR_P) java/net/$(DEPDIR)
        @: > java/net/$(DEPDIR)/$(am__dirstamp)
-java/net/natVMNetworkInterface.lo: java/net/$(am__dirstamp) \
-       java/net/$(DEPDIR)/$(am__dirstamp)
 java/net/natVMInetAddress.lo: java/net/$(am__dirstamp) \
        java/net/$(DEPDIR)/$(am__dirstamp)
-java/net/natURLClassLoader.lo: java/net/$(am__dirstamp) \
+java/net/natVMNetworkInterface.lo: java/net/$(am__dirstamp) \
+       java/net/$(DEPDIR)/$(am__dirstamp)
+java/net/natVMURLConnection.lo: java/net/$(am__dirstamp) \
        java/net/$(DEPDIR)/$(am__dirstamp)
 java/nio/channels/$(am__dirstamp):
-       @$(mkdir_p) java/nio/channels
+       @$(MKDIR_P) java/nio/channels
        @: > java/nio/channels/$(am__dirstamp)
 java/nio/channels/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) java/nio/channels/$(DEPDIR)
+       @$(MKDIR_P) java/nio/channels/$(DEPDIR)
        @: > java/nio/channels/$(DEPDIR)/$(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
+       @$(MKDIR_P) java/nio
        @: > java/nio/$(am__dirstamp)
 java/nio/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) java/nio/$(DEPDIR)
+       @$(MKDIR_P) java/nio/$(DEPDIR)
        @: > java/nio/$(DEPDIR)/$(am__dirstamp)
-java/nio/natDirectByteBufferImpl.lo: java/nio/$(am__dirstamp) \
+java/nio/natVMDirectByteBufferImpl.lo: java/nio/$(am__dirstamp) \
        java/nio/$(DEPDIR)/$(am__dirstamp)
 java/security/$(am__dirstamp):
-       @$(mkdir_p) java/security
+       @$(MKDIR_P) java/security
        @: > java/security/$(am__dirstamp)
 java/security/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) java/security/$(DEPDIR)
+       @$(MKDIR_P) java/security/$(DEPDIR)
        @: > java/security/$(DEPDIR)/$(am__dirstamp)
 java/security/natVMAccessController.lo: java/security/$(am__dirstamp) \
        java/security/$(DEPDIR)/$(am__dirstamp)
@@ -7960,100 +9254,183 @@ java/security/natVMAccessControlState.lo:  \
        java/security/$(am__dirstamp) \
        java/security/$(DEPDIR)/$(am__dirstamp)
 java/text/$(am__dirstamp):
-       @$(mkdir_p) java/text
+       @$(MKDIR_P) java/text
        @: > java/text/$(am__dirstamp)
 java/text/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) java/text/$(DEPDIR)
+       @$(MKDIR_P) java/text/$(DEPDIR)
        @: > java/text/$(DEPDIR)/$(am__dirstamp)
 java/text/natCollator.lo: java/text/$(am__dirstamp) \
        java/text/$(DEPDIR)/$(am__dirstamp)
 java/util/$(am__dirstamp):
-       @$(mkdir_p) java/util
+       @$(MKDIR_P) java/util
        @: > java/util/$(am__dirstamp)
 java/util/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) java/util/$(DEPDIR)
+       @$(MKDIR_P) java/util/$(DEPDIR)
        @: > java/util/$(DEPDIR)/$(am__dirstamp)
-java/util/natResourceBundle.lo: java/util/$(am__dirstamp) \
-       java/util/$(DEPDIR)/$(am__dirstamp)
 java/util/natVMTimeZone.lo: java/util/$(am__dirstamp) \
        java/util/$(DEPDIR)/$(am__dirstamp)
+java/util/concurrent/atomic/$(am__dirstamp):
+       @$(MKDIR_P) java/util/concurrent/atomic
+       @: > java/util/concurrent/atomic/$(am__dirstamp)
+java/util/concurrent/atomic/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) java/util/concurrent/atomic/$(DEPDIR)
+       @: > java/util/concurrent/atomic/$(DEPDIR)/$(am__dirstamp)
+java/util/concurrent/atomic/natAtomicLong.lo:  \
+       java/util/concurrent/atomic/$(am__dirstamp) \
+       java/util/concurrent/atomic/$(DEPDIR)/$(am__dirstamp)
 java/util/logging/$(am__dirstamp):
-       @$(mkdir_p) java/util/logging
+       @$(MKDIR_P) java/util/logging
        @: > java/util/logging/$(am__dirstamp)
 java/util/logging/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) java/util/logging/$(DEPDIR)
+       @$(MKDIR_P) java/util/logging/$(DEPDIR)
        @: > java/util/logging/$(DEPDIR)/$(am__dirstamp)
 java/util/logging/natLogger.lo: java/util/logging/$(am__dirstamp) \
        java/util/logging/$(DEPDIR)/$(am__dirstamp)
 java/util/zip/$(am__dirstamp):
-       @$(mkdir_p) java/util/zip
+       @$(MKDIR_P) java/util/zip
        @: > java/util/zip/$(am__dirstamp)
 java/util/zip/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) java/util/zip/$(DEPDIR)
+       @$(MKDIR_P) java/util/zip/$(DEPDIR)
        @: > java/util/zip/$(DEPDIR)/$(am__dirstamp)
 java/util/zip/natDeflater.lo: java/util/zip/$(am__dirstamp) \
        java/util/zip/$(DEPDIR)/$(am__dirstamp)
 java/util/zip/natInflater.lo: java/util/zip/$(am__dirstamp) \
        java/util/zip/$(DEPDIR)/$(am__dirstamp)
+sun/misc/$(am__dirstamp):
+       @$(MKDIR_P) sun/misc
+       @: > sun/misc/$(am__dirstamp)
+sun/misc/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) sun/misc/$(DEPDIR)
+       @: > sun/misc/$(DEPDIR)/$(am__dirstamp)
+sun/misc/natUnsafe.lo: sun/misc/$(am__dirstamp) \
+       sun/misc/$(DEPDIR)/$(am__dirstamp)
+java/lang/Object.lo: java/lang/$(am__dirstamp) \
+       java/lang/$(DEPDIR)/$(am__dirstamp)
 libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) 
-       $(libgcj_la_LINK) -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(libgcj_la_OBJECTS) $(libgcj_la_LIBADD) $(LIBS)
+       $(libgcj_la_LINK) -rpath $(toolexeclibdir) $(libgcj_la_OBJECTS) $(libgcj_la_LIBADD) $(LIBS)
 libgij.la: $(libgij_la_OBJECTS) $(libgij_la_DEPENDENCIES) 
-       $(CXXLINK) -rpath $(toolexeclibdir) $(libgij_la_LDFLAGS) $(libgij_la_OBJECTS) $(libgij_la_LIBADD) $(LIBS)
+       $(libgij_la_LINK) -rpath $(toolexeclibdir) $(libgij_la_OBJECTS) $(libgij_la_LIBADD) $(LIBS)
 libjvm.la: $(libjvm_la_OBJECTS) $(libjvm_la_DEPENDENCIES) 
-       $(CXXLINK) -rpath $(dbexecdir) $(libjvm_la_LDFLAGS) $(libjvm_la_OBJECTS) $(libjvm_la_LIBADD) $(LIBS)
+       $(libjvm_la_LINK) -rpath $(dbexecdir) $(libjvm_la_OBJECTS) $(libjvm_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
-       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-       @list='$(bin_PROGRAMS)'; for p in $$list; do \
-         p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-         if test -f $$p \
-            || test -f $$p1 \
-         ; then \
-           f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-         else :; fi; \
-       done
+       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+       @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+       for p in $$list; do echo "$$p $$p"; done | \
+       sed 's/$(EXEEXT)$$//' | \
+       while read p p1; do if test -f $$p || test -f $$p1; \
+         then echo "$$p"; echo "$$p"; else :; fi; \
+       done | \
+       sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+           -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+       sed 'N;N;N;s,\n, ,g' | \
+       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+           if ($$2 == $$4) files[d] = files[d] " " $$1; \
+           else { print "f", $$3 "/" $$4, $$1; } } \
+         END { for (d in files) print "f", d, files[d] }' | \
+       while read type dir files; do \
+           if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+           test -z "$$files" || { \
+           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+           } \
+       ; done
 
 uninstall-binPROGRAMS:
        @$(NORMAL_UNINSTALL)
-       @list='$(bin_PROGRAMS)'; for p in $$list; do \
-         f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-         echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-         rm -f "$(DESTDIR)$(bindir)/$$f"; \
-       done
+       @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+       files=`for p in $$list; do echo "$$p"; done | \
+         sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+             -e 's/$$/$(EXEEXT)/' `; \
+       test -n "$$list" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
-       @list='$(bin_PROGRAMS)'; for p in $$list; do \
-         f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-         echo " rm -f $$p $$f"; \
-         rm -f $$p $$f ; \
-       done
+       @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+       echo " rm -f" $$list; \
+       rm -f $$list || exit $$?; \
+       test -n "$(EXEEXT)" || exit 0; \
+       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+       echo " rm -f" $$list; \
+       rm -f $$list
+install-libexecsubPROGRAMS: $(libexecsub_PROGRAMS)
+       @$(NORMAL_INSTALL)
+       test -z "$(libexecsubdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecsubdir)"
+       @list='$(libexecsub_PROGRAMS)'; test -n "$(libexecsubdir)" || list=; \
+       for p in $$list; do echo "$$p $$p"; done | \
+       sed 's/$(EXEEXT)$$//' | \
+       while read p p1; do if test -f $$p || test -f $$p1; \
+         then echo "$$p"; echo "$$p"; else :; fi; \
+       done | \
+       sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+           -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+       sed 'N;N;N;s,\n, ,g' | \
+       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+           if ($$2 == $$4) files[d] = files[d] " " $$1; \
+           else { print "f", $$3 "/" $$4, $$1; } } \
+         END { for (d in files) print "f", d, files[d] }' | \
+       while read type dir files; do \
+           if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+           test -z "$$files" || { \
+           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecsubdir)$$dir'"; \
+           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecsubdir)$$dir" || exit $$?; \
+           } \
+       ; done
+
+uninstall-libexecsubPROGRAMS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libexecsub_PROGRAMS)'; test -n "$(libexecsubdir)" || list=; \
+       files=`for p in $$list; do echo "$$p"; done | \
+         sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+             -e 's/$$/$(EXEEXT)/' `; \
+       test -n "$$list" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libexecsubdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libexecsubdir)" && rm -f $$files
+
+clean-libexecsubPROGRAMS:
+       @list='$(libexecsub_PROGRAMS)'; test -n "$$list" || exit 0; \
+       echo " rm -f" $$list; \
+       rm -f $$list || exit $$?; \
+       test -n "$(EXEEXT)" || exit 0; \
+       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+       echo " rm -f" $$list; \
+       rm -f $$list
 
 clean-noinstPROGRAMS:
-       @list='$(noinst_PROGRAMS)'; for p in $$list; do \
-         f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-         echo " rm -f $$p $$f"; \
-         rm -f $$p $$f ; \
-       done
+       @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+       echo " rm -f" $$list; \
+       rm -f $$list || exit $$?; \
+       test -n "$(EXEEXT)" || exit 0; \
+       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+       echo " rm -f" $$list; \
+       rm -f $$list
+ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES) 
+       @rm -f ecjx$(EXEEXT)
+       $(ecjx_LINK) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
 gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES) 
        @rm -f gappletviewer$(EXEEXT)
-       $(gappletviewer_LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
+       $(gappletviewer_LINK) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
+gc-analyze$(EXEEXT): $(gc_analyze_OBJECTS) $(gc_analyze_DEPENDENCIES) 
+       @rm -f gc-analyze$(EXEEXT)
+       $(gc_analyze_LINK) $(gc_analyze_OBJECTS) $(gc_analyze_LDADD) $(LIBS)
 gnu/gcj/tools/gcj_dbtool/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/tools/gcj_dbtool
+       @$(MKDIR_P) gnu/gcj/tools/gcj_dbtool
        @: > gnu/gcj/tools/gcj_dbtool/$(am__dirstamp)
 gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/gcj/tools/gcj_dbtool/$(DEPDIR)
+       @$(MKDIR_P) gnu/gcj/tools/gcj_dbtool/$(DEPDIR)
        @: > gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/$(am__dirstamp)
-gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT):  \
-       gnu/gcj/tools/gcj_dbtool/$(am__dirstamp) \
-       gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT):  \
        gnu/gcj/tools/gcj_dbtool/$(am__dirstamp) \
        gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/$(am__dirstamp)
 gcj-dbtool$(EXEEXT): $(gcj_dbtool_OBJECTS) $(gcj_dbtool_DEPENDENCIES) 
        @rm -f gcj-dbtool$(EXEEXT)
-       $(gcj_dbtool_LINK) $(gcj_dbtool_LDFLAGS) $(gcj_dbtool_OBJECTS) $(gcj_dbtool_LDADD) $(LIBS)
+       $(gcj_dbtool_LINK) $(gcj_dbtool_OBJECTS) $(gcj_dbtool_LDADD) $(LIBS)
+gcjh$(EXEEXT): $(gcjh_OBJECTS) $(gcjh_DEPENDENCIES) 
+       @rm -f gcjh$(EXEEXT)
+       $(gcjh_LINK) $(gcjh_OBJECTS) $(gcjh_LDADD) $(LIBS)
 gnu/gcj/convert/gen-from-JIS.$(OBJEXT):  \
        gnu/gcj/convert/$(am__dirstamp) \
        gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp)
@@ -8061,44 +9438,83 @@ gnu/gcj/convert/make-trie.$(OBJEXT): gnu/gcj/convert/$(am__dirstamp) \
        gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp)
 gen-from-JIS$(EXEEXT): $(gen_from_JIS_OBJECTS) $(gen_from_JIS_DEPENDENCIES) 
        @rm -f gen-from-JIS$(EXEEXT)
-       $(LINK) $(gen_from_JIS_LDFLAGS) $(gen_from_JIS_OBJECTS) $(gen_from_JIS_LDADD) $(LIBS)
+       $(LINK) $(gen_from_JIS_OBJECTS) $(gen_from_JIS_LDADD) $(LIBS)
 gij$(EXEEXT): $(gij_OBJECTS) $(gij_DEPENDENCIES) 
        @rm -f gij$(EXEEXT)
-       $(gij_LINK) $(gij_LDFLAGS) $(gij_OBJECTS) $(gij_LDADD) $(LIBS)
+       $(gij_LINK) $(gij_OBJECTS) $(gij_LDADD) $(LIBS)
+gjar$(EXEEXT): $(gjar_OBJECTS) $(gjar_DEPENDENCIES) 
+       @rm -f gjar$(EXEEXT)
+       $(gjar_LINK) $(gjar_OBJECTS) $(gjar_LDADD) $(LIBS)
 gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsigner_DEPENDENCIES) 
        @rm -f gjarsigner$(EXEEXT)
-       $(gjarsigner_LINK) $(gjarsigner_LDFLAGS) $(gjarsigner_OBJECTS) $(gjarsigner_LDADD) $(LIBS)
+       $(gjarsigner_LINK) $(gjarsigner_OBJECTS) $(gjarsigner_LDADD) $(LIBS)
+gjavah$(EXEEXT): $(gjavah_OBJECTS) $(gjavah_DEPENDENCIES) 
+       @rm -f gjavah$(EXEEXT)
+       $(gjavah_LINK) $(gjavah_OBJECTS) $(gjavah_LDADD) $(LIBS)
+gjdoc$(EXEEXT): $(gjdoc_OBJECTS) $(gjdoc_DEPENDENCIES) 
+       @rm -f gjdoc$(EXEEXT)
+       $(gjdoc_LINK) $(gjdoc_OBJECTS) $(gjdoc_LDADD) $(LIBS)
 gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DEPENDENCIES) 
        @rm -f gkeytool$(EXEEXT)
-       $(gkeytool_LINK) $(gkeytool_LDFLAGS) $(gkeytool_OBJECTS) $(gkeytool_LDADD) $(LIBS)
+       $(gkeytool_LINK) $(gkeytool_OBJECTS) $(gkeytool_LDADD) $(LIBS)
+gnative2ascii$(EXEEXT): $(gnative2ascii_OBJECTS) $(gnative2ascii_DEPENDENCIES) 
+       @rm -f gnative2ascii$(EXEEXT)
+       $(gnative2ascii_LINK) $(gnative2ascii_OBJECTS) $(gnative2ascii_LDADD) $(LIBS)
+gorbd$(EXEEXT): $(gorbd_OBJECTS) $(gorbd_DEPENDENCIES) 
+       @rm -f gorbd$(EXEEXT)
+       $(gorbd_LINK) $(gorbd_OBJECTS) $(gorbd_LDADD) $(LIBS)
 grmic$(EXEEXT): $(grmic_OBJECTS) $(grmic_DEPENDENCIES) 
        @rm -f grmic$(EXEEXT)
-       $(grmic_LINK) $(grmic_LDFLAGS) $(grmic_OBJECTS) $(grmic_LDADD) $(LIBS)
+       $(grmic_LINK) $(grmic_OBJECTS) $(grmic_LDADD) $(LIBS)
+grmid$(EXEEXT): $(grmid_OBJECTS) $(grmid_DEPENDENCIES) 
+       @rm -f grmid$(EXEEXT)
+       $(grmid_LINK) $(grmid_OBJECTS) $(grmid_LDADD) $(LIBS)
 grmiregistry$(EXEEXT): $(grmiregistry_OBJECTS) $(grmiregistry_DEPENDENCIES) 
        @rm -f grmiregistry$(EXEEXT)
-       $(grmiregistry_LINK) $(grmiregistry_LDFLAGS) $(grmiregistry_OBJECTS) $(grmiregistry_LDADD) $(LIBS)
+       $(grmiregistry_LINK) $(grmiregistry_OBJECTS) $(grmiregistry_LDADD) $(LIBS)
+gserialver$(EXEEXT): $(gserialver_OBJECTS) $(gserialver_DEPENDENCIES) 
+       @rm -f gserialver$(EXEEXT)
+       $(gserialver_LINK) $(gserialver_OBJECTS) $(gserialver_LDADD) $(LIBS)
+gtnameserv$(EXEEXT): $(gtnameserv_OBJECTS) $(gtnameserv_DEPENDENCIES) 
+       @rm -f gtnameserv$(EXEEXT)
+       $(gtnameserv_LINK) $(gtnameserv_OBJECTS) $(gtnameserv_LDADD) $(LIBS)
 jv-convert$(EXEEXT): $(jv_convert_OBJECTS) $(jv_convert_DEPENDENCIES) 
        @rm -f jv-convert$(EXEEXT)
-       $(jv_convert_LINK) $(jv_convert_LDFLAGS) $(jv_convert_OBJECTS) $(jv_convert_LDADD) $(LIBS)
+       $(jv_convert_LINK) $(jv_convert_OBJECTS) $(jv_convert_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
        @$(NORMAL_INSTALL)
-       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-       @list='$(bin_SCRIPTS)'; for p in $$list; do \
+       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+       @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         if test -f $$d$$p; then \
-           f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-           echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-           $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-         else :; fi; \
-       done
+         if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+       done | \
+       sed -e 'p;s,.*/,,;n' \
+           -e 'h;s|.*|.|' \
+           -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+           if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+             if (++n[d] == $(am__install_max)) { \
+               print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+           else { print "f", d "/" $$4, $$1 } } \
+         END { for (d in files) print "f", d, files[d] }' | \
+       while read type dir files; do \
+            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+            test -z "$$files" || { \
+              echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+              $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+            } \
+       ; done
 
 uninstall-binSCRIPTS:
        @$(NORMAL_UNINSTALL)
-       @list='$(bin_SCRIPTS)'; for p in $$list; do \
-         f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-         echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-         rm -f "$(DESTDIR)$(bindir)/$$f"; \
-       done
+       @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+       files=`for p in $$list; do echo "$$p"; done | \
+              sed -e 's,.*/,,;$(transform)'`; \
+       test -n "$$list" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -8110,8 +9526,12 @@ mostlyclean-compile:
        -rm -f gnu/classpath/jdwp/natVMMethod.lo
        -rm -f gnu/classpath/jdwp/natVMVirtualMachine.$(OBJEXT)
        -rm -f gnu/classpath/jdwp/natVMVirtualMachine.lo
+       -rm -f gnu/classpath/natConfiguration.$(OBJEXT)
+       -rm -f gnu/classpath/natConfiguration.lo
        -rm -f gnu/classpath/natSystemProperties.$(OBJEXT)
        -rm -f gnu/classpath/natSystemProperties.lo
+       -rm -f gnu/classpath/natVMStackWalker.$(OBJEXT)
+       -rm -f gnu/classpath/natVMStackWalker.lo
        -rm -f gnu/gcj/convert/JIS0208_to_Unicode.$(OBJEXT)
        -rm -f gnu/gcj/convert/JIS0208_to_Unicode.lo
        -rm -f gnu/gcj/convert/JIS0212_to_Unicode.$(OBJEXT)
@@ -8136,6 +9556,8 @@ mostlyclean-compile:
        -rm -f gnu/gcj/io/shs.lo
        -rm -f gnu/gcj/jvmti/natBreakpoint.$(OBJEXT)
        -rm -f gnu/gcj/jvmti/natBreakpoint.lo
+       -rm -f gnu/gcj/jvmti/natNormalBreakpoint.$(OBJEXT)
+       -rm -f gnu/gcj/jvmti/natNormalBreakpoint.lo
        -rm -f gnu/gcj/natCore.$(OBJEXT)
        -rm -f gnu/gcj/natCore.lo
        -rm -f gnu/gcj/runtime/natFinalizerThread.$(OBJEXT)
@@ -8146,10 +9568,11 @@ mostlyclean-compile:
        -rm -f gnu/gcj/runtime/natStringBuffer.lo
        -rm -f gnu/gcj/runtime/natSystemClassLoader.$(OBJEXT)
        -rm -f gnu/gcj/runtime/natSystemClassLoader.lo
-       -rm -f gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT)
        -rm -f gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT)
        -rm -f gnu/gcj/util/natDebug.$(OBJEXT)
        -rm -f gnu/gcj/util/natDebug.lo
+       -rm -f gnu/gcj/util/natGCInfo.$(OBJEXT)
+       -rm -f gnu/gcj/util/natGCInfo.lo
        -rm -f gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.$(OBJEXT)
        -rm -f gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo
        -rm -f gnu/gcj/xlib/lib_gnu_awt_xlib_la-natColormap.$(OBJEXT)
@@ -8190,6 +9613,24 @@ mostlyclean-compile:
        -rm -f gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo
        -rm -f gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.$(OBJEXT)
        -rm -f gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo
+       -rm -f gnu/java/lang/management/natVMClassLoadingMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMClassLoadingMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMCompilationMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMCompilationMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMMemoryMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMMemoryMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMRuntimeMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMRuntimeMXBeanImpl.lo
+       -rm -f gnu/java/lang/management/natVMThreadMXBeanImpl.$(OBJEXT)
+       -rm -f gnu/java/lang/management/natVMThreadMXBeanImpl.lo
        -rm -f gnu/java/lang/natMainThread.$(OBJEXT)
        -rm -f gnu/java/lang/natMainThread.lo
        -rm -f gnu/java/net/natPlainDatagramSocketImpl.$(OBJEXT)
@@ -8202,20 +9643,24 @@ mostlyclean-compile:
        -rm -f gnu/java/nio/channels/natFileChannelImpl.lo
        -rm -f gnu/java/nio/natNIOServerSocket.$(OBJEXT)
        -rm -f gnu/java/nio/natNIOServerSocket.lo
-       -rm -f gnu/java/nio/natPipeImpl.$(OBJEXT)
-       -rm -f gnu/java/nio/natPipeImpl.lo
-       -rm -f gnu/java/nio/natSelectorImpl.$(OBJEXT)
-       -rm -f gnu/java/nio/natSelectorImpl.lo
+       -rm -f gnu/java/nio/natVMChannel.$(OBJEXT)
+       -rm -f gnu/java/nio/natVMChannel.lo
+       -rm -f gnu/java/nio/natVMPipe.$(OBJEXT)
+       -rm -f gnu/java/nio/natVMPipe.lo
+       -rm -f gnu/java/nio/natVMSelector.$(OBJEXT)
+       -rm -f gnu/java/nio/natVMSelector.lo
+       -rm -f gnu/java/security/jce/prng/natVMSecureRandom.$(OBJEXT)
+       -rm -f gnu/java/security/jce/prng/natVMSecureRandom.lo
        -rm -f java/io/natFile.$(OBJEXT)
        -rm -f java/io/natFile.lo
-       -rm -f java/io/natObjectInputStream.$(OBJEXT)
-       -rm -f java/io/natObjectInputStream.lo
+       -rm -f java/io/natVMObjectInputStream.$(OBJEXT)
+       -rm -f java/io/natVMObjectInputStream.lo
        -rm -f java/io/natVMObjectStreamClass.$(OBJEXT)
        -rm -f java/io/natVMObjectStreamClass.lo
-       -rm -f java/lang/Class.$(OBJEXT)
-       -rm -f java/lang/Class.lo
        -rm -f java/lang/Object.$(OBJEXT)
        -rm -f java/lang/Object.lo
+       -rm -f java/lang/natAbstractStringBuffer.$(OBJEXT)
+       -rm -f java/lang/natAbstractStringBuffer.lo
        -rm -f java/lang/natCharacter.$(OBJEXT)
        -rm -f java/lang/natCharacter.lo
        -rm -f java/lang/natClass.$(OBJEXT)
@@ -8224,10 +9669,6 @@ mostlyclean-compile:
        -rm -f java/lang/natClassLoader.lo
        -rm -f java/lang/natConcreteProcess.$(OBJEXT)
        -rm -f java/lang/natConcreteProcess.lo
-       -rm -f java/lang/natDouble.$(OBJEXT)
-       -rm -f java/lang/natDouble.lo
-       -rm -f java/lang/natFloat.$(OBJEXT)
-       -rm -f java/lang/natFloat.lo
        -rm -f java/lang/natMath.$(OBJEXT)
        -rm -f java/lang/natMath.lo
        -rm -f java/lang/natObject.$(OBJEXT)
@@ -8236,18 +9677,20 @@ mostlyclean-compile:
        -rm -f java/lang/natRuntime.lo
        -rm -f java/lang/natString.$(OBJEXT)
        -rm -f java/lang/natString.lo
-       -rm -f java/lang/natStringBuffer.$(OBJEXT)
-       -rm -f java/lang/natStringBuffer.lo
-       -rm -f java/lang/natStringBuilder.$(OBJEXT)
-       -rm -f java/lang/natStringBuilder.lo
        -rm -f java/lang/natSystem.$(OBJEXT)
        -rm -f java/lang/natSystem.lo
        -rm -f java/lang/natThread.$(OBJEXT)
        -rm -f java/lang/natThread.lo
+       -rm -f java/lang/natThreadLocal.$(OBJEXT)
+       -rm -f java/lang/natThreadLocal.lo
        -rm -f java/lang/natVMClassLoader.$(OBJEXT)
        -rm -f java/lang/natVMClassLoader.lo
-       -rm -f java/lang/natVMSecurityManager.$(OBJEXT)
-       -rm -f java/lang/natVMSecurityManager.lo
+       -rm -f java/lang/natVMDouble.$(OBJEXT)
+       -rm -f java/lang/natVMDouble.lo
+       -rm -f java/lang/natVMFloat.$(OBJEXT)
+       -rm -f java/lang/natVMFloat.lo
+       -rm -f java/lang/natVMProcess.$(OBJEXT)
+       -rm -f java/lang/natVMProcess.lo
        -rm -f java/lang/natVMThrowable.$(OBJEXT)
        -rm -f java/lang/natVMThrowable.lo
        -rm -f java/lang/ref/natReference.$(OBJEXT)
@@ -8260,32 +9703,36 @@ mostlyclean-compile:
        -rm -f java/lang/reflect/natField.lo
        -rm -f java/lang/reflect/natMethod.$(OBJEXT)
        -rm -f java/lang/reflect/natMethod.lo
-       -rm -f java/net/natURLClassLoader.$(OBJEXT)
-       -rm -f java/net/natURLClassLoader.lo
+       -rm -f java/lang/reflect/natVMProxy.$(OBJEXT)
+       -rm -f java/lang/reflect/natVMProxy.lo
        -rm -f java/net/natVMInetAddress.$(OBJEXT)
        -rm -f java/net/natVMInetAddress.lo
        -rm -f java/net/natVMNetworkInterface.$(OBJEXT)
        -rm -f java/net/natVMNetworkInterface.lo
+       -rm -f java/net/natVMURLConnection.$(OBJEXT)
+       -rm -f java/net/natVMURLConnection.lo
        -rm -f java/nio/channels/natVMChannels.$(OBJEXT)
        -rm -f java/nio/channels/natVMChannels.lo
-       -rm -f java/nio/natDirectByteBufferImpl.$(OBJEXT)
-       -rm -f java/nio/natDirectByteBufferImpl.lo
+       -rm -f java/nio/natVMDirectByteBufferImpl.$(OBJEXT)
+       -rm -f java/nio/natVMDirectByteBufferImpl.lo
        -rm -f java/security/natVMAccessControlState.$(OBJEXT)
        -rm -f java/security/natVMAccessControlState.lo
        -rm -f java/security/natVMAccessController.$(OBJEXT)
        -rm -f java/security/natVMAccessController.lo
        -rm -f java/text/natCollator.$(OBJEXT)
        -rm -f java/text/natCollator.lo
+       -rm -f java/util/concurrent/atomic/natAtomicLong.$(OBJEXT)
+       -rm -f java/util/concurrent/atomic/natAtomicLong.lo
        -rm -f java/util/logging/natLogger.$(OBJEXT)
        -rm -f java/util/logging/natLogger.lo
-       -rm -f java/util/natResourceBundle.$(OBJEXT)
-       -rm -f java/util/natResourceBundle.lo
        -rm -f java/util/natVMTimeZone.$(OBJEXT)
        -rm -f java/util/natVMTimeZone.lo
        -rm -f java/util/zip/natDeflater.$(OBJEXT)
        -rm -f java/util/zip/natDeflater.lo
        -rm -f java/util/zip/natInflater.$(OBJEXT)
        -rm -f java/util/zip/natInflater.lo
+       -rm -f sun/misc/natUnsafe.$(OBJEXT)
+       -rm -f sun/misc/natUnsafe.lo
 
 distclean-compile:
        -rm -f *.tab.c
@@ -8293,6 +9740,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boehm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/darwin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/defineclass.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecjx.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gij.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpret.Plo@am__quote@
@@ -8311,7 +9759,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32-threads.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/$(DEPDIR)/natConfiguration.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/$(DEPDIR)/natSystemProperties.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/$(DEPDIR)/natVMStackWalker.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/jdwp/$(DEPDIR)/natVMFrame.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/jdwp/$(DEPDIR)/natVMMethod.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/jdwp/$(DEPDIR)/natVMVirtualMachine.Plo@am__quote@
@@ -8329,13 +9779,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/io/$(DEPDIR)/natSimpleSHSStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/io/$(DEPDIR)/shs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/jvmti/$(DEPDIR)/natBreakpoint.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/jvmti/$(DEPDIR)/natNormalBreakpoint.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natFinalizerThread.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natSharedLibLoader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natStringBuffer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natSystemClassLoader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/Main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/natMain.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/util/$(DEPDIR)/natDebug.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/util/$(DEPDIR)/natGCInfo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natClip.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natColormap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDisplay.Plo@am__quote@
@@ -8357,293 +9808,305 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXImage.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXUnmapEvent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/$(DEPDIR)/natMainThread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMClassLoadingMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMCompilationMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMGarbageCollectorMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMMemoryMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMMemoryManagerMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMMemoryPoolMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMOperatingSystemMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMRuntimeMXBeanImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/lang/management/$(DEPDIR)/natVMThreadMXBeanImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/net/$(DEPDIR)/natPlainDatagramSocketImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/net/$(DEPDIR)/natPlainSocketImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/net/protocol/core/$(DEPDIR)/natCoreInputStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natNIOServerSocket.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natPipeImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natSelectorImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natVMChannel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natVMPipe.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natVMSelector.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/channels/$(DEPDIR)/natFileChannelImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/security/jce/prng/$(DEPDIR)/natVMSecureRandom.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natFile.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natObjectInputStream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectInputStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectStreamClass.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/Class.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/Object.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natAbstractStringBuffer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natCharacter.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natClass.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natClassLoader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natConcreteProcess.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natDouble.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natFloat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natMath.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natObject.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natRuntime.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natString.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natStringBuffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natStringBuilder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natSystem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natThread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natThreadLocal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMClassLoader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMSecurityManager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMDouble.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMFloat.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMProcess.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMThrowable.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/ref/$(DEPDIR)/natReference.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natArray.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natConstructor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natField.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natMethod.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natURLClassLoader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natVMProxy.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natVMInetAddress.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natVMNetworkInterface.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/nio/$(DEPDIR)/natDirectByteBufferImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natVMURLConnection.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/nio/$(DEPDIR)/natVMDirectByteBufferImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/nio/channels/$(DEPDIR)/natVMChannels.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/security/$(DEPDIR)/natVMAccessControlState.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/security/$(DEPDIR)/natVMAccessController.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/text/$(DEPDIR)/natCollator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/natResourceBundle.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/natVMTimeZone.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/util/concurrent/atomic/$(DEPDIR)/natAtomicLong.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/util/logging/$(DEPDIR)/natLogger.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/util/zip/$(DEPDIR)/natDeflater.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/util/zip/$(DEPDIR)/natInflater.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sun/misc/$(DEPDIR)/natUnsafe.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@   depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
-@am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@   then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@   depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@   depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
-@am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@   then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@   depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@   depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
-@am__fastdepCC_TRUE@   if $(LTCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@   then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@   depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
 .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 $@ $<; \
-@am__fastdepCXX_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
-@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
-@am__fastdepCXX_TRUE@  if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@  $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo: gnu/gcj/xlib/natClip.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natClip.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo `test -f 'gnu/gcj/xlib/natClip.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natClip.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natClip.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natClip.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natClip.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natClip.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo `test -f 'gnu/gcj/xlib/natClip.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natClip.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natClip.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natClip.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natClip.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo `test -f 'gnu/gcj/xlib/natClip.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natClip.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo `test -f 'gnu/gcj/xlib/natClip.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natClip.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natColormap.lo: gnu/gcj/xlib/natColormap.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natColormap.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natColormap.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natColormap.lo `test -f 'gnu/gcj/xlib/natColormap.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natColormap.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natColormap.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natColormap.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natColormap.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natColormap.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natColormap.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natColormap.lo `test -f 'gnu/gcj/xlib/natColormap.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natColormap.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natColormap.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natColormap.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natColormap.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natColormap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natColormap.lo `test -f 'gnu/gcj/xlib/natColormap.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natColormap.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natColormap.lo `test -f 'gnu/gcj/xlib/natColormap.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natColormap.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDisplay.lo: gnu/gcj/xlib/natDisplay.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDisplay.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDisplay.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDisplay.lo `test -f 'gnu/gcj/xlib/natDisplay.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natDisplay.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDisplay.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDisplay.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDisplay.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDisplay.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDisplay.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDisplay.lo `test -f 'gnu/gcj/xlib/natDisplay.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natDisplay.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDisplay.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDisplay.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natDisplay.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDisplay.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDisplay.lo `test -f 'gnu/gcj/xlib/natDisplay.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natDisplay.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDisplay.lo `test -f 'gnu/gcj/xlib/natDisplay.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natDisplay.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDrawable.lo: gnu/gcj/xlib/natDrawable.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDrawable.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDrawable.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDrawable.lo `test -f 'gnu/gcj/xlib/natDrawable.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natDrawable.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDrawable.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDrawable.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDrawable.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDrawable.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDrawable.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDrawable.lo `test -f 'gnu/gcj/xlib/natDrawable.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natDrawable.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDrawable.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natDrawable.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natDrawable.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDrawable.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDrawable.lo `test -f 'gnu/gcj/xlib/natDrawable.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natDrawable.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natDrawable.lo `test -f 'gnu/gcj/xlib/natDrawable.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natDrawable.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natFont.lo: gnu/gcj/xlib/natFont.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natFont.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natFont.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natFont.lo `test -f 'gnu/gcj/xlib/natFont.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natFont.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natFont.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natFont.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natFont.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natFont.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natFont.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natFont.lo `test -f 'gnu/gcj/xlib/natFont.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natFont.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natFont.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natFont.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natFont.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natFont.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natFont.lo `test -f 'gnu/gcj/xlib/natFont.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natFont.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natFont.lo `test -f 'gnu/gcj/xlib/natFont.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natFont.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natGC.lo: gnu/gcj/xlib/natGC.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natGC.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natGC.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natGC.lo `test -f 'gnu/gcj/xlib/natGC.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natGC.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natGC.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natGC.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natGC.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natGC.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natGC.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natGC.lo `test -f 'gnu/gcj/xlib/natGC.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natGC.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natGC.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natGC.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natGC.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natGC.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natGC.lo `test -f 'gnu/gcj/xlib/natGC.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natGC.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natGC.lo `test -f 'gnu/gcj/xlib/natGC.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natGC.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natPixmap.lo: gnu/gcj/xlib/natPixmap.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natPixmap.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natPixmap.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natPixmap.lo `test -f 'gnu/gcj/xlib/natPixmap.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natPixmap.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natPixmap.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natPixmap.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natPixmap.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natPixmap.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natPixmap.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natPixmap.lo `test -f 'gnu/gcj/xlib/natPixmap.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natPixmap.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natPixmap.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natPixmap.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natPixmap.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natPixmap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natPixmap.lo `test -f 'gnu/gcj/xlib/natPixmap.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natPixmap.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natPixmap.lo `test -f 'gnu/gcj/xlib/natPixmap.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natPixmap.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natScreen.lo: gnu/gcj/xlib/natScreen.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natScreen.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natScreen.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natScreen.lo `test -f 'gnu/gcj/xlib/natScreen.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natScreen.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natScreen.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natScreen.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natScreen.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natScreen.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natScreen.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natScreen.lo `test -f 'gnu/gcj/xlib/natScreen.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natScreen.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natScreen.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natScreen.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natScreen.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natScreen.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natScreen.lo `test -f 'gnu/gcj/xlib/natScreen.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natScreen.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natScreen.lo `test -f 'gnu/gcj/xlib/natScreen.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natScreen.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natVisual.lo: gnu/gcj/xlib/natVisual.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natVisual.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natVisual.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natVisual.lo `test -f 'gnu/gcj/xlib/natVisual.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natVisual.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natVisual.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natVisual.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natVisual.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natVisual.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natVisual.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natVisual.lo `test -f 'gnu/gcj/xlib/natVisual.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natVisual.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natVisual.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natVisual.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natVisual.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natVisual.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natVisual.lo `test -f 'gnu/gcj/xlib/natVisual.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natVisual.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natVisual.lo `test -f 'gnu/gcj/xlib/natVisual.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natVisual.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWMSizeHints.lo: gnu/gcj/xlib/natWMSizeHints.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWMSizeHints.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWMSizeHints.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWMSizeHints.lo `test -f 'gnu/gcj/xlib/natWMSizeHints.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natWMSizeHints.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWMSizeHints.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWMSizeHints.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWMSizeHints.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWMSizeHints.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWMSizeHints.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWMSizeHints.lo `test -f 'gnu/gcj/xlib/natWMSizeHints.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natWMSizeHints.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWMSizeHints.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWMSizeHints.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natWMSizeHints.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWMSizeHints.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWMSizeHints.lo `test -f 'gnu/gcj/xlib/natWMSizeHints.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natWMSizeHints.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWMSizeHints.lo `test -f 'gnu/gcj/xlib/natWMSizeHints.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natWMSizeHints.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindow.lo: gnu/gcj/xlib/natWindow.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindow.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindow.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindow.lo `test -f 'gnu/gcj/xlib/natWindow.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natWindow.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindow.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindow.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindow.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindow.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindow.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindow.lo `test -f 'gnu/gcj/xlib/natWindow.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natWindow.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindow.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindow.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natWindow.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindow.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindow.lo `test -f 'gnu/gcj/xlib/natWindow.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natWindow.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindow.lo `test -f 'gnu/gcj/xlib/natWindow.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natWindow.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindowAttributes.lo: gnu/gcj/xlib/natWindowAttributes.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindowAttributes.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindowAttributes.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindowAttributes.lo `test -f 'gnu/gcj/xlib/natWindowAttributes.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natWindowAttributes.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindowAttributes.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindowAttributes.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindowAttributes.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindowAttributes.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindowAttributes.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindowAttributes.lo `test -f 'gnu/gcj/xlib/natWindowAttributes.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natWindowAttributes.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindowAttributes.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natWindowAttributes.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natWindowAttributes.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindowAttributes.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindowAttributes.lo `test -f 'gnu/gcj/xlib/natWindowAttributes.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natWindowAttributes.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natWindowAttributes.lo `test -f 'gnu/gcj/xlib/natWindowAttributes.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natWindowAttributes.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXAnyEvent.lo: gnu/gcj/xlib/natXAnyEvent.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXAnyEvent.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXAnyEvent.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXAnyEvent.lo `test -f 'gnu/gcj/xlib/natXAnyEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXAnyEvent.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXAnyEvent.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXAnyEvent.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXAnyEvent.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXAnyEvent.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXAnyEvent.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXAnyEvent.lo `test -f 'gnu/gcj/xlib/natXAnyEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXAnyEvent.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXAnyEvent.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXAnyEvent.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natXAnyEvent.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXAnyEvent.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXAnyEvent.lo `test -f 'gnu/gcj/xlib/natXAnyEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXAnyEvent.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXAnyEvent.lo `test -f 'gnu/gcj/xlib/natXAnyEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXAnyEvent.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXButtonEvent.lo: gnu/gcj/xlib/natXButtonEvent.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXButtonEvent.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXButtonEvent.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXButtonEvent.lo `test -f 'gnu/gcj/xlib/natXButtonEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXButtonEvent.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXButtonEvent.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXButtonEvent.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXButtonEvent.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXButtonEvent.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXButtonEvent.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXButtonEvent.lo `test -f 'gnu/gcj/xlib/natXButtonEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXButtonEvent.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXButtonEvent.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXButtonEvent.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natXButtonEvent.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXButtonEvent.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXButtonEvent.lo `test -f 'gnu/gcj/xlib/natXButtonEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXButtonEvent.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXButtonEvent.lo `test -f 'gnu/gcj/xlib/natXButtonEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXButtonEvent.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXColor.lo: gnu/gcj/xlib/natXColor.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXColor.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXColor.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXColor.lo `test -f 'gnu/gcj/xlib/natXColor.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXColor.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXColor.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXColor.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXColor.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXColor.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXColor.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXColor.lo `test -f 'gnu/gcj/xlib/natXColor.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXColor.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXColor.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXColor.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natXColor.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXColor.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXColor.lo `test -f 'gnu/gcj/xlib/natXColor.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXColor.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXColor.lo `test -f 'gnu/gcj/xlib/natXColor.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXColor.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXConfigureEvent.lo: gnu/gcj/xlib/natXConfigureEvent.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXConfigureEvent.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXConfigureEvent.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXConfigureEvent.lo `test -f 'gnu/gcj/xlib/natXConfigureEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXConfigureEvent.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXConfigureEvent.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXConfigureEvent.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXConfigureEvent.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXConfigureEvent.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXConfigureEvent.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXConfigureEvent.lo `test -f 'gnu/gcj/xlib/natXConfigureEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXConfigureEvent.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXConfigureEvent.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXConfigureEvent.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natXConfigureEvent.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXConfigureEvent.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXConfigureEvent.lo `test -f 'gnu/gcj/xlib/natXConfigureEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXConfigureEvent.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXConfigureEvent.lo `test -f 'gnu/gcj/xlib/natXConfigureEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXConfigureEvent.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXException.lo: gnu/gcj/xlib/natXException.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXException.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXException.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXException.lo `test -f 'gnu/gcj/xlib/natXException.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXException.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXException.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXException.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXException.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXException.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXException.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXException.lo `test -f 'gnu/gcj/xlib/natXException.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXException.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXException.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXException.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natXException.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXException.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXException.lo `test -f 'gnu/gcj/xlib/natXException.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXException.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXException.lo `test -f 'gnu/gcj/xlib/natXException.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXException.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXExposeEvent.lo: gnu/gcj/xlib/natXExposeEvent.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXExposeEvent.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXExposeEvent.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXExposeEvent.lo `test -f 'gnu/gcj/xlib/natXExposeEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXExposeEvent.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXExposeEvent.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXExposeEvent.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXExposeEvent.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXExposeEvent.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXExposeEvent.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXExposeEvent.lo `test -f 'gnu/gcj/xlib/natXExposeEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXExposeEvent.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXExposeEvent.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXExposeEvent.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natXExposeEvent.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXExposeEvent.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXExposeEvent.lo `test -f 'gnu/gcj/xlib/natXExposeEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXExposeEvent.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXExposeEvent.lo `test -f 'gnu/gcj/xlib/natXExposeEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXExposeEvent.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo: gnu/gcj/xlib/natXImage.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXImage.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo `test -f 'gnu/gcj/xlib/natXImage.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXImage.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXImage.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXImage.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXImage.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXImage.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo `test -f 'gnu/gcj/xlib/natXImage.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXImage.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXImage.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXImage.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natXImage.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo `test -f 'gnu/gcj/xlib/natXImage.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXImage.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo `test -f 'gnu/gcj/xlib/natXImage.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXImage.cc
 
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo: gnu/gcj/xlib/natXUnmapEvent.cc
-@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo -MD -MP -MF "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXUnmapEvent.Tpo" -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo `test -f 'gnu/gcj/xlib/natXUnmapEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXUnmapEvent.cc; \
-@am__fastdepCXX_TRUE@  then mv -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXUnmapEvent.Tpo" "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXUnmapEvent.Plo"; else rm -f "gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXUnmapEvent.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo -MD -MP -MF gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXUnmapEvent.Tpo -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo `test -f 'gnu/gcj/xlib/natXUnmapEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXUnmapEvent.cc
+@am__fastdepCXX_TRUE@  $(am__mv) gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXUnmapEvent.Tpo gnu/gcj/xlib/$(DEPDIR)/lib_gnu_awt_xlib_la-natXUnmapEvent.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='gnu/gcj/xlib/natXUnmapEvent.cc' object='gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo `test -f 'gnu/gcj/xlib/natXUnmapEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXUnmapEvent.cc
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo `test -f 'gnu/gcj/xlib/natXUnmapEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXUnmapEvent.cc
 
-.jar.o:
-@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
-@am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
-@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+.java.o:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepGCJ_TRUE@  $(GCJCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepGCJ_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ $<
 
-.jar.obj:
-@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
-@am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+.java.obj:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepGCJ_TRUE@  $(GCJCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepGCJ_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-.jar.lo:
-@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
-@am__fastdepGCJ_TRUE@  if $(LTGCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
-@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
+.java.lo:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepGCJ_TRUE@  $(LTGCJCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepGCJ_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepGCJ_FALSE@ $(LTGCJCOMPILE) -c -o $@ $<
 
-classpath/tools/libgcj_tools_la-tools.lo: classpath/tools/tools.jar
-@am__fastdepGCJ_TRUE@  if $(LIBTOOL) --mode=compile $(GCJ) $(libgcj_tools_la_GCJFLAGS) $(GCJFLAGS) -MT classpath/tools/libgcj_tools_la-tools.lo -MD -MP -MF "classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Tpo" -c -o classpath/tools/libgcj_tools_la-tools.lo `test -f 'classpath/tools/tools.jar' || echo '$(srcdir)/'`classpath/tools/tools.jar; \
-@am__fastdepGCJ_TRUE@  then mv -f "classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Tpo" "classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Plo"; else rm -f "classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='classpath/tools/tools.jar' object='classpath/tools/libgcj_tools_la-tools.lo' libtool=yes @AMDEPBACKSLASH@
+classpath/tools/libgcj_tools_la-tools.lo: classpath/tools/tools.zip
+@am__fastdepGCJ_TRUE@  $(LIBTOOL)  --tag=GCJ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GCJ) $(libgcj_tools_la_GCJFLAGS) $(GCJFLAGS) -MT classpath/tools/libgcj_tools_la-tools.lo -MD -MP -MF classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Tpo -c -o classpath/tools/libgcj_tools_la-tools.lo `test -f 'classpath/tools/tools.zip' || echo '$(srcdir)/'`classpath/tools/tools.zip
+@am__fastdepGCJ_TRUE@  $(am__mv) classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Tpo classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Plo
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='classpath/tools/tools.zip' object='classpath/tools/libgcj_tools_la-tools.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepGCJ_FALSE@ $(LIBTOOL) --mode=compile $(GCJ) $(libgcj_tools_la_GCJFLAGS) $(GCJFLAGS) -c -o classpath/tools/libgcj_tools_la-tools.lo `test -f 'classpath/tools/tools.jar' || echo '$(srcdir)/'`classpath/tools/tools.jar
+@am__fastdepGCJ_FALSE@ $(LIBTOOL)  --tag=GCJ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GCJ) $(libgcj_tools_la_GCJFLAGS) $(GCJFLAGS) -c -o classpath/tools/libgcj_tools_la-tools.lo `test -f 'classpath/tools/tools.zip' || echo '$(srcdir)/'`classpath/tools/tools.zip
 
-.java.o:
-@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
-@am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
-@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+.zip.o:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepGCJ_TRUE@  $(GCJCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepGCJ_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ $<
 
-.java.obj:
-@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
-@am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+.zip.obj:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepGCJ_TRUE@  $(GCJCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepGCJ_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-.java.lo:
-@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
-@am__fastdepGCJ_TRUE@  if $(LTGCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
-@am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
+.zip.lo:
+@am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepGCJ_TRUE@  $(LTGCJCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepGCJ_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepGCJ_FALSE@ $(LTGCJCOMPILE) -c -o $@ $<
@@ -8664,10 +10127,12 @@ clean-libtool:
        -rm -rf gnu/gcj/util/.libs gnu/gcj/util/_libs
        -rm -rf gnu/gcj/xlib/.libs gnu/gcj/xlib/_libs
        -rm -rf gnu/java/lang/.libs gnu/java/lang/_libs
+       -rm -rf gnu/java/lang/management/.libs gnu/java/lang/management/_libs
        -rm -rf gnu/java/net/.libs gnu/java/net/_libs
        -rm -rf gnu/java/net/protocol/core/.libs gnu/java/net/protocol/core/_libs
        -rm -rf gnu/java/nio/.libs gnu/java/nio/_libs
        -rm -rf gnu/java/nio/channels/.libs gnu/java/nio/channels/_libs
+       -rm -rf gnu/java/security/jce/prng/.libs gnu/java/security/jce/prng/_libs
        -rm -rf java/io/.libs java/io/_libs
        -rm -rf java/lang/.libs java/lang/_libs
        -rm -rf java/lang/ref/.libs java/lang/ref/_libs
@@ -8678,63 +10143,73 @@ clean-libtool:
        -rm -rf java/security/.libs java/security/_libs
        -rm -rf java/text/.libs java/text/_libs
        -rm -rf java/util/.libs java/util/_libs
+       -rm -rf java/util/concurrent/atomic/.libs java/util/concurrent/atomic/_libs
        -rm -rf java/util/logging/.libs java/util/logging/_libs
        -rm -rf java/util/zip/.libs java/util/zip/_libs
+       -rm -rf sun/misc/.libs sun/misc/_libs
 
 distclean-libtool:
-       -rm -f libtool
-uninstall-info-am:
+       -rm -f libtool config.lt
 install-dbexecDATA: $(dbexec_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(dbexecdir)" || $(mkdir_p) "$(DESTDIR)$(dbexecdir)"
-       @list='$(dbexec_DATA)'; for p in $$list; do \
+       test -z "$(dbexecdir)" || $(MKDIR_P) "$(DESTDIR)$(dbexecdir)"
+       @list='$(dbexec_DATA)'; test -n "$(dbexecdir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(dbexecDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbexecdir)/$$f'"; \
-         $(dbexecDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbexecdir)/$$f"; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbexecdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(dbexecdir)" || exit $$?; \
        done
 
 uninstall-dbexecDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(dbexec_DATA)'; for p in $$list; do \
-         f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(dbexecdir)/$$f'"; \
-         rm -f "$(DESTDIR)$(dbexecdir)/$$f"; \
-       done
+       @list='$(dbexec_DATA)'; test -n "$(dbexecdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(dbexecdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(dbexecdir)" && rm -f $$files
 install-jarDATA: $(jar_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(jardir)" || $(mkdir_p) "$(DESTDIR)$(jardir)"
-       @list='$(jar_DATA)'; for p in $$list; do \
+       test -z "$(jardir)" || $(MKDIR_P) "$(DESTDIR)$(jardir)"
+       @list='$(jar_DATA)'; test -n "$(jardir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(jarDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(jardir)/$$f'"; \
-         $(jarDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(jardir)/$$f"; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(jardir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(jardir)" || exit $$?; \
        done
 
 uninstall-jarDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(jar_DATA)'; for p in $$list; do \
-         f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(jardir)/$$f'"; \
-         rm -f "$(DESTDIR)$(jardir)/$$f"; \
-       done
+       @list='$(jar_DATA)'; test -n "$(jardir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(jardir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(jardir)" && rm -f $$files
 install-toolexecmainlibDATA: $(toolexecmainlib_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(toolexecmainlibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexecmainlibdir)"
-       @list='$(toolexecmainlib_DATA)'; for p in $$list; do \
+       test -z "$(toolexecmainlibdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexecmainlibdir)"
+       @list='$(toolexecmainlib_DATA)'; test -n "$(toolexecmainlibdir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(toolexecmainlibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(toolexecmainlibdir)/$$f'"; \
-         $(toolexecmainlibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(toolexecmainlibdir)/$$f"; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(toolexecmainlibdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexecmainlibdir)" || exit $$?; \
        done
 
 uninstall-toolexecmainlibDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(toolexecmainlib_DATA)'; for p in $$list; do \
-         f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(toolexecmainlibdir)/$$f'"; \
-         rm -f "$(DESTDIR)$(toolexecmainlibdir)/$$f"; \
-       done
+       @list='$(toolexecmainlib_DATA)'; test -n "$(toolexecmainlibdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(toolexecmainlibdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexecmainlibdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -8743,7 +10218,7 @@ 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):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
@@ -8760,16 +10235,15 @@ $(RECURSIVE_TARGETS):
          else \
            local_target="$$target"; \
          fi; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
          || eval $$failcom; \
        done; \
        if test "$$dot_seen" = "no"; then \
          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
        fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-       @failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
@@ -8795,16 +10269,16 @@ maintainer-clean-recursive:
          else \
            local_target="$$target"; \
          fi; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
          || eval $$failcom; \
        done && test -z "$$fail"
 tags-recursive:
        list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
        done
 ctags-recursive:
        list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
        done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -8812,14 +10286,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        unique=`for i in $$list; do \
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
        mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
-       tags=; \
+       set x; \
        here=`pwd`; \
        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
          include_option=--etags-include; \
@@ -8831,93 +10305,114 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
        list='$(SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
            test ! -f $$subdir/TAGS || \
-             tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+             set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
          fi; \
        done; \
        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
-       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       shift; \
+       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
          test -n "$$unique" || unique=$$empty_fix; \
-         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-           $$tags $$unique; \
+         if test $$# -gt 0; then \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             "$$@" $$unique; \
+         else \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$unique; \
+         fi; \
        fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
-       tags=; \
-       here=`pwd`; \
        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
-       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$unique" \
          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$tags $$unique
+            $$unique
 
 GTAGS:
        here=`$(am__cd) $(top_builddir) && pwd` \
-         && cd $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) $$here
+         && $(am__cd) $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
        $(am__remove_distdir)
-       mkdir $(distdir)
-       $(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 \
-         case $$file in \
-           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-         esac; \
+       test -d "$(distdir)" || mkdir "$(distdir)"
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       list='$(DISTFILES)'; \
+         dist_files=`for file in $$list; do echo $$file; done | \
+         sed -e "s|^$$srcdirstrip/||;t" \
+             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+       case $$dist_files in \
+         */*) $(MKDIR_P) `echo "$$dist_files" | \
+                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+                          sort -u` ;; \
+       esac; \
+       for file in $$dist_files; do \
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-           dir="/$$dir"; \
-           $(mkdir_p) "$(distdir)$$dir"; \
-         else \
-           dir=''; \
-         fi; \
          if test -d $$d/$$file; then \
+           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
-       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
            test -d "$(distdir)/$$subdir" \
-           || $(mkdir_p) "$(distdir)/$$subdir" \
+           || $(MKDIR_P) "$(distdir)/$$subdir" \
            || exit 1; \
-           distdir=`$(am__cd) $(distdir) && pwd`; \
-           top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-           (cd $$subdir && \
+         fi; \
+       done
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+           $(am__relativize); \
+           new_distdir=$$reldir; \
+           dir1=$$subdir; dir2="$(top_distdir)"; \
+           $(am__relativize); \
+           new_top_distdir=$$reldir; \
+           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+           ($(am__cd) $$subdir && \
              $(MAKE) $(AM_MAKEFLAGS) \
-               top_distdir="$$top_distdir" \
-               distdir="$$distdir/$$subdir" \
+               top_distdir="$$new_top_distdir" \
+               distdir="$$new_distdir" \
+               am__remove_distdir=: \
+               am__skip_length_check=: \
+               am__skip_mode_fix=: \
                distdir) \
              || exit 1; \
          fi; \
        done
-       -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+       -test -n "$(am__skip_mode_fix)" \
+       || find "$(distdir)" -type d ! -perm -755 \
+               -exec chmod u+rwx,go+rx {} \; -o \
          ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-         ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-       || chmod -R a+r $(distdir)
+         ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+       || chmod -R a+r "$(distdir)"
 dist-gzip: distdir
        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
        $(am__remove_distdir)
@@ -8926,6 +10421,14 @@ dist-bzip2: distdir
        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
        $(am__remove_distdir)
 
+dist-lzma: distdir
+       tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+       $(am__remove_distdir)
+
+dist-xz: distdir
+       tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+       $(am__remove_distdir)
+
 dist-tarZ: distdir
        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
        $(am__remove_distdir)
@@ -8949,13 +10452,17 @@ dist dist-all: distdir
 distcheck: dist
        case '$(DIST_ARCHIVES)' in \
        *.tar.gz*) \
-         GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+         GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
        *.tar.bz2*) \
-         bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+         bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+       *.tar.lzma*) \
+         lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+       *.tar.xz*) \
+         xz -dc $(distdir).tar.xz | $(am__untar) ;;\
        *.tar.Z*) \
          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
        *.shar.gz*) \
-         GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+         GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
        *.zip*) \
          unzip $(distdir).zip ;;\
        esac
@@ -8963,9 +10470,11 @@ distcheck: dist
        mkdir $(distdir)/_build
        mkdir $(distdir)/_inst
        chmod a-w $(distdir)
+       test -d $(distdir)/_build || exit 0; \
        dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-         && cd $(distdir)/_build \
+         && am__cwd=`pwd` \
+         && $(am__cd) $(distdir)/_build \
          && ../configure --srcdir=.. --prefix="$$dc_install_base" \
            $(DISTCHECK_CONFIGURE_FLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) \
@@ -8987,13 +10496,15 @@ distcheck: dist
          && rm -rf "$$dc_destdir" \
          && $(MAKE) $(AM_MAKEFLAGS) dist \
          && rm -rf $(DIST_ARCHIVES) \
-         && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+         && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+         && cd "$$am__cwd" \
+         || exit 1
        $(am__remove_distdir)
        @(echo "$(distdir) archives ready for distribution: "; \
          list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-         sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+         sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-       @cd $(distuninstallcheck_dir) \
+       @$(am__cd) '$(distuninstallcheck_dir)' \
        && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
           || { echo "ERROR: files left after uninstall:" ; \
                if test -n "$(DESTDIR)"; then \
@@ -9012,11 +10523,12 @@ distcleancheck: distclean
               exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) all-multi \
+               $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(jardir)" "$(DESTDIR)$(toolexecmainlibdir)"; do \
-         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       for dir in "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecsubdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(jardir)" "$(DESTDIR)$(toolexecmainlibdir)"; do \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -9039,6 +10551,7 @@ clean-generic:
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
        -rm -f classpath/tools/$(DEPDIR)/$(am__dirstamp)
        -rm -f classpath/tools/$(am__dirstamp)
        -rm -f gnu/classpath/$(DEPDIR)/$(am__dirstamp)
@@ -9063,6 +10576,8 @@ distclean-generic:
        -rm -f gnu/gcj/xlib/$(am__dirstamp)
        -rm -f gnu/java/lang/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/java/lang/$(am__dirstamp)
+       -rm -f gnu/java/lang/management/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/java/lang/management/$(am__dirstamp)
        -rm -f gnu/java/net/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/java/net/$(am__dirstamp)
        -rm -f gnu/java/net/protocol/core/$(DEPDIR)/$(am__dirstamp)
@@ -9071,6 +10586,8 @@ distclean-generic:
        -rm -f gnu/java/nio/$(am__dirstamp)
        -rm -f gnu/java/nio/channels/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/java/nio/channels/$(am__dirstamp)
+       -rm -f gnu/java/security/jce/prng/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/java/security/jce/prng/$(am__dirstamp)
        -rm -f java/io/$(DEPDIR)/$(am__dirstamp)
        -rm -f java/io/$(am__dirstamp)
        -rm -f java/lang/$(DEPDIR)/$(am__dirstamp)
@@ -9091,25 +10608,28 @@ distclean-generic:
        -rm -f java/text/$(am__dirstamp)
        -rm -f java/util/$(DEPDIR)/$(am__dirstamp)
        -rm -f java/util/$(am__dirstamp)
+       -rm -f java/util/concurrent/atomic/$(DEPDIR)/$(am__dirstamp)
+       -rm -f java/util/concurrent/atomic/$(am__dirstamp)
        -rm -f java/util/logging/$(DEPDIR)/$(am__dirstamp)
        -rm -f java/util/logging/$(am__dirstamp)
        -rm -f java/util/zip/$(DEPDIR)/$(am__dirstamp)
        -rm -f java/util/zip/$(am__dirstamp)
+       -rm -f sun/misc/$(DEPDIR)/$(am__dirstamp)
+       -rm -f sun/misc/$(am__dirstamp)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-@USE_LIBGCJ_BC_FALSE@install-exec-hook:
-clean: clean-recursive
+clean: clean-multi clean-recursive
 
 clean-am: clean-binPROGRAMS clean-dbexecLTLIBRARIES clean-generic \
-       clean-libtool clean-noinstPROGRAMS \
+       clean-libexecsubPROGRAMS clean-libtool clean-noinstPROGRAMS \
        clean-toolexeclibLTLIBRARIES mostlyclean-am
 
-distclean: distclean-recursive
+distclean: distclean-multi distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/management/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) gnu/java/security/jce/prng/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/concurrent/atomic/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) sun/misc/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-libtool distclean-local distclean-tags
@@ -9120,32 +10640,52 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-data-local install-jarDATA
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS install-binSCRIPTS \
        install-dbexecDATA install-dbexecLTLIBRARIES \
+       install-libexecsubPROGRAMS install-multi \
        install-toolexeclibLTLIBRARIES install-toolexecmainlibDATA
        @$(NORMAL_INSTALL)
        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-html: install-html-recursive
+
+install-html-am:
 
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
-maintainer-clean: maintainer-clean-recursive
+maintainer-clean: maintainer-clean-multi maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
-       -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/management/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) gnu/java/security/jce/prng/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/concurrent/atomic/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) sun/misc/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-multi mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
        mostlyclean-libtool mostlyclean-local
@@ -9160,38 +10700,46 @@ ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
        uninstall-dbexecDATA uninstall-dbexecLTLIBRARIES \
-       uninstall-info-am uninstall-jarDATA \
+       uninstall-jarDATA uninstall-libexecsubPROGRAMS \
        uninstall-toolexeclibLTLIBRARIES uninstall-toolexecmainlibDATA
 
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-       check-am clean clean-binPROGRAMS clean-dbexecLTLIBRARIES \
-       clean-generic clean-libtool clean-noinstPROGRAMS \
-       clean-recursive clean-toolexeclibLTLIBRARIES ctags \
-       ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
-       dist-tarZ dist-zip distcheck distclean distclean-compile \
-       distclean-generic distclean-libtool distclean-local \
-       distclean-recursive distclean-tags distcleancheck distdir \
-       distuninstallcheck dvi dvi-am html html-am info info-am \
-       install install-am install-binPROGRAMS install-binSCRIPTS \
-       install-data install-data-am install-data-local \
-       install-dbexecDATA install-dbexecLTLIBRARIES install-exec \
-       install-exec-am install-exec-hook install-info install-info-am \
-       install-jarDATA install-man install-strip \
-       install-toolexeclibLTLIBRARIES install-toolexecmainlibDATA \
-       installcheck installcheck-am installdirs installdirs-am \
-       maintainer-clean maintainer-clean-generic \
-       maintainer-clean-recursive mostlyclean mostlyclean-compile \
-       mostlyclean-generic mostlyclean-libtool mostlyclean-local \
-       mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-       uninstall uninstall-am uninstall-binPROGRAMS \
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all-multi \
+       clean-multi ctags-recursive distclean-multi install-am \
+       install-exec-am install-multi install-strip \
+       maintainer-clean-multi mostlyclean-multi tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+       all all-am all-multi am--refresh check check-am clean \
+       clean-binPROGRAMS clean-dbexecLTLIBRARIES clean-generic \
+       clean-libexecsubPROGRAMS clean-libtool clean-multi \
+       clean-noinstPROGRAMS clean-toolexeclibLTLIBRARIES ctags \
+       ctags-recursive distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-local distclean-multi \
+       distclean-tags dvi dvi-am html html-am info info-am install \
+       install-am install-binPROGRAMS install-binSCRIPTS install-data \
+       install-data-am install-data-local install-dbexecDATA \
+       install-dbexecLTLIBRARIES install-dvi install-dvi-am \
+       install-exec install-exec-am install-exec-hook install-html \
+       install-html-am install-info install-info-am install-jarDATA \
+       install-libexecsubPROGRAMS install-man install-multi \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip install-toolexeclibLTLIBRARIES \
+       install-toolexecmainlibDATA installcheck installcheck-am \
+       installdirs installdirs-am maintainer-clean \
+       maintainer-clean-generic maintainer-clean-multi mostlyclean \
+       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+       mostlyclean-local mostlyclean-multi pdf pdf-am ps ps-am tags \
+       tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \
        uninstall-binSCRIPTS uninstall-dbexecDATA \
-       uninstall-dbexecLTLIBRARIES uninstall-info-am \
-       uninstall-jarDATA uninstall-toolexeclibLTLIBRARIES \
+       uninstall-dbexecLTLIBRARIES uninstall-jarDATA \
+       uninstall-libexecsubPROGRAMS uninstall-toolexeclibLTLIBRARIES \
        uninstall-toolexecmainlibDATA
 
 
+interpret.lo:  AM_CXXFLAGS += -fwrapv
+@BUILD_SUBLIBS_TRUE@libgcj-noncore-dummy.dll.a : $(srcdir)/libgcj-noncore-dummy.def
+@BUILD_SUBLIBS_TRUE@   $(DLLTOOL) -d $^ -l $@ --dllname cyggcj-noncore-$(DLL_VERSION).dll 
+
 $(db_name): gcj-dbtool$(EXEEXT)
        @rm -f $(db_name)
        ./gcj-dbtool -n $(db_name) || touch $(db_name)
@@ -9211,14 +10759,15 @@ $(propertyo_files): %.lo: classpath/resource/%
        $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,$(@:.lo=)
 
 libgcj-$(gcc_version).jar: classpath/lib/compile-classes
-       cd classpath/lib; $(JAR) -cfM \
-           ../../libgcj-$(gcc_version).jar gnu java javax org
+       here=`pwd`; cd $(srcdir)/classpath/lib; \
+       find gnu java javax org sun -name .svn -prune -o -name '*.class' -print | \
+       $(JAR) -cfM@ $$here/libgcj-$(gcc_version).jar
 
-libgcj-tools-$(gcc_version).jar: classpath/tools/tools.jar
+libgcj-tools-$(gcc_version).jar: classpath/tools/tools.zip
        cp $< $@
 
 mostlyclean-local:
-       find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f
+       find . -name '*.lo' -print | xargs $(LIBTOOL) --mode=clean rm -f
 
 distclean-local:
        find . -name '*.d' -print | xargs rm -f
@@ -9233,2556 +10782,1816 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND
        $(lib_gnu_awt_xlib_la_LINK) -objectlist lib_gnu_awt_xlib.objectlist \
        -rpath $(toolexeclibdir) $(lib_gnu_awt_xlib_la_LDFLAGS) $(LIBS)
 
+# Concurrent things use reflection internally.
+java/util/concurrent.lo \
+java/util/concurrent/atomic.lo \
+java/util/concurrent/locks.lo: LIBGCJ_REDUCED_REFLECTION_FLAGS =
+
 %.lo: %.list
-       $(LTGCJCOMPILE) -c -o $@ -MT $@ -MD -MP -MF $(basename $@).deps @$<
+       $(LTGCJCOMPILE) $(LIBGCJ_REDUCED_REFLECTION_FLAGS) -c -o $@ -fsource-filename=$(here)/classpath/lib/classes -MT $@ -MD -MP -MF $(basename $@).deps @$<
+
+java/lang/Object.lo: classpath/lib/java/lang/Object.class
+       $(LTGCJCOMPILE) -c -o $@ -fsource-filename=$(srcdir)/$(basename $@).java $<
+
+java/lang/Class.lo: classpath/lib/java/lang/Class.class
+       $(LTGCJCOMPILE) -c -o $@  -fsource-filename=$(srcdir)/$(basename $@).java $<
 
 gnu-CORBA.lo: $(gnu_CORBA_source_files)
-       @find classpath/lib/gnu/CORBA -name '*.class' > gnu-CORBA.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-CORBA.lo @gnu-CORBA.list
+       @find $(srcdir)/classpath/lib/gnu/CORBA -name '*.class' > gnu-CORBA.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-CORBA.lo @gnu-CORBA.list
        @rm -f gnu-CORBA.list
 
 gnu/awt.list: $(gnu_awt_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_awt_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/awt.list
+       echo $(srcdir)/classpath/lib/gnu/awt/*.class > gnu/awt.list
 
 -include gnu/awt.deps
 
 gnu/awt/j2d.list: $(gnu_awt_j2d_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_awt_j2d_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/awt/j2d.list
+       echo $(srcdir)/classpath/lib/gnu/awt/j2d/*.class > gnu/awt/j2d.list
 
 -include gnu/awt/j2d.deps
 
 gnu/awt/xlib.list: $(gnu_awt_xlib_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_awt_xlib_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/awt/xlib.list
+       echo $(srcdir)/classpath/lib/gnu/awt/xlib/*.class > gnu/awt/xlib.list
 
 -include gnu/awt/xlib.deps
 
 gnu/classpath.list: $(gnu_classpath_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_classpath_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/classpath.list
+       echo $(srcdir)/classpath/lib/gnu/classpath/*.class > gnu/classpath.list
 
 -include gnu/classpath.deps
 
 gnu/classpath/debug.list: $(gnu_classpath_debug_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_classpath_debug_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/classpath/debug.list
+       echo $(srcdir)/classpath/lib/gnu/classpath/debug/*.class > gnu/classpath/debug.list
 
 -include gnu/classpath/debug.deps
 
 gnu/classpath/jdwp.list: $(gnu_classpath_jdwp_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_classpath_jdwp_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/classpath/jdwp.list
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/*.class > gnu/classpath/jdwp.list
 
 -include gnu/classpath/jdwp.deps
 
 gnu/classpath/jdwp/event.list: $(gnu_classpath_jdwp_event_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_classpath_jdwp_event_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/classpath/jdwp/event.list
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/event/*.class > gnu/classpath/jdwp/event.list
 
 -include gnu/classpath/jdwp/event.deps
 
 gnu/classpath/jdwp/event/filters.list: $(gnu_classpath_jdwp_event_filters_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_classpath_jdwp_event_filters_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/classpath/jdwp/event/filters.list
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/event/filters/*.class > gnu/classpath/jdwp/event/filters.list
 
 -include gnu/classpath/jdwp/event/filters.deps
 
 gnu/classpath/jdwp/exception.list: $(gnu_classpath_jdwp_exception_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_classpath_jdwp_exception_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/classpath/jdwp/exception.list
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/exception/*.class > gnu/classpath/jdwp/exception.list
 
 -include gnu/classpath/jdwp/exception.deps
 
 gnu/classpath/jdwp/id.list: $(gnu_classpath_jdwp_id_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_classpath_jdwp_id_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/classpath/jdwp/id.list
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/id/*.class > gnu/classpath/jdwp/id.list
 
 -include gnu/classpath/jdwp/id.deps
 
 gnu/classpath/jdwp/processor.list: $(gnu_classpath_jdwp_processor_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_classpath_jdwp_processor_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/classpath/jdwp/processor.list
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/processor/*.class > gnu/classpath/jdwp/processor.list
 
 -include gnu/classpath/jdwp/processor.deps
 
 gnu/classpath/jdwp/transport.list: $(gnu_classpath_jdwp_transport_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_classpath_jdwp_transport_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/classpath/jdwp/transport.list
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/transport/*.class > gnu/classpath/jdwp/transport.list
 
 -include gnu/classpath/jdwp/transport.deps
 
 gnu/classpath/jdwp/util.list: $(gnu_classpath_jdwp_util_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_classpath_jdwp_util_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/classpath/jdwp/util.list
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/util/*.class > gnu/classpath/jdwp/util.list
 
 -include gnu/classpath/jdwp/util.deps
 
+gnu/classpath/jdwp/value.list: $(gnu_classpath_jdwp_value_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/classpath/jdwp/value/*.class > gnu/classpath/jdwp/value.list
+
+-include gnu/classpath/jdwp/value.deps
+
+gnu/classpath/toolkit.list: $(gnu_classpath_toolkit_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/classpath/toolkit/*.class > gnu/classpath/toolkit.list
+
+-include gnu/classpath/toolkit.deps
+
 gnu/gcj.list: $(gnu_gcj_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_gcj_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/gcj.list
+       echo $(srcdir)/classpath/lib/gnu/gcj/*.class > gnu/gcj.list
 
 -include gnu/gcj.deps
 
 gnu/gcj/convert.list: $(gnu_gcj_convert_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_gcj_convert_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/gcj/convert.list
+       echo $(srcdir)/classpath/lib/gnu/gcj/convert/*.class > gnu/gcj/convert.list
 
 -include gnu/gcj/convert.deps
 
 gnu/gcj/io.list: $(gnu_gcj_io_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_gcj_io_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/gcj/io.list
+       echo $(srcdir)/classpath/lib/gnu/gcj/io/*.class > gnu/gcj/io.list
 
 -include gnu/gcj/io.deps
 
 gnu/gcj/jvmti.list: $(gnu_gcj_jvmti_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_gcj_jvmti_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/gcj/jvmti.list
+       echo $(srcdir)/classpath/lib/gnu/gcj/jvmti/*.class > gnu/gcj/jvmti.list
 
 -include gnu/gcj/jvmti.deps
 
 gnu/gcj/runtime.list: $(gnu_gcj_runtime_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_gcj_runtime_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/gcj/runtime.list
+       echo $(srcdir)/classpath/lib/gnu/gcj/runtime/*.class > gnu/gcj/runtime.list
 
 -include gnu/gcj/runtime.deps
 
+gnu/gcj/tools/gcj_dbtool.list: $(gnu_gcj_tools_gcj_dbtool_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/gcj/tools/gcj_dbtool/*.class > gnu/gcj/tools/gcj_dbtool.list
+
+-include gnu/gcj/tools/gcj_dbtool.deps
+
 gnu/gcj/util.list: $(gnu_gcj_util_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_gcj_util_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/gcj/util.list
+       echo $(srcdir)/classpath/lib/gnu/gcj/util/*.class > gnu/gcj/util.list
 
 -include gnu/gcj/util.deps
 
 gnu/gcj/xlib.list: $(gnu_gcj_xlib_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_gcj_xlib_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/gcj/xlib.list
+       echo $(srcdir)/classpath/lib/gnu/gcj/xlib/*.class > gnu/gcj/xlib.list
 
 -include gnu/gcj/xlib.deps
 
 gnu/java/awt.list: $(gnu_java_awt_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_awt_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/awt.list
+       echo $(srcdir)/classpath/lib/gnu/java/awt/*.class > gnu/java/awt.list
 
 -include gnu/java/awt.deps
 
 gnu/java/awt/color.list: $(gnu_java_awt_color_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_awt_color_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/awt/color.list
+       echo $(srcdir)/classpath/lib/gnu/java/awt/color/*.class > gnu/java/awt/color.list
 
 -include gnu/java/awt/color.deps
 
 gnu/java/awt/dnd.list: $(gnu_java_awt_dnd_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_awt_dnd_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/awt/dnd.list
+       echo $(srcdir)/classpath/lib/gnu/java/awt/dnd/*.class > gnu/java/awt/dnd.list
 
 -include gnu/java/awt/dnd.deps
 
 gnu-java-awt-dnd-peer-gtk.lo: $(gnu_java_awt_dnd_peer_gtk_source_files)
-       @find classpath/lib/gnu/java/awt/dnd/peer/gtk -name '*.class' > gnu-java-awt-dnd-peer-gtk.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-dnd-peer-gtk.lo @gnu-java-awt-dnd-peer-gtk.list
+       @find $(srcdir)/classpath/lib/gnu/java/awt/dnd/peer/gtk -name '*.class' > gnu-java-awt-dnd-peer-gtk.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-awt-dnd-peer-gtk.lo @gnu-java-awt-dnd-peer-gtk.list
        @rm -f gnu-java-awt-dnd-peer-gtk.list
 
 gnu/java/awt/font.list: $(gnu_java_awt_font_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_awt_font_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/awt/font.list
+       echo $(srcdir)/classpath/lib/gnu/java/awt/font/*.class > gnu/java/awt/font.list
 
 -include gnu/java/awt/font.deps
 
+gnu/java/awt/font/autofit.list: $(gnu_java_awt_font_autofit_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/awt/font/autofit/*.class > gnu/java/awt/font/autofit.list
+
+-include gnu/java/awt/font/autofit.deps
+
 gnu/java/awt/font/opentype.list: $(gnu_java_awt_font_opentype_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/java/awt/font/opentype/*.class > gnu/java/awt/font/opentype.list
 
 -include gnu/java/awt/font/opentype.deps
 
 gnu/java/awt/font/opentype/truetype.list: $(gnu_java_awt_font_opentype_truetype_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/java/awt/font/opentype/truetype/*.class > gnu/java/awt/font/opentype/truetype.list
 
 -include gnu/java/awt/font/opentype/truetype.deps
 
 gnu/java/awt/image.list: $(gnu_java_awt_image_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_awt_image_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/awt/image.list
+       echo $(srcdir)/classpath/lib/gnu/java/awt/image/*.class > gnu/java/awt/image.list
 
 -include gnu/java/awt/image.deps
 
 gnu/java/awt/java2d.list: $(gnu_java_awt_java2d_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/java/awt/java2d/*.class > gnu/java/awt/java2d.list
 
 -include gnu/java/awt/java2d.deps
 
 gnu/java/awt/peer.list: $(gnu_java_awt_peer_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_awt_peer_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/awt/peer.list
+       echo $(srcdir)/classpath/lib/gnu/java/awt/peer/*.class > gnu/java/awt/peer.list
 
 -include gnu/java/awt/peer.deps
 
 gnu-java-awt-peer-gtk.lo: $(gnu_java_awt_peer_gtk_source_files)
-       @find classpath/lib/gnu/java/awt/peer/gtk -name '*.class' > gnu-java-awt-peer-gtk.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-gtk.lo @gnu-java-awt-peer-gtk.list
+       @find $(srcdir)/classpath/lib/gnu/java/awt/peer/gtk -name '*.class' > gnu-java-awt-peer-gtk.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-awt-peer-gtk.lo @gnu-java-awt-peer-gtk.list
        @rm -f gnu-java-awt-peer-gtk.list
 
+gnu/java/awt/peer/headless.list: $(gnu_java_awt_peer_headless_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/java/awt/peer/headless/*.class > gnu/java/awt/peer/headless.list
+
+-include gnu/java/awt/peer/headless.deps
+
 gnu-java-awt-peer-qt.lo: $(gnu_java_awt_peer_qt_source_files)
-       @find classpath/lib/gnu/java/awt/peer/qt -name '*.class' > gnu-java-awt-peer-qt.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-qt.lo @gnu-java-awt-peer-qt.list
+       @find $(srcdir)/classpath/lib/gnu/java/awt/peer/qt -name '*.class' > gnu-java-awt-peer-qt.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-awt-peer-qt.lo @gnu-java-awt-peer-qt.list
        @rm -f gnu-java-awt-peer-qt.list
 
 gnu-java-awt-peer-swing.lo: $(gnu_java_awt_peer_swing_source_files)
-       @find classpath/lib/gnu/java/awt/peer/swing -name '*.class' > gnu-java-awt-peer-swing.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-swing.lo @gnu-java-awt-peer-swing.list
+       @find $(srcdir)/classpath/lib/gnu/java/awt/peer/swing -name '*.class' > gnu-java-awt-peer-swing.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-awt-peer-swing.lo @gnu-java-awt-peer-swing.list
        @rm -f gnu-java-awt-peer-swing.list
 
+gnu-java-awt-peer-x.lo: $(gnu_java_awt_peer_x_source_files)
+       @find $(srcdir)/classpath/lib/gnu/java/awt/peer/x -name '*.class' > gnu-java-awt-peer-x.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-awt-peer-x.lo @gnu-java-awt-peer-x.list
+       @rm -f gnu-java-awt-peer-x.list
+
 gnu/java/awt/print.list: $(gnu_java_awt_print_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/java/awt/print/*.class > gnu/java/awt/print.list
 
 -include gnu/java/awt/print.deps
 
 gnu-java-beans.lo: $(gnu_java_beans_source_files)
-       @find classpath/lib/gnu/java/beans -name '*.class' > gnu-java-beans.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-beans.lo @gnu-java-beans.list
+       @find $(srcdir)/classpath/lib/gnu/java/beans -name '*.class' > gnu-java-beans.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-beans.lo @gnu-java-beans.list
        @rm -f gnu-java-beans.list
 
 gnu/java/io.list: $(gnu_java_io_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_io_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/io.list
+       echo $(srcdir)/classpath/lib/gnu/java/io/*.class > gnu/java/io.list
 
 -include gnu/java/io.deps
 
 gnu/java/lang.list: $(gnu_java_lang_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_lang_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/lang.list
+       echo $(srcdir)/classpath/lib/gnu/java/lang/*.class > gnu/java/lang.list
 
 -include gnu/java/lang.deps
 
-gnu/java/lang/management.list: $(gnu_java_lang_management_source_files)
-       @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_lang_management_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/lang/management.list
-
--include gnu/java/lang/management.deps
+gnu-java-lang-management.lo: $(gnu_java_lang_management_source_files)
+       @find $(srcdir)/classpath/lib/gnu/java/lang/management -name '*.class' > gnu-java-lang-management.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes $(LIBGCJ_BC_FLAGS) -c -o gnu-java-lang-management.lo @gnu-java-lang-management.list
+       @rm -f gnu-java-lang-management.list
 
 gnu/java/lang/reflect.list: $(gnu_java_lang_reflect_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_lang_reflect_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/lang/reflect.list
+       echo $(srcdir)/classpath/lib/gnu/java/lang/reflect/*.class > gnu/java/lang/reflect.list
 
 -include gnu/java/lang/reflect.deps
 
 gnu/java/locale.list: $(gnu_java_locale_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_locale_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/locale.list
+       echo $(srcdir)/classpath/lib/gnu/java/locale/*.class > gnu/java/locale.list
 
 -include gnu/java/locale.deps
 
-gnu/java/math.list: $(gnu_java_math_source_files)
-       @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_math_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/math.list
-
--include gnu/java/math.deps
+gnu-java-math.lo: $(gnu_java_math_source_files)
+       @find $(srcdir)/classpath/lib/gnu/java/math -name '*.class' > gnu-java-math.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-math.lo @gnu-java-math.list
+       @rm -f gnu-java-math.list
 
 gnu/java/net.list: $(gnu_java_net_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_net_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/*.class > gnu/java/net.list
 
 -include gnu/java/net.deps
 
 gnu/java/net/loader.list: $(gnu_java_net_loader_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_net_loader_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net/loader.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/loader/*.class > gnu/java/net/loader.list
 
 -include gnu/java/net/loader.deps
 
 gnu/java/net/local.list: $(gnu_java_net_local_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/java/net/local/*.class > gnu/java/net/local.list
 
 -include gnu/java/net/local.deps
 
 gnu/java/net/protocol/core.list: $(gnu_java_net_protocol_core_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/core/*.class > gnu/java/net/protocol/core.list
 
 -include gnu/java/net/protocol/core.deps
 
 gnu/java/net/protocol/file.list: $(gnu_java_net_protocol_file_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_net_protocol_file_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net/protocol/file.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/file/*.class > gnu/java/net/protocol/file.list
 
 -include gnu/java/net/protocol/file.deps
 
 gnu/java/net/protocol/ftp.list: $(gnu_java_net_protocol_ftp_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_net_protocol_ftp_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net/protocol/ftp.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/ftp/*.class > gnu/java/net/protocol/ftp.list
 
 -include gnu/java/net/protocol/ftp.deps
 
 gnu/java/net/protocol/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
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/gcjlib/*.class > 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 \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net/protocol/http.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/http/*.class > gnu/java/net/protocol/http.list
 
 -include gnu/java/net/protocol/http.deps
 
 gnu/java/net/protocol/https.list: $(gnu_java_net_protocol_https_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_net_protocol_https_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net/protocol/https.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/https/*.class > gnu/java/net/protocol/https.list
 
 -include gnu/java/net/protocol/https.deps
 
 gnu/java/net/protocol/jar.list: $(gnu_java_net_protocol_jar_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_net_protocol_jar_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/net/protocol/jar.list
+       echo $(srcdir)/classpath/lib/gnu/java/net/protocol/jar/*.class > gnu/java/net/protocol/jar.list
 
 -include gnu/java/net/protocol/jar.deps
 
 gnu/java/nio.list: $(gnu_java_nio_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_nio_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/nio.list
+       echo $(srcdir)/classpath/lib/gnu/java/nio/*.class > gnu/java/nio.list
 
 -include gnu/java/nio.deps
 
 gnu/java/nio/channels.list: $(gnu_java_nio_channels_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_nio_channels_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/nio/channels.list
+       echo $(srcdir)/classpath/lib/gnu/java/nio/channels/*.class > gnu/java/nio/channels.list
 
 -include gnu/java/nio/channels.deps
 
 gnu/java/nio/charset.list: $(gnu_java_nio_charset_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_nio_charset_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/nio/charset.list
+       echo $(srcdir)/classpath/lib/gnu/java/nio/charset/*.class > gnu/java/nio/charset.list
 
 -include gnu/java/nio/charset.deps
 
 gnu/java/rmi.list: $(gnu_java_rmi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_rmi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/rmi.list
+       echo $(srcdir)/classpath/lib/gnu/java/rmi/*.class > gnu/java/rmi.list
 
 -include gnu/java/rmi.deps
 
 gnu/java/rmi/activation.list: $(gnu_java_rmi_activation_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/java/rmi/activation/*.class > gnu/java/rmi/activation.list
 
 -include gnu/java/rmi/activation.deps
 
 gnu/java/rmi/dgc.list: $(gnu_java_rmi_dgc_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_rmi_dgc_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/rmi/dgc.list
+       echo $(srcdir)/classpath/lib/gnu/java/rmi/dgc/*.class > gnu/java/rmi/dgc.list
 
 -include gnu/java/rmi/dgc.deps
 
 gnu/java/rmi/registry.list: $(gnu_java_rmi_registry_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_rmi_registry_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/rmi/registry.list
+       echo $(srcdir)/classpath/lib/gnu/java/rmi/registry/*.class > gnu/java/rmi/registry.list
 
 -include gnu/java/rmi/registry.deps
 
-gnu/java/rmi/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 \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/rmi/server.list
+       echo $(srcdir)/classpath/lib/gnu/java/rmi/server/*.class > gnu/java/rmi/server.list
 
 -include gnu/java/rmi/server.deps
 
 gnu/java/security.list: $(gnu_java_security_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/*.class > gnu/java/security.list
 
 -include gnu/java/security.deps
 
 gnu/java/security/action.list: $(gnu_java_security_action_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_action_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/action.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/action/*.class > gnu/java/security/action.list
 
 -include gnu/java/security/action.deps
 
 gnu/java/security/ber.list: $(gnu_java_security_ber_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_ber_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/ber.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/ber/*.class > gnu/java/security/ber.list
 
 -include gnu/java/security/ber.deps
 
 gnu/java/security/der.list: $(gnu_java_security_der_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_der_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/der.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/der/*.class > gnu/java/security/der.list
 
 -include gnu/java/security/der.deps
 
 gnu/java/security/hash.list: $(gnu_java_security_hash_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_hash_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/hash.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/hash/*.class > gnu/java/security/hash.list
 
 -include gnu/java/security/hash.deps
 
 gnu/java/security/jce/hash.list: $(gnu_java_security_jce_hash_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_jce_hash_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/jce/hash.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/jce/hash/*.class > gnu/java/security/jce/hash.list
 
 -include gnu/java/security/jce/hash.deps
 
 gnu/java/security/jce/prng.list: $(gnu_java_security_jce_prng_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_jce_prng_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/jce/prng.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/jce/prng/*.class > gnu/java/security/jce/prng.list
 
 -include gnu/java/security/jce/prng.deps
 
 gnu/java/security/jce/sig.list: $(gnu_java_security_jce_sig_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_jce_sig_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/jce/sig.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/jce/sig/*.class > gnu/java/security/jce/sig.list
 
 -include gnu/java/security/jce/sig.deps
 
 gnu/java/security/key.list: $(gnu_java_security_key_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_key_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/key.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/key/*.class > gnu/java/security/key.list
 
 -include gnu/java/security/key.deps
 
 gnu/java/security/key/dss.list: $(gnu_java_security_key_dss_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_key_dss_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/key/dss.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/key/dss/*.class > gnu/java/security/key/dss.list
 
 -include gnu/java/security/key/dss.deps
 
 gnu/java/security/key/rsa.list: $(gnu_java_security_key_rsa_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_key_rsa_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/key/rsa.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/key/rsa/*.class > gnu/java/security/key/rsa.list
 
 -include gnu/java/security/key/rsa.deps
 
 gnu/java/security/pkcs.list: $(gnu_java_security_pkcs_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_pkcs_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/pkcs.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/pkcs/*.class > gnu/java/security/pkcs.list
 
 -include gnu/java/security/pkcs.deps
 
 gnu/java/security/prng.list: $(gnu_java_security_prng_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_prng_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/prng.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/prng/*.class > gnu/java/security/prng.list
 
 -include gnu/java/security/prng.deps
 
 gnu/java/security/provider.list: $(gnu_java_security_provider_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_provider_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/provider.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/provider/*.class > gnu/java/security/provider.list
 
 -include gnu/java/security/provider.deps
 
 gnu/java/security/sig.list: $(gnu_java_security_sig_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_sig_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/sig.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/sig/*.class > gnu/java/security/sig.list
 
 -include gnu/java/security/sig.deps
 
 gnu/java/security/sig/dss.list: $(gnu_java_security_sig_dss_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_sig_dss_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/sig/dss.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/sig/dss/*.class > gnu/java/security/sig/dss.list
 
 -include gnu/java/security/sig/dss.deps
 
 gnu/java/security/sig/rsa.list: $(gnu_java_security_sig_rsa_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_sig_rsa_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/sig/rsa.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/sig/rsa/*.class > gnu/java/security/sig/rsa.list
 
 -include gnu/java/security/sig/rsa.deps
 
 gnu/java/security/util.list: $(gnu_java_security_util_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_util_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/util.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/util/*.class > gnu/java/security/util.list
 
 -include gnu/java/security/util.deps
 
 gnu/java/security/x509.list: $(gnu_java_security_x509_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_x509_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/x509.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/x509/*.class > gnu/java/security/x509.list
 
 -include gnu/java/security/x509.deps
 
 gnu/java/security/x509/ext.list: $(gnu_java_security_x509_ext_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_security_x509_ext_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/security/x509/ext.list
+       echo $(srcdir)/classpath/lib/gnu/java/security/x509/ext/*.class > gnu/java/security/x509/ext.list
 
 -include gnu/java/security/x509/ext.deps
 
 gnu/java/text.list: $(gnu_java_text_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_text_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/text.list
+       echo $(srcdir)/classpath/lib/gnu/java/text/*.class > gnu/java/text.list
 
 -include gnu/java/text.deps
 
 gnu/java/util.list: $(gnu_java_util_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_util_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/util.list
+       echo $(srcdir)/classpath/lib/gnu/java/util/*.class > gnu/java/util.list
 
 -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
+       echo $(srcdir)/classpath/lib/gnu/java/util/jar/*.class > gnu/java/util/jar.list
 
 -include gnu/java/util/jar.deps
 
 gnu/java/util/prefs.list: $(gnu_java_util_prefs_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_util_prefs_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/util/prefs.list
+       echo $(srcdir)/classpath/lib/gnu/java/util/prefs/*.class > gnu/java/util/prefs.list
 
 -include gnu/java/util/prefs.deps
 
 gnu-java-util-prefs-gconf.lo: $(gnu_java_util_prefs_gconf_source_files)
-       @find classpath/lib/gnu/java/util/prefs/gconf -name '*.class' > gnu-java-util-prefs-gconf.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-util-prefs-gconf.lo @gnu-java-util-prefs-gconf.list
+       @find $(srcdir)/classpath/lib/gnu/java/util/prefs/gconf -name '*.class' > gnu-java-util-prefs-gconf.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-util-prefs-gconf.lo @gnu-java-util-prefs-gconf.list
        @rm -f gnu-java-util-prefs-gconf.list
 
 gnu/java/util/regex.list: $(gnu_java_util_regex_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_java_util_regex_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/java/util/regex.list
+       echo $(srcdir)/classpath/lib/gnu/java/util/regex/*.class > gnu/java/util/regex.list
 
 -include gnu/java/util/regex.deps
 
+gnu/javax/activation/viewers.list: $(gnu_javax_activation_viewers_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/activation/viewers/*.class > gnu/javax/activation/viewers.list
+
+-include gnu/javax/activation/viewers.deps
+
 gnu/javax/crypto.list: $(gnu_javax_crypto_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/*.class > gnu/javax/crypto.list
 
 -include gnu/javax/crypto.deps
 
 gnu/javax/crypto/assembly.list: $(gnu_javax_crypto_assembly_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_assembly_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/assembly.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/assembly/*.class > gnu/javax/crypto/assembly.list
 
 -include gnu/javax/crypto/assembly.deps
 
 gnu/javax/crypto/cipher.list: $(gnu_javax_crypto_cipher_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_cipher_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/cipher.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/cipher/*.class > gnu/javax/crypto/cipher.list
 
 -include gnu/javax/crypto/cipher.deps
 
 gnu/javax/crypto/jce.list: $(gnu_javax_crypto_jce_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_jce_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/jce.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/*.class > gnu/javax/crypto/jce.list
 
 -include gnu/javax/crypto/jce.deps
 
 gnu/javax/crypto/jce/cipher.list: $(gnu_javax_crypto_jce_cipher_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_jce_cipher_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/jce/cipher.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/cipher/*.class > gnu/javax/crypto/jce/cipher.list
 
 -include gnu/javax/crypto/jce/cipher.deps
 
 gnu/javax/crypto/jce/key.list: $(gnu_javax_crypto_jce_key_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_jce_key_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/jce/key.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/key/*.class > gnu/javax/crypto/jce/key.list
 
 -include gnu/javax/crypto/jce/key.deps
 
 gnu/javax/crypto/jce/keyring.list: $(gnu_javax_crypto_jce_keyring_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_jce_keyring_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/jce/keyring.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/keyring/*.class > gnu/javax/crypto/jce/keyring.list
 
 -include gnu/javax/crypto/jce/keyring.deps
 
 gnu/javax/crypto/jce/mac.list: $(gnu_javax_crypto_jce_mac_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_jce_mac_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/jce/mac.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/mac/*.class > gnu/javax/crypto/jce/mac.list
 
 -include gnu/javax/crypto/jce/mac.deps
 
 gnu/javax/crypto/jce/params.list: $(gnu_javax_crypto_jce_params_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_jce_params_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/jce/params.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/params/*.class > gnu/javax/crypto/jce/params.list
 
 -include gnu/javax/crypto/jce/params.deps
 
 gnu/javax/crypto/jce/prng.list: $(gnu_javax_crypto_jce_prng_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_jce_prng_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/jce/prng.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/prng/*.class > gnu/javax/crypto/jce/prng.list
 
 -include gnu/javax/crypto/jce/prng.deps
 
 gnu/javax/crypto/jce/sig.list: $(gnu_javax_crypto_jce_sig_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_jce_sig_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/jce/sig.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/sig/*.class > gnu/javax/crypto/jce/sig.list
 
 -include gnu/javax/crypto/jce/sig.deps
 
 gnu/javax/crypto/jce/spec.list: $(gnu_javax_crypto_jce_spec_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_jce_spec_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/jce/spec.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/jce/spec/*.class > gnu/javax/crypto/jce/spec.list
 
 -include gnu/javax/crypto/jce/spec.deps
 
 gnu/javax/crypto/key.list: $(gnu_javax_crypto_key_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_key_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/key.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/key/*.class > gnu/javax/crypto/key.list
 
 -include gnu/javax/crypto/key.deps
 
 gnu/javax/crypto/key/dh.list: $(gnu_javax_crypto_key_dh_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_key_dh_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/key/dh.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/key/dh/*.class > gnu/javax/crypto/key/dh.list
 
 -include gnu/javax/crypto/key/dh.deps
 
 gnu/javax/crypto/key/srp6.list: $(gnu_javax_crypto_key_srp6_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_key_srp6_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/key/srp6.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/key/srp6/*.class > gnu/javax/crypto/key/srp6.list
 
 -include gnu/javax/crypto/key/srp6.deps
 
 gnu/javax/crypto/keyring.list: $(gnu_javax_crypto_keyring_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_keyring_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/keyring.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/keyring/*.class > gnu/javax/crypto/keyring.list
 
 -include gnu/javax/crypto/keyring.deps
 
 gnu/javax/crypto/kwa.list: $(gnu_javax_crypto_kwa_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_kwa_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/kwa.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/kwa/*.class > gnu/javax/crypto/kwa.list
 
 -include gnu/javax/crypto/kwa.deps
 
 gnu/javax/crypto/mac.list: $(gnu_javax_crypto_mac_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_mac_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/mac.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/mac/*.class > gnu/javax/crypto/mac.list
 
 -include gnu/javax/crypto/mac.deps
 
 gnu/javax/crypto/mode.list: $(gnu_javax_crypto_mode_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_mode_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/mode.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/mode/*.class > gnu/javax/crypto/mode.list
 
 -include gnu/javax/crypto/mode.deps
 
 gnu/javax/crypto/pad.list: $(gnu_javax_crypto_pad_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_pad_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/pad.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/pad/*.class > gnu/javax/crypto/pad.list
 
 -include gnu/javax/crypto/pad.deps
 
 gnu/javax/crypto/prng.list: $(gnu_javax_crypto_prng_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_prng_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/prng.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/prng/*.class > gnu/javax/crypto/prng.list
 
 -include gnu/javax/crypto/prng.deps
 
 gnu/javax/crypto/sasl.list: $(gnu_javax_crypto_sasl_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_sasl_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/sasl.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/sasl/*.class > gnu/javax/crypto/sasl.list
 
 -include gnu/javax/crypto/sasl.deps
 
 gnu/javax/crypto/sasl/anonymous.list: $(gnu_javax_crypto_sasl_anonymous_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_sasl_anonymous_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/sasl/anonymous.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/sasl/anonymous/*.class > gnu/javax/crypto/sasl/anonymous.list
 
 -include gnu/javax/crypto/sasl/anonymous.deps
 
 gnu/javax/crypto/sasl/crammd5.list: $(gnu_javax_crypto_sasl_crammd5_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_sasl_crammd5_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/sasl/crammd5.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/sasl/crammd5/*.class > gnu/javax/crypto/sasl/crammd5.list
 
 -include gnu/javax/crypto/sasl/crammd5.deps
 
 gnu/javax/crypto/sasl/plain.list: $(gnu_javax_crypto_sasl_plain_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_sasl_plain_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/sasl/plain.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/sasl/plain/*.class > gnu/javax/crypto/sasl/plain.list
 
 -include gnu/javax/crypto/sasl/plain.deps
 
 gnu/javax/crypto/sasl/srp.list: $(gnu_javax_crypto_sasl_srp_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_crypto_sasl_srp_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/crypto/sasl/srp.list
+       echo $(srcdir)/classpath/lib/gnu/javax/crypto/sasl/srp/*.class > gnu/javax/crypto/sasl/srp.list
 
 -include gnu/javax/crypto/sasl/srp.deps
 
 gnu/javax/imageio.list: $(gnu_javax_imageio_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_imageio_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/imageio.list
+       echo $(srcdir)/classpath/lib/gnu/javax/imageio/*.class > gnu/javax/imageio.list
 
 -include gnu/javax/imageio.deps
 
 gnu/javax/imageio/bmp.list: $(gnu_javax_imageio_bmp_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_imageio_bmp_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/imageio/bmp.list
+       echo $(srcdir)/classpath/lib/gnu/javax/imageio/bmp/*.class > gnu/javax/imageio/bmp.list
 
 -include gnu/javax/imageio/bmp.deps
 
 gnu/javax/imageio/gif.list: $(gnu_javax_imageio_gif_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_imageio_gif_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/imageio/gif.list
+       echo $(srcdir)/classpath/lib/gnu/javax/imageio/gif/*.class > gnu/javax/imageio/gif.list
 
 -include gnu/javax/imageio/gif.deps
 
 gnu/javax/imageio/jpeg.list: $(gnu_javax_imageio_jpeg_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_imageio_jpeg_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/imageio/jpeg.list
+       echo $(srcdir)/classpath/lib/gnu/javax/imageio/jpeg/*.class > gnu/javax/imageio/jpeg.list
 
 -include gnu/javax/imageio/jpeg.deps
 
 gnu/javax/imageio/png.list: $(gnu_javax_imageio_png_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_imageio_png_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/imageio/png.list
+       echo $(srcdir)/classpath/lib/gnu/javax/imageio/png/*.class > gnu/javax/imageio/png.list
 
 -include gnu/javax/imageio/png.deps
 
+gnu-javax-management.lo: $(gnu_javax_management_source_files)
+       @find $(srcdir)/classpath/lib/gnu/javax/management -name '*.class' > gnu-javax-management.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-javax-management.lo @gnu-javax-management.list
+       @rm -f gnu-javax-management.list
+
+gnu/javax/naming/giop.list: $(gnu_javax_naming_giop_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/naming/giop/*.class > gnu/javax/naming/giop.list
+
+-include gnu/javax/naming/giop.deps
+
+gnu/javax/naming/ictxImpl/trans.list: $(gnu_javax_naming_ictxImpl_trans_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/naming/ictxImpl/trans/*.class > gnu/javax/naming/ictxImpl/trans.list
+
+-include gnu/javax/naming/ictxImpl/trans.deps
+
+gnu/javax/naming/jndi/url/corbaname.list: $(gnu_javax_naming_jndi_url_corbaname_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/naming/jndi/url/corbaname/*.class > gnu/javax/naming/jndi/url/corbaname.list
+
+-include gnu/javax/naming/jndi/url/corbaname.deps
+
+gnu/javax/naming/jndi/url/rmi.list: $(gnu_javax_naming_jndi_url_rmi_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/naming/jndi/url/rmi/*.class > gnu/javax/naming/jndi/url/rmi.list
+
+-include gnu/javax/naming/jndi/url/rmi.deps
+
 gnu/javax/net/ssl.list: $(gnu_javax_net_ssl_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_net_ssl_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/net/ssl.list
+       echo $(srcdir)/classpath/lib/gnu/javax/net/ssl/*.class > gnu/javax/net/ssl.list
 
 -include gnu/javax/net/ssl.deps
 
 gnu/javax/net/ssl/provider.list: $(gnu_javax_net_ssl_provider_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_net_ssl_provider_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/net/ssl/provider.list
+       echo $(srcdir)/classpath/lib/gnu/javax/net/ssl/provider/*.class > gnu/javax/net/ssl/provider.list
 
 -include gnu/javax/net/ssl/provider.deps
 
 gnu/javax/print.list: $(gnu_javax_print_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/javax/print/*.class > gnu/javax/print.list
 
 -include gnu/javax/print.deps
 
 gnu/javax/print/ipp.list: $(gnu_javax_print_ipp_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/javax/print/ipp/*.class > gnu/javax/print/ipp.list
 
 -include gnu/javax/print/ipp.deps
 
 gnu/javax/print/ipp/attribute.list: $(gnu_javax_print_ipp_attribute_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/javax/print/ipp/attribute/*.class > gnu/javax/print/ipp/attribute.list
 
 -include gnu/javax/print/ipp/attribute.deps
 
 gnu/javax/print/ipp/attribute/defaults.list: $(gnu_javax_print_ipp_attribute_defaults_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/javax/print/ipp/attribute/defaults/*.class > gnu/javax/print/ipp/attribute/defaults.list
 
 -include gnu/javax/print/ipp/attribute/defaults.deps
 
 gnu/javax/print/ipp/attribute/job.list: $(gnu_javax_print_ipp_attribute_job_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/javax/print/ipp/attribute/job/*.class > gnu/javax/print/ipp/attribute/job.list
 
 -include gnu/javax/print/ipp/attribute/job.deps
 
 gnu/javax/print/ipp/attribute/printer.list: $(gnu_javax_print_ipp_attribute_printer_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/javax/print/ipp/attribute/printer/*.class > gnu/javax/print/ipp/attribute/printer.list
 
 -include gnu/javax/print/ipp/attribute/printer.deps
 
 gnu/javax/print/ipp/attribute/supported.list: $(gnu_javax_print_ipp_attribute_supported_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/javax/print/ipp/attribute/supported/*.class > gnu/javax/print/ipp/attribute/supported.list
 
 -include gnu/javax/print/ipp/attribute/supported.deps
 
 gnu-javax-rmi.lo: $(gnu_javax_rmi_source_files)
-       @find 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
+       @find $(srcdir)/classpath/lib/gnu/javax/rmi -name '*.class' > gnu-javax-rmi.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-javax-rmi.lo @gnu-javax-rmi.list
        @rm -f gnu-javax-rmi.list
 
 gnu/javax/security/auth.list: $(gnu_javax_security_auth_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_security_auth_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/security/auth.list
+       echo $(srcdir)/classpath/lib/gnu/javax/security/auth/*.class > gnu/javax/security/auth.list
 
 -include gnu/javax/security/auth.deps
 
 gnu/javax/security/auth/callback.list: $(gnu_javax_security_auth_callback_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_security_auth_callback_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/security/auth/callback.list
+       echo $(srcdir)/classpath/lib/gnu/javax/security/auth/callback/*.class > gnu/javax/security/auth/callback.list
 
 -include gnu/javax/security/auth/callback.deps
 
 gnu/javax/security/auth/login.list: $(gnu_javax_security_auth_login_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_security_auth_login_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/security/auth/login.list
+       echo $(srcdir)/classpath/lib/gnu/javax/security/auth/login/*.class > gnu/javax/security/auth/login.list
 
 -include gnu/javax/security/auth/login.deps
 
+gnu/javax/sound.list: $(gnu_javax_sound_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/sound/*.class > gnu/javax/sound.list
+
+-include gnu/javax/sound.deps
+
 gnu-javax-sound-midi.lo: $(gnu_javax_sound_midi_source_files)
-       @find classpath/lib/gnu/javax/sound/midi -name '*.class' > gnu-javax-sound-midi.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-sound-midi.lo @gnu-javax-sound-midi.list
+       @find $(srcdir)/classpath/lib/gnu/javax/sound/midi -name '*.class' > gnu-javax-sound-midi.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-javax-sound-midi.lo @gnu-javax-sound-midi.list
        @rm -f gnu-javax-sound-midi.list
 
 gnu/javax/sound/sampled/AU.list: $(gnu_javax_sound_sampled_AU_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_sound_sampled_AU_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/sound/sampled/AU.list
+       echo $(srcdir)/classpath/lib/gnu/javax/sound/sampled/AU/*.class > gnu/javax/sound/sampled/AU.list
 
 -include gnu/javax/sound/sampled/AU.deps
 
 gnu/javax/sound/sampled/WAV.list: $(gnu_javax_sound_sampled_WAV_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_sound_sampled_WAV_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/sound/sampled/WAV.list
+       echo $(srcdir)/classpath/lib/gnu/javax/sound/sampled/WAV/*.class > gnu/javax/sound/sampled/WAV.list
 
 -include gnu/javax/sound/sampled/WAV.deps
 
 gnu/javax/swing/plaf/gnu.list: $(gnu_javax_swing_plaf_gnu_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/plaf/gnu/*.class > gnu/javax/swing/plaf/gnu.list
 
 -include gnu/javax/swing/plaf/gnu.deps
 
 gnu/javax/swing/plaf/metal.list: $(gnu_javax_swing_plaf_metal_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/plaf/metal/*.class > gnu/javax/swing/plaf/metal.list
 
 -include gnu/javax/swing/plaf/metal.deps
 
 gnu/javax/swing/text/html.list: $(gnu_javax_swing_text_html_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/*.class > gnu/javax/swing/text/html.list
 
 -include gnu/javax/swing/text/html.deps
 
-gnu/javax/swing/text/html/parser.list: $(gnu_javax_swing_text_html_parser_source_files)
+gnu/javax/swing/text/html/css.list: $(gnu_javax_swing_text_html_css_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/css/*.class > gnu/javax/swing/text/html/css.list
+
+-include gnu/javax/swing/text/html/css.deps
+
+gnu/javax/swing/text/html/parser/GnuParserDelegator.list: classpath/gnu/javax/swing/text/html/parser/GnuParserDelegator.java
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_swing_text_html_parser_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/swing/text/html/parser.list
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/parser/GnuParserDelegator*.class> gnu/javax/swing/text/html/parser/GnuParserDelegator.list
 
--include gnu/javax/swing/text/html/parser.deps
+-include gnu/javax/swing/text/html/parser/GnuParserDelegator.deps
+
+gnu/javax/swing/text/html/parser/HTML_401F.list: classpath/gnu/javax/swing/text/html/parser/HTML_401F.java
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/parser/HTML_401F*.class> gnu/javax/swing/text/html/parser/HTML_401F.list
+
+-include gnu/javax/swing/text/html/parser/HTML_401F.deps
+
+gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.list: classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet*.class> gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.list
+
+-include gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.deps
+
+gnu/javax/swing/text/html/parser/gnuDTD.list: classpath/gnu/javax/swing/text/html/parser/gnuDTD.java
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/parser/gnuDTD*.class> gnu/javax/swing/text/html/parser/gnuDTD.list
+
+-include gnu/javax/swing/text/html/parser/gnuDTD.deps
+
+gnu/javax/swing/text/html/parser/htmlAttributeSet.list: classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/parser/htmlAttributeSet*.class> gnu/javax/swing/text/html/parser/htmlAttributeSet.list
+
+-include gnu/javax/swing/text/html/parser/htmlAttributeSet.deps
+
+gnu/javax/swing/text/html/parser/htmlValidator.list: classpath/gnu/javax/swing/text/html/parser/htmlValidator.java
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/parser/htmlValidator*.class> gnu/javax/swing/text/html/parser/htmlValidator.list
+
+-include gnu/javax/swing/text/html/parser/htmlValidator.deps
 
 gnu/javax/swing/text/html/parser/models.list: $(gnu_javax_swing_text_html_parser_models_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_swing_text_html_parser_models_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/swing/text/html/parser/models.list
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/parser/models/*.class > gnu/javax/swing/text/html/parser/models.list
 
 -include gnu/javax/swing/text/html/parser/models.deps
 
 gnu/javax/swing/text/html/parser/support.list: $(gnu_javax_swing_text_html_parser_support_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_swing_text_html_parser_support_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/swing/text/html/parser/support.list
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/parser/support/*.class > gnu/javax/swing/text/html/parser/support.list
 
 -include gnu/javax/swing/text/html/parser/support.deps
 
 gnu/javax/swing/text/html/parser/support/low.list: $(gnu_javax_swing_text_html_parser_support_low_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(gnu_javax_swing_text_html_parser_support_low_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > gnu/javax/swing/text/html/parser/support/low.list
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/text/html/parser/support/low/*.class > gnu/javax/swing/text/html/parser/support/low.list
 
 -include gnu/javax/swing/text/html/parser/support/low.deps
 
 gnu/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
+       echo $(srcdir)/classpath/lib/gnu/javax/swing/tree/*.class > gnu/javax/swing/tree.list
 
 -include gnu/javax/swing/tree.deps
 
-gnu-xml.lo: $(gnu_xml_source_files)
-       @find classpath/lib/gnu/xml -name '*.class' > gnu-xml.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml.lo @gnu-xml.list
-       @rm -f gnu-xml.list
+gnu-xml-aelfred2.lo: $(gnu_xml_aelfred2_source_files)
+       @find $(srcdir)/classpath/lib/gnu/xml/aelfred2 -name '*.class' > gnu-xml-aelfred2.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-aelfred2.lo @gnu-xml-aelfred2.list
+       @rm -f gnu-xml-aelfred2.list
+
+gnu-xml-dom.lo: $(gnu_xml_dom_source_files)
+       @find $(srcdir)/classpath/lib/gnu/xml/dom -name '*.class' > gnu-xml-dom.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-dom.lo @gnu-xml-dom.list
+       @rm -f gnu-xml-dom.list
+
+gnu-xml-libxmlj.lo: $(gnu_xml_libxmlj_source_files)
+       @find $(srcdir)/classpath/lib/gnu/xml/libxmlj -name '*.class' > gnu-xml-libxmlj.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-libxmlj.lo @gnu-xml-libxmlj.list
+       @rm -f gnu-xml-libxmlj.list
+
+gnu-xml-pipeline.lo: $(gnu_xml_pipeline_source_files)
+       @find $(srcdir)/classpath/lib/gnu/xml/pipeline -name '*.class' > gnu-xml-pipeline.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-pipeline.lo @gnu-xml-pipeline.list
+       @rm -f gnu-xml-pipeline.list
+
+gnu-xml-stream.lo: $(gnu_xml_stream_source_files)
+       @find $(srcdir)/classpath/lib/gnu/xml/stream -name '*.class' > gnu-xml-stream.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-stream.lo @gnu-xml-stream.list
+       @rm -f gnu-xml-stream.list
+
+gnu-xml-transform.lo: $(gnu_xml_transform_source_files)
+       @find $(srcdir)/classpath/lib/gnu/xml/transform -name '*.class' > gnu-xml-transform.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-transform.lo @gnu-xml-transform.list
+       @rm -f gnu-xml-transform.list
+
+gnu-xml-util.lo: $(gnu_xml_util_source_files)
+       @find $(srcdir)/classpath/lib/gnu/xml/util -name '*.class' > gnu-xml-util.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-util.lo @gnu-xml-util.list
+       @rm -f gnu-xml-util.list
+
+gnu-xml-validation.lo: $(gnu_xml_validation_source_files)
+       @find $(srcdir)/classpath/lib/gnu/xml/validation -name '*.class' > gnu-xml-validation.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-validation.lo @gnu-xml-validation.list
+       @rm -f gnu-xml-validation.list
+
+gnu-xml-xpath.lo: $(gnu_xml_xpath_source_files)
+       @find $(srcdir)/classpath/lib/gnu/xml/xpath -name '*.class' > gnu-xml-xpath.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-xpath.lo @gnu-xml-xpath.list
+       @rm -f gnu-xml-xpath.list
 
 java/applet.list: $(java_applet_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_applet_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/applet.list
+       echo $(srcdir)/classpath/lib/java/applet/*.class > java/applet.list
 
 -include java/applet.deps
 
 java/awt.list: $(java_awt_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt.list
+       echo $(srcdir)/classpath/lib/java/awt/*.class > java/awt.list
 
 -include java/awt.deps
 
 java/awt/color.list: $(java_awt_color_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_color_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/color.list
+       echo $(srcdir)/classpath/lib/java/awt/color/*.class > java/awt/color.list
 
 -include java/awt/color.deps
 
 java/awt/datatransfer.list: $(java_awt_datatransfer_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_datatransfer_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/datatransfer.list
+       echo $(srcdir)/classpath/lib/java/awt/datatransfer/*.class > java/awt/datatransfer.list
 
 -include java/awt/datatransfer.deps
 
 java/awt/dnd.list: $(java_awt_dnd_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_dnd_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/dnd.list
+       echo $(srcdir)/classpath/lib/java/awt/dnd/*.class > java/awt/dnd.list
 
 -include java/awt/dnd.deps
 
 java/awt/dnd/peer.list: $(java_awt_dnd_peer_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_dnd_peer_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/dnd/peer.list
+       echo $(srcdir)/classpath/lib/java/awt/dnd/peer/*.class > java/awt/dnd/peer.list
 
 -include java/awt/dnd/peer.deps
 
 java/awt/event.list: $(java_awt_event_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_event_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/event.list
+       echo $(srcdir)/classpath/lib/java/awt/event/*.class > java/awt/event.list
 
 -include java/awt/event.deps
 
 java/awt/font.list: $(java_awt_font_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_font_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/font.list
+       echo $(srcdir)/classpath/lib/java/awt/font/*.class > java/awt/font.list
 
 -include java/awt/font.deps
 
 java/awt/geom.list: $(java_awt_geom_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_geom_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/geom.list
+       echo $(srcdir)/classpath/lib/java/awt/geom/*.class > java/awt/geom.list
 
 -include java/awt/geom.deps
 
 java/awt/im.list: $(java_awt_im_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_im_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/im.list
+       echo $(srcdir)/classpath/lib/java/awt/im/*.class > java/awt/im.list
 
 -include java/awt/im.deps
 
 java/awt/im/spi.list: $(java_awt_im_spi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_im_spi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/im/spi.list
+       echo $(srcdir)/classpath/lib/java/awt/im/spi/*.class > java/awt/im/spi.list
 
 -include java/awt/im/spi.deps
 
 java/awt/image.list: $(java_awt_image_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_image_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/image.list
+       echo $(srcdir)/classpath/lib/java/awt/image/*.class > java/awt/image.list
 
 -include java/awt/image.deps
 
 java/awt/image/renderable.list: $(java_awt_image_renderable_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_image_renderable_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/image/renderable.list
+       echo $(srcdir)/classpath/lib/java/awt/image/renderable/*.class > java/awt/image/renderable.list
 
 -include java/awt/image/renderable.deps
 
 java/awt/peer.list: $(java_awt_peer_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_peer_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/peer.list
+       echo $(srcdir)/classpath/lib/java/awt/peer/*.class > java/awt/peer.list
 
 -include java/awt/peer.deps
 
 java/awt/print.list: $(java_awt_print_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_awt_print_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/awt/print.list
+       echo $(srcdir)/classpath/lib/java/awt/print/*.class > java/awt/print.list
 
 -include java/awt/print.deps
 
 java/beans.list: $(java_beans_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_beans_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/beans.list
+       echo $(srcdir)/classpath/lib/java/beans/*.class > java/beans.list
 
 -include java/beans.deps
 
 java/beans/beancontext.list: $(java_beans_beancontext_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_beans_beancontext_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/beans/beancontext.list
+       echo $(srcdir)/classpath/lib/java/beans/beancontext/*.class > java/beans/beancontext.list
 
 -include java/beans/beancontext.deps
 
 java/io.list: $(java_io_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_io_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/io.list
+       echo $(srcdir)/classpath/lib/java/io/*.class > java/io.list
 
 -include java/io.deps
 
 java/lang.list: $(java_lang_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_lang_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/lang.list
+       echo $(srcdir)/classpath/lib/java/lang/*.class | tr ' ' '\012' | fgrep -v Object.class | fgrep -v Class.class | egrep -v '(Ecos|Posix|Win32)Process' > java/lang.list
 
 -include java/lang.deps
 
 java/lang/annotation.list: $(java_lang_annotation_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_lang_annotation_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/lang/annotation.list
+       echo $(srcdir)/classpath/lib/java/lang/annotation/*.class > java/lang/annotation.list
 
 -include java/lang/annotation.deps
 
 java/lang/instrument.list: $(java_lang_instrument_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/java/lang/instrument/*.class > java/lang/instrument.list
 
 -include java/lang/instrument.deps
 
-java/lang/management.list: $(java_lang_management_source_files)
-       @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_lang_management_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/lang/management.list
-
--include java/lang/management.deps
+java-lang-management.lo: $(java_lang_management_source_files)
+       @find $(srcdir)/classpath/lib/java/lang/management -name '*.class' > java-lang-management.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o java-lang-management.lo @java-lang-management.list
+       @rm -f java-lang-management.list
 
 java/lang/ref.list: $(java_lang_ref_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_lang_ref_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/lang/ref.list
+       echo $(srcdir)/classpath/lib/java/lang/ref/*.class > java/lang/ref.list
 
 -include java/lang/ref.deps
 
 java/lang/reflect.list: $(java_lang_reflect_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_lang_reflect_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/lang/reflect.list
+       echo $(srcdir)/classpath/lib/java/lang/reflect/*.class > java/lang/reflect.list
 
 -include java/lang/reflect.deps
 
 java/math.list: $(java_math_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_math_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/math.list
+       echo $(srcdir)/classpath/lib/java/math/*.class > java/math.list
 
 -include java/math.deps
 
 java/net.list: $(java_net_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_net_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/net.list
+       echo $(srcdir)/classpath/lib/java/net/*.class > java/net.list
 
 -include java/net.deps
 
 java/nio.list: $(java_nio_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_nio_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/nio.list
+       echo $(srcdir)/classpath/lib/java/nio/*.class > java/nio.list
 
 -include java/nio.deps
 
 java/nio/channels.list: $(java_nio_channels_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_nio_channels_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/nio/channels.list
+       echo $(srcdir)/classpath/lib/java/nio/channels/*.class > java/nio/channels.list
 
 -include java/nio/channels.deps
 
 java/nio/channels/spi.list: $(java_nio_channels_spi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_nio_channels_spi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/nio/channels/spi.list
+       echo $(srcdir)/classpath/lib/java/nio/channels/spi/*.class > java/nio/channels/spi.list
 
 -include java/nio/channels/spi.deps
 
 java/nio/charset.list: $(java_nio_charset_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_nio_charset_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/nio/charset.list
+       echo $(srcdir)/classpath/lib/java/nio/charset/*.class > java/nio/charset.list
 
 -include java/nio/charset.deps
 
 java/nio/charset/spi.list: $(java_nio_charset_spi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_nio_charset_spi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/nio/charset/spi.list
+       echo $(srcdir)/classpath/lib/java/nio/charset/spi/*.class > java/nio/charset/spi.list
 
 -include java/nio/charset/spi.deps
 
 java/rmi.list: $(java_rmi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_rmi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/rmi.list
+       echo $(srcdir)/classpath/lib/java/rmi/*.class > java/rmi.list
 
 -include java/rmi.deps
 
 java/rmi/activation.list: $(java_rmi_activation_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_rmi_activation_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/rmi/activation.list
+       echo $(srcdir)/classpath/lib/java/rmi/activation/*.class > java/rmi/activation.list
 
 -include java/rmi/activation.deps
 
 java/rmi/dgc.list: $(java_rmi_dgc_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_rmi_dgc_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/rmi/dgc.list
+       echo $(srcdir)/classpath/lib/java/rmi/dgc/*.class > java/rmi/dgc.list
 
 -include java/rmi/dgc.deps
 
 java/rmi/registry.list: $(java_rmi_registry_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_rmi_registry_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/rmi/registry.list
+       echo $(srcdir)/classpath/lib/java/rmi/registry/*.class > java/rmi/registry.list
 
 -include java/rmi/registry.deps
 
 java/rmi/server.list: $(java_rmi_server_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_rmi_server_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/rmi/server.list
+       echo $(srcdir)/classpath/lib/java/rmi/server/*.class > java/rmi/server.list
 
 -include java/rmi/server.deps
 
 java/security.list: $(java_security_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_security_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/security.list
+       echo $(srcdir)/classpath/lib/java/security/*.class > java/security.list
 
 -include java/security.deps
 
 java/security/acl.list: $(java_security_acl_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_security_acl_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/security/acl.list
+       echo $(srcdir)/classpath/lib/java/security/acl/*.class > java/security/acl.list
 
 -include java/security/acl.deps
 
 java/security/cert.list: $(java_security_cert_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_security_cert_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/security/cert.list
+       echo $(srcdir)/classpath/lib/java/security/cert/*.class > java/security/cert.list
 
 -include java/security/cert.deps
 
 java/security/interfaces.list: $(java_security_interfaces_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_security_interfaces_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/security/interfaces.list
+       echo $(srcdir)/classpath/lib/java/security/interfaces/*.class > java/security/interfaces.list
 
 -include java/security/interfaces.deps
 
 java/security/spec.list: $(java_security_spec_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_security_spec_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/security/spec.list
+       echo $(srcdir)/classpath/lib/java/security/spec/*.class > java/security/spec.list
 
 -include java/security/spec.deps
 
 java/sql.list: $(java_sql_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_sql_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/sql.list
+       echo $(srcdir)/classpath/lib/java/sql/*.class > java/sql.list
 
 -include java/sql.deps
 
 java/text.list: $(java_text_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_text_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/text.list
+       echo $(srcdir)/classpath/lib/java/text/*.class > java/text.list
 
 -include java/text.deps
 
+java/text/spi.list: $(java_text_spi_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/text/spi/*.class > java/text/spi.list
+
+-include java/text/spi.deps
+
 java/util.list: $(java_util_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_util_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/util.list
+       echo $(srcdir)/classpath/lib/java/util/*.class > java/util.list
 
 -include java/util.deps
 
+java/util/concurrent.list: $(java_util_concurrent_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/util/concurrent/*.class > java/util/concurrent.list
+
+-include java/util/concurrent.deps
+
+java/util/concurrent/atomic.list: $(java_util_concurrent_atomic_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/util/concurrent/atomic/*.class > java/util/concurrent/atomic.list
+
+-include java/util/concurrent/atomic.deps
+
+java/util/concurrent/locks.list: $(java_util_concurrent_locks_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/util/concurrent/locks/*.class > java/util/concurrent/locks.list
+
+-include java/util/concurrent/locks.deps
+
 java/util/jar.list: $(java_util_jar_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_util_jar_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/util/jar.list
+       echo $(srcdir)/classpath/lib/java/util/jar/*.class > java/util/jar.list
 
 -include java/util/jar.deps
 
 java/util/logging.list: $(java_util_logging_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_util_logging_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/util/logging.list
+       echo $(srcdir)/classpath/lib/java/util/logging/*.class > java/util/logging.list
 
 -include java/util/logging.deps
 
 java/util/prefs.list: $(java_util_prefs_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_util_prefs_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/util/prefs.list
+       echo $(srcdir)/classpath/lib/java/util/prefs/*.class > java/util/prefs.list
 
 -include java/util/prefs.deps
 
 java/util/regex.list: $(java_util_regex_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_util_regex_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/util/regex.list
+       echo $(srcdir)/classpath/lib/java/util/regex/*.class > java/util/regex.list
 
 -include java/util/regex.deps
 
+java/util/spi.list: $(java_util_spi_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/util/spi/*.class > java/util/spi.list
+
+-include java/util/spi.deps
+
 java/util/zip.list: $(java_util_zip_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(java_util_zip_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > java/util/zip.list
+       echo $(srcdir)/classpath/lib/java/util/zip/*.class > java/util/zip.list
 
 -include java/util/zip.deps
 
 javax/accessibility.list: $(javax_accessibility_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_accessibility_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/accessibility.list
+       echo $(srcdir)/classpath/lib/javax/accessibility/*.class > javax/accessibility.list
 
 -include javax/accessibility.deps
 
+javax/activation.list: $(javax_activation_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/activation/*.class > javax/activation.list
+
+-include javax/activation.deps
+
+javax/activity.list: $(javax_activity_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/activity/*.class > javax/activity.list
+
+-include javax/activity.deps
+
 javax/crypto.list: $(javax_crypto_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_crypto_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/crypto.list
+       echo $(srcdir)/classpath/lib/javax/crypto/*.class > javax/crypto.list
 
 -include javax/crypto.deps
 
 javax/crypto/interfaces.list: $(javax_crypto_interfaces_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_crypto_interfaces_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/crypto/interfaces.list
+       echo $(srcdir)/classpath/lib/javax/crypto/interfaces/*.class > javax/crypto/interfaces.list
 
 -include javax/crypto/interfaces.deps
 
 javax/crypto/spec.list: $(javax_crypto_spec_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_crypto_spec_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/crypto/spec.list
+       echo $(srcdir)/classpath/lib/javax/crypto/spec/*.class > javax/crypto/spec.list
 
 -include javax/crypto/spec.deps
 
 javax-imageio.lo: $(javax_imageio_source_files)
-       @find classpath/lib/javax/imageio -name '*.class' > javax-imageio.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-imageio.lo @javax-imageio.list
+       @find $(srcdir)/classpath/lib/javax/imageio -name '*.class' > javax-imageio.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o javax-imageio.lo @javax-imageio.list
        @rm -f javax-imageio.list
 
 javax/management.list: $(javax_management_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_management_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/management.list
+       echo $(srcdir)/classpath/lib/javax/management/*.class > javax/management.list
 
 -include javax/management.deps
 
+javax/management/loading.list: $(javax_management_loading_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/management/loading/*.class > javax/management/loading.list
+
+-include javax/management/loading.deps
+
 javax/management/openmbean.list: $(javax_management_openmbean_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_management_openmbean_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/management/openmbean.list
+       echo $(srcdir)/classpath/lib/javax/management/openmbean/*.class > javax/management/openmbean.list
 
 -include javax/management/openmbean.deps
 
+javax/management/remote.list: $(javax_management_remote_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/management/remote/*.class > javax/management/remote.list
+
+-include javax/management/remote.deps
+
+javax/management/remote/rmi.list: $(javax_management_remote_rmi_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/management/remote/rmi/*.class > javax/management/remote/rmi.list
+
+-include javax/management/remote/rmi.deps
+
 javax/naming.list: $(javax_naming_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_naming_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/naming.list
+       echo $(srcdir)/classpath/lib/javax/naming/*.class > javax/naming.list
 
 -include javax/naming.deps
 
 javax/naming/directory.list: $(javax_naming_directory_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_naming_directory_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/naming/directory.list
+       echo $(srcdir)/classpath/lib/javax/naming/directory/*.class > javax/naming/directory.list
 
 -include javax/naming/directory.deps
 
 javax/naming/event.list: $(javax_naming_event_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_naming_event_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/naming/event.list
+       echo $(srcdir)/classpath/lib/javax/naming/event/*.class > javax/naming/event.list
 
 -include javax/naming/event.deps
 
 javax/naming/ldap.list: $(javax_naming_ldap_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_naming_ldap_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/naming/ldap.list
+       echo $(srcdir)/classpath/lib/javax/naming/ldap/*.class > javax/naming/ldap.list
 
 -include javax/naming/ldap.deps
 
 javax/naming/spi.list: $(javax_naming_spi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_naming_spi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/naming/spi.list
+       echo $(srcdir)/classpath/lib/javax/naming/spi/*.class > javax/naming/spi.list
 
 -include javax/naming/spi.deps
 
 javax/net.list: $(javax_net_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_net_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/net.list
+       echo $(srcdir)/classpath/lib/javax/net/*.class > javax/net.list
 
 -include javax/net.deps
 
 javax/net/ssl.list: $(javax_net_ssl_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_net_ssl_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/net/ssl.list
+       echo $(srcdir)/classpath/lib/javax/net/ssl/*.class > javax/net/ssl.list
 
 -include javax/net/ssl.deps
 
 javax/print.list: $(javax_print_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_print_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/print.list
+       echo $(srcdir)/classpath/lib/javax/print/*.class > javax/print.list
 
 -include javax/print.deps
 
 javax/print/attribute.list: $(javax_print_attribute_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_print_attribute_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/print/attribute.list
+       echo $(srcdir)/classpath/lib/javax/print/attribute/*.class > javax/print/attribute.list
 
 -include javax/print/attribute.deps
 
 javax/print/attribute/standard.list: $(javax_print_attribute_standard_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_print_attribute_standard_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/print/attribute/standard.list
+       echo $(srcdir)/classpath/lib/javax/print/attribute/standard/*.class > javax/print/attribute/standard.list
 
 -include javax/print/attribute/standard.deps
 
 javax/print/event.list: $(javax_print_event_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_print_event_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/print/event.list
+       echo $(srcdir)/classpath/lib/javax/print/event/*.class > javax/print/event.list
 
 -include javax/print/event.deps
 
 javax-rmi.lo: $(javax_rmi_source_files)
-       @find classpath/lib/javax/rmi -name '*.class' > javax-rmi.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-rmi.lo @javax-rmi.list
+       @find $(srcdir)/classpath/lib/javax/rmi -name '*.class' > javax-rmi.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o javax-rmi.lo @javax-rmi.list
        @rm -f javax-rmi.list
 
 javax/security/auth.list: $(javax_security_auth_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_security_auth_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/auth.list
+       echo $(srcdir)/classpath/lib/javax/security/auth/*.class > javax/security/auth.list
 
 -include javax/security/auth.deps
 
 javax/security/auth/callback.list: $(javax_security_auth_callback_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_security_auth_callback_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/auth/callback.list
+       echo $(srcdir)/classpath/lib/javax/security/auth/callback/*.class > javax/security/auth/callback.list
 
 -include javax/security/auth/callback.deps
 
 javax/security/auth/kerberos.list: $(javax_security_auth_kerberos_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @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
+       echo $(srcdir)/classpath/lib/javax/security/auth/kerberos/*.class > javax/security/auth/kerberos.list
 
 -include javax/security/auth/kerberos.deps
 
 javax/security/auth/login.list: $(javax_security_auth_login_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_security_auth_login_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/auth/login.list
+       echo $(srcdir)/classpath/lib/javax/security/auth/login/*.class > javax/security/auth/login.list
 
 -include javax/security/auth/login.deps
 
 javax/security/auth/spi.list: $(javax_security_auth_spi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_security_auth_spi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/auth/spi.list
+       echo $(srcdir)/classpath/lib/javax/security/auth/spi/*.class > javax/security/auth/spi.list
 
 -include javax/security/auth/spi.deps
 
 javax/security/auth/x500.list: $(javax_security_auth_x500_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_security_auth_x500_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/auth/x500.list
+       echo $(srcdir)/classpath/lib/javax/security/auth/x500/*.class > javax/security/auth/x500.list
 
 -include javax/security/auth/x500.deps
 
 javax/security/cert.list: $(javax_security_cert_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_security_cert_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/cert.list
+       echo $(srcdir)/classpath/lib/javax/security/cert/*.class > javax/security/cert.list
 
 -include javax/security/cert.deps
 
 javax/security/sasl.list: $(javax_security_sasl_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_security_sasl_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/security/sasl.list
+       echo $(srcdir)/classpath/lib/javax/security/sasl/*.class > javax/security/sasl.list
 
 -include javax/security/sasl.deps
 
 javax/sound/midi.list: $(javax_sound_midi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_sound_midi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/sound/midi.list
+       echo $(srcdir)/classpath/lib/javax/sound/midi/*.class > javax/sound/midi.list
 
 -include javax/sound/midi.deps
 
 javax/sound/midi/spi.list: $(javax_sound_midi_spi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_sound_midi_spi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/sound/midi/spi.list
+       echo $(srcdir)/classpath/lib/javax/sound/midi/spi/*.class > javax/sound/midi/spi.list
 
 -include javax/sound/midi/spi.deps
 
 javax/sound/sampled.list: $(javax_sound_sampled_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_sound_sampled_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/sound/sampled.list
+       echo $(srcdir)/classpath/lib/javax/sound/sampled/*.class > javax/sound/sampled.list
 
 -include javax/sound/sampled.deps
 
 javax/sound/sampled/spi.list: $(javax_sound_sampled_spi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_sound_sampled_spi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/sound/sampled/spi.list
+       echo $(srcdir)/classpath/lib/javax/sound/sampled/spi/*.class > javax/sound/sampled/spi.list
 
 -include javax/sound/sampled/spi.deps
 
 javax/sql.list: $(javax_sql_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_sql_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/sql.list
+       echo $(srcdir)/classpath/lib/javax/sql/*.class > javax/sql.list
 
 -include javax/sql.deps
 
 javax/swing.list: $(javax_swing_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing.list
+       echo $(srcdir)/classpath/lib/javax/swing/*.class > javax/swing.list
 
 -include javax/swing.deps
 
 javax/swing/border.list: $(javax_swing_border_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_border_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/border.list
+       echo $(srcdir)/classpath/lib/javax/swing/border/*.class > javax/swing/border.list
 
 -include javax/swing/border.deps
 
 javax/swing/colorchooser.list: $(javax_swing_colorchooser_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_colorchooser_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/colorchooser.list
+       echo $(srcdir)/classpath/lib/javax/swing/colorchooser/*.class > javax/swing/colorchooser.list
 
 -include javax/swing/colorchooser.deps
 
 javax/swing/event.list: $(javax_swing_event_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_event_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/event.list
+       echo $(srcdir)/classpath/lib/javax/swing/event/*.class > javax/swing/event.list
 
 -include javax/swing/event.deps
 
 javax/swing/filechooser.list: $(javax_swing_filechooser_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_filechooser_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/filechooser.list
+       echo $(srcdir)/classpath/lib/javax/swing/filechooser/*.class > javax/swing/filechooser.list
 
 -include javax/swing/filechooser.deps
 
 javax/swing/plaf.list: $(javax_swing_plaf_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_plaf_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/plaf.list
+       echo $(srcdir)/classpath/lib/javax/swing/plaf/*.class > javax/swing/plaf.list
 
 -include javax/swing/plaf.deps
 
 javax/swing/plaf/basic.list: $(javax_swing_plaf_basic_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_plaf_basic_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/plaf/basic.list
+       echo $(srcdir)/classpath/lib/javax/swing/plaf/basic/*.class > javax/swing/plaf/basic.list
 
 -include javax/swing/plaf/basic.deps
 
 javax/swing/plaf/metal.list: $(javax_swing_plaf_metal_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_plaf_metal_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/plaf/metal.list
+       echo $(srcdir)/classpath/lib/javax/swing/plaf/metal/*.class > javax/swing/plaf/metal.list
 
 -include javax/swing/plaf/metal.deps
 
 javax/swing/plaf/multi.list: $(javax_swing_plaf_multi_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_plaf_multi_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/plaf/multi.list
+       echo $(srcdir)/classpath/lib/javax/swing/plaf/multi/*.class > javax/swing/plaf/multi.list
 
 -include javax/swing/plaf/multi.deps
 
 javax/swing/plaf/synth.list: $(javax_swing_plaf_synth_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_plaf_synth_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/plaf/synth.list
+       echo $(srcdir)/classpath/lib/javax/swing/plaf/synth/*.class > javax/swing/plaf/synth.list
 
 -include javax/swing/plaf/synth.deps
 
 javax/swing/table.list: $(javax_swing_table_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_table_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/table.list
+       echo $(srcdir)/classpath/lib/javax/swing/table/*.class > javax/swing/table.list
 
 -include javax/swing/table.deps
 
 javax/swing/text.list: $(javax_swing_text_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_text_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/text.list
+       echo $(srcdir)/classpath/lib/javax/swing/text/*.class > javax/swing/text.list
 
 -include javax/swing/text.deps
 
 javax/swing/text/html.list: $(javax_swing_text_html_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_text_html_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/text/html.list
+       echo $(srcdir)/classpath/lib/javax/swing/text/html/*.class > javax/swing/text/html.list
 
 -include javax/swing/text/html.deps
 
 javax/swing/text/html/parser.list: $(javax_swing_text_html_parser_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_text_html_parser_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/text/html/parser.list
+       echo $(srcdir)/classpath/lib/javax/swing/text/html/parser/*.class > javax/swing/text/html/parser.list
 
 -include javax/swing/text/html/parser.deps
 
 javax/swing/text/rtf.list: $(javax_swing_text_rtf_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_text_rtf_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/text/rtf.list
+       echo $(srcdir)/classpath/lib/javax/swing/text/rtf/*.class > javax/swing/text/rtf.list
 
 -include javax/swing/text/rtf.deps
 
 javax/swing/tree.list: $(javax_swing_tree_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_tree_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/tree.list
+       echo $(srcdir)/classpath/lib/javax/swing/tree/*.class > javax/swing/tree.list
 
 -include javax/swing/tree.deps
 
 javax/swing/undo.list: $(javax_swing_undo_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_swing_undo_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/swing/undo.list
+       echo $(srcdir)/classpath/lib/javax/swing/undo/*.class > javax/swing/undo.list
 
 -include javax/swing/undo.deps
 
+javax/tools.list: $(javax_tools_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/tools/*.class > javax/tools.list
+
+-include javax/tools.deps
+
 javax/transaction.list: $(javax_transaction_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_transaction_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/transaction.list
+       echo $(srcdir)/classpath/lib/javax/transaction/*.class > javax/transaction.list
 
 -include javax/transaction.deps
 
 javax/transaction/xa.list: $(javax_transaction_xa_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(javax_transaction_xa_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > javax/transaction/xa.list
+       echo $(srcdir)/classpath/lib/javax/transaction/xa/*.class > javax/transaction/xa.list
 
 -include javax/transaction/xa.deps
 
 javax-xml.lo: $(javax_xml_source_files)
-       @find classpath/lib/javax/xml -name '*.class' > javax-xml.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-xml.lo @javax-xml.list
+       @find $(srcdir)/classpath/lib/javax/xml -name '*.class' > javax-xml.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o javax-xml.lo @javax-xml.list
        @rm -f javax-xml.list
 
 org/ietf/jgss.list: $(org_ietf_jgss_source_files)
        @$(mkinstalldirs) $(dir $@)
-       @for file in $(org_ietf_jgss_source_files); do \
-         if test -f $(srcdir)/$$file; then \
-           echo $(srcdir)/$$file; \
-         else echo $$file; fi; \
-       done > org/ietf/jgss.list
+       echo $(srcdir)/classpath/lib/org/ietf/jgss/*.class > org/ietf/jgss.list
 
 -include org/ietf/jgss.deps
 
-org-omg.lo: $(org_omg_source_files)
-       @find classpath/lib/org/omg -name '*.class' > org-omg.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o org-omg.lo @org-omg.list
-       @rm -f org-omg.list
+org-omg-CORBA.lo: $(org_omg_CORBA_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/CORBA -name '*.class' > org-omg-CORBA.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-CORBA.lo @org-omg-CORBA.list
+       @rm -f org-omg-CORBA.list
+
+org-omg-CORBA_2_3.lo: $(org_omg_CORBA_2_3_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/CORBA_2_3 -name '*.class' > org-omg-CORBA_2_3.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-CORBA_2_3.lo @org-omg-CORBA_2_3.list
+       @rm -f org-omg-CORBA_2_3.list
+
+org-omg-CosNaming.lo: $(org_omg_CosNaming_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/CosNaming -name '*.class' > org-omg-CosNaming.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-CosNaming.lo @org-omg-CosNaming.list
+       @rm -f org-omg-CosNaming.list
+
+org-omg-Dynamic.lo: $(org_omg_Dynamic_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/Dynamic -name '*.class' > org-omg-Dynamic.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-Dynamic.lo @org-omg-Dynamic.list
+       @rm -f org-omg-Dynamic.list
+
+org-omg-DynamicAny.lo: $(org_omg_DynamicAny_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/DynamicAny -name '*.class' > org-omg-DynamicAny.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-DynamicAny.lo @org-omg-DynamicAny.list
+       @rm -f org-omg-DynamicAny.list
+
+org-omg-IOP.lo: $(org_omg_IOP_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/IOP -name '*.class' > org-omg-IOP.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-IOP.lo @org-omg-IOP.list
+       @rm -f org-omg-IOP.list
+
+org-omg-Messaging.lo: $(org_omg_Messaging_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/Messaging -name '*.class' > org-omg-Messaging.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-Messaging.lo @org-omg-Messaging.list
+       @rm -f org-omg-Messaging.list
+
+org-omg-PortableInterceptor.lo: $(org_omg_PortableInterceptor_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/PortableInterceptor -name '*.class' > org-omg-PortableInterceptor.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-PortableInterceptor.lo @org-omg-PortableInterceptor.list
+       @rm -f org-omg-PortableInterceptor.list
+
+org-omg-PortableServer.lo: $(org_omg_PortableServer_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/PortableServer -name '*.class' > org-omg-PortableServer.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-PortableServer.lo @org-omg-PortableServer.list
+       @rm -f org-omg-PortableServer.list
+
+org-omg-SendingContext.lo: $(org_omg_SendingContext_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/SendingContext -name '*.class' > org-omg-SendingContext.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-SendingContext.lo @org-omg-SendingContext.list
+       @rm -f org-omg-SendingContext.list
+
+org-omg-stub.lo: $(org_omg_stub_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/stub -name '*.class' > org-omg-stub.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-stub.lo @org-omg-stub.list
+       @rm -f org-omg-stub.list
 
 org-relaxng.lo: $(org_relaxng_source_files)
-       @find classpath/lib/org/relaxng -name '*.class' > org-relaxng.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o org-relaxng.lo @org-relaxng.list
+       @find $(srcdir)/classpath/lib/org/relaxng -name '*.class' > org-relaxng.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-relaxng.lo @org-relaxng.list
        @rm -f org-relaxng.list
 
 org-w3c.lo: $(org_w3c_source_files)
-       @find classpath/lib/org/w3c -name '*.class' > org-w3c.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o org-w3c.lo @org-w3c.list
+       @find $(srcdir)/classpath/lib/org/w3c -name '*.class' > org-w3c.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-w3c.lo @org-w3c.list
        @rm -f org-w3c.list
 
 org-xml.lo: $(org_xml_source_files)
-       @find classpath/lib/org/xml -name '*.class' > org-xml.list
-       $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o org-xml.lo @org-xml.list
+       @find $(srcdir)/classpath/lib/org/xml -name '*.class' > org-xml.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-xml.lo @org-xml.list
        @rm -f org-xml.list
 
-$(generic_header_files): %.h: classpath/lib/%.class
-       name=`echo $< | sed -e 's/\.class$$//' -e 's,classpath/lib/,,'`; \
-       $(mkinstalldirs) `dirname $$name`; \
-       $(GCJH) -d . -classpath '' -bootclasspath classpath/lib $$name
-
-java/lang/ClassLoader.h: classpath/lib/java/lang/ClassLoader.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-               -prepend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \
-               -prepend 'void _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \
-               -friend 'jclass (::_Jv_FindClass) (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \
-               -friend 'void ::_Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \
-               java/lang/ClassLoader
-
-java/lang/Thread.h: classpath/lib/java/lang/Thread.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-               -prepend 'class _Jv_JNIEnv;' \
-               -prepend 'class _Jv_Thread_t;' \
-               -prepend '#define _JV_NOT_OWNER 1' \
-               -prepend '#define _JV_INTERRUPTED 2' \
-               -prepend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \
-               -prepend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
-               -prepend 'void _Jv_ThreadRun (java::lang::Thread* thread);' \
-               -prepend 'jint _Jv_AttachCurrentThread(java::lang::Thread* thread);' \
-               -prepend 'java::lang::Thread* _Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \
-               -prepend 'java::lang::Thread* _Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \
-               -prepend 'jint _Jv_DetachCurrentThread ();' \
-               -prepend '_Jv_Thread_t* _Jv_ThreadGetData (java::lang::Thread* thread);' \
-               -friend '_Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();' \
-               -friend 'void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
-               -friend 'void ::_Jv_ThreadRun (java::lang::Thread* thread);' \
-               -friend 'jint (::_Jv_AttachCurrentThread) (java::lang::Thread* thread);' \
-               -friend 'java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \
-               -friend 'java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \
-               -friend 'jint (::_Jv_DetachCurrentThread) ();' \
-               -friend '_Jv_Thread_t* ::_Jv_ThreadGetData (java::lang::Thread* thread);' \
-               java/lang/Thread
-
-java/lang/String.h: classpath/lib/java/lang/String.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-           -prepend 'jchar* _Jv_GetStringChars (jstring str);' \
-           -prepend 'jstring* _Jv_StringFindSlot (jchar*, jint, jint);' \
-           -prepend 'jstring* _Jv_StringGetSlot (jstring);' \
-           -prepend 'jstring _Jv_NewStringUtf8Const (_Jv_Utf8Const* str);' \
-           -prepend 'jstring _Jv_NewStringLatin1 (const char*, jsize);' \
-           -prepend 'jstring _Jv_AllocString (jsize);' \
-           -friend 'jchar* ::_Jv_GetStringChars (jstring str);' \
-           -friend 'jstring* ::_Jv_StringFindSlot (jchar*, jint, jint);' \
-           -friend 'jstring* ::_Jv_StringGetSlot (jstring);' \
-           -friend 'jstring (::_Jv_NewStringUtf8Const) (_Jv_Utf8Const* str);' \
-           -friend 'jstring (::_Jv_NewStringLatin1) (const char*, jsize);' \
-           -friend 'jstring (::_Jv_AllocString) (jsize);' \
-           java/lang/String
-
-java/lang/reflect/Constructor.h: classpath/lib/java/lang/reflect/Constructor.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-           -prepend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \
-           -prepend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-           -friend 'jmethodID (::_Jv_FromReflectedConstructor) (java::lang::reflect::Constructor *);' \
-           -friend 'jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-           -friend 'class java::lang::Class;' \
-           java/lang/reflect/Constructor
-
-java/lang/reflect/Field.h: classpath/lib/java/lang/reflect/Field.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-           -prepend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \
-           -prepend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
-           -friend 'jfieldID (::_Jv_FromReflectedField) (java::lang::reflect::Field *);' \
-           -friend 'jobject (::_Jv_JNI_ToReflectedField) (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
-           -friend 'class java::lang::Class;' \
-           java/lang/reflect/Field
-
-java/lang/reflect/Method.h: classpath/lib/java/lang/reflect/Method.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-           -prepend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \
-           -prepend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-           -friend 'jmethodID (::_Jv_FromReflectedMethod) (java::lang::reflect::Method *);' \
-           -friend 'jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-           -friend 'class java::lang::Class;' \
-           -friend 'class java::io::ObjectInputStream;' \
-           java/lang/reflect/Method
-
-java/lang/reflect/Proxy.h: classpath/lib/java/lang/reflect/Proxy.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-           java/lang/reflect/Proxy
-
-java/lang/reflect/Proxy$$ProxyData.h: classpath/lib/java/lang/reflect/Proxy.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/lang/reflect/Proxy$$ProxyData'
-
-java/lang/reflect/Proxy$$ProxyType.h: classpath/lib/java/lang/reflect/Proxy.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/lang/reflect/Proxy$$ProxyType'
-
-gnu/gcj/runtime/ExtensionClassLoader.h: classpath/lib/gnu/gcj/runtime/ExtensionClassLoader.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-           -friend 'class ::java::lang::ClassLoader;' \
-           gnu/gcj/runtime/ExtensionClassLoader
-
-java/io/ObjectInputStream$$GetField.h: classpath/lib/java/io/ObjectInputStream.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/io/ObjectInputStream$$GetField'
-
-java/io/ObjectOutputStream$$PutField.h: classpath/lib/java/io/ObjectOutputStream.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/io/ObjectOutputStream$$PutField'
-
-java/nio/DirectByteBufferImpl$$ReadWrite.h: classpath/lib/java/nio/DirectByteBufferImpl.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/nio/DirectByteBufferImpl$$ReadWrite'
-
-java/nio/channels/Pipe$$SinkChannel.h: classpath/lib/java/nio/channels/Pipe.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/nio/channels/Pipe$$SinkChannel'
-
-java/nio/channels/Pipe$$SourceChannel.h: classpath/lib/java/nio/channels/Pipe.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/nio/channels/Pipe$$SourceChannel'
-
-gnu/java/net/PlainSocketImpl$$SocketInputStream.h: classpath/lib/gnu/java/net/PlainSocketImpl.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'gnu/java/net/PlainSocketImpl$$SocketInputStream'
-
-gnu/java/net/PlainSocketImpl$$SocketOutputStream.h: classpath/lib/gnu/java/net/PlainSocketImpl.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'gnu/java/net/PlainSocketImpl$$SocketOutputStream'
-
-gnu/java/nio/PipeImpl$$SinkChannelImpl.h: classpath/lib/gnu/java/nio/PipeImpl.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'gnu/java/nio/PipeImpl$$SinkChannelImpl'
-
-gnu/java/nio/PipeImpl$$SourceChannelImpl.h: classpath/lib/gnu/java/nio/PipeImpl.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'gnu/java/nio/PipeImpl$$SourceChannelImpl'
-
-java/lang/ConcreteProcess$$ProcessManager.h: classpath/lib/java/lang/ConcreteProcess.class
-       $(GCJH) -classpath '' -bootclasspath classpath/lib \
-       'java/lang/ConcreteProcess$$ProcessManager'
+sun/awt.list: $(sun_awt_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/sun/awt/*.class > sun/awt.list
+
+-include sun/awt.deps
+
+sun/misc.list: $(sun_misc_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/sun/misc/*.class > sun/misc.list
+
+-include sun/misc.deps
+
+sun/reflect.list: $(sun_reflect_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/sun/reflect/*.class > sun/reflect.list
+
+-include sun/reflect.deps
+
+sun/reflect/annotation.list: $(sun_reflect_annotation_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/sun/reflect/annotation/*.class > sun/reflect/annotation.list
+
+-include sun/reflect/annotation.deps
+
+sun/reflect/misc.list: $(sun_reflect_misc_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/sun/reflect/misc/*.class > sun/reflect/misc.list
+
+-include sun/reflect/misc.deps
+
+java/process-Ecos.list: java/lang/EcosProcess.java
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/lang/EcosProcess*.class > java/process-Ecos.list
+
+-include java/process-Ecos.deps
+
+java/process-Win32.list: java/lang/Win32Process.java
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/lang/Win32Process*.class > java/process-Win32.list
+
+-include java/process-Win32.deps
+
+java/process-Posix.list: java/lang/PosixProcess.java
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/java/lang/PosixProcess*.class > java/process-Posix.list
+
+-include java/process-Posix.deps
+
+$(generic_header_files): gcjh.stamp
+
+gcjh.stamp: classpath/lib/compile-classes
+@JAVA_MAINTAINER_MODE_TRUE@    $(MYGCJH) --cni --all $(srcdir)/classpath/lib \
+@JAVA_MAINTAINER_MODE_TRUE@        --cmdfile=$(srcdir)/headers.txt -d $(srcdir) --force
+       echo > gcjh.stamp
 
 $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h:
        @:
 
-@USE_LIBGCJ_BC_TRUE@install-exec-hook: install-toolexeclibLTLIBRARIES
+install-exec-hook: install-binPROGRAMS install-toolexeclibLTLIBRARIES \
+       install-libexecsubPROGRAMS
 @USE_LIBGCJ_BC_TRUE@   @echo Installing dummy lib libgcj_bc.so.1.0.0; \
 @USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
 @USE_LIBGCJ_BC_TRUE@   mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
@@ -11791,7 +12600,7 @@ $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h:
 @USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
 @USE_LIBGCJ_BC_TRUE@   $(LN_S) libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
 @USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.la;
-
+@BUILD_ECJ1_TRUE@      mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
 install-data-local:
        $(PRE_INSTALL)
        @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
@@ -11801,24 +12610,159 @@ install-data-local:
        $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file
        @echo Creating list of headers to install...
        @: $(call write_entries_to_file,$(nat_headers_install) $(extra_headers),tmp-ilist)
-       @cat tmp-ilist | while read f; do \
-         d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \
-         $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/$$d; \
-         if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
-         echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f"; \
-         $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f; \
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       while read file; do echo "$$file $$file"; done < tmp-ilist | \
+       sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+       $(AWK) 'BEGIN { files["."] = "" } \
+         { files[$$2] = files[$$2] " " $$1; \
+           if (++n[$$2] == $(install_data_local_split)) { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+            END { for (dir in files) print dir, files[dir] }' | \
+       while read dir files; do \
+         xfiles=; for file in $$files; do \
+           if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+           else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+         test -z "$$xfiles" || { \
+           test "x$$dir" = x. || { \
+             echo "$(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/$$dir"; \
+             $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/$$dir; }; \
+           echo " $(INSTALL_DATA) $$xfiles $(DESTDIR)$(gxx_include_dir)/$$dir"; \
+           $(INSTALL_DATA) $$xfiles $(DESTDIR)$(gxx_include_dir)/$$dir; }; \
        done
        -@rm -f tmp-ilist
-       $(INSTALL_DATA) 'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
-       $(INSTALL_DATA) 'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
-       $(INSTALL_DATA) 'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/
-       $(INSTALL_DATA) 'java/nio/channels/Pipe$$SourceChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/
-       $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/
-       $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/
-       $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/
-       $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/
-       $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/
-       $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/
+       $(INSTALL_DATA) $(srcdir)/'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
+       $(INSTALL_DATA) $(srcdir)/'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
+       $(INSTALL_DATA) $(srcdir)/'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/
+       $(INSTALL_DATA) $(srcdir)/'java/nio/channels/Pipe$$SourceChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/
+       $(INSTALL_DATA) $(srcdir)/'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/
+       $(INSTALL_DATA) $(srcdir)/'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/
+       $(INSTALL_DATA) $(srcdir)/'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/
+       $(INSTALL_DATA) $(srcdir)/'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/
+       $(INSTALL_DATA) $(srcdir)/'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/
+       $(INSTALL_DATA) $(srcdir)/'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/
+       $(mkinstalldirs) $(DESTDIR)$(python_mod_dir); \
+       $(INSTALL_DATA) $(srcdir)/contrib/classfile.py \
+         $(DESTDIR)$(python_mod_dir)/classfile.py; \
+       $(INSTALL_DATA) contrib/aotcompile.py \
+         $(DESTDIR)$(python_mod_dir)/aotcompile.py;
+@CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(JRE_BIN_DIR)
+@CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(SDK_BIN_DIR)
+@CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)
+@CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)
+@CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)
+@CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)
+@CREATE_JAVA_HOME_TRUE@        relative() { \
+@CREATE_JAVA_HOME_TRUE@          $(PERL) -e 'use File::Spec; \
+@CREATE_JAVA_HOME_TRUE@            print File::Spec->abs2rel($$ARGV[0], $$ARGV[1])' $$1 $$2; \
+@CREATE_JAVA_HOME_TRUE@        }; \
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(bindir) $(DESTDIR)$(SDK_BIN_DIR)); \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gij | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/java; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gjar | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/jar; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gjdoc | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/javadoc; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo grmic | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/rmic; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gjavah | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/javah; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gappletviewer | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/appletviewer; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gjarsigner | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/jarsigner; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo grmiregistry | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/rmiregistry; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gkeytool | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/keytool; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gorbd | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/orbd; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gnative2ascii | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/native2ascii; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo grmid | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/rmid; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gtnameserv | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/tnameserv; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gserialver | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/serialver; \
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(bindir) $(DESTDIR)$(JRE_BIN_DIR)); \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo grmiregistry | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_BIN_DIR)/rmiregistry; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gkeytool | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_BIN_DIR)/keytool; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gij | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_BIN_DIR)/java; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gorbd | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_BIN_DIR)/orbd; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo grmid | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_BIN_DIR)/rmid; \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gtnameserv | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_BIN_DIR)/tnameserv; \
+@CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(JVM_JAR_DIR); \
+@CREATE_JAVA_HOME_TRUE@        version=$(JAVA_VERSION).$(BUILD_VERSION); \
+@CREATE_JAVA_HOME_TRUE@        working_dir=`pwd`; \
+@CREATE_JAVA_HOME_TRUE@        cd $(DESTDIR)$(JVM_JAR_DIR); \
+@CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $(DESTDIR)$(JRE_LIB_DIR) \
+@CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(JVM_JAR_DIR)); \
+@CREATE_JAVA_HOME_TRUE@          for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
+@CREATE_JAVA_HOME_TRUE@            jndi-ldap jndi-rmi jsse sasl; \
+@CREATE_JAVA_HOME_TRUE@          do \
+@CREATE_JAVA_HOME_TRUE@            ln -sf $$RELATIVE/rt.jar $$jarname-$$version.jar; \
+@CREATE_JAVA_HOME_TRUE@          done; \
+@CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+@CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(JVM_JAR_DIR)); \
+@CREATE_JAVA_HOME_TRUE@          for jar in *-$$version.jar; \
+@CREATE_JAVA_HOME_TRUE@          do \
+@CREATE_JAVA_HOME_TRUE@            ln -sf $$jar $$(echo $$jar | sed "s|-$$version.jar|-$(JAVA_VERSION).jar|g"); \
+@CREATE_JAVA_HOME_TRUE@            ln -sf $$jar $$(echo $$jar | sed "s|-$$version.jar|.jar|g"); \
+@CREATE_JAVA_HOME_TRUE@          done; \
+@CREATE_JAVA_HOME_TRUE@        cd $$working_dir; \
+@CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/security; \
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(toolexeclibdir)/security \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)/security); \
+@CREATE_JAVA_HOME_TRUE@        cd $(DESTDIR)$(JRE_LIB_DIR)/security; \
+@CREATE_JAVA_HOME_TRUE@          ln -sf $$RELATIVE/classpath.security java.security; \
+@CREATE_JAVA_HOME_TRUE@        cd $$working_dir; \
+@CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/linux; \
+@CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \
+@CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \
+@CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)); \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/libgcj-$(gcc_version).jar \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)/rt.jar; \
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(dbexecdir) \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)); \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/libjawt.so \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/libjawt.so; \
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(dbexecdir) \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client); \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/libjvm.so \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client/libjvm.so; \
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(dbexecdir) \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server); \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/libjvm.so \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server/libjvm.so;     \
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_LIB_DIR)); \
+@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
+@CREATE_JAVA_HOME_TRUE@        for headername in jawt jni; do \
+@CREATE_JAVA_HOME_TRUE@          DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@            -print-file-name=include/$$headername.h)); \
+@CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $$DIRECTORY \
+@CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)); \
+@CREATE_JAVA_HOME_TRUE@          ln -sf $$RELATIVE/$$headername.h \
+@CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)/$$headername.h; \
+@CREATE_JAVA_HOME_TRUE@        done; \
+@CREATE_JAVA_HOME_TRUE@        for headername in jawt_md jni_md; do \
+@CREATE_JAVA_HOME_TRUE@          DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+@CREATE_JAVA_HOME_TRUE@            -print-file-name=include/$$headername.h)); \
+@CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $$DIRECTORY \
+@CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
+@CREATE_JAVA_HOME_TRUE@          ln -sf $$RELATIVE/$$headername.h \
+@CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
+@CREATE_JAVA_HOME_TRUE@        done; \
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); 
 
 maintainer-check: libgcj.la
        $(NM) .libs/libgcj.a | grep ' T ' \
@@ -11892,12 +12836,33 @@ src.zip:
        here=`pwd`; \
        ( \
          ( cd $(srcdir)/classpath; \
-         find java gnu javax org -name '*.java' -print | \
+         find java gnu javax org sun -name '*.java' -print | \
          while read file; do \
            echo "x-C" | sed -e 's/^.//'; \
            echo $(srcdir)/classpath; \
            echo $$file; \
          done ); \
+         ( cd $(srcdir)/classpath/external/sax; \
+         find org -name '*.java' -print | \
+         while read file; do \
+           echo "x-C" | sed -e 's/^.//'; \
+           echo $(srcdir)/classpath/external/sax; \
+           echo $$file; \
+         done ); \
+         ( cd $(srcdir)/classpath/external/relaxngDatatype; \
+         find org -name '*.java' -print | \
+         while read file; do \
+           echo "x-C" | sed -e 's/^.//'; \
+           echo $(srcdir)/classpath/external/relaxngDatatype; \
+           echo $$file; \
+         done ); \
+         ( cd $(srcdir)/classpath/external/w3c_dom; \
+         find org -name '*.java' -print | \
+         while read file; do \
+           echo "x-C" | sed -e 's/^.//'; \
+           echo $(srcdir)/classpath/external/w3c_dom; \
+           echo $$file; \
+         done ); \
          ( cd classpath; \
            find gnu java -name '*.java' -print | \
            while read file; do \
@@ -11934,10 +12899,6 @@ $(libgcj_la_OBJECTS) $(gcj_dbtool_OBJECTS) $(xlib_nat_files): headers.stamp
 $(libgij_la_OBJECTS): headers.stamp
 $(libjvm_la_OBJECTS): headers.stamp
 
-# No install-html support yet.
-.PHONY: install-html
-install-html:
-
 # Multilib support.
 .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
        maintainer-clean-multi
@@ -11961,6 +12922,7 @@ distclean-multi:
        $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean
 maintainer-clean-multi:
        $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: