OSDN Git Service

Fix typo in previous changelog entry.
[pf3gnuchains/gcc-fork.git] / libjava / Makefile.am
index a6aa9b5..89cb633 100644 (file)
@@ -4,6 +4,9 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 
 ACLOCAL_AMFLAGS = -I . -I ../config
 
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+
 ## Garbage collector conditionals.
 if USING_BOEHMGC
 BOEHMGC_SRC = boehm.cc
@@ -64,9 +67,9 @@ endif
 
 ## Testsuite conditional.
 if TESTSUBDIR
-SUBDIRS = $(DIRLTDL) testsuite gcj include
+SUBDIRS = $(DIRLTDL) testsuite gcj include external
 else
-SUBDIRS = $(DIRLTDL) gcj include
+SUBDIRS = $(DIRLTDL) gcj include external
 endif
 
 ## Darwin uses the jcr section, but doesn't use crtstuff.
@@ -102,29 +105,49 @@ endif
 
 if GTK_AWT
 cond_gtk_ltlibrary = lib-gnu-java-awt-peer-gtk.la
+cond_gtk_jawt_ltlibrary = libjawt.la
 else
 cond_gtk_ltlibrary =
+cond_gtk_jawt_ltlibrary =
 endif
 
-toolexeclib_LTLIBRARIES = libgcj.la libgij.la lib-org-xml-sax.la \
-       lib-org-w3c-dom.la lib-org-ietf-jgss.la \
-    $(cond_gtk_ltlibrary) $(cond_xlib_ltlibrary)
+toolexeclib_LTLIBRARIES = libgcj.la libgij.la \
+    $(cond_gtk_ltlibrary) $(cond_gtk_jawt_ltlibrary) $(cond_xlib_ltlibrary)
 toolexecmainlib_DATA = libgcj.spec
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgcj.pc
 
 jardir = $(datadir)/java
-jar_DATA = libgcj-@gcc_version@.jar
+jar_DATA = libgcj-$(gcc_version).jar
+
+if JAVA_HOME_SET
+JAVA_HOME_DIR = $(JAVA_HOME)
+BOOT_CLASS_PATH_DIR = $(JAVA_HOME)/lib/rt.jar
+else
+JAVA_HOME_DIR = $(prefix)
+BOOT_CLASS_PATH_DIR = $(jardir)/$(jar_DATA)
+endif
 
 ## FIXME: Using libdir violates GNU coding standards.
 secdir = $(libdir)/security
 ## Where to install default logging property file.
 propdir = $(libdir)
 
+## Where the standard .db file is found.
+dbexecdir = $(libdir)/gcj-$(gcc_version)
+## Name of the default .db.
+db_name = classmap.db
+## Compiler specific component of the .db file
+db_pathtail = gcj-$(gcc_version)/$(db_name)
+
 ## For now, only on native systems.  FIXME.
 if NATIVE
 bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool
+
+## It is convenient to actually build and install the default database
+## when gcj-dbtool is available.
+dbexec_DATA = $(db_name)
 endif
 
 bin_SCRIPTS = addr2name.awk
@@ -169,12 +192,17 @@ AM_CXXFLAGS = \
        -D_GNU_SOURCE \
        -DPREFIX="\"$(prefix)\"" \
        -DLIBDIR="\"$(libdir)\"" \
-       -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \
-       -DJAVA_EXT_DIRS="\"$(jardir)/ext\""
+        -DJAVA_HOME="\"$(JAVA_HOME_DIR)\"" \
+        -DBOOT_CLASS_PATH="\"$(BOOT_CLASS_PATH_DIR)\"" \
+       -DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \
+       -DGCJ_ENDORSED_DIRS="\"$(jardir)/gcj-endorsed\"" \
+       -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
+       -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \
+       -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\""
 
 AM_GCJFLAGS = \
        @LIBGCJ_JAVAFLAGS@ \
-       -fclasspath= -fbootclasspath=$(here) \
+       -fclasspath= -fbootclasspath=$(BOOTCLASSPATH) \
        --encoding=UTF-8 \
        -Wno-deprecated
 
@@ -196,6 +224,8 @@ AM_CPPFLAGS = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
        $(GCINCS) $(THREADINCS) $(INCLTDL) \
        $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS)
 
+BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(srcdir)/external/w3c_dom'$(CLASSPATH_SEPARATOR)'$(srcdir)/external/sax
+
 ## ################################################################
 
 ##
@@ -203,10 +233,18 @@ AM_CPPFLAGS = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
 ##
 
 libgij_la_SOURCES = gij.cc
-libgij_la_LIBADD = libgcj.la
 libgij_la_DEPENDENCIES = libgcj.la libgcj.spec
+## See jv_convert_LDADD.
+libgij_la_LIBADD = -L$(here)/.libs libgcj.la
+## The mysterious backslash in the grep pattern is consumed by make.
+libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
+        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
 
-libgcj_la_SOURCES = prims.cc jni.cc exception.cc \
+# Work around libtool wanting to do piece-wise linking with -r.  Using a
+# convenience library suddenly invokes the --whole-archive path instead.
+# This allows the build to succeed for targets that allocate multiple got
+# subsections in the linker, such as Alpha and MIPS.
+libgcj0_convenience_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc \
        link.cc defineclass.cc interpret.cc verify.cc \
        $(nat_source_files) $(math_c_source_files) $(java_source_files) \
        $(built_java_source_files) \
@@ -215,9 +253,15 @@ libgcj_la_SOURCES = prims.cc jni.cc exception.cc \
        $(POSIX_PLATFORM_SRC) $(WIN32_PLATFORM_SRC) $(ECOS_PLATFORM_SRC) \
        $(DARWIN_CRT_SRC) \
        $(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC)
-libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar \
-       java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \
-       $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
+libgcj0_convenience_la_LIBADD = \
+       gnu-xml.lo javax-imageio.lo \
+       javax-xml.lo gnu-java-beans.lo \
+       external/sax/libsax-gcj.la \
+       external/w3c_dom/libw3c-gcj.la
+
+noinst_LTLIBRARIES = libgcj0_convenience.la
+
+libgcj_la_SOURCES =
 
 ## Objects from C++ sources in subdirs.
 nat_files = $(nat_source_files:.cc=.lo)
@@ -229,9 +273,25 @@ xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
 libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
        $(LIBLTDL) $(SYS_ZLIBS) \
        -version-info `grep -v '^\#' $(srcdir)/libtool-version`
-libgcj_la_LIBADD = $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
+libgcj_la_LIBADD = \
+       libgcj0_convenience.la \
+       $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
+libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
+       java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \
+       $(LIBLTDL) $(libgcj_la_LIBADD)
 libgcj_la_LINK = $(LIBLINK)
 
+
+## The .db file.  This rule is only used for native builds, so it is
+## safe to invoke gcj-dbtool.
+$(db_name): gcj-dbtool$(EXEEXT)
+## In case it exists already.
+       @rm -f $(db_name)
+## We don't actually care if it fails -- if it does, just make an
+## empty file.  This is simpler than trying to discover when mmap is
+## not available.
+       ./gcj-dbtool -n $(db_name) || touch $(db_name)
+
 # Gtk/Cairo JNI sources.
 if GTK_CAIRO
 gtk_cairo_c_source_files = \
@@ -244,12 +304,11 @@ endif
 gtk_c_source_files = \
 $(gtk_cairo_c_source_files) \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c \
-jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c \
-jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c \
+jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.c \
@@ -266,7 +325,6 @@ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c \
-jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c \
@@ -282,10 +340,8 @@ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c    \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c \
 jni/gtk-peer/gthread-jni.c \
-jni/classpath/jcl.c \
-jni/classpath/jnilink.c        \
-jni/classpath/native_state.c \
-jni/classpath/primlib.c
+jni/gtk-peer/gtk_jawt.c \
+jni/classpath/native_state.c
 
 ## Java sources for Gtk peers.
 gtk_awt_peer_sources = \
@@ -295,8 +351,11 @@ gnu/java/awt/peer/gtk/GdkFontPeer.java \
 gnu/java/awt/peer/gtk/GdkGlyphVector.java \
 gnu/java/awt/peer/gtk/GdkGraphics.java \
 gnu/java/awt/peer/gtk/GdkGraphics2D.java \
+gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java \
 gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java \
 gnu/java/awt/peer/gtk/GdkPixbufDecoder.java \
+gnu/java/awt/peer/gtk/GdkRobotPeer.java \
+gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java \
 gnu/java/awt/peer/gtk/GtkButtonPeer.java \
 gnu/java/awt/peer/gtk/GtkCanvasPeer.java \
 gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java        \
@@ -315,7 +374,6 @@ gnu/java/awt/peer/gtk/GtkImage.java \
 gnu/java/awt/peer/gtk/GtkImagePainter.java \
 gnu/java/awt/peer/gtk/GtkLabelPeer.java        \
 gnu/java/awt/peer/gtk/GtkListPeer.java \
-gnu/java/awt/peer/gtk/GtkMainThread.java \
 gnu/java/awt/peer/gtk/GtkMenuBarPeer.java \
 gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java        \
 gnu/java/awt/peer/gtk/GtkMenuItemPeer.java \
@@ -336,8 +394,6 @@ gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java
 
 gtk_jni_headers = $(patsubst %.java,jniinclude/%.h,$(subst /,_,$(gtk_awt_peer_sources)))
 
-jniinclude/gnu_java_awt_peer_gtk_GdkFontMetrics.h: gnu/java/awt/peer/gtk/GdkFontMetrics.java
-jniinclude/gnu_java_awt_peer_gtk_GdkGlyphVector.h: gnu/java/awt/peer/gtk/GdkGlyphVector.java
 jniinclude/gnu_java_awt_peer_gtk_GdkGraphics.h: gnu/java/awt/peer/gtk/GdkGraphics.java
 jniinclude/gnu_java_awt_peer_gtk_GdkGraphics2D.h: gnu/java/awt/peer/gtk/GdkGraphics2D.java
 jniinclude/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h: gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
@@ -361,7 +417,6 @@ jniinclude/gnu_java_awt_peer_gtk_GtkImage.h: gnu/java/awt/peer/gtk/GtkImage.java
 jniinclude/gnu_java_awt_peer_gtk_GtkImagePainter.h: gnu/java/awt/peer/gtk/GtkImagePainter.java
 jniinclude/gnu_java_awt_peer_gtk_GtkLabelPeer.h: gnu/java/awt/peer/gtk/GtkLabelPeer.java
 jniinclude/gnu_java_awt_peer_gtk_GtkListPeer.h: gnu/java/awt/peer/gtk/GtkListPeer.java
-jniinclude/gnu_java_awt_peer_gtk_GtkMainThread.h: gnu/java/awt/peer/gtk/GtkMainThread.java
 jniinclude/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h: gnu/java/awt/peer/gtk/GtkMenuBarPeer.java
 jniinclude/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h: gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
 jniinclude/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h: gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
@@ -386,9 +441,7 @@ $(gtk_jni_headers): %.h:
        echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \
        $(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input
 
-jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkFontMetrics.h
 jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkFontPeer.h
-jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkGlyphVector.h
 jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkGraphics2D.h
 jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h
 jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkGraphics.h
@@ -410,7 +463,6 @@ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.lo: $(top_builddir)/jniinclude
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkImagePainter.h
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkLabelPeer.h
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkListPeer.h
-jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkMainThread.h
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h
@@ -431,121 +483,40 @@ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.lo: $(top_builddir)/jniinclude/
 $(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES)
 
 lib_gnu_java_awt_peer_gtk_la_SOURCES = \
-$(gtk_awt_peer_sources) \
 $(gtk_c_source_files) \
 jni/gtk-peer/gthread-jni.h \
 jni/gtk-peer/gtkpeer.h \
-jni/classpath/jcl.h \
-jni/classpath/jnilink.h        \
-jni/classpath/native_state.h \
-jni/classpath/primlib.h
+jni/classpath/native_state.h
 
 lib_gnu_java_awt_peer_gtk_la_CFLAGS = \
        -Ijniinclude -I$(srcdir)/jni/classpath \
        -I$(srcdir)/jni/gtk-peer $(PEDANTIC_CFLAGS) $(GTK_CFLAGS) $(LIBART_CFLAGS) \
-       $(CAIRO_CFLAGS) $(PANGOFT2_CFLAGS)
+       $(X_CFLAGS) $(CAIRO_CFLAGS) $(PANGOFT2_CFLAGS)
 lib_gnu_java_awt_peer_gtk_la_GCJFLAGS = $(AM_GCJFLAGS) -fjni
-lib_gnu_java_awt_peer_gtk_la_LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)
-lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = $(gtk_jni_headers) libgcj-@gcc_version@.jar libgcj.la libgcj.spec
+lib_gnu_java_awt_peer_gtk_la_LIBADD = gtk-awt-peer.lo $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)
+lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gtk-awt-peer.lo $(gtk_jni_headers) libgcj-$(gcc_version).jar libgcj.la libgcj.spec
 ## The mysterious backslash in the grep pattern is consumed by make.
 lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
+        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) $(X_LIBS) -lXtst
 lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
 
-lib_org_ietf_jgss_la_SOURCES = \
-org/ietf/jgss/ChannelBinding.java \
-org/ietf/jgss/GSSContext.java \
-org/ietf/jgss/GSSCredential.java \
-org/ietf/jgss/GSSException.java \
-org/ietf/jgss/GSSManager.java \
-org/ietf/jgss/GSSName.java \
-org/ietf/jgss/MessageProp.java \
-org/ietf/jgss/Oid.java
-
-lib_org_ietf_jgss_la_DEPENDENCIES= $(jgss_propertyo_files) \
-       libgcj-@gcc_version@.jar libgcj.la libgcj.spec
-## See jv_convert_LDADD.
-lib_org_ietf_jgss_la_LIBADD = -L$(here)/.libs  $(jgss_propertyo_files) \
-       libgcj.la
-
-## The mysterious backslash in the grep pattern is consumed by make.
-lib_org_ietf_jgss_la_LDFLAGS = -rpath $(toolexeclibdir) \
-       -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
-
-lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \
-org/w3c/dom/CDATASection.java \
-org/w3c/dom/CharacterData.java \
-org/w3c/dom/Comment.java \
-org/w3c/dom/DOMException.java \
-org/w3c/dom/DOMImplementation.java \
-org/w3c/dom/Document.java \
-org/w3c/dom/DocumentFragment.java \
-org/w3c/dom/DocumentType.java \
-org/w3c/dom/Element.java \
-org/w3c/dom/Entity.java \
-org/w3c/dom/EntityReference.java \
-org/w3c/dom/NamedNodeMap.java \
-org/w3c/dom/Node.java \
-org/w3c/dom/NodeList.java \
-org/w3c/dom/Notation.java \
-org/w3c/dom/ProcessingInstruction.java \
-org/w3c/dom/Text.java \
-org/w3c/dom/ranges/DocumentRange.java \
-org/w3c/dom/ranges/Range.java \
-org/w3c/dom/ranges/RangeException.java \
-org/w3c/dom/traversal/DocumentTraversal.java \
-org/w3c/dom/traversal/NodeFilter.java \
-org/w3c/dom/traversal/NodeIterator.java \
-org/w3c/dom/traversal/TreeWalker.java
-## See jv_convert_LDADD.
-lib_org_w3c_dom_la_LIBADD = -L$(here)/.libs libgcj.la
-## The mysterious backslash in the grep pattern is consumed by make.
-lib_org_w3c_dom_la_LDFLAGS = -rpath $(toolexeclibdir) \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
-
-lib_org_xml_sax_la_SOURCES = org/xml/sax/ext/DeclHandler.java \
-org/xml/sax/ext/LexicalHandler.java \
-org/xml/sax/helpers/AttributeListImpl.java \
-org/xml/sax/helpers/AttributesImpl.java \
-org/xml/sax/helpers/DefaultHandler.java \
-org/xml/sax/helpers/LocatorImpl.java \
-org/xml/sax/helpers/NamespaceSupport.java \
-org/xml/sax/helpers/NewInstance.java \
-org/xml/sax/helpers/ParserAdapter.java \
-org/xml/sax/helpers/ParserFactory.java \
-org/xml/sax/helpers/XMLFilterImpl.java \
-org/xml/sax/helpers/XMLReaderAdapter.java \
-org/xml/sax/helpers/XMLReaderFactory.java \
-org/xml/sax/AttributeList.java \
-org/xml/sax/Attributes.java \
-org/xml/sax/ContentHandler.java \
-org/xml/sax/DTDHandler.java \
-org/xml/sax/DocumentHandler.java \
-org/xml/sax/EntityResolver.java \
-org/xml/sax/ErrorHandler.java \
-org/xml/sax/HandlerBase.java \
-org/xml/sax/InputSource.java \
-org/xml/sax/Locator.java \
-org/xml/sax/Parser.java \
-org/xml/sax/SAXException.java \
-org/xml/sax/SAXNotRecognizedException.java \
-org/xml/sax/SAXNotSupportedException.java \
-org/xml/sax/SAXParseException.java \
-org/xml/sax/XMLFilter.java \
-org/xml/sax/XMLReader.java
+libjawt_la_SOURCES = jawt.c
+libjawt_la_CFLAGS = -I$(srcdir)/jni/classpath $(PEDANTIC_CFLAGS) $(X_CFLAGS)
 ## See jv_convert_LDADD.
-lib_org_xml_sax_la_LIBADD = -L$(here)/.libs libgcj.la
-## The mysterious backslash in the grep pattern is consumed by make.
-lib_org_xml_sax_la_LDFLAGS = -rpath $(toolexeclibdir) \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
+libjawt_la_LIBADD = -L$(here)/.libs lib-gnu-java-awt-peer-gtk.la
+libjawt_la_LDFLAGS = \
+       -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
+       $(LIBGCJ_LD_SYMBOLIC)
+libjawt_la_LINK = $(LIBLINK)
 
 lib_gnu_awt_xlib_la_SOURCES = \
        $(xlib_java_source_files) \
        $(xlib_nat_source_files)
-lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-@gcc_version@.jar libgcj.la libgcj.spec
+lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar libgcj.la libgcj.spec
 lib_gnu_awt_xlib_la_LIBADD = $(xlib_javao_files)
 ## We require libstdc++-v3 to be in the same build tree.
 lib_gnu_awt_xlib_la_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
        -I../libstdc++-v3/include \
        -I../libstdc++-v3/include/$(target_noncanonical) \
        -I$(srcdir)/../libstdc++-v3/libsupc++
@@ -559,32 +530,25 @@ lib_gnu_awt_xlib_la_LINK = $(LIBLINK)
 all_java_source_files = \
     $(java_source_files) \
     $(built_java_source_files) \
-    $(lib_org_ietf_jgss_la_SOURCES) \
-    $(lib_org_xml_sax_la_SOURCES) \
-    $(lib_org_w3c_dom_la_SOURCES) \
     $(gtk_awt_peer_sources) \
-    $(xlib_java_source_files)
+    $(xlib_java_source_files) \
+    $(gnu_xml_source_files) \
+    $(javax_imageio_source_files) \
+    $(javax_xml_source_files) \
+    $(gnu_java_beans_source_files)
 
 all_java_class_files = $(all_java_source_files:.java=.class)
 
-all_property_files = $(property_files) $(jgss_property_files) \
+all_property_files = $(property_files) \
     java/util/logging/logging.properties
 
 ## Build property files into the library.
 property_files = \
 gnu/regexp/MessagesBundle.properties \
-gnu/regexp/MessagesBundle_fr.properties
-
-propertyo_files = $(property_files:.properties=.properties.lo) 
-
-%.properties.lo: %.properties
-       $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
-
-## Build property files into the lib-org-ietf-jgss library.
-jgss_property_files = \
+gnu/regexp/MessagesBundle_fr.properties \
 org/ietf/jgss/MessagesBundle.properties
 
-jgss_propertyo_files = $(jgss_property_files:.properties=.properties.lo)
+propertyo_files = $(property_files:.properties=.properties.lo) 
 
 %.properties.lo: %.properties
        $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
@@ -593,39 +557,31 @@ if ONESTEP
 
 # Compile all classfiles in one go.
 
-libgcj-@gcc_version@.jar: $(all_java_source_files)
-       -@rm -f libgcj-@gcc_version@.jar
+classes.stamp: $(all_java_source_files) gnu/gcj/tools/gcj_dbtool/Main.java
        @echo Compiling Java sourcefiles...
        @: $(call write_entries_to_file,$?,libgcj.sourcelist)
-       $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir) -d $(here) @libgcj.sourcelist
-## Note that we explicitly want to include directory information.
-       (find java gnu javax org -type d -o -type f -name '*.class'; \
-## Ugly code to avoid "echo -C".  Must separate each entry by a newline
-## Gross but easy.
-       for file in $(all_property_files); do \
-         echo "x-C" | sed -e 's/^.//'; \
-         echo $(srcdir); \
-         echo $$file; \
-       done) | \
-         sed -e '/\/xlib/d' -e '/\/\.libs/d' -e '/\/\.deps/d' | \
-         $(ZIP) -cfM0E@ $@
-
-# This next rule seems backward, but reflects the fact
-# that 1) all classfiles are compiled in one go when the
-# libgcj jarfile is built and 2) anything which depends
-# on a particular .class file must wait until the jarfile
-# is built.
-$(all_java_class_files): libgcj-@gcc_version@.jar
+       $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(BOOTCLASSPATH) -d $(here) @libgcj.sourcelist
+       echo > classes.stamp
+# This next rule seems backward, but reflects the fact that 1) all
+# classfiles are compiled in one go when classes.stamp is built and 2)
+# anything which depends on a particular .class file must wait until
+# this file is built.
+$(all_java_class_files) gnu/gcj/tools/gcj_dbtool/Main.class: classes.stamp
 
 else # !ONESTEP
 
 # Compile each classfile individually.
 
 .java.class:
-       $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir) -d $(here) $<
+       $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(BOOTCLASSPATH) -d $(here) $<
+
+classes.stamp: $(all_java_class_files) $(all_property_files)
+       echo > classes.stamp
 
-libgcj-@gcc_version@.jar: $(all_java_class_files) $(all_property_files)
-       -@rm -f libgcj-@gcc_version@.jar
+endif
+
+libgcj-$(gcc_version).jar: classes.stamp
+       -@rm -f libgcj-$(gcc_version).jar
 ## Note that we explicitly want to include directory information.
        (find java gnu javax org -type d -o -type f -name '*.class'; \
 ## Ugly code to avoid "echo -C".  Must separate each entry by a newline
@@ -637,10 +593,18 @@ libgcj-@gcc_version@.jar: $(all_java_class_files) $(all_property_files)
        done) | \
          sed -e '/\/xlib/d' -e '/\/\.libs/d' -e '/\/\.deps/d' | \
          $(ZIP) -cfM0E@ $@
+## Now include the classes from external/.
+       for dir in sax w3c_dom; do \
+         (cd external/$$dir; \
+         find org -type f -name '*.class' -print | while read file; do \
+           echo "x-C" | sed -e 's/^.//'; \
+           echo external/$$dir; \
+           echo $$file; \
+          done) | \
+         $(ZIP) -ufM0E@ $@; \
+       done
 
-endif
-
-CLEANFILES = libgcj-@gcc_version@.jar
+CLEANFILES = libgcj-$(gcc_version).jar classes.stamp
 
 mostlyclean-local:
 ## Use libtool rm to remove each libtool object
@@ -663,20 +627,9 @@ clean-nat:
 
 SUFFIXES = .class .java .h .properties
 
-## Note: we omit StackTrace here, since it has an explicit rule a bit
-## later, and GNU make will warn in this case.
-$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(xlib_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_ietf_jgss_la_OBJECTS): %.lo: %.java
+$(javao_files) $(xlib_javao_files): %.lo: %.java
        $(LTGCJCOMPILE) -o $@ -c $<
 
-$(gtk_awt_peer_sources:.java=.lo): %.lo: %.java
-       $(LTGCJCOMPILE) -fjni -o $@ -c $<
-
-## A special case.  The sibcall optimization can change the number of
-## frames on the stack, and StackTrace makes assumptions about this
-## number.
-gnu/gcj/runtime/StackTrace.lo: gnu/gcj/runtime/StackTrace.java
-       $(LTGCJCOMPILE) -fno-optimize-sibling-calls -o $@ -c $<
-
 ## Pass the list of object files to libtool in a temporary file to
 ## avoid tripping platform command line length limits.
 libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
@@ -695,15 +648,79 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND
 ## ################################################################
 
 ##
+## Some packages must be built with the binary compatibility ABI.  We
+## compile each such package into a .so, broken down more or less by
+## conceptual unit.
+##
+
+## Depend on the sources, even though we are going to compile the
+## classes.
+gnu-xml.lo: $(gnu_xml_source_files)
+## FIXME: this is ugly.  We want to make sure the .class files have
+## been built, but we don't want a real dependency on them as this
+## would cause our target to be rebuilt whenever any .java file is
+## touched.
+       $(MAKE) classes.stamp
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-xml.lo \
+               `find gnu/xml -name '*.class' -print`
+
+## Depend on the sources, even though we are going to compile the
+## classes.
+javax-imageio.lo: $(javax_imageio_source_files)
+## FIXME: this is ugly.  We want to make sure the .class files have
+## been built, but we don't want a real dependency on them as this
+## would cause our target to be rebuilt whenever any .java file is
+## touched.
+       $(MAKE) classes.stamp
+       $(LTGCJCOMPILE) -findirect-dispatch -c -o javax-imageio.lo \
+               `find javax/imageio -name '*.class' -print`
+
+## Depend on the sources, even though we are going to compile the
+## classes.
+javax-xml.lo: $(javax_xml_source_files)
+## FIXME: this is ugly.  We want to make sure the .class files have
+## been built, but we don't want a real dependency on them as this
+## would cause our target to be rebuilt whenever any .java file is
+## touched.
+       $(MAKE) classes.stamp
+       $(LTGCJCOMPILE) -findirect-dispatch -c -o javax-xml.lo \
+               `find javax/xml -name '*.class' -print`
+
+## Depend on the sources, even though we are going to compile the
+## classes.
+gnu-java-beans.lo: $(gnu_java_beans_source_files)
+## FIXME: this is ugly.  We want to make sure the .class files have
+## been built, but we don't want a real dependency on them as this
+## would cause our target to be rebuilt whenever any .java file is
+## touched.
+       $(MAKE) classes.stamp
+       $(LTGCJCOMPILE) -findirect-dispatch -c -o gnu-java-beans.lo \
+               `find gnu/java/beans -name '*.class' -print`
+
+## Depend on the sources, even though we are going to compile the
+## classes.
+gtk-awt-peer.lo: $(gtk_awt_peer_sources)
+## FIXME: this is ugly.  We want to make sure the .class files have
+## been built, but we don't want a real dependency on them as this
+## would cause our target to be rebuilt whenever any .java file is
+## touched.
+       $(MAKE) classes.stamp
+       $(LTGCJCOMPILE) -findirect-dispatch -fjni -c -o gtk-awt-peer.lo \
+               `find gnu/java/awt/peer/gtk -name '*.class' -print`
+
+## ################################################################
+
+##
 ## How to build header files.
 ##
 
-.class.h:
+%.h: %.class
        $(GCJH) -classpath '' -bootclasspath $(top_builddir) $(basename $<)
 
 ## Header files used when compiling some of the nat* files.
-ordinary_nat_headers = $(ordinary_java_source_files:.java=.h) \
-       $(built_java_source_files:.java=.h)
+ordinary_nat_headers = \
+    $(ordinary_java_source_files:.java=.h) \
+    $(built_java_source_files:.java=.h)
 
 inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
        java/io/ObjectInputStream$$GetField.h \
@@ -718,7 +735,7 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
        gnu/java/nio/PipeImpl$$SourceChannelImpl.h \
        $(PLATFORM_INNER_NAT_HDRS)
 
-nat_headers = $(ordinary_nat_headers) $(inner_nat_headers)
+nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) gnu/gcj/tools/gcj_dbtool/Main.h
 nat_headers_install = $(ordinary_nat_headers)
 
 xlib_nat_headers = $(xlib_java_source_files:.java=.h)
@@ -810,7 +827,7 @@ java/lang/reflect/Proxy$$ProxyType.h: java/lang/reflect/Proxy.class
        $(GCJH) -classpath '' -bootclasspath $(top_builddir) \
        'java/lang/reflect/Proxy$$ProxyType'
 
-gnu/gcj/runtime/VMClassLoader.h: gnu/gcj/runtime/VMClassLoader.class
+gnu/gcj/runtime/ExtensionClassLoader.h: gnu/gcj/runtime/ExtensionClassLoader.class
        $(GCJH) -classpath '' -bootclasspath $(top_builddir) \
            -friend 'class ::java::lang::ClassLoader;' \
            $(basename $<)
@@ -922,7 +939,7 @@ maintainer-check: libgcj.la
 
 ## This rule can be used to see if the headers are more or less
 ## correct.
-header-check: libgcj-@gcc_version@.jar $(nat_headers)
+header-check: libgcj-$(gcc_version).jar $(nat_headers)
        rm -f htest.cc; \
        for h in $(nat_headers); do \
          echo "#include \"$$h\"" >> htest.cc; \
@@ -931,7 +948,7 @@ header-check: libgcj-@gcc_version@.jar $(nat_headers)
 
 ## This rule can be used to see if all the .class files verify
 ## correctly.
-class-check: libgcj-@gcc_version@.jar
+class-check: libgcj-$(gcc_version).jar
        @ok=0; find . -name '*.class' -print | fgrep -v testsuite | \
        while read f; do \
          echo "$(GCJ_WITH_FLAGS) --syntax-only $$f"; \
@@ -1031,7 +1048,8 @@ jv_convert_LDADD = -L$(here)/.libs libgcj.la
 ## linking this program.
 jv_convert_DEPENDENCIES = libgcj.la libgcj.spec
 
-gcj_dbtool_SOURCES = gnu/gcj/tools/gcj_dbtool/Main.java
+gcj_dbtool_SOURCES = gnu/gcj/tools/gcj_dbtool/Main.java \
+       gnu/gcj/tools/gcj_dbtool/natMain.cc
 ## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'.  We
 ## need this because we are explicitly using libtool to link using the
 ## `.la' file.
@@ -1117,6 +1135,60 @@ gnu/gcj/convert/UnicodeToBytes.java
 ## hand.
 special_java_source_files = java/lang/Class.java java/lang/Object.java
 
+gnu_java_beans_source_files = \
+gnu/java/beans/decoder/AbstractContext.java \
+gnu/java/beans/decoder/AbstractCreatableObjectContext.java \
+gnu/java/beans/decoder/AbstractElementHandler.java \
+gnu/java/beans/decoder/AbstractObjectContext.java \
+gnu/java/beans/decoder/ArrayContext.java \
+gnu/java/beans/decoder/ArrayHandler.java \
+gnu/java/beans/decoder/AssemblyException.java \
+gnu/java/beans/decoder/BooleanHandler.java \
+gnu/java/beans/decoder/ByteHandler.java \
+gnu/java/beans/decoder/CharHandler.java \
+gnu/java/beans/decoder/ClassHandler.java \
+gnu/java/beans/decoder/ConstructorContext.java \
+gnu/java/beans/decoder/Context.java \
+gnu/java/beans/decoder/DecoderContext.java \
+gnu/java/beans/decoder/DefaultExceptionListener.java \
+gnu/java/beans/decoder/DoubleHandler.java \
+gnu/java/beans/decoder/DummyContext.java \
+gnu/java/beans/decoder/DummyHandler.java \
+gnu/java/beans/decoder/ElementHandler.java \
+gnu/java/beans/decoder/FloatHandler.java \
+gnu/java/beans/decoder/GrowableArrayContext.java \
+gnu/java/beans/decoder/IndexContext.java \
+gnu/java/beans/decoder/IntHandler.java \
+gnu/java/beans/decoder/JavaHandler.java \
+gnu/java/beans/decoder/LongHandler.java \
+gnu/java/beans/decoder/MethodContext.java \
+gnu/java/beans/decoder/MethodFinder.java \
+gnu/java/beans/decoder/NullHandler.java \
+gnu/java/beans/decoder/ObjectContext.java \
+gnu/java/beans/decoder/ObjectHandler.java \
+gnu/java/beans/decoder/PersistenceParser.java \
+gnu/java/beans/decoder/PropertyContext.java \
+gnu/java/beans/decoder/ShortHandler.java \
+gnu/java/beans/decoder/SimpleHandler.java \
+gnu/java/beans/decoder/StaticMethodContext.java \
+gnu/java/beans/decoder/StringHandler.java \
+gnu/java/beans/decoder/VoidHandler.java \
+gnu/java/beans/editors/ColorEditor.java        \
+gnu/java/beans/editors/FontEditor.java \
+gnu/java/beans/editors/NativeBooleanEditor.java        \
+gnu/java/beans/editors/NativeByteEditor.java \
+gnu/java/beans/editors/NativeDoubleEditor.java \
+gnu/java/beans/editors/NativeFloatEditor.java \
+gnu/java/beans/editors/NativeIntEditor.java \
+gnu/java/beans/editors/NativeLongEditor.java \
+gnu/java/beans/editors/NativeShortEditor.java \
+gnu/java/beans/editors/StringEditor.java \
+gnu/java/beans/BeanInfoEmbryo.java \
+gnu/java/beans/DummyAppletContext.java \
+gnu/java/beans/DummyAppletStub.java \
+gnu/java/beans/ExplicitBeanInfo.java \
+gnu/java/beans/IntrospectionIncubator.java
+
 awt_java_source_files =        \
 gnu/awt/LightweightRedirector.java \
 gnu/awt/j2d/AbstractGraphicsState.java \
@@ -1151,21 +1223,29 @@ gnu/java/awt/peer/EmbeddedWindowPeer.java \
 gnu/java/awt/peer/GLightweightPeer.java \
 gnu/java/awt/peer/ClasspathFontPeer.java \
 gnu/java/awt/peer/ClasspathTextLayoutPeer.java \
-gnu/java/beans/editors/ColorEditor.java        \
-gnu/java/beans/editors/FontEditor.java \
-gnu/java/beans/editors/NativeBooleanEditor.java        \
-gnu/java/beans/editors/NativeByteEditor.java \
-gnu/java/beans/editors/NativeDoubleEditor.java \
-gnu/java/beans/editors/NativeFloatEditor.java \
-gnu/java/beans/editors/NativeIntEditor.java \
-gnu/java/beans/editors/NativeLongEditor.java \
-gnu/java/beans/editors/NativeShortEditor.java \
-gnu/java/beans/editors/StringEditor.java \
-gnu/java/beans/info/ComponentBeanInfo.java \
-gnu/java/beans/BeanInfoEmbryo.java \
-gnu/java/beans/EmptyBeanInfo.java \
-gnu/java/beans/ExplicitBeanInfo.java \
-gnu/java/beans/IntrospectionIncubator.java \
+gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.java \
+gnu/javax/swing/text/html/parser/support/parameterDefaulter.java \
+gnu/javax/swing/text/html/parser/support/Parser.java \
+gnu/javax/swing/text/html/parser/support/textPreProcessor.java \
+gnu/javax/swing/text/html/parser/support/low/Buffer.java \
+gnu/javax/swing/text/html/parser/support/low/Constants.java \
+gnu/javax/swing/text/html/parser/support/low/Location.java \
+gnu/javax/swing/text/html/parser/support/low/node.java \
+gnu/javax/swing/text/html/parser/support/low/ParseException.java \
+gnu/javax/swing/text/html/parser/support/low/pattern.java \
+gnu/javax/swing/text/html/parser/support/low/Queue.java \
+gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.java \
+gnu/javax/swing/text/html/parser/support/low/Token.java \
+gnu/javax/swing/text/html/parser/gnuDTD.java \
+gnu/javax/swing/text/html/parser/HTML_401F.java \
+gnu/javax/swing/text/html/parser/htmlAttributeSet.java \
+gnu/javax/swing/text/html/parser/htmlValidator.java \
+gnu/javax/swing/text/html/parser/models/list.java \
+gnu/javax/swing/text/html/parser/models/node.java \
+gnu/javax/swing/text/html/parser/models/noTagModel.java \
+gnu/javax/swing/text/html/parser/models/PCDATAonly_model.java \
+gnu/javax/swing/text/html/parser/models/TableRowContentModel.java \
+gnu/javax/swing/text/html/parser/models/transformer.java \
 java/applet/Applet.java \
 java/applet/AppletStub.java \
 java/applet/AppletContext.java \
@@ -1543,6 +1623,7 @@ java/beans/VetoableChangeListenerProxy.java \
 java/beans/VetoableChangeSupport.java \
 java/beans/Visibility.java \
 java/beans/AppletInitializer.java \
+java/beans/XMLDecoder.java \
 javax/swing/border/AbstractBorder.java \
 javax/swing/border/BevelBorder.java \
 javax/swing/border/Border.java \
@@ -1568,6 +1649,7 @@ javax/swing/plaf/basic/BasicComboBoxRenderer.java \
 javax/swing/plaf/basic/BasicComboPopup.java \
 javax/swing/plaf/basic/BasicDesktopIconUI.java \
 javax/swing/plaf/basic/BasicDesktopPaneUI.java \
+javax/swing/plaf/basic/BasicEditorPaneUI.java \
 javax/swing/plaf/basic/BasicFormattedTextFieldUI.java \
 javax/swing/plaf/basic/BasicGraphicsUtils.java \
 javax/swing/plaf/basic/BasicInternalFrameTitlePane.java \
@@ -1611,6 +1693,28 @@ javax/swing/plaf/basic/BasicLookAndFeel.java \
 javax/swing/plaf/basic/BasicBorders.java \
 javax/swing/plaf/basic/BasicIconFactory.java \
 javax/swing/plaf/basic/ComboPopup.java \
+javax/swing/plaf/metal/MetalBorders.java \
+javax/swing/plaf/metal/MetalButtonUI.java \
+javax/swing/plaf/metal/MetalCheckBoxUI.java \
+javax/swing/plaf/metal/MetalComboBoxUI.java \
+javax/swing/plaf/metal/MetalDesktopIconUI.java \
+javax/swing/plaf/metal/MetalInternalFrameUI.java \
+javax/swing/plaf/metal/MetalLabelUI.java \
+javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java \
+javax/swing/plaf/metal/MetalProgressBarUI.java \
+javax/swing/plaf/metal/MetalRadioButtonUI.java \
+javax/swing/plaf/metal/MetalRootPaneUI.java \
+javax/swing/plaf/metal/MetalScrollBarUI.java \
+javax/swing/plaf/metal/MetalScrollPaneUI.java \
+javax/swing/plaf/metal/MetalSeparatorUI.java \
+javax/swing/plaf/metal/MetalSliderUI.java \
+javax/swing/plaf/metal/MetalSplitPaneUI.java \
+javax/swing/plaf/metal/MetalTabbedPaneUI.java \
+javax/swing/plaf/metal/MetalTextFieldUI.java \
+javax/swing/plaf/metal/MetalToggleButtonUI.java \
+javax/swing/plaf/metal/MetalToolBarUI.java \
+javax/swing/plaf/metal/MetalToolTipUI.java \
+javax/swing/plaf/metal/MetalTreeUI.java \
 javax/swing/plaf/BorderUIResource.java \
 javax/swing/plaf/UIResource.java \
 javax/swing/plaf/ButtonUI.java \
@@ -1624,7 +1728,9 @@ javax/swing/plaf/TabbedPaneUI.java \
 javax/swing/plaf/TextUI.java \
 javax/swing/plaf/TreeUI.java \
 javax/swing/plaf/ViewportUI.java \
+javax/swing/plaf/metal/DefaultMetalTheme.java \
 javax/swing/plaf/metal/MetalLookAndFeel.java \
+javax/swing/plaf/metal/MetalTheme.java \
 javax/swing/plaf/ColorUIResource.java \
 javax/swing/plaf/DimensionUIResource.java \
 javax/swing/plaf/FontUIResource.java \
@@ -1654,7 +1760,6 @@ javax/swing/plaf/TableUI.java \
 javax/swing/plaf/ToolBarUI.java \
 javax/swing/plaf/ToolTipUI.java \
 javax/swing/AbstractListModel.java \
-javax/swing/AbstractSet.java \
 javax/swing/colorchooser/AbstractColorChooserPanel.java \
 javax/swing/colorchooser/ColorChooserComponentFactory.java \
 javax/swing/colorchooser/ColorSelectionModel.java \
@@ -1684,12 +1789,12 @@ javax/swing/ButtonGroup.java \
 javax/swing/ButtonModel.java \
 javax/swing/ComponentInputMap.java \
 javax/swing/DefaultButtonModel.java \
-javax/swing/DefaultCellRenderer.java \
 javax/swing/DefaultListModel.java \
 javax/swing/DefaultListSelectionModel.java \
 javax/swing/Icon.java \
 javax/swing/ImageIcon.java \
 javax/swing/InputMap.java \
+javax/swing/InternalFrameFocusTraversalPolicy.java \
 javax/swing/JApplet.java \
 javax/swing/JButton.java \
 javax/swing/JCheckBox.java \
@@ -1718,11 +1823,14 @@ javax/swing/JTree.java \
 javax/swing/JViewport.java \
 javax/swing/JWindow.java \
 javax/swing/KeyStroke.java \
+javax/swing/LayoutFocusTraversalPolicy.java \
 javax/swing/ListCellRenderer.java \
 javax/swing/ListModel.java \
 javax/swing/ListSelectionModel.java \
 javax/swing/LookAndFeel.java \
 javax/swing/Scrollable.java \
+javax/swing/SortingFocusTraversalPolicy.java \
+javax/swing/SpinnerDateModel.java \
 javax/swing/SpinnerListModel.java \
 javax/swing/SpinnerModel.java \
 javax/swing/SpinnerNumberModel.java \
@@ -1784,10 +1892,12 @@ javax/swing/text/AbstractDocument.java \
 javax/swing/text/AttributeSet.java \
 javax/swing/text/BadLocationException.java \
 javax/swing/text/Caret.java \
+javax/swing/text/ChangedCharSetException.java \
 javax/swing/text/ComponentView.java \
 javax/swing/text/DefaultCaret.java \
 javax/swing/text/DefaultEditorKit.java \
 javax/swing/text/DefaultHighlighter.java \
+javax/swing/text/DefaultStyledDocument.java \
 javax/swing/text/Document.java \
 javax/swing/text/DocumentFilter.java \
 javax/swing/text/EditorKit.java \
@@ -1806,6 +1916,7 @@ javax/swing/text/PlainView.java \
 javax/swing/text/Position.java \
 javax/swing/text/Segment.java \
 javax/swing/text/SimpleAttributeSet.java \
+javax/swing/text/StringContent.java \
 javax/swing/text/Style.java \
 javax/swing/text/StyleConstants.java \
 javax/swing/text/StyleContext.java \
@@ -1820,7 +1931,26 @@ javax/swing/text/Utilities.java \
 javax/swing/text/View.java \
 javax/swing/text/ViewFactory.java \
 javax/swing/text/html/HTML.java \
+javax/swing/text/html/HTMLDocument.java \
+javax/swing/text/html/HTMLEditorKit.java \
+javax/swing/text/html/HTMLFrameHyperlinkEvent.java \
+javax/swing/text/html/parser/AttributeList.java \
+javax/swing/text/html/parser/ContentModel.java \
+javax/swing/text/html/parser/DTD.java \
+javax/swing/text/html/parser/DTDConstants.java \
+javax/swing/text/html/parser/DocumentParser.java \
+javax/swing/text/html/parser/Element.java \
+javax/swing/text/html/parser/Entity.java \
+javax/swing/text/html/parser/Parser.java \
 javax/swing/text/html/parser/ParserDelegator.java \
+javax/swing/text/html/parser/TagElement.java \
+javax/swing/text/rtf/ControlWordToken.java \
+javax/swing/text/rtf/RTFEditorKit.java \
+javax/swing/text/rtf/RTFParseException.java \
+javax/swing/text/rtf/RTFParser.java \
+javax/swing/text/rtf/RTFScanner.java \
+javax/swing/text/rtf/TextToken.java \
+javax/swing/text/rtf/Token.java \
 javax/swing/tree/TreeNode.java \
 javax/swing/tree/AbstractLayoutCache.java \
 javax/swing/tree/DefaultMutableTreeNode.java \
@@ -2000,427 +2130,732 @@ gnu/java/rmi/server/UnicastRemoteStub.java \
 gnu/java/rmi/server/UnicastServer.java \
 gnu/java/rmi/server/UnicastServerRef.java
 
-javax_source_files = \
-javax/accessibility/Accessible.java \
-javax/accessibility/AccessibleAction.java \
-javax/accessibility/AccessibleBundle.java \
-javax/accessibility/AccessibleComponent.java \
-javax/accessibility/AccessibleContext.java \
-javax/accessibility/AccessibleEditableText.java \
-javax/accessibility/AccessibleExtendedComponent.java \
-javax/accessibility/AccessibleExtendedTable.java \
-javax/accessibility/AccessibleHyperlink.java \
-javax/accessibility/AccessibleHypertext.java \
-javax/accessibility/AccessibleIcon.java \
-javax/accessibility/AccessibleKeyBinding.java \
-javax/accessibility/AccessibleRelation.java \
-javax/accessibility/AccessibleRelationSet.java \
-javax/accessibility/AccessibleResourceBundle.java \
-javax/accessibility/AccessibleRole.java \
-javax/accessibility/AccessibleSelection.java \
-javax/accessibility/AccessibleState.java \
-javax/accessibility/AccessibleStateSet.java \
-javax/accessibility/AccessibleTable.java \
-javax/accessibility/AccessibleTableModelChange.java \
-javax/accessibility/AccessibleText.java \
-javax/accessibility/AccessibleValue.java \
-javax/crypto/BadPaddingException.java \
-javax/crypto/Cipher.java \
-javax/crypto/CipherInputStream.java \
-javax/crypto/CipherOutputStream.java \
-javax/crypto/CipherSpi.java \
-javax/crypto/EncryptedPrivateKeyInfo.java \
-javax/crypto/KeyGeneratorSpi.java \
-javax/crypto/ExemptionMechanism.java \
-javax/crypto/ExemptionMechanismException.java \
-javax/crypto/ExemptionMechanismSpi.java \
-javax/crypto/IllegalBlockSizeException.java \
-javax/crypto/KeyAgreement.java \
-javax/crypto/KeyAgreementSpi.java \
-javax/crypto/KeyGenerator.java \
-javax/crypto/Mac.java \
-javax/crypto/MacSpi.java \
-javax/crypto/NoSuchPaddingException.java \
-javax/crypto/NullCipher.java \
-javax/crypto/NullCipherImpl.java \
-javax/crypto/SealedObject.java \
-javax/crypto/SecretKey.java \
-javax/crypto/SecretKeyFactory.java \
-javax/crypto/SecretKeyFactorySpi.java \
-javax/crypto/ShortBufferException.java \
-javax/crypto/interfaces/DHKey.java \
-javax/crypto/interfaces/DHPrivateKey.java \
-javax/crypto/interfaces/DHPublicKey.java \
-javax/crypto/interfaces/PBEKey.java \
-javax/crypto/spec/DESKeySpec.java \
-javax/crypto/spec/DESedeKeySpec.java \
-javax/crypto/spec/DHGenParameterSpec.java \
-javax/crypto/spec/DHParameterSpec.java \
-javax/crypto/spec/DHPrivateKeySpec.java \
-javax/crypto/spec/DHPublicKeySpec.java \
-javax/crypto/spec/IvParameterSpec.java \
-javax/crypto/spec/PBEKeySpec.java \
-javax/crypto/spec/PBEParameterSpec.java \
-javax/crypto/spec/RC2ParameterSpec.java \
-javax/crypto/spec/RC5ParameterSpec.java \
-javax/crypto/spec/SecretKeySpec.java \
-javax/imageio/IIOException.java \
-javax/imageio/IIOImage.java \
-javax/imageio/IIOParam.java \
-javax/imageio/IIOParamController.java \
-javax/imageio/ImageIO.java \
-javax/imageio/ImageReadParam.java \
-javax/imageio/ImageReader.java \
-javax/imageio/ImageTranscoder.java \
-javax/imageio/ImageTypeSpecifier.java \
+javax_imageio_source_files = \
 javax/imageio/ImageWriteParam.java \
+javax/imageio/ImageReader.java \
 javax/imageio/ImageWriter.java \
-javax/imageio/event/IIOReadProgressListener.java \
-javax/imageio/event/IIOReadUpdateListener.java \
-javax/imageio/event/IIOReadWarningListener.java \
-javax/imageio/event/IIOWriteProgressListener.java \
-javax/imageio/event/IIOWriteWarningListener.java \
-javax/imageio/metadata/IIOInvalidTreeException.java \
-javax/imageio/metadata/IIOMetadata.java \
-javax/imageio/metadata/IIOMetadataController.java \
-javax/imageio/metadata/IIOMetadataFormat.java \
-javax/imageio/metadata/IIOMetadataFormatImpl.java \
-javax/imageio/metadata/IIOMetadataNode.java \
-javax/imageio/spi/IIOServiceProvider.java \
+javax/imageio/IIOException.java        \
+javax/imageio/IIOParamController.java \
+javax/imageio/ImageReadParam.java \
+javax/imageio/IIOParam.java \
 javax/imageio/spi/IIORegistry.java \
-javax/imageio/spi/ImageInputStreamSpi.java \
+javax/imageio/spi/ImageWriterSpi.java \
 javax/imageio/spi/ImageOutputStreamSpi.java \
+javax/imageio/spi/ServiceRegistry.java \
+javax/imageio/spi/ImageTranscoderSpi.java \
 javax/imageio/spi/ImageReaderSpi.java \
+javax/imageio/spi/IIOServiceProvider.java \
 javax/imageio/spi/ImageReaderWriterSpi.java \
-javax/imageio/spi/ImageTranscoderSpi.java \
+javax/imageio/spi/ImageInputStreamSpi.java \
 javax/imageio/spi/RegisterableService.java \
-javax/imageio/spi/ServiceRegistry.java \
-javax/imageio/spi/ImageWriterSpi.java \
-javax/imageio/stream/FileCacheImageInputStream.java \
-javax/imageio/stream/FileCacheImageOutputStream.java \
-javax/imageio/stream/FileImageInputStream.java \
-javax/imageio/stream/FileImageOutputStream.java \
-javax/imageio/stream/IIOByteBuffer.java \
+javax/imageio/metadata/IIOAttr.java \
+javax/imageio/metadata/IIONamedNodeMap.java \
+javax/imageio/metadata/IIONodeList.java \
+javax/imageio/metadata/IIOMetadataFormatImpl.java \
+javax/imageio/metadata/IIOInvalidTreeException.java \
+javax/imageio/metadata/IIOMetadataFormat.java \
+javax/imageio/metadata/IIOMetadataController.java \
+javax/imageio/metadata/IIOMetadataNode.java \
+javax/imageio/metadata/IIOMetadata.java        \
+javax/imageio/stream/FileImageOutputStream.java        \
 javax/imageio/stream/ImageInputStream.java \
+javax/imageio/stream/IIOByteBuffer.java        \
+javax/imageio/stream/FileCacheImageInputStream.java \
 javax/imageio/stream/ImageInputStreamImpl.java \
-javax/imageio/stream/ImageOutputStream.java \
-javax/imageio/stream/ImageOutputStreamImpl.java \
+javax/imageio/stream/ImageOutputStreamImpl.java        \
 javax/imageio/stream/MemoryCacheImageInputStream.java \
+javax/imageio/stream/FileCacheImageOutputStream.java \
+javax/imageio/stream/ImageOutputStream.java \
 javax/imageio/stream/MemoryCacheImageOutputStream.java \
-javax/naming/directory/Attribute.java \
-javax/naming/directory/AttributeInUseException.java \
-javax/naming/directory/AttributeModificationException.java \
-javax/naming/directory/Attributes.java \
-javax/naming/directory/DirContext.java \
-javax/naming/directory/InvalidAttributeIdentifierException.java        \
-javax/naming/directory/InvalidAttributeValueException.java \
-javax/naming/directory/InvalidAttributesException.java \
-javax/naming/directory/InvalidSearchControlsException.java \
-javax/naming/directory/InvalidSearchFilterException.java \
-javax/naming/directory/NoSuchAttributeException.java \
-javax/naming/directory/SchemaViolationException.java \
-javax/naming/directory/BasicAttribute.java \
-javax/naming/directory/BasicAttributes.java \
-javax/naming/directory/ModificationItem.java \
-javax/naming/directory/SearchControls.java \
-javax/naming/directory/SearchResult.java \
-javax/naming/directory/InitialDirContext.java \
-javax/naming/AuthenticationException.java \
-javax/naming/AuthenticationNotSupportedException.java \
-javax/naming/CannotProceedException.java \
-javax/naming/CommunicationException.java \
-javax/naming/ConfigurationException.java \
-javax/naming/Context.java \
-javax/naming/ContextNotEmptyException.java \
-javax/naming/InsufficientResourcesException.java \
-javax/naming/InterruptedNamingException.java \
-javax/naming/BinaryRefAddr.java        \
-javax/naming/LimitExceededException.java \
-javax/naming/LinkException.java        \
-javax/naming/LinkLoopException.java \
-javax/naming/MalformedLinkException.java \
-javax/naming/Name.java \
-javax/naming/NameAlreadyBoundException.java \
-javax/naming/NameNotFoundException.java        \
-javax/naming/NameParser.java \
-javax/naming/NamingEnumeration.java \
-javax/naming/InitialContext.java \
-javax/naming/NamingSecurityException.java \
-javax/naming/NoInitialContextException.java \
-javax/naming/NoPermissionException.java        \
-javax/naming/NotContextException.java \
-javax/naming/NamingException.java \
-javax/naming/PartialResultException.java \
-javax/naming/event/EventContext.java \
-javax/naming/event/EventDirContext.java        \
-javax/naming/event/NamespaceChangeListener.java        \
-javax/naming/event/NamingEvent.java \
-javax/naming/event/NamingExceptionEvent.java \
-javax/naming/event/NamingListener.java \
-javax/naming/event/ObjectChangeListener.java \
-javax/naming/RefAddr.java \
-javax/naming/Reference.java \
-javax/naming/Referenceable.java        \
-javax/naming/ReferralException.java \
-javax/naming/ServiceUnavailableException.java \
-javax/naming/SizeLimitExceededException.java \
-javax/naming/StringRefAddr.java        \
-javax/naming/TimeLimitExceededException.java \
-javax/naming/spi/InitialContextFactory.java \
-javax/naming/spi/InitialContextFactoryBuilder.java \
-javax/naming/spi/NamingManager.java \
-javax/naming/spi/ObjectFactory.java \
-javax/naming/spi/Resolver.java \
-javax/naming/spi/DirObjectFactory.java \
-javax/naming/spi/DirStateFactory.java \
-javax/naming/spi/DirectoryManager.java \
-javax/naming/spi/ObjectFactoryBuilder.java \
-javax/naming/spi/ResolveResult.java \
-javax/naming/spi/StateFactory.java \
-javax/naming/InvalidNameException.java \
-javax/naming/Binding.java \
-javax/naming/CompositeName.java        \
-javax/naming/CompoundName.java \
-javax/naming/LinkRef.java \
-javax/naming/NameClassPair.java        \
-javax/naming/ldap/Control.java \
-javax/naming/ldap/ControlFactory.java \
-javax/naming/ldap/ExtendedRequest.java \
-javax/naming/ldap/ExtendedResponse.java        \
-javax/naming/ldap/HasControls.java \
-javax/naming/ldap/InitialLdapContext.java \
-javax/naming/ldap/LdapContext.java \
-javax/naming/ldap/LdapReferralException.java \
-javax/naming/ldap/UnsolicitedNotification.java \
-javax/naming/ldap/UnsolicitedNotificationEvent.java \
-javax/naming/ldap/UnsolicitedNotificationListener.java \
-javax/naming/OperationNotSupportedException.java \
-javax/net/ServerSocketFactory.java \
-javax/net/SocketFactory.java \
-javax/net/ssl/HandshakeCompletedEvent.java \
-javax/net/ssl/HandshakeCompletedListener.java \
-javax/net/ssl/HostnameVerifier.java \
-javax/net/ssl/HttpsURLConnection.java \
-javax/net/ssl/KeyManager.java \
-javax/net/ssl/KeyManagerFactory.java \
-javax/net/ssl/KeyManagerFactorySpi.java \
-javax/net/ssl/ManagerFactoryParameters.java \
-javax/net/ssl/SSLProtocolException.java \
-javax/net/ssl/SSLContext.java \
-javax/net/ssl/SSLContextSpi.java \
-javax/net/ssl/SSLException.java \
-javax/net/ssl/SSLHandshakeException.java \
+javax/imageio/stream/FileImageInputStream.java \
+javax/imageio/event/IIOReadProgressListener.java \
+javax/imageio/event/IIOWriteWarningListener.java \
+javax/imageio/event/IIOReadWarningListener.java        \
+javax/imageio/event/IIOReadUpdateListener.java \
+javax/imageio/event/IIOWriteProgressListener.java \
+javax/imageio/ImageTranscoder.java \
+javax/imageio/ImageTypeSpecifier.java \
+javax/imageio/ImageIO.java \
+javax/imageio/IIOImage.java
+
+javax_xml_source_files = \
+javax/xml/xpath/XPathConstants.java \
+javax/xml/xpath/XPathFunction.java \
+javax/xml/xpath/XPathVariableResolver.java \
+javax/xml/xpath/XPathExpressionException.java \
+javax/xml/xpath/XPathFunctionResolver.java \
+javax/xml/xpath/XPath.java \
+javax/xml/xpath/XPathFactoryConfigurationException.java        \
+javax/xml/xpath/XPathFactory.java \
+javax/xml/xpath/XPathException.java \
+javax/xml/xpath/XPathExpression.java \
+javax/xml/xpath/XPathFunctionException.java \
+javax/xml/validation/ValidatorHandler.java \
+javax/xml/validation/Validator.java \
+javax/xml/validation/TypeInfoProvider.java \
+javax/xml/validation/SchemaFactory.java        \
+javax/xml/validation/Schema.java \
+javax/xml/parsers/SAXParserFactory.java        \
+javax/xml/parsers/FactoryConfigurationError.java \
+javax/xml/parsers/SAXParser.java \
+javax/xml/parsers/DocumentBuilderFactory.java \
+javax/xml/parsers/ParserConfigurationException.java \
+javax/xml/parsers/DocumentBuilder.java \
+javax/xml/datatype/DatatypeFactory.java        \
+javax/xml/datatype/XMLGregorianCalendar.java \
+javax/xml/datatype/Duration.java \
+javax/xml/datatype/DatatypeConfigurationException.java \
+javax/xml/datatype/DatatypeConstants.java \
+javax/xml/XMLConstants.java \
+javax/xml/namespace/NamespaceContext.java \
+javax/xml/namespace/QName.java \
+javax/xml/transform/TransformerException.java \
+javax/xml/transform/TransformerFactoryConfigurationError.java \
+javax/xml/transform/sax/SAXResult.java \
+javax/xml/transform/sax/TransformerHandler.java        \
+javax/xml/transform/sax/SAXTransformerFactory.java \
+javax/xml/transform/sax/SAXSource.java \
+javax/xml/transform/sax/TemplatesHandler.java \
+javax/xml/transform/OutputKeys.java \
+javax/xml/transform/stream/StreamResult.java \
+javax/xml/transform/stream/StreamSource.java \
+javax/xml/transform/Source.java        \
+javax/xml/transform/SourceLocator.java \
+javax/xml/transform/ErrorListener.java \
+javax/xml/transform/TransformerConfigurationException.java \
+javax/xml/transform/Templates.java \
+javax/xml/transform/Result.java        \
+javax/xml/transform/URIResolver.java \
+javax/xml/transform/dom/DOMSource.java \
+javax/xml/transform/dom/DOMLocator.java        \
+javax/xml/transform/dom/DOMResult.java \
+javax/xml/transform/Transformer.java \
+javax/xml/transform/TransformerFactory.java
+
+javax_source_files = \
+javax/net/VanillaSocketFactory.java \
+javax/net/ssl/TrustManagerFactorySpi.java \
 javax/net/ssl/SSLKeyException.java \
-javax/net/ssl/SSLPeerUnverifiedException.java \
-javax/net/ssl/SSLPermission.java \
+javax/net/ssl/TrustManager.java        \
 javax/net/ssl/SSLServerSocket.java \
+javax/net/ssl/TrustManagerFactory.java \
+javax/net/ssl/KeyManager.java \
+javax/net/ssl/SSLSocketFactory.java \
+javax/net/ssl/SSLPermission.java \
+javax/net/ssl/SSLContext.java \
+javax/net/ssl/TrivialHostnameVerifier.java \
+javax/net/ssl/X509KeyManager.java \
 javax/net/ssl/SSLServerSocketFactory.java \
-javax/net/ssl/SSLSession.java \
-javax/net/ssl/SSLSessionBindingEvent.java \
 javax/net/ssl/SSLSessionBindingListener.java \
 javax/net/ssl/SSLSessionContext.java \
+javax/net/ssl/KeyManagerFactory.java \
+javax/net/ssl/SSLProtocolException.java        \
 javax/net/ssl/SSLSocket.java \
-javax/net/ssl/SSLSocketFactory.java \
-javax/net/ssl/TrivialHostnameVerifier.java \
-javax/net/ssl/TrustManager.java \
-javax/net/ssl/TrustManagerFactory.java \
-javax/net/ssl/TrustManagerFactorySpi.java \
-javax/net/ssl/X509KeyManager.java \
+javax/net/ssl/HostnameVerifier.java \
+javax/net/ssl/HandshakeCompletedListener.java \
+javax/net/ssl/HttpsURLConnection.java \
+javax/net/ssl/KeyManagerFactorySpi.java        \
+javax/net/ssl/SSLHandshakeException.java \
+javax/net/ssl/SSLPeerUnverifiedException.java \
 javax/net/ssl/X509TrustManager.java \
-javax/net/VanillaSocketFactory.java \
+javax/net/ssl/SSLSession.java \
+javax/net/ssl/SSLContextSpi.java \
+javax/net/ssl/HandshakeCompletedEvent.java \
+javax/net/ssl/SSLSessionBindingEvent.java \
+javax/net/ssl/SSLException.java        \
+javax/net/ssl/ManagerFactoryParameters.java \
+javax/net/SocketFactory.java \
 javax/net/VanillaServerSocketFactory.java \
-javax/print/AttributeException.java \
-javax/print/CancelablePrintJob.java \
-javax/print/Doc.java \
-javax/print/DocFlavor.java \
-javax/print/DocPrintJob.java \
-javax/print/FlavorException.java \
-javax/print/MultiDoc.java \
-javax/print/MultiDocPrintJob.java \
-javax/print/MultiDocPrintService.java \
-javax/print/PrintException.java \
-javax/print/PrintService.java \
-javax/print/PrintServiceLookup.java \
-javax/print/ServiceUIFactory.java \
-javax/print/StreamPrintService.java \
-javax/print/URIException.java \
+javax/net/ServerSocketFactory.java \
+javax/print/attribute/HashPrintServiceAttributeSet.java        \
 javax/print/attribute/Attribute.java \
-javax/print/attribute/AttributeSet.java \
-javax/print/attribute/AttributeSetUtilities.java \
-javax/print/attribute/DateTimeSyntax.java \
-javax/print/attribute/DocAttribute.java \
 javax/print/attribute/DocAttributeSet.java \
-javax/print/attribute/EnumSyntax.java \
-javax/print/attribute/HashAttributeSet.java \
-javax/print/attribute/HashDocAttributeSet.java \
-javax/print/attribute/HashPrintJobAttributeSet.java \
-javax/print/attribute/HashPrintRequestAttributeSet.java \
-javax/print/attribute/HashPrintServiceAttributeSet.java \
-javax/print/attribute/IntegerSyntax.java \
-javax/print/attribute/PrintJobAttribute.java \
-javax/print/attribute/PrintJobAttributeSet.java \
-javax/print/attribute/PrintRequestAttribute.java \
 javax/print/attribute/PrintRequestAttributeSet.java \
-javax/print/attribute/PrintServiceAttribute.java \
-javax/print/attribute/PrintServiceAttributeSet.java \
-javax/print/attribute/ResolutionSyntax.java \
-javax/print/attribute/SetOfIntegerSyntax.java \
-javax/print/attribute/Size2DSyntax.java \
-javax/print/attribute/SupportedValuesAttribute.java \
-javax/print/attribute/TextSyntax.java \
-javax/print/attribute/UnmodifiableSetException.java \
-javax/print/attribute/URISyntax.java \
-javax/print/attribute/standard/ColorSupported.java \
-javax/print/attribute/standard/Compression.java \
-javax/print/attribute/standard/Copies.java \
-javax/print/attribute/standard/CopiesSupported.java \
-javax/print/attribute/standard/DateTimeAtCompleted.java \
-javax/print/attribute/standard/DateTimeAtCreation.java \
-javax/print/attribute/standard/DateTimeAtProcessing.java \
-javax/print/attribute/standard/DocumentName.java \
-javax/print/attribute/standard/Fidelity.java \
-javax/print/attribute/standard/Finishings.java \
-javax/print/attribute/standard/JobHoldUntil.java \
+javax/print/attribute/standard/Chromaticity.java \
+javax/print/attribute/standard/Destination.java \
+javax/print/attribute/standard/MediaPrintableArea.java \
+javax/print/attribute/standard/MediaSize.java \
+javax/print/attribute/standard/NumberOfInterveningJobs.java \
+javax/print/attribute/standard/PrinterMakeAndModel.java        \
+javax/print/attribute/standard/PrinterStateReason.java \
 javax/print/attribute/standard/JobImpressions.java \
-javax/print/attribute/standard/JobImpressionsCompleted.java \
-javax/print/attribute/standard/JobImpressionsSupported.java \
-javax/print/attribute/standard/JobKOctets.java \
-javax/print/attribute/standard/JobKOctetsProcessed.java \
-javax/print/attribute/standard/JobKOctetsSupported.java \
+javax/print/attribute/standard/JobHoldUntil.java \
+javax/print/attribute/standard/JobKOctetsSupported.java        \
+javax/print/attribute/standard/JobPriority.java        \
+javax/print/attribute/standard/QueuedJobCount.java \
+javax/print/attribute/standard/JobOriginatingUserName.java \
+javax/print/attribute/standard/PrinterName.java        \
+javax/print/attribute/standard/PDLOverrideSupported.java \
+javax/print/attribute/standard/PrinterStateReasons.java        \
 javax/print/attribute/standard/JobMediaSheets.java \
-javax/print/attribute/standard/JobMediaSheetsCompleted.java \
-javax/print/attribute/standard/JobMediaSheetsSupported.java \
+javax/print/attribute/standard/JobKOctets.java \
+javax/print/attribute/standard/MultipleDocumentHandling.java \
+javax/print/attribute/standard/PrinterMessageFromOperator.java \
+javax/print/attribute/standard/Severity.java \
+javax/print/attribute/standard/ReferenceUriSchemesSupported.java \
+javax/print/attribute/standard/DocumentName.java \
+javax/print/attribute/standard/PrinterMoreInfo.java \
 javax/print/attribute/standard/JobMessageFromOperator.java \
-javax/print/attribute/standard/JobName.java \
-javax/print/attribute/standard/JobOriginatingUserName.java \
-javax/print/attribute/standard/JobPriority.java \
-javax/print/attribute/standard/JobPrioritySupported.java \
-javax/print/attribute/standard/JobSheets.java \
-javax/print/attribute/standard/JobState.java \
-javax/print/attribute/standard/JobStateReason.java \
 javax/print/attribute/standard/JobStateReasons.java \
-javax/print/attribute/standard/Media.java \
-javax/print/attribute/standard/MediaSizeName.java \
-javax/print/attribute/standard/MultipleDocumentHandling.java \
-javax/print/attribute/standard/NumberOfDocuments.java \
-javax/print/attribute/standard/NumberOfInterveningJobs.java \
-javax/print/attribute/standard/NumberUp.java \
-javax/print/attribute/standard/NumberUpSupported.java \
-javax/print/attribute/standard/OrientationRequested.java \
-javax/print/attribute/standard/OutputDeviceAssigned.java \
-javax/print/attribute/standard/PDLOverrideSupported.java \
-javax/print/attribute/standard/PageRanges.java \
+javax/print/attribute/standard/PrinterIsAcceptingJobs.java \
+javax/print/attribute/standard/DateTimeAtProcessing.java \
 javax/print/attribute/standard/PagesPerMinute.java \
-javax/print/attribute/standard/PagesPerMinuteColor.java \
-javax/print/attribute/standard/PresentationDirection.java \
+javax/print/attribute/standard/PrinterResolution.java \
+javax/print/attribute/standard/JobMediaSheetsSupported.java \
+javax/print/attribute/standard/NumberUpSupported.java \
+javax/print/attribute/standard/Finishings.java \
+javax/print/attribute/standard/DateTimeAtCompleted.java        \
+javax/print/attribute/standard/NumberOfDocuments.java \
+javax/print/attribute/standard/PrinterInfo.java        \
 javax/print/attribute/standard/PrintQuality.java \
-javax/print/attribute/standard/PrinterInfo.java \
-javax/print/attribute/standard/PrinterIsAcceptingJobs.java \
+javax/print/attribute/standard/JobSheets.java \
+javax/print/attribute/standard/Media.java \
+javax/print/attribute/standard/Fidelity.java \
 javax/print/attribute/standard/PrinterLocation.java \
-javax/print/attribute/standard/PrinterMakeAndModel.java \
-javax/print/attribute/standard/PrinterMessageFromOperator.java \
-javax/print/attribute/standard/PrinterMoreInfo.java \
-javax/print/attribute/standard/PrinterMoreInfoManufacturer.java \
-javax/print/attribute/standard/PrinterName.java \
-javax/print/attribute/standard/PrinterResolution.java \
-javax/print/attribute/standard/PrinterState.java \
-javax/print/attribute/standard/PrinterStateReason.java \
-javax/print/attribute/standard/PrinterStateReasons.java \
+javax/print/attribute/standard/PrinterMoreInfoManufacturer.java        \
+javax/print/attribute/standard/OrientationRequested.java \
+javax/print/attribute/standard/JobState.java \
+javax/print/attribute/standard/DateTimeAtCreation.java \
+javax/print/attribute/standard/PresentationDirection.java \
+javax/print/attribute/standard/JobName.java \
+javax/print/attribute/standard/PagesPerMinuteColor.java        \
+javax/print/attribute/standard/CopiesSupported.java \
 javax/print/attribute/standard/PrinterURI.java \
-javax/print/attribute/standard/QueuedJobCount.java \
-javax/print/attribute/standard/ReferenceUriSchemesSupported.java \
+javax/print/attribute/standard/PageRanges.java \
 javax/print/attribute/standard/RequestingUserName.java \
-javax/print/attribute/standard/Severity.java \
-javax/print/attribute/standard/SheetCollate.java \
+javax/print/attribute/standard/JobPrioritySupported.java \
+javax/print/attribute/standard/JobMediaSheetsCompleted.java \
+javax/print/attribute/standard/JobKOctetsProcessed.java        \
+javax/print/attribute/standard/JobImpressionsCompleted.java \
+javax/print/attribute/standard/Compression.java        \
+javax/print/attribute/standard/JobImpressionsSupported.java \
 javax/print/attribute/standard/Sides.java \
+javax/print/attribute/standard/JobStateReason.java \
+javax/print/attribute/standard/SheetCollate.java \
+javax/print/attribute/standard/Copies.java \
+javax/print/attribute/standard/MediaSizeName.java \
+javax/print/attribute/standard/OutputDeviceAssigned.java \
+javax/print/attribute/standard/PrinterState.java \
+javax/print/attribute/standard/NumberUp.java \
+javax/print/attribute/standard/ColorSupported.java \
+javax/print/attribute/HashAttributeSet.java \
+javax/print/attribute/SetOfIntegerSyntax.java \
+javax/print/attribute/HashDocAttributeSet.java \
+javax/print/attribute/PrintRequestAttribute.java \
+javax/print/attribute/DateTimeSyntax.java \
+javax/print/attribute/PrintServiceAttribute.java \
+javax/print/attribute/UnmodifiableSetException.java \
+javax/print/attribute/HashPrintJobAttributeSet.java \
+javax/print/attribute/PrintJobAttribute.java \
+javax/print/attribute/AttributeSet.java        \
+javax/print/attribute/ResolutionSyntax.java \
+javax/print/attribute/URISyntax.java \
+javax/print/attribute/AttributeSetUtilities.java \
+javax/print/attribute/HashPrintRequestAttributeSet.java        \
+javax/print/attribute/TextSyntax.java \
+javax/print/attribute/PrintJobAttributeSet.java        \
+javax/print/attribute/SupportedValuesAttribute.java \
+javax/print/attribute/EnumSyntax.java \
+javax/print/attribute/DocAttribute.java        \
+javax/print/attribute/Size2DSyntax.java        \
+javax/print/attribute/IntegerSyntax.java \
+javax/print/attribute/PrintServiceAttributeSet.java \
+javax/print/PrintService.java \
+javax/print/DocFlavor.java \
+javax/print/DocPrintJob.java \
 javax/print/event/PrintEvent.java \
 javax/print/event/PrintJobAdapter.java \
-javax/print/event/PrintJobAttributeEvent.java \
-javax/print/event/PrintJobAttributeListener.java \
-javax/print/event/PrintJobEvent.java \
-javax/print/event/PrintJobListener.java \
 javax/print/event/PrintServiceAttributeEvent.java \
+javax/print/event/PrintJobAttributeEvent.java \
 javax/print/event/PrintServiceAttributeListener.java \
-javax/security/auth/AuthPermission.java \
+javax/print/event/PrintJobEvent.java \
+javax/print/event/PrintJobListener.java        \
+javax/print/event/PrintJobAttributeListener.java \
+javax/print/PrintServiceLookup.java \
+javax/print/URIException.java \
+javax/print/StreamPrintService.java \
+javax/print/MultiDoc.java \
+javax/print/FlavorException.java \
+javax/print/Doc.java \
+javax/print/MultiDocPrintJob.java \
+javax/print/CancelablePrintJob.java \
+javax/print/MultiDocPrintService.java \
+javax/print/ServiceUIFactory.java \
+javax/print/AttributeException.java \
+javax/print/PrintException.java        \
+javax/naming/ServiceUnavailableException.java \
+javax/naming/directory/Attribute.java \
+javax/naming/directory/SchemaViolationException.java \
+javax/naming/directory/InitialDirContext.java \
+javax/naming/directory/BasicAttribute.java \
+javax/naming/directory/NoSuchAttributeException.java \
+javax/naming/directory/InvalidAttributesException.java \
+javax/naming/directory/InvalidAttributeValueException.java \
+javax/naming/directory/BasicAttributes.java \
+javax/naming/directory/AttributeModificationException.java \
+javax/naming/directory/InvalidAttributeIdentifierException.java        \
+javax/naming/directory/DirContext.java \
+javax/naming/directory/Attributes.java \
+javax/naming/directory/InvalidSearchControlsException.java \
+javax/naming/directory/SearchControls.java \
+javax/naming/directory/AttributeInUseException.java \
+javax/naming/directory/InvalidSearchFilterException.java \
+javax/naming/directory/ModificationItem.java \
+javax/naming/directory/SearchResult.java \
+javax/naming/Binding.java \
+javax/naming/ContextNotEmptyException.java \
+javax/naming/Referenceable.java        \
+javax/naming/InterruptedNamingException.java \
+javax/naming/CommunicationException.java \
+javax/naming/LinkException.java        \
+javax/naming/BinaryRefAddr.java        \
+javax/naming/LinkLoopException.java \
+javax/naming/AuthenticationException.java \
+javax/naming/NameAlreadyBoundException.java \
+javax/naming/MalformedLinkException.java \
+javax/naming/NotContextException.java \
+javax/naming/spi/DirStateFactory.java \
+javax/naming/spi/ResolveResult.java \
+javax/naming/spi/ObjectFactoryBuilder.java \
+javax/naming/spi/DirObjectFactory.java \
+javax/naming/spi/DirectoryManager.java \
+javax/naming/spi/InitialContextFactoryBuilder.java \
+javax/naming/spi/ObjectFactory.java \
+javax/naming/spi/Resolver.java \
+javax/naming/spi/StateFactory.java \
+javax/naming/spi/InitialContextFactory.java \
+javax/naming/spi/NamingManager.java \
+javax/naming/InvalidNameException.java \
+javax/naming/NamingEnumeration.java \
+javax/naming/LinkRef.java \
+javax/naming/event/NamingListener.java \
+javax/naming/event/NamingEvent.java \
+javax/naming/event/NamespaceChangeListener.java        \
+javax/naming/event/ObjectChangeListener.java \
+javax/naming/event/EventContext.java \
+javax/naming/event/NamingExceptionEvent.java \
+javax/naming/event/EventDirContext.java        \
+javax/naming/NamingException.java \
+javax/naming/CannotProceedException.java \
+javax/naming/PartialResultException.java \
+javax/naming/TimeLimitExceededException.java \
+javax/naming/NoPermissionException.java        \
+javax/naming/CompoundName.java \
+javax/naming/SizeLimitExceededException.java \
+javax/naming/NoInitialContextException.java \
+javax/naming/NameNotFoundException.java        \
+javax/naming/InitialContext.java \
+javax/naming/NamingSecurityException.java \
+javax/naming/Context.java \
+javax/naming/ConfigurationException.java \
+javax/naming/InsufficientResourcesException.java \
+javax/naming/AuthenticationNotSupportedException.java \
+javax/naming/StringRefAddr.java        \
+javax/naming/ldap/InitialLdapContext.java \
+javax/naming/ldap/ExtendedRequest.java \
+javax/naming/ldap/Control.java \
+javax/naming/ldap/UnsolicitedNotificationListener.java \
+javax/naming/ldap/LdapReferralException.java \
+javax/naming/ldap/UnsolicitedNotificationEvent.java \
+javax/naming/ldap/HasControls.java \
+javax/naming/ldap/LdapContext.java \
+javax/naming/ldap/ExtendedResponse.java        \
+javax/naming/ldap/UnsolicitedNotification.java \
+javax/naming/ldap/ControlFactory.java \
+javax/naming/OperationNotSupportedException.java \
+javax/naming/ReferralException.java \
+javax/naming/LimitExceededException.java \
+javax/naming/Reference.java \
+javax/naming/NameParser.java \
+javax/naming/NameClassPair.java        \
+javax/naming/RefAddr.java \
+javax/naming/CompositeName.java        \
+javax/naming/Name.java \
+javax/security/cert/CertificateNotYetValidException.java \
+javax/security/cert/Certificate.java \
+javax/security/cert/X509Certificate.java \
+javax/security/cert/X509CertBridge.java        \
+javax/security/cert/CertificateEncodingException.java \
+javax/security/cert/CertificateExpiredException.java \
+javax/security/cert/CertificateException.java \
+javax/security/cert/CertificateParsingException.java \
 javax/security/auth/Destroyable.java \
-javax/security/auth/DestroyFailedException.java \
+javax/security/auth/x500/X500PrivateCredential.java \
+javax/security/auth/x500/X500Principal.java \
+javax/security/auth/spi/LoginModule.java \
+javax/security/auth/DestroyFailedException.java        \
+javax/security/auth/SubjectDomainCombiner.java \
+javax/security/auth/AuthPermission.java        \
+javax/security/auth/login/CredentialExpiredException.java \
+javax/security/auth/login/NullConfiguration.java \
 javax/security/auth/login/AccountExpiredException.java \
+javax/security/auth/login/LoginException.java \
 javax/security/auth/login/AppConfigurationEntry.java \
 javax/security/auth/login/Configuration.java \
-javax/security/auth/login/CredentialExpiredException.java \
-javax/security/auth/login/FailedLoginException.java \
 javax/security/auth/login/LoginContext.java \
-javax/security/auth/login/LoginException.java \
-javax/security/auth/login/NullConfiguration.java \
-javax/security/auth/spi/LoginModule.java \
-javax/security/auth/Policy.java \
+javax/security/auth/login/FailedLoginException.java \
 javax/security/auth/PrivateCredentialPermission.java \
-javax/security/auth/Refreshable.java \
-javax/security/auth/RefreshFailedException.java \
 javax/security/auth/Subject.java \
-javax/security/auth/SubjectDomainCombiner.java \
-javax/security/auth/x500/X500Principal.java \
-javax/security/auth/x500/X500PrivateCredential.java \
+javax/security/auth/Policy.java        \
+javax/security/auth/Refreshable.java \
+javax/security/auth/callback/TextInputCallback.java \
+javax/security/auth/callback/LanguageCallback.java \
+javax/security/auth/callback/TextOutputCallback.java \
+javax/security/auth/callback/UnsupportedCallbackException.java \
 javax/security/auth/callback/Callback.java \
-javax/security/auth/callback/CallbackHandler.java \
-javax/security/auth/callback/ChoiceCallback.java \
 javax/security/auth/callback/ConfirmationCallback.java \
-javax/security/auth/callback/LanguageCallback.java \
+javax/security/auth/callback/ChoiceCallback.java \
 javax/security/auth/callback/NameCallback.java \
 javax/security/auth/callback/PasswordCallback.java \
-javax/security/auth/callback/TextInputCallback.java \
-javax/security/auth/callback/TextOutputCallback.java \
-javax/security/auth/callback/UnsupportedCallbackException.java \
-javax/security/cert/Certificate.java \
-javax/security/cert/CertificateEncodingException.java \
-javax/security/cert/CertificateException.java \
-javax/security/cert/CertificateExpiredException.java \
-javax/security/cert/CertificateNotYetValidException.java \
-javax/security/cert/CertificateParsingException.java \
-javax/security/cert/X509CertBridge.java \
-javax/security/cert/X509Certificate.java \
-javax/security/sasl/AuthenticationException.java \
-javax/security/sasl/AuthorizeCallback.java \
+javax/security/auth/callback/CallbackHandler.java \
+javax/security/auth/RefreshFailedException.java        \
 javax/security/sasl/RealmCallback.java \
+javax/security/sasl/SaslClient.java \
 javax/security/sasl/RealmChoiceCallback.java \
+javax/security/sasl/AuthenticationException.java \
 javax/security/sasl/Sasl.java \
-javax/security/sasl/SaslClient.java \
 javax/security/sasl/SaslClientFactory.java \
+javax/security/sasl/AuthorizeCallback.java \
+javax/security/sasl/SaslServerFactory.java \
 javax/security/sasl/SaslException.java \
 javax/security/sasl/SaslServer.java \
-javax/security/sasl/SaslServerFactory.java \
-javax/sql/ConnectionEvent.java \
-javax/sql/ConnectionEventListener.java \
-javax/sql/ConnectionPoolDataSource.java \
-javax/sql/DataSource.java \
-javax/sql/PooledConnection.java \
-javax/sql/RowSetEvent.java \
-javax/sql/RowSetInternal.java \
-javax/sql/RowSet.java \
-javax/sql/RowSetListener.java \
-javax/sql/RowSetMetaData.java \
-javax/sql/RowSetReader.java \
-javax/sql/RowSetWriter.java \
-javax/sql/XAConnection.java \
-javax/sql/XADataSource.java \
-javax/transaction/xa/XAException.java \
-javax/transaction/xa/XAResource.java \
-javax/transaction/xa/Xid.java \
-javax/transaction/HeuristicCommitException.java        \
-javax/transaction/HeuristicMixedException.java \
-javax/transaction/HeuristicRollbackException.java \
-javax/transaction/InvalidTransactionException.java \
-javax/transaction/NotSupportedException.java \
+javax/transaction/TransactionRolledbackException.java \
+javax/transaction/Synchronization.java \
+javax/transaction/TransactionRequiredException.java \
 javax/transaction/RollbackException.java \
 javax/transaction/Status.java \
-javax/transaction/Synchronization.java \
+javax/transaction/HeuristicMixedException.java \
+javax/transaction/HeuristicRollbackException.java \
 javax/transaction/SystemException.java \
+javax/transaction/UserTransaction.java \
+javax/transaction/NotSupportedException.java \
+javax/transaction/HeuristicCommitException.java        \
 javax/transaction/Transaction.java \
 javax/transaction/TransactionManager.java \
-javax/transaction/TransactionRequiredException.java \
-javax/transaction/TransactionRolledbackException.java \
-javax/transaction/UserTransaction.java
+javax/transaction/InvalidTransactionException.java \
+javax/transaction/xa/XAException.java \
+javax/transaction/xa/XAResource.java \
+javax/transaction/xa/Xid.java \
+javax/accessibility/AccessibleValue.java \
+javax/accessibility/AccessibleBundle.java \
+javax/accessibility/AccessibleContext.java \
+javax/accessibility/AccessibleRelationSet.java \
+javax/accessibility/Accessible.java \
+javax/accessibility/AccessibleTableModelChange.java \
+javax/accessibility/AccessibleState.java \
+javax/accessibility/AccessibleIcon.java        \
+javax/accessibility/AccessibleHypertext.java \
+javax/accessibility/AccessibleComponent.java \
+javax/accessibility/AccessibleText.java        \
+javax/accessibility/AccessibleRole.java        \
+javax/accessibility/AccessibleEditableText.java        \
+javax/accessibility/AccessibleRelation.java \
+javax/accessibility/AccessibleTable.java \
+javax/accessibility/AccessibleStateSet.java \
+javax/accessibility/AccessibleSelection.java \
+javax/accessibility/AccessibleExtendedTable.java \
+javax/accessibility/AccessibleResourceBundle.java \
+javax/accessibility/AccessibleExtendedComponent.java \
+javax/accessibility/AccessibleHyperlink.java \
+javax/accessibility/AccessibleKeyBinding.java \
+javax/accessibility/AccessibleAction.java \
+javax/sql/ConnectionEventListener.java \
+javax/sql/RowSetEvent.java \
+javax/sql/ConnectionPoolDataSource.java        \
+javax/sql/RowSetWriter.java \
+javax/sql/XAConnection.java \
+javax/sql/RowSet.java \
+javax/sql/DataSource.java \
+javax/sql/RowSetInternal.java \
+javax/sql/RowSetReader.java \
+javax/sql/RowSetMetaData.java \
+javax/sql/PooledConnection.java        \
+javax/sql/XADataSource.java \
+javax/sql/RowSetListener.java \
+javax/sql/ConnectionEvent.java \
+javax/crypto/Cipher.java \
+javax/crypto/IllegalBlockSizeException.java \
+javax/crypto/MacSpi.java \
+javax/crypto/SecretKeyFactorySpi.java \
+javax/crypto/ShortBufferException.java \
+javax/crypto/KeyAgreement.java \
+javax/crypto/ExemptionMechanism.java \
+javax/crypto/CipherOutputStream.java \
+javax/crypto/SealedObject.java \
+javax/crypto/NullCipher.java \
+javax/crypto/KeyAgreementSpi.java \
+javax/crypto/SecretKeyFactory.java \
+javax/crypto/SecretKey.java \
+javax/crypto/NullCipherImpl.java \
+javax/crypto/spec/DESKeySpec.java \
+javax/crypto/spec/DHPrivateKeySpec.java        \
+javax/crypto/spec/DHParameterSpec.java \
+javax/crypto/spec/PBEParameterSpec.java        \
+javax/crypto/spec/DESedeKeySpec.java \
+javax/crypto/spec/DHGenParameterSpec.java \
+javax/crypto/spec/DHPublicKeySpec.java \
+javax/crypto/spec/PBEKeySpec.java \
+javax/crypto/spec/RC5ParameterSpec.java        \
+javax/crypto/spec/RC2ParameterSpec.java        \
+javax/crypto/spec/IvParameterSpec.java \
+javax/crypto/spec/SecretKeySpec.java \
+javax/crypto/interfaces/DHPublicKey.java \
+javax/crypto/interfaces/DHKey.java \
+javax/crypto/interfaces/DHPrivateKey.java \
+javax/crypto/interfaces/PBEKey.java \
+javax/crypto/NoSuchPaddingException.java \
+javax/crypto/KeyGeneratorSpi.java \
+javax/crypto/BadPaddingException.java \
+javax/crypto/CipherSpi.java \
+javax/crypto/KeyGenerator.java \
+javax/crypto/CipherInputStream.java \
+javax/crypto/ExemptionMechanismException.java \
+javax/crypto/ExemptionMechanismSpi.java        \
+javax/crypto/EncryptedPrivateKeyInfo.java \
+javax/crypto/Mac.java
 
+org_source_files = \
+org/ietf/jgss/GSSManager.java \
+org/ietf/jgss/GSSException.java        \
+org/ietf/jgss/MessageProp.java \
+org/ietf/jgss/GSSName.java \
+org/ietf/jgss/GSSContext.java \
+org/ietf/jgss/Oid.java \
+org/ietf/jgss/GSSCredential.java \
+org/ietf/jgss/ChannelBinding.java
+
+gnu_xml_source_files = \
+gnu/xml/xpath/EqualityExpr.java        \
+gnu/xml/xpath/NumberFunction.java \
+gnu/xml/xpath/StringLengthFunction.java        \
+gnu/xml/xpath/NameFunction.java        \
+gnu/xml/xpath/SumFunction.java \
+gnu/xml/xpath/Pattern.java \
+gnu/xml/xpath/StringFunction.java \
+gnu/xml/xpath/NegativeExpr.java        \
+gnu/xml/xpath/UnionExpr.java \
+gnu/xml/xpath/SubstringFunction.java \
+gnu/xml/xpath/Expr.java        \
+gnu/xml/xpath/XPathFactoryImpl.java \
+gnu/xml/xpath/NormalizeSpaceFunction.java \
+gnu/xml/xpath/Constant.java \
+gnu/xml/xpath/Predicate.java \
+gnu/xml/xpath/Path.java        \
+gnu/xml/xpath/OrExpr.java \
+gnu/xml/xpath/LangFunction.java        \
+gnu/xml/xpath/StartsWithFunction.java \
+gnu/xml/xpath/SubstringAfterFunction.java \
+gnu/xml/xpath/FloorFunction.java \
+gnu/xml/xpath/NotFunction.java \
+gnu/xml/xpath/Root.java        \
+gnu/xml/xpath/PositionFunction.java \
+gnu/xml/xpath/VariableReference.java \
+gnu/xml/xpath/DocumentOrderComparator.java \
+gnu/xml/xpath/LocalNameFunction.java \
+gnu/xml/xpath/NamespaceUriFunction.java        \
+gnu/xml/xpath/TranslateFunction.java \
+gnu/xml/xpath/FalseFunction.java \
+gnu/xml/xpath/AndExpr.java \
+gnu/xml/xpath/XPathParser.java \
+gnu/xml/xpath/NamespaceTest.java \
+gnu/xml/xpath/ConcatFunction.java \
+gnu/xml/xpath/NameTest.java \
+gnu/xml/xpath/CountFunction.java \
+gnu/xml/xpath/IdFunction.java \
+gnu/xml/xpath/LastFunction.java        \
+gnu/xml/xpath/XPathTokenizer.java \
+gnu/xml/xpath/Steps.java \
+gnu/xml/xpath/TrueFunction.java        \
+gnu/xml/xpath/BooleanFunction.java \
+gnu/xml/xpath/ParenthesizedExpr.java \
+gnu/xml/xpath/XPathImpl.java \
+gnu/xml/xpath/Selector.java \
+gnu/xml/xpath/RoundFunction.java \
+gnu/xml/xpath/SubstringBeforeFunction.java \
+gnu/xml/xpath/Function.java \
+gnu/xml/xpath/CeilingFunction.java \
+gnu/xml/xpath/RelationalExpr.java \
+gnu/xml/xpath/FunctionCall.java        \
+gnu/xml/xpath/NodeTypeTest.java        \
+gnu/xml/xpath/ArithmeticExpr.java \
+gnu/xml/xpath/Test.java        \
+gnu/xml/xpath/ContainsFunction.java \
+gnu/xml/pipeline/EventFilter.java \
+gnu/xml/pipeline/NSFilter.java \
+gnu/xml/pipeline/XsltFilter.java \
+gnu/xml/pipeline/ValidationConsumer.java \
+gnu/xml/pipeline/PipelineFactory.java \
+gnu/xml/pipeline/TextConsumer.java \
+gnu/xml/pipeline/LinkFilter.java \
+gnu/xml/pipeline/TeeConsumer.java \
+gnu/xml/pipeline/DomConsumer.java \
+gnu/xml/pipeline/EventConsumer.java \
+gnu/xml/pipeline/WellFormednessFilter.java \
+gnu/xml/pipeline/XIncludeFilter.java \
+gnu/xml/pipeline/CallFilter.java \
+gnu/xml/aelfred2/XmlParser.java        \
+gnu/xml/aelfred2/XmlReader.java        \
+gnu/xml/aelfred2/JAXPFactory.java \
+gnu/xml/aelfred2/ContentHandler2.java \
+gnu/xml/aelfred2/SAXDriver.java        \
+gnu/xml/util/XCat.java \
+gnu/xml/util/DomParser.java \
+gnu/xml/util/XMLWriter.java \
+gnu/xml/util/Resolver.java \
+gnu/xml/util/DoParse.java \
+gnu/xml/util/XHTMLWriter.java \
+gnu/xml/util/SAXNullTransformerFactory.java \
+gnu/xml/dom/DomXPathNSResolver.java \
+gnu/xml/dom/ls/FilteredSAXEventSink.java \
+gnu/xml/dom/ls/DomLSException.java \
+gnu/xml/dom/ls/DomLSSerializer.java \
+gnu/xml/dom/ls/DomLSInput.java \
+gnu/xml/dom/ls/DomLSOutput.java        \
+gnu/xml/dom/ls/SAXEventSink.java \
+gnu/xml/dom/ls/DomLSParser.java        \
+gnu/xml/dom/ls/ReaderInputStream.java \
+gnu/xml/dom/ls/WriterOutputStream.java \
+gnu/xml/dom/DomElement.java \
+gnu/xml/dom/DomNsNode.java \
+gnu/xml/dom/DomAttr.java \
+gnu/xml/dom/DTDAttributeTypeInfo.java \
+gnu/xml/dom/DomDocumentBuilder.java \
+gnu/xml/dom/DTDElementTypeInfo.java \
+gnu/xml/dom/DomDocument.java \
+gnu/xml/dom/DomXPathExpression.java \
+gnu/xml/dom/DomDocumentConfiguration.java \
+gnu/xml/dom/DomDocumentFragment.java \
+gnu/xml/dom/DomProcessingInstruction.java \
+gnu/xml/dom/Consumer.java \
+gnu/xml/dom/DomComment.java \
+gnu/xml/dom/DomCharacterData.java \
+gnu/xml/dom/DomExtern.java \
+gnu/xml/dom/DomEntityReference.java \
+gnu/xml/dom/DomNamedNodeMap.java \
+gnu/xml/dom/ImplementationList.java \
+gnu/xml/dom/ImplementationSource.java \
+gnu/xml/dom/DomImpl.java \
+gnu/xml/dom/DomDoctype.java \
+gnu/xml/dom/DomNode.java \
+gnu/xml/dom/DomXPathResult.java        \
+gnu/xml/dom/DomDocumentBuilderFactory.java \
+gnu/xml/dom/DomText.java \
+gnu/xml/dom/DomNSResolverContext.java \
+gnu/xml/dom/DomNodeIterator.java \
+gnu/xml/dom/DomNotation.java \
+gnu/xml/dom/JAXPFactory.java \
+gnu/xml/dom/DomIterator.java \
+gnu/xml/dom/DomEvent.java \
+gnu/xml/dom/DomEntity.java \
+gnu/xml/dom/DomCDATASection.java \
+gnu/xml/dom/DomDOMException.java \
+gnu/xml/dom/html2/DomHTMLAnchorElement.java \
+gnu/xml/dom/html2/DomHTMLAppletElement.java \
+gnu/xml/dom/html2/DomHTMLAreaElement.java \
+gnu/xml/dom/html2/DomHTMLBaseElement.java \
+gnu/xml/dom/html2/DomHTMLBaseFontElement.java \
+gnu/xml/dom/html2/DomHTMLBodyElement.java \
+gnu/xml/dom/html2/DomHTMLBRElement.java \
+gnu/xml/dom/html2/DomHTMLButtonElement.java \
+gnu/xml/dom/html2/DomHTMLCollection.java \
+gnu/xml/dom/html2/DomHTMLDirectoryElement.java \
+gnu/xml/dom/html2/DomHTMLDivElement.java \
+gnu/xml/dom/html2/DomHTMLDListElement.java \
+gnu/xml/dom/html2/DomHTMLDocument.java \
+gnu/xml/dom/html2/DomHTMLElement.java \
+gnu/xml/dom/html2/DomHTMLFieldSetElement.java \
+gnu/xml/dom/html2/DomHTMLFontElement.java \
+gnu/xml/dom/html2/DomHTMLFormElement.java \
+gnu/xml/dom/html2/DomHTMLFrameElement.java \
+gnu/xml/dom/html2/DomHTMLFrameSetElement.java \
+gnu/xml/dom/html2/DomHTMLHeadElement.java \
+gnu/xml/dom/html2/DomHTMLHeadingElement.java \
+gnu/xml/dom/html2/DomHTMLHRElement.java \
+gnu/xml/dom/html2/DomHTMLHtmlElement.java \
+gnu/xml/dom/html2/DomHTMLIFrameElement.java \
+gnu/xml/dom/html2/DomHTMLImageElement.java \
+gnu/xml/dom/html2/DomHTMLImpl.java \
+gnu/xml/dom/html2/DomHTMLInputElement.java \
+gnu/xml/dom/html2/DomHTMLIsIndexElement.java \
+gnu/xml/dom/html2/DomHTMLLabelElement.java \
+gnu/xml/dom/html2/DomHTMLLegendElement.java \
+gnu/xml/dom/html2/DomHTMLLIElement.java \
+gnu/xml/dom/html2/DomHTMLLinkElement.java \
+gnu/xml/dom/html2/DomHTMLMapElement.java \
+gnu/xml/dom/html2/DomHTMLMenuElement.java \
+gnu/xml/dom/html2/DomHTMLMetaElement.java \
+gnu/xml/dom/html2/DomHTMLModElement.java \
+gnu/xml/dom/html2/DomHTMLObjectElement.java \
+gnu/xml/dom/html2/DomHTMLOListElement.java \
+gnu/xml/dom/html2/DomHTMLOptGroupElement.java \
+gnu/xml/dom/html2/DomHTMLOptionElement.java \
+gnu/xml/dom/html2/DomHTMLParagraphElement.java \
+gnu/xml/dom/html2/DomHTMLParamElement.java \
+gnu/xml/dom/html2/DomHTMLParser.java \
+gnu/xml/dom/html2/DomHTMLPreElement.java \
+gnu/xml/dom/html2/DomHTMLQuoteElement.java \
+gnu/xml/dom/html2/DomHTMLScriptElement.java \
+gnu/xml/dom/html2/DomHTMLSelectElement.java \
+gnu/xml/dom/html2/DomHTMLStyleElement.java \
+gnu/xml/dom/html2/DomHTMLTableCaptionElement.java \
+gnu/xml/dom/html2/DomHTMLTableCellElement.java \
+gnu/xml/dom/html2/DomHTMLTableColElement.java \
+gnu/xml/dom/html2/DomHTMLTableElement.java \
+gnu/xml/dom/html2/DomHTMLTableRowElement.java \
+gnu/xml/dom/html2/DomHTMLTableSectionElement.java \
+gnu/xml/dom/html2/DomHTMLTextAreaElement.java \
+gnu/xml/dom/html2/DomHTMLTitleElement.java \
+gnu/xml/dom/html2/DomHTMLUListElement.java \
+gnu/xml/transform/GenerateIdFunction.java \
+gnu/xml/transform/FormatNumberFunction.java \
+gnu/xml/transform/ValueOfNode.java \
+gnu/xml/transform/ApplyImportsNode.java        \
+gnu/xml/transform/WithParam.java \
+gnu/xml/transform/DocumentFunction.java        \
+gnu/xml/transform/SAXSerializer.java \
+gnu/xml/transform/FunctionAvailableFunction.java \
+gnu/xml/transform/ElementAvailableFunction.java        \
+gnu/xml/transform/IfNode.java \
+gnu/xml/transform/ApplyTemplatesNode.java \
+gnu/xml/transform/SortKey.java \
+gnu/xml/transform/Key.java \
+gnu/xml/transform/ElementNode.java \
+gnu/xml/transform/CurrentFunction.java \
+gnu/xml/transform/XSLComparator.java \
+gnu/xml/transform/CallTemplateNode.java        \
+gnu/xml/transform/TemplatesImpl.java \
+gnu/xml/transform/ChooseNode.java \
+gnu/xml/transform/NumberNode.java \
+gnu/xml/transform/CopyOfNode.java \
+gnu/xml/transform/ParameterNode.java \
+gnu/xml/transform/TransformerFactoryImpl.java \
+gnu/xml/transform/TextNode.java        \
+gnu/xml/transform/CopyNode.java        \
+gnu/xml/transform/SystemPropertyFunction.java \
+gnu/xml/transform/Stylesheet.java \
+gnu/xml/transform/ProcessingInstructionNode.java \
+gnu/xml/transform/UnparsedEntityUriFunction.java \
+gnu/xml/transform/URIResolverEntityResolver.java \
+gnu/xml/transform/ErrorListenerErrorHandler.java \
+gnu/xml/transform/Bindings.java        \
+gnu/xml/transform/AttributeSet.java \
+gnu/xml/transform/Template.java        \
+gnu/xml/transform/MessageNode.java \
+gnu/xml/transform/LiteralNode.java \
+gnu/xml/transform/StreamSerializer.java        \
+gnu/xml/transform/XSLURIResolver.java \
+gnu/xml/transform/AttributeNode.java \
+gnu/xml/transform/CommentNode.java \
+gnu/xml/transform/ForEachNode.java \
+gnu/xml/transform/KeyFunction.java \
+gnu/xml/transform/TransformerImpl.java \
+gnu/xml/transform/WhenNode.java        \
+gnu/xml/transform/NodeNumberNode.java \
+gnu/xml/transform/OtherwiseNode.java \
+gnu/xml/transform/AbstractNumberNode.java \
+gnu/xml/transform/TemplateNode.java \
+gnu/xml/transform/TransformerOutputProperties.java \
+gnu/xml/transform/DOMSourceLocator.java
 
 ## Java files which are created by configure and thus are in the build
 ## directory.
@@ -2693,17 +3128,18 @@ gnu/gcj/RawDataManaged.java \
 gnu/gcj/io/DefaultMimeTypes.java \
 gnu/gcj/io/MimeTypes.java \
 gnu/gcj/io/SimpleSHSStream.java        \
+gnu/gcj/runtime/BootClassLoader.java \
+gnu/gcj/runtime/ExtensionClassLoader.java \
 gnu/gcj/runtime/FileDeleter.java \
 gnu/gcj/runtime/FinalizerThread.java \
+gnu/gcj/runtime/HelperClassLoader.java \
 gnu/gcj/runtime/JNIWeakRef.java \
-gnu/gcj/runtime/MethodRef.java \
 gnu/gcj/runtime/NameFinder.java \
 gnu/gcj/runtime/PersistentByteMap.java \
 gnu/gcj/runtime/SharedLibHelper.java \
 gnu/gcj/runtime/SharedLibLoader.java \
-gnu/gcj/runtime/StackTrace.java \
 gnu/gcj/runtime/StringBuffer.java \
-gnu/gcj/runtime/VMClassLoader.java \
+gnu/gcj/runtime/SystemClassLoader.java \
 gnu/gcj/util/Debug.java \
 gnu/java/io/ASN1ParsingException.java \
 gnu/java/io/Base64InputStream.java \
@@ -2855,8 +3291,11 @@ gnu/java/locale/LocaleInformation_zh_SG.java \
 gnu/java/locale/LocaleInformation_zh_TW.java \
 gnu/java/math/MPN.java \
 gnu/java/net/BASE64.java \
+gnu/java/net/CRLFInputStream.java \
+gnu/java/net/CRLFOutputStream.java \
 gnu/java/net/DefaultContentHandlerFactory.java \
 gnu/java/net/EmptyX509TrustManager.java \
+gnu/java/net/GetLocalHostAction.java \
 gnu/java/net/HeaderFieldHelper.java \
 gnu/java/net/LineInputStream.java \
 gnu/java/net/PlainDatagramSocketImpl.java \
@@ -2867,6 +3306,22 @@ gnu/java/net/protocol/core/CoreInputStream.java \
 gnu/java/net/protocol/core/Handler.java \
 gnu/java/net/protocol/file/Connection.java \
 gnu/java/net/protocol/file/Handler.java \
+gnu/java/net/protocol/ftp/ActiveModeDTP.java \
+gnu/java/net/protocol/ftp/BlockInputStream.java \
+gnu/java/net/protocol/ftp/BlockOutputStream.java \
+gnu/java/net/protocol/ftp/CompressedInputStream.java \
+gnu/java/net/protocol/ftp/CompressedOutputStream.java \
+gnu/java/net/protocol/ftp/DTP.java \
+gnu/java/net/protocol/ftp/DTPInputStream.java \
+gnu/java/net/protocol/ftp/DTPOutputStream.java \
+gnu/java/net/protocol/ftp/FTPConnection.java \
+gnu/java/net/protocol/ftp/FTPException.java \
+gnu/java/net/protocol/ftp/FTPResponse.java \
+gnu/java/net/protocol/ftp/FTPURLConnection.java \
+gnu/java/net/protocol/ftp/Handler.java \
+gnu/java/net/protocol/ftp/PassiveModeDTP.java \
+gnu/java/net/protocol/ftp/StreamInputStream.java \
+gnu/java/net/protocol/ftp/StreamOutputStream.java \
 gnu/java/net/protocol/gcjlib/Connection.java \
 gnu/java/net/protocol/gcjlib/Handler.java \
 gnu/java/net/protocol/http/Authenticator.java \
@@ -2895,6 +3350,7 @@ gnu/java/net/protocol/jar/Connection.java \
 gnu/java/net/protocol/jar/Handler.java \
 gnu/java/nio/ChannelInputStream.java \
 gnu/java/nio/ChannelOutputStream.java \
+gnu/java/nio/ChannelReader.java \
 gnu/java/nio/DatagramChannelImpl.java \
 gnu/java/nio/DatagramChannelSelectionKey.java \
 gnu/java/nio/FileLockImpl.java \
@@ -2930,12 +3386,18 @@ gnu/java/security/PolicyFile.java \
 gnu/java/security/action/GetPropertyAction.java \
 gnu/java/security/action/GetSecurityPropertyAction.java \
 gnu/java/security/action/SetAccessibleAction.java \
+gnu/java/security/ber/BER.java \
+gnu/java/security/ber/BEREncodingException.java \
+gnu/java/security/ber/BERReader.java \
+gnu/java/security/ber/BERValue.java \
 gnu/java/security/der/BitString.java \
 gnu/java/security/der/DER.java \
 gnu/java/security/der/DEREncodingException.java \
 gnu/java/security/der/DERReader.java \
 gnu/java/security/der/DERValue.java \
 gnu/java/security/der/DERWriter.java \
+gnu/java/security/pkcs/PKCS7SignedData.java \
+gnu/java/security/pkcs/SignerInfo.java \
 gnu/java/security/provider/CollectionCertStoreImpl.java \
 gnu/java/security/provider/DSAKeyFactory.java \
 gnu/java/security/provider/DSAKeyPairGenerator.java \
@@ -3397,7 +3859,8 @@ java/util/zip/ZipOutputStream.java \
 $(rmi_java_source_files) \
 $(awt_java_source_files) \
 $(convert_source_files) \
-$(javax_source_files)
+$(javax_source_files) \
+$(org_source_files)
 
 
 java_source_files = $(special_java_source_files) $(ordinary_java_source_files)
@@ -3433,11 +3896,8 @@ gnu/gcj/convert/natOutput_SJIS.cc \
 gnu/gcj/io/natSimpleSHSStream.cc \
 gnu/gcj/io/shs.cc \
 gnu/gcj/runtime/natFinalizerThread.cc \
-gnu/gcj/runtime/natNameFinder.cc \
 gnu/gcj/runtime/natSharedLibLoader.cc \
-gnu/gcj/runtime/natStackTrace.cc \
 gnu/gcj/runtime/natStringBuffer.cc \
-gnu/gcj/runtime/natVMClassLoader.cc \
 gnu/gcj/util/natDebug.cc \
 gnu/java/lang/natMainThread.cc \
 gnu/java/net/natPlainDatagramSocketImpl.cc \
@@ -3465,6 +3925,7 @@ java/lang/natSystem.cc \
 java/lang/natThread.cc \
 java/lang/natVMClassLoader.cc \
 java/lang/natVMSecurityManager.cc \
+java/lang/natVMThrowable.cc \
 java/lang/ref/natReference.cc \
 java/lang/reflect/natArray.cc \
 java/lang/reflect/natConstructor.cc \
@@ -3478,6 +3939,7 @@ java/nio/natDirectByteBufferImpl.cc \
 java/text/natCollator.cc \
 java/util/natResourceBundle.cc \
 java/util/natVMTimeZone.cc \
+java/util/logging/natLogger.cc \
 java/util/zip/natDeflater.cc \
 java/util/zip/natInflater.cc
 
@@ -3542,40 +4004,45 @@ gnu/gcj/xlib/natXUnmapEvent.cc
 ## ################################################################
 
 ##
-## javadoc to texinfo conversion
+## Creating and installing sources.zip
 ##
 
-TexinfoDoclet.class: $(srcdir)/scripts/TexinfoDoclet.java
-       javac -d . $(srcdir)/scripts/TexinfoDoclet.java
-
-texinfo: TexinfoDoclet.class
-       langsource=`ls $(srcdir)/java/lang/*.java`; \
-       lang=`echo $$langsource | sed -e 's/[^ ].*EcosProcess.java//g' | sed -e 's/[^ ].*PosixProcess.java//g'`; \
-       javadoc -outfile $(srcdir)/doc/java-lang.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $$lang
-       javadoc -outfile $(srcdir)/doc/java-lang-ref.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/lang/ref/*.java
-       javadoc -outfile $(srcdir)/doc/java-lang-reflect.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/lang/reflect/*.java
-       javadoc -outfile $(srcdir)/doc/java-applet.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/applet/*.java
-       javadoc -outfile $(srcdir)/doc/java-awt.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/*.java
-       javadoc -outfile $(srcdir)/doc/java-awt-color.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/color/*.java
-       javadoc -outfile $(srcdir)/doc/java-awt-datatransfer.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/datatransfer/*.java
-       javadoc -outfile $(srcdir)/doc/java-awt-event.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/event/*.java
-       javadoc -outfile $(srcdir)/doc/java-awt-geom.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/geom/*.java
-       javadoc -outfile $(srcdir)/doc/java-awt-image.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/image/*.java
-       javadoc -outfile $(srcdir)/doc/java-awt-peer.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/peer/*.java
-       javadoc -outfile $(srcdir)/doc/java-beans.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/beans/*.java
-       javadoc -outfile $(srcdir)/doc/java-beans-beancontext.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/beans/beancontext/*.java
-       javadoc -outfile $(srcdir)/doc/java-io.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/io/*.java
-       javadoc -outfile $(srcdir)/doc/java-math.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/math/*.java
-       javadoc -outfile $(srcdir)/doc/java-net.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/net/*.java
-       javadoc -outfile $(srcdir)/doc/java-security.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security/*.java
-       javadoc -outfile $(srcdir)/doc/java-security-cert.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security-cert/*.java
-       javadoc -outfile $(srcdir)/doc/java-security-spec.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security/spec/*.java
-       javadoc -outfile $(srcdir)/doc/java-security-interfaces.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security/spec/interfaces/*.java
-       javadoc -outfile $(srcdir)/doc/java-sql.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/sql/*.java
-       javadoc -outfile $(srcdir)/doc/java-text.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/text/*.java
-       javadoc -outfile $(srcdir)/doc/java-util.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/*.java
-       javadoc -outfile $(srcdir)/doc/java-util-jar.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/jar/*.java
-       javadoc -outfile $(srcdir)/doc/java-util-zip.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/zip/*.java
+## Create a zip holding all the sources.  This can be meaningfully
+## used in Eclipse.
+src.zip:
+       -rm -f src.zip
+       here=`pwd`; \
+       ( ( cd $(srcdir); \
+         find java gnu javax org -name '*.java' -print | \
+         while read file; do \
+## Ugly code to avoid "echo -C".  Must separate each entry by a newline
+## Gross but easy.
+           echo "x-C" | sed -e 's/^.//'; \
+           echo $(srcdir); \
+           echo $$file; \
+         done ); \
+## Now the build tree.
+         find gnu java -name '*.java' -print) | \
+## Many of the above circumlocutions are because ZIP will most likely
+## be a relative path to fastjar.
+       $(ZIP) -cfM@ $$here/src.zip
+## Now include the files from external/.
+       for dir in sax w3c_dom; do \
+         (cd $(srcdir)/external/$$dir; \
+         find org -type f -name '*.java' -print | while read file; do \
+           echo "x-C" | sed -e 's/^.//'; \
+           echo $(srcdir)/external/$$dir; \
+           echo $$file; \
+          done) | \
+         $(ZIP) -ufM0E@ src.zip; \
+       done
+
+## We use a variable for this in case the user wants to override it.
+sourcesdir = $(jardir)
+
+install-src.zip: src.zip
+       $(INSTALL_DATA) src.zip $(DESTDIR)$(sourcesdir)/src-$(gcc_version).zip
+
 
 ## ################################################################
 
@@ -3590,7 +4057,7 @@ texinfo: TexinfoDoclet.class
 ## the C++ code whenever any .java file is touched.
 ## Also force all the class files to build first. This makes them build in
 ## the right order to improve performance.
-all-recursive: libgcj-@gcc_version@.jar $(nat_headers) $(xlib_nat_headers)
+all-recursive: classes.stamp $(nat_headers) $(xlib_nat_headers)
 
 ## ################################################################