OSDN Git Service

* Makefile.in: Rebuilt.
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 24 Mar 2005 00:04:22 +0000 (00:04 +0000)
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 24 Mar 2005 00:04:22 +0000 (00:04 +0000)
* Makefile.am (AM_CXXFLAGS): Define TOOLEXECLIBDIR.
(libgcj0_convenience_la_SOURCES): Don't include
gnu_xml_source_files.
(libgcj0_convenience_la_LIBADD): New variable.
(libgcj_la_LIBADD): Don't include sax or w3c_dom.
(all_java_source_files): javax_imageio_source_files,
javax_xml_source_files, and gnu_java_beans_source_files.
($(gnu_xml_source_files:.java=.lo)): Removed target.
(gnu-xml.lo): New target.
(javax-imageio.lo): Likewise.
(javax-xml.lo): Likewise.
(gnu-java-beans.lo): Likewise.
(gnu_java_beans_source_files): New variable.
(javax_imageio_source_files): Likewise.
(javax_xml_source_files): Likewise.
(javax_source_files): Moved files to other variable.
(awt_java_source_files): Likewise.
(ordinary_java_source_files): Added BootClassLoader.java.
* java/lang/natVMClassLoader.cc (defineClass): Use boot loader,
not system class loader.
(initBootLoader): New method.
(loadClass): Search bootLoader.
* java/lang/natClassLoader.cc (_Jv_RegisterInitiatingLoader): Use
boot loader, not system class loader.
(_Jv_UnregisterInitiatingLoader): Likewise.
(_Jv_FindClass): Likewise.  Ensure entries in
bootstrap_class_list are unique.
* java/lang/natClass.cc (getClassLoader): Don't special case
system class loader.
* java/lang/VMClassLoader.java (bootLoader): New field.
(getResource): Use bootLoader.
(getResources): Likewise.
(initBootLoader): Declare.
* gnu/gcj/runtime/BootClassLoader.java: New file.
* external/sax/org/xml/sax/helpers/NamespaceSupport.java
(EMPTY_ENUMERATION): Now package-private.
* external/w3c_com/Makefile.in: Rebuilt.
* external/w3c_com/Makefile.am (MULTIBUILDTOP): New variable.
(w3c.jar): New target.
(classes.stamp): Updated.
(toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES.
Changed name of library.
(libw3c_gcj_la_SOURCES): New variable.
(libw3c_gcj_la_GCJFLAGS): Likewise.
(source_files): Renamed from lib3c_convenience_la_SOURCES.
* external/sax/Makefile.in: Rebuilt.
* external/sax/Makefile.am (MULTIBUILDTOP): New variable.
(sax.jar): New target.
(classes.stamp): Updated.
(toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES.
Changed name of library.
(libsax_gcj_la_SOURCES): New variable.
(libsax_gcj_la_GCJFLAGS): Likewise.
(source_files): Renamed from libsax_convenience_la_SOURCES.
* stacktrace.cc (non_system_trace_fn): Don't look at system class
loader.
* prims.cc (_Jv_CreateJavaVM): Initialize the bootstrap class
loader.
(_Jv_RunMain): Handle case where 'runtime' is NULL at exit.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96960 138bc75d-0d04-0410-961f-82ee72b054a4

24 files changed:
libjava/ChangeLog
libjava/Makefile.am
libjava/Makefile.in
libjava/aclocal.m4
libjava/external/Makefile.in
libjava/external/sax/Makefile.am
libjava/external/sax/Makefile.in
libjava/external/sax/org/xml/sax/helpers/NamespaceSupport.java
libjava/external/w3c_dom/Makefile.am
libjava/external/w3c_dom/Makefile.in
libjava/gcj/Makefile.in
libjava/gnu/gcj/runtime/BootClassLoader.java [new file with mode: 0644]
libjava/gnu/xml/aelfred2/JAXPFactory.java
libjava/gnu/xml/aelfred2/SAXDriver.java
libjava/gnu/xml/aelfred2/XmlParser.java
libjava/gnu/xml/aelfred2/XmlReader.java
libjava/include/Makefile.in
libjava/java/lang/VMClassLoader.java
libjava/java/lang/natClass.cc
libjava/java/lang/natClassLoader.cc
libjava/java/lang/natVMClassLoader.cc
libjava/prims.cc
libjava/stacktrace.cc
libjava/testsuite/Makefile.in

index dc31111..b2d5002 100644 (file)
@@ -1,3 +1,66 @@
+2005-03-23  Tom Tromey  <tromey@redhat.com>
+
+       * Makefile.in: Rebuilt.
+       * Makefile.am (AM_CXXFLAGS): Define TOOLEXECLIBDIR.
+       (libgcj0_convenience_la_SOURCES): Don't include
+       gnu_xml_source_files.
+       (libgcj0_convenience_la_LIBADD): New variable.
+       (libgcj_la_LIBADD): Don't include sax or w3c_dom.
+       (all_java_source_files): javax_imageio_source_files,
+       javax_xml_source_files, and gnu_java_beans_source_files.
+       ($(gnu_xml_source_files:.java=.lo)): Removed target.
+       (gnu-xml.lo): New target.
+       (javax-imageio.lo): Likewise.
+       (javax-xml.lo): Likewise.
+       (gnu-java-beans.lo): Likewise.
+       (gnu_java_beans_source_files): New variable.
+       (javax_imageio_source_files): Likewise.
+       (javax_xml_source_files): Likewise.
+       (javax_source_files): Moved files to other variable.
+       (awt_java_source_files): Likewise.
+       (ordinary_java_source_files): Added BootClassLoader.java.
+       * java/lang/natVMClassLoader.cc (defineClass): Use boot loader,
+       not system class loader.
+       (initBootLoader): New method.
+       (loadClass): Search bootLoader.
+       * java/lang/natClassLoader.cc (_Jv_RegisterInitiatingLoader): Use
+       boot loader, not system class loader.
+       (_Jv_UnregisterInitiatingLoader): Likewise.
+       (_Jv_FindClass): Likewise.  Ensure entries in
+       bootstrap_class_list are unique.
+       * java/lang/natClass.cc (getClassLoader): Don't special case
+       system class loader.
+       * java/lang/VMClassLoader.java (bootLoader): New field.
+       (getResource): Use bootLoader.
+       (getResources): Likewise.
+       (initBootLoader): Declare.
+       * gnu/gcj/runtime/BootClassLoader.java: New file.
+       * external/sax/org/xml/sax/helpers/NamespaceSupport.java
+       (EMPTY_ENUMERATION): Now package-private.
+       * external/w3c_com/Makefile.in: Rebuilt.
+       * external/w3c_com/Makefile.am (MULTIBUILDTOP): New variable.
+       (w3c.jar): New target.
+       (classes.stamp): Updated.
+       (toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES.
+       Changed name of library.
+       (libw3c_gcj_la_SOURCES): New variable.
+       (libw3c_gcj_la_GCJFLAGS): Likewise.
+       (source_files): Renamed from lib3c_convenience_la_SOURCES.
+       * external/sax/Makefile.in: Rebuilt.
+       * external/sax/Makefile.am (MULTIBUILDTOP): New variable.
+       (sax.jar): New target.
+       (classes.stamp): Updated.
+       (toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES.
+       Changed name of library.
+       (libsax_gcj_la_SOURCES): New variable.
+       (libsax_gcj_la_GCJFLAGS): Likewise.
+       (source_files): Renamed from libsax_convenience_la_SOURCES.
+       * stacktrace.cc (non_system_trace_fn): Don't look at system class
+       loader.
+       * prims.cc (_Jv_CreateJavaVM): Initialize the bootstrap class
+       loader.
+       (_Jv_RunMain): Handle case where 'runtime' is NULL at exit.
+
 2005-03-23  Sven de Marothy  <sven@physto.se>
 
        PR libgcj/2641, PR libgcj/9854, PR libgcj/14892, PR libgcj/18083,
index a9141a0..5ca1844 100644 (file)
@@ -184,7 +184,8 @@ AM_CXXFLAGS = \
        -DLIBDIR="\"$(libdir)\"" \
        -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \
        -DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \
-       -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\""
+       -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
+       -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\""
 
 AM_GCJFLAGS = \
        @LIBGCJ_JAVAFLAGS@ \
@@ -233,12 +234,16 @@ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
 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) \
-       $(gnu_xml_source_files) $(built_java_source_files) \
+       $(built_java_source_files) \
        $(BOEHMGC_SRC) $(NOGC_SRC) \
        $(BACKTRACE_SRC) \
        $(POSIX_PLATFORM_SRC) $(WIN32_PLATFORM_SRC) $(ECOS_PLATFORM_SRC) \
        $(DARWIN_CRT_SRC) \
        $(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC)
+libgcj0_convenience_la_LIBADD = \
+       gnu-xml.lo javax-imageio.lo \
+       javax-xml.lo gnu-java-beans.lo
+
 noinst_LTLIBRARIES = libgcj0_convenience.la
 
 libgcj_la_SOURCES =
@@ -254,8 +259,6 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
        $(LIBLTDL) $(SYS_ZLIBS) \
        -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 libgcj_la_LIBADD = \
-       external/sax/libsax_convenience.la \
-       external/w3c_dom/libw3c_convenience.la \
        libgcj0_convenience.la \
        $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
 libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
@@ -515,7 +518,10 @@ all_java_source_files = \
     $(built_java_source_files) \
     $(gtk_awt_peer_sources) \
     $(xlib_java_source_files) \
-    $(gnu_xml_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)
 
@@ -610,7 +616,7 @@ SUFFIXES = .class .java .h .properties
 $(javao_files) $(xlib_javao_files): %.lo: %.java
        $(LTGCJCOMPILE) -o $@ -c $<
 
-$(gtk_awt_peer_sources:.java=.lo) $(gnu_xml_source_files:.java=.lo): %.lo: %.java
+$(gtk_awt_peer_sources:.java=.lo): %.lo: %.java
        $(LTGCJCOMPILE) -fjni -o $@ -c $<
 
 ## Pass the list of object files to libtool in a temporary file to
@@ -631,6 +637,58 @@ 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`
+
+## ################################################################
+
+##
 ## How to build header files.
 ##
 
@@ -1054,40 +1112,7 @@ gnu/gcj/convert/UnicodeToBytes.java
 ## hand.
 special_java_source_files = java/lang/Class.java java/lang/Object.java
 
-awt_java_source_files =        \
-gnu/awt/LightweightRedirector.java \
-gnu/awt/j2d/AbstractGraphicsState.java \
-gnu/awt/j2d/DirectRasterGraphics.java \
-gnu/awt/j2d/Graphics2DImpl.java \
-gnu/awt/j2d/IntegerGraphicsState.java \
-gnu/awt/j2d/MappedRaster.java \
-gnu/java/awt/BitMaskExtent.java \
-gnu/java/awt/Buffers.java \
-gnu/java/awt/BitwiseXORComposite.java \
-gnu/java/awt/ComponentDataBlitOp.java \
-gnu/java/awt/ClasspathToolkit.java \
-gnu/java/awt/EmbeddedWindow.java \
-gnu/java/awt/EmbeddedWindowSupport.java \
-gnu/java/awt/EventModifier.java \
-gnu/java/awt/color/CieXyzConverter.java \
-gnu/java/awt/color/ClutProfileConverter.java \
-gnu/java/awt/color/ColorLookUpTable.java \
-gnu/java/awt/color/ColorSpaceConverter.java \
-gnu/java/awt/color/GrayProfileConverter.java \
-gnu/java/awt/color/GrayScaleConverter.java \
-gnu/java/awt/color/LinearRGBConverter.java \
-gnu/java/awt/color/ProfileHeader.java \
-gnu/java/awt/color/PyccConverter.java \
-gnu/java/awt/color/RgbProfileConverter.java \
-gnu/java/awt/color/SrgbConverter.java \
-gnu/java/awt/color/TagEntry.java \
-gnu/java/awt/color/ToneReproductionCurve.java \
-gnu/java/awt/image/ImageDecoder.java \
-gnu/java/awt/image/XBMDecoder.java \
-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_source_files = \
 gnu/java/beans/decoder/AbstractContext.java \
 gnu/java/beans/decoder/AbstractCreatableObjectContext.java \
 gnu/java/beans/decoder/AbstractElementHandler.java \
@@ -1139,7 +1164,42 @@ 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 \
+gnu/java/beans/IntrospectionIncubator.java
+
+awt_java_source_files =        \
+gnu/awt/LightweightRedirector.java \
+gnu/awt/j2d/AbstractGraphicsState.java \
+gnu/awt/j2d/DirectRasterGraphics.java \
+gnu/awt/j2d/Graphics2DImpl.java \
+gnu/awt/j2d/IntegerGraphicsState.java \
+gnu/awt/j2d/MappedRaster.java \
+gnu/java/awt/BitMaskExtent.java \
+gnu/java/awt/Buffers.java \
+gnu/java/awt/BitwiseXORComposite.java \
+gnu/java/awt/ComponentDataBlitOp.java \
+gnu/java/awt/ClasspathToolkit.java \
+gnu/java/awt/EmbeddedWindow.java \
+gnu/java/awt/EmbeddedWindowSupport.java \
+gnu/java/awt/EventModifier.java \
+gnu/java/awt/color/CieXyzConverter.java \
+gnu/java/awt/color/ClutProfileConverter.java \
+gnu/java/awt/color/ColorLookUpTable.java \
+gnu/java/awt/color/ColorSpaceConverter.java \
+gnu/java/awt/color/GrayProfileConverter.java \
+gnu/java/awt/color/GrayScaleConverter.java \
+gnu/java/awt/color/LinearRGBConverter.java \
+gnu/java/awt/color/ProfileHeader.java \
+gnu/java/awt/color/PyccConverter.java \
+gnu/java/awt/color/RgbProfileConverter.java \
+gnu/java/awt/color/SrgbConverter.java \
+gnu/java/awt/color/TagEntry.java \
+gnu/java/awt/color/ToneReproductionCurve.java \
+gnu/java/awt/image/ImageDecoder.java \
+gnu/java/awt/image/XBMDecoder.java \
+gnu/java/awt/peer/EmbeddedWindowPeer.java \
+gnu/java/awt/peer/GLightweightPeer.java \
+gnu/java/awt/peer/ClasspathFontPeer.java \
+gnu/java/awt/peer/ClasspathTextLayoutPeer.java \
 java/applet/Applet.java \
 java/applet/AppletStub.java \
 java/applet/AppletContext.java \
@@ -1982,7 +2042,7 @@ gnu/java/rmi/server/UnicastRemoteStub.java \
 gnu/java/rmi/server/UnicastServer.java \
 gnu/java/rmi/server/UnicastServerRef.java
 
-javax_source_files = \
+javax_imageio_source_files = \
 javax/imageio/ImageWriteParam.java \
 javax/imageio/ImageReader.java \
 javax/imageio/ImageWriter.java \
@@ -2028,7 +2088,63 @@ javax/imageio/event/IIOWriteProgressListener.java \
 javax/imageio/ImageTranscoder.java \
 javax/imageio/ImageTypeSpecifier.java \
 javax/imageio/ImageIO.java \
-javax/imageio/IIOImage.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 \
@@ -2267,58 +2383,6 @@ javax/naming/NameClassPair.java  \
 javax/naming/RefAddr.java \
 javax/naming/CompositeName.java        \
 javax/naming/Name.java \
-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/security/cert/CertificateNotYetValidException.java \
 javax/security/cert/Certificate.java \
 javax/security/cert/X509Certificate.java \
@@ -2919,6 +2983,7 @@ 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/FileDeleter.java \
 gnu/gcj/runtime/FinalizerThread.java \
 gnu/gcj/runtime/JNIWeakRef.java \
index c98a225..79f4ee9 100644 (file)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -324,7 +324,8 @@ am__DEPENDENCIES_2 = gnu/regexp/MessagesBundle.properties.lo \
 am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
 am_libgcj_la_OBJECTS =
 libgcj_la_OBJECTS = $(am_libgcj_la_OBJECTS)
-libgcj0_convenience_la_LIBADD =
+libgcj0_convenience_la_DEPENDENCIES = gnu-xml.lo javax-imageio.lo \
+       javax-xml.lo gnu-java-beans.lo
 am__libgcj0_convenience_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
        stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \
        gnu/gcj/natCore.cc gnu/gcj/convert/JIS0208_to_Unicode.cc \
@@ -546,6 +547,7 @@ am__libgcj0_convenience_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
        gnu/gcj/Core.java gnu/gcj/RawData.java \
        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/FileDeleter.java \
        gnu/gcj/runtime/FinalizerThread.java \
        gnu/gcj/runtime/JNIWeakRef.java \
@@ -1306,58 +1308,6 @@ am__libgcj0_convenience_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
        gnu/java/awt/peer/GLightweightPeer.java \
        gnu/java/awt/peer/ClasspathFontPeer.java \
        gnu/java/awt/peer/ClasspathTextLayoutPeer.java \
-       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 \
        java/applet/Applet.java java/applet/AppletStub.java \
        java/applet/AppletContext.java java/applet/AudioClip.java \
        java/awt/AWTError.java java/awt/AWTEvent.java \
@@ -1989,49 +1939,6 @@ am__libgcj0_convenience_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
        gnu/gcj/convert/Output_UTF8.java \
        gnu/gcj/convert/Output_iconv.java \
        gnu/gcj/convert/UnicodeToBytes.java \
-       javax/imageio/ImageWriteParam.java \
-       javax/imageio/ImageReader.java javax/imageio/ImageWriter.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/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/ImageInputStreamSpi.java \
-       javax/imageio/spi/RegisterableService.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/ImageOutputStreamImpl.java \
-       javax/imageio/stream/MemoryCacheImageInputStream.java \
-       javax/imageio/stream/FileCacheImageOutputStream.java \
-       javax/imageio/stream/ImageOutputStream.java \
-       javax/imageio/stream/MemoryCacheImageOutputStream.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/net/VanillaSocketFactory.java \
        javax/net/ssl/TrustManagerFactorySpi.java \
        javax/net/ssl/SSLKeyException.java \
@@ -2260,58 +2167,6 @@ am__libgcj0_convenience_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
        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/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/security/cert/CertificateNotYetValidException.java \
        javax/security/cert/Certificate.java \
        javax/security/cert/X509Certificate.java \
@@ -2448,151 +2303,6 @@ am__libgcj0_convenience_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
        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/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/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/lang/ConcreteProcess.java \
        gnu/classpath/Configuration.java boehm.cc nogc.cc \
        sysdep/dwarf2-backtrace.cc posix.cc win32.cc darwin.cc \
@@ -2908,67 +2618,16 @@ am__objects_11 = gnu/awt/LightweightRedirector.lo \
        gnu/java/awt/peer/GLightweightPeer.lo \
        gnu/java/awt/peer/ClasspathFontPeer.lo \
        gnu/java/awt/peer/ClasspathTextLayoutPeer.lo \
-       gnu/java/beans/decoder/AbstractContext.lo \
-       gnu/java/beans/decoder/AbstractCreatableObjectContext.lo \
-       gnu/java/beans/decoder/AbstractElementHandler.lo \
-       gnu/java/beans/decoder/AbstractObjectContext.lo \
-       gnu/java/beans/decoder/ArrayContext.lo \
-       gnu/java/beans/decoder/ArrayHandler.lo \
-       gnu/java/beans/decoder/AssemblyException.lo \
-       gnu/java/beans/decoder/BooleanHandler.lo \
-       gnu/java/beans/decoder/ByteHandler.lo \
-       gnu/java/beans/decoder/CharHandler.lo \
-       gnu/java/beans/decoder/ClassHandler.lo \
-       gnu/java/beans/decoder/ConstructorContext.lo \
-       gnu/java/beans/decoder/Context.lo \
-       gnu/java/beans/decoder/DecoderContext.lo \
-       gnu/java/beans/decoder/DefaultExceptionListener.lo \
-       gnu/java/beans/decoder/DoubleHandler.lo \
-       gnu/java/beans/decoder/DummyContext.lo \
-       gnu/java/beans/decoder/DummyHandler.lo \
-       gnu/java/beans/decoder/ElementHandler.lo \
-       gnu/java/beans/decoder/FloatHandler.lo \
-       gnu/java/beans/decoder/GrowableArrayContext.lo \
-       gnu/java/beans/decoder/IndexContext.lo \
-       gnu/java/beans/decoder/IntHandler.lo \
-       gnu/java/beans/decoder/JavaHandler.lo \
-       gnu/java/beans/decoder/LongHandler.lo \
-       gnu/java/beans/decoder/MethodContext.lo \
-       gnu/java/beans/decoder/MethodFinder.lo \
-       gnu/java/beans/decoder/NullHandler.lo \
-       gnu/java/beans/decoder/ObjectContext.lo \
-       gnu/java/beans/decoder/ObjectHandler.lo \
-       gnu/java/beans/decoder/PersistenceParser.lo \
-       gnu/java/beans/decoder/PropertyContext.lo \
-       gnu/java/beans/decoder/ShortHandler.lo \
-       gnu/java/beans/decoder/SimpleHandler.lo \
-       gnu/java/beans/decoder/StaticMethodContext.lo \
-       gnu/java/beans/decoder/StringHandler.lo \
-       gnu/java/beans/decoder/VoidHandler.lo \
-       gnu/java/beans/editors/ColorEditor.lo \
-       gnu/java/beans/editors/FontEditor.lo \
-       gnu/java/beans/editors/NativeBooleanEditor.lo \
-       gnu/java/beans/editors/NativeByteEditor.lo \
-       gnu/java/beans/editors/NativeDoubleEditor.lo \
-       gnu/java/beans/editors/NativeFloatEditor.lo \
-       gnu/java/beans/editors/NativeIntEditor.lo \
-       gnu/java/beans/editors/NativeLongEditor.lo \
-       gnu/java/beans/editors/NativeShortEditor.lo \
-       gnu/java/beans/editors/StringEditor.lo \
-       gnu/java/beans/BeanInfoEmbryo.lo \
-       gnu/java/beans/DummyAppletContext.lo \
-       gnu/java/beans/DummyAppletStub.lo \
-       gnu/java/beans/ExplicitBeanInfo.lo \
-       gnu/java/beans/IntrospectionIncubator.lo java/applet/Applet.lo \
-       java/applet/AppletStub.lo java/applet/AppletContext.lo \
-       java/applet/AudioClip.lo java/awt/AWTError.lo \
-       java/awt/AWTEvent.lo java/awt/AWTEventMulticaster.lo \
-       java/awt/AWTException.lo java/awt/AWTPermission.lo \
-       java/awt/ActiveEvent.lo java/awt/Adjustable.lo \
-       java/awt/BorderLayout.lo java/awt/Button.lo java/awt/Canvas.lo \
-       java/awt/CardLayout.lo java/awt/Checkbox.lo \
-       java/awt/CheckboxGroup.lo java/awt/CheckboxMenuItem.lo \
-       java/awt/Choice.lo java/awt/Color.lo java/awt/Component.lo \
+       java/applet/Applet.lo java/applet/AppletStub.lo \
+       java/applet/AppletContext.lo java/applet/AudioClip.lo \
+       java/awt/AWTError.lo java/awt/AWTEvent.lo \
+       java/awt/AWTEventMulticaster.lo java/awt/AWTException.lo \
+       java/awt/AWTPermission.lo java/awt/ActiveEvent.lo \
+       java/awt/Adjustable.lo java/awt/BorderLayout.lo \
+       java/awt/Button.lo java/awt/Canvas.lo java/awt/CardLayout.lo \
+       java/awt/Checkbox.lo java/awt/CheckboxGroup.lo \
+       java/awt/CheckboxMenuItem.lo java/awt/Choice.lo \
+       java/awt/Color.lo java/awt/Component.lo \
        java/awt/ComponentOrientation.lo java/awt/Container.lo \
        java/awt/Cursor.lo java/awt/Dialog.lo java/awt/Dimension.lo \
        java/awt/Event.lo java/awt/EventDispatchThread.lo \
@@ -3536,49 +3195,7 @@ am__objects_12 = gnu/gcj/convert/BytesToUnicode.lo \
        gnu/gcj/convert/Output_UnicodeLittleUnmarked.lo \
        gnu/gcj/convert/Output_UTF8.lo gnu/gcj/convert/Output_iconv.lo \
        gnu/gcj/convert/UnicodeToBytes.lo
-am__objects_13 = javax/imageio/ImageWriteParam.lo \
-       javax/imageio/ImageReader.lo javax/imageio/ImageWriter.lo \
-       javax/imageio/IIOException.lo \
-       javax/imageio/IIOParamController.lo \
-       javax/imageio/ImageReadParam.lo javax/imageio/IIOParam.lo \
-       javax/imageio/spi/IIORegistry.lo \
-       javax/imageio/spi/ImageWriterSpi.lo \
-       javax/imageio/spi/ImageOutputStreamSpi.lo \
-       javax/imageio/spi/ServiceRegistry.lo \
-       javax/imageio/spi/ImageTranscoderSpi.lo \
-       javax/imageio/spi/ImageReaderSpi.lo \
-       javax/imageio/spi/IIOServiceProvider.lo \
-       javax/imageio/spi/ImageReaderWriterSpi.lo \
-       javax/imageio/spi/ImageInputStreamSpi.lo \
-       javax/imageio/spi/RegisterableService.lo \
-       javax/imageio/metadata/IIOAttr.lo \
-       javax/imageio/metadata/IIONamedNodeMap.lo \
-       javax/imageio/metadata/IIONodeList.lo \
-       javax/imageio/metadata/IIOMetadataFormatImpl.lo \
-       javax/imageio/metadata/IIOInvalidTreeException.lo \
-       javax/imageio/metadata/IIOMetadataFormat.lo \
-       javax/imageio/metadata/IIOMetadataController.lo \
-       javax/imageio/metadata/IIOMetadataNode.lo \
-       javax/imageio/metadata/IIOMetadata.lo \
-       javax/imageio/stream/FileImageOutputStream.lo \
-       javax/imageio/stream/ImageInputStream.lo \
-       javax/imageio/stream/IIOByteBuffer.lo \
-       javax/imageio/stream/FileCacheImageInputStream.lo \
-       javax/imageio/stream/ImageInputStreamImpl.lo \
-       javax/imageio/stream/ImageOutputStreamImpl.lo \
-       javax/imageio/stream/MemoryCacheImageInputStream.lo \
-       javax/imageio/stream/FileCacheImageOutputStream.lo \
-       javax/imageio/stream/ImageOutputStream.lo \
-       javax/imageio/stream/MemoryCacheImageOutputStream.lo \
-       javax/imageio/stream/FileImageInputStream.lo \
-       javax/imageio/event/IIOReadProgressListener.lo \
-       javax/imageio/event/IIOWriteWarningListener.lo \
-       javax/imageio/event/IIOReadWarningListener.lo \
-       javax/imageio/event/IIOReadUpdateListener.lo \
-       javax/imageio/event/IIOWriteProgressListener.lo \
-       javax/imageio/ImageTranscoder.lo \
-       javax/imageio/ImageTypeSpecifier.lo javax/imageio/ImageIO.lo \
-       javax/imageio/IIOImage.lo javax/net/VanillaSocketFactory.lo \
+am__objects_13 = javax/net/VanillaSocketFactory.lo \
        javax/net/ssl/TrustManagerFactorySpi.lo \
        javax/net/ssl/SSLKeyException.lo javax/net/ssl/TrustManager.lo \
        javax/net/ssl/SSLServerSocket.lo \
@@ -3798,57 +3415,6 @@ am__objects_13 = javax/imageio/ImageWriteParam.lo \
        javax/naming/Reference.lo javax/naming/NameParser.lo \
        javax/naming/NameClassPair.lo javax/naming/RefAddr.lo \
        javax/naming/CompositeName.lo javax/naming/Name.lo \
-       javax/xml/xpath/XPathConstants.lo \
-       javax/xml/xpath/XPathFunction.lo \
-       javax/xml/xpath/XPathVariableResolver.lo \
-       javax/xml/xpath/XPathExpressionException.lo \
-       javax/xml/xpath/XPathFunctionResolver.lo \
-       javax/xml/xpath/XPath.lo \
-       javax/xml/xpath/XPathFactoryConfigurationException.lo \
-       javax/xml/xpath/XPathFactory.lo \
-       javax/xml/xpath/XPathException.lo \
-       javax/xml/xpath/XPathExpression.lo \
-       javax/xml/xpath/XPathFunctionException.lo \
-       javax/xml/validation/ValidatorHandler.lo \
-       javax/xml/validation/Validator.lo \
-       javax/xml/validation/TypeInfoProvider.lo \
-       javax/xml/validation/SchemaFactory.lo \
-       javax/xml/validation/Schema.lo \
-       javax/xml/parsers/SAXParserFactory.lo \
-       javax/xml/parsers/FactoryConfigurationError.lo \
-       javax/xml/parsers/SAXParser.lo \
-       javax/xml/parsers/DocumentBuilderFactory.lo \
-       javax/xml/parsers/ParserConfigurationException.lo \
-       javax/xml/parsers/DocumentBuilder.lo \
-       javax/xml/datatype/DatatypeFactory.lo \
-       javax/xml/datatype/XMLGregorianCalendar.lo \
-       javax/xml/datatype/Duration.lo \
-       javax/xml/datatype/DatatypeConfigurationException.lo \
-       javax/xml/datatype/DatatypeConstants.lo \
-       javax/xml/XMLConstants.lo \
-       javax/xml/namespace/NamespaceContext.lo \
-       javax/xml/namespace/QName.lo \
-       javax/xml/transform/TransformerException.lo \
-       javax/xml/transform/TransformerFactoryConfigurationError.lo \
-       javax/xml/transform/sax/SAXResult.lo \
-       javax/xml/transform/sax/TransformerHandler.lo \
-       javax/xml/transform/sax/SAXTransformerFactory.lo \
-       javax/xml/transform/sax/SAXSource.lo \
-       javax/xml/transform/sax/TemplatesHandler.lo \
-       javax/xml/transform/OutputKeys.lo \
-       javax/xml/transform/stream/StreamResult.lo \
-       javax/xml/transform/stream/StreamSource.lo \
-       javax/xml/transform/Source.lo \
-       javax/xml/transform/SourceLocator.lo \
-       javax/xml/transform/ErrorListener.lo \
-       javax/xml/transform/TransformerConfigurationException.lo \
-       javax/xml/transform/Templates.lo javax/xml/transform/Result.lo \
-       javax/xml/transform/URIResolver.lo \
-       javax/xml/transform/dom/DOMSource.lo \
-       javax/xml/transform/dom/DOMLocator.lo \
-       javax/xml/transform/dom/DOMResult.lo \
-       javax/xml/transform/Transformer.lo \
-       javax/xml/transform/TransformerFactory.lo \
        javax/security/cert/CertificateNotYetValidException.lo \
        javax/security/cert/Certificate.lo \
        javax/security/cert/X509Certificate.lo \
@@ -3984,7 +3550,9 @@ am__objects_15 = $(am__objects_9) gnu/classpath/ServiceFactory.lo \
        gnu/classpath/ServiceProviderLoadingAction.lo gnu/gcj/Core.lo \
        gnu/gcj/RawData.lo gnu/gcj/RawDataManaged.lo \
        gnu/gcj/io/DefaultMimeTypes.lo gnu/gcj/io/MimeTypes.lo \
-       gnu/gcj/io/SimpleSHSStream.lo gnu/gcj/runtime/FileDeleter.lo \
+       gnu/gcj/io/SimpleSHSStream.lo \
+       gnu/gcj/runtime/BootClassLoader.lo \
+       gnu/gcj/runtime/FileDeleter.lo \
        gnu/gcj/runtime/FinalizerThread.lo \
        gnu/gcj/runtime/JNIWeakRef.lo gnu/gcj/runtime/NameFinder.lo \
        gnu/gcj/runtime/PersistentByteMap.lo \
@@ -4592,155 +4160,25 @@ am__objects_15 = $(am__objects_9) gnu/classpath/ServiceFactory.lo \
        $(am__objects_11) $(am__objects_12) $(am__objects_13) \
        $(am__objects_14)
 am__objects_16 = $(am__objects_8) $(am__objects_15)
-am__objects_17 = gnu/xml/xpath/EqualityExpr.lo \
-       gnu/xml/xpath/NumberFunction.lo \
-       gnu/xml/xpath/StringLengthFunction.lo \
-       gnu/xml/xpath/NameFunction.lo gnu/xml/xpath/SumFunction.lo \
-       gnu/xml/xpath/Pattern.lo gnu/xml/xpath/StringFunction.lo \
-       gnu/xml/xpath/NegativeExpr.lo gnu/xml/xpath/UnionExpr.lo \
-       gnu/xml/xpath/SubstringFunction.lo gnu/xml/xpath/Expr.lo \
-       gnu/xml/xpath/XPathFactoryImpl.lo \
-       gnu/xml/xpath/NormalizeSpaceFunction.lo \
-       gnu/xml/xpath/Constant.lo gnu/xml/xpath/Predicate.lo \
-       gnu/xml/xpath/Path.lo gnu/xml/xpath/OrExpr.lo \
-       gnu/xml/xpath/LangFunction.lo \
-       gnu/xml/xpath/StartsWithFunction.lo \
-       gnu/xml/xpath/SubstringAfterFunction.lo \
-       gnu/xml/xpath/FloorFunction.lo gnu/xml/xpath/NotFunction.lo \
-       gnu/xml/xpath/Root.lo gnu/xml/xpath/PositionFunction.lo \
-       gnu/xml/xpath/VariableReference.lo \
-       gnu/xml/xpath/DocumentOrderComparator.lo \
-       gnu/xml/xpath/LocalNameFunction.lo \
-       gnu/xml/xpath/NamespaceUriFunction.lo \
-       gnu/xml/xpath/TranslateFunction.lo \
-       gnu/xml/xpath/FalseFunction.lo gnu/xml/xpath/AndExpr.lo \
-       gnu/xml/xpath/XPathParser.lo gnu/xml/xpath/NamespaceTest.lo \
-       gnu/xml/xpath/ConcatFunction.lo gnu/xml/xpath/NameTest.lo \
-       gnu/xml/xpath/CountFunction.lo gnu/xml/xpath/IdFunction.lo \
-       gnu/xml/xpath/LastFunction.lo gnu/xml/xpath/XPathTokenizer.lo \
-       gnu/xml/xpath/Steps.lo gnu/xml/xpath/TrueFunction.lo \
-       gnu/xml/xpath/BooleanFunction.lo \
-       gnu/xml/xpath/ParenthesizedExpr.lo gnu/xml/xpath/XPathImpl.lo \
-       gnu/xml/xpath/Selector.lo gnu/xml/xpath/RoundFunction.lo \
-       gnu/xml/xpath/SubstringBeforeFunction.lo \
-       gnu/xml/xpath/Function.lo gnu/xml/xpath/CeilingFunction.lo \
-       gnu/xml/xpath/RelationalExpr.lo gnu/xml/xpath/FunctionCall.lo \
-       gnu/xml/xpath/NodeTypeTest.lo gnu/xml/xpath/ArithmeticExpr.lo \
-       gnu/xml/xpath/Test.lo gnu/xml/xpath/ContainsFunction.lo \
-       gnu/xml/pipeline/EventFilter.lo gnu/xml/pipeline/NSFilter.lo \
-       gnu/xml/pipeline/XsltFilter.lo \
-       gnu/xml/pipeline/ValidationConsumer.lo \
-       gnu/xml/pipeline/PipelineFactory.lo \
-       gnu/xml/pipeline/TextConsumer.lo \
-       gnu/xml/pipeline/LinkFilter.lo gnu/xml/pipeline/TeeConsumer.lo \
-       gnu/xml/pipeline/DomConsumer.lo \
-       gnu/xml/pipeline/EventConsumer.lo \
-       gnu/xml/pipeline/WellFormednessFilter.lo \
-       gnu/xml/pipeline/XIncludeFilter.lo \
-       gnu/xml/pipeline/CallFilter.lo gnu/xml/aelfred2/XmlParser.lo \
-       gnu/xml/aelfred2/XmlReader.lo gnu/xml/aelfred2/JAXPFactory.lo \
-       gnu/xml/aelfred2/ContentHandler2.lo \
-       gnu/xml/aelfred2/SAXDriver.lo gnu/xml/util/XCat.lo \
-       gnu/xml/util/DomParser.lo gnu/xml/util/XMLWriter.lo \
-       gnu/xml/util/Resolver.lo gnu/xml/util/DoParse.lo \
-       gnu/xml/util/XHTMLWriter.lo \
-       gnu/xml/util/SAXNullTransformerFactory.lo \
-       gnu/xml/dom/DomXPathNSResolver.lo \
-       gnu/xml/dom/ls/FilteredSAXEventSink.lo \
-       gnu/xml/dom/ls/DomLSException.lo \
-       gnu/xml/dom/ls/DomLSSerializer.lo gnu/xml/dom/ls/DomLSInput.lo \
-       gnu/xml/dom/ls/DomLSOutput.lo gnu/xml/dom/ls/SAXEventSink.lo \
-       gnu/xml/dom/ls/DomLSParser.lo \
-       gnu/xml/dom/ls/ReaderInputStream.lo \
-       gnu/xml/dom/ls/WriterOutputStream.lo gnu/xml/dom/DomElement.lo \
-       gnu/xml/dom/DomNsNode.lo gnu/xml/dom/DomAttr.lo \
-       gnu/xml/dom/DTDAttributeTypeInfo.lo \
-       gnu/xml/dom/DomDocumentBuilder.lo \
-       gnu/xml/dom/DTDElementTypeInfo.lo gnu/xml/dom/DomDocument.lo \
-       gnu/xml/dom/DomXPathExpression.lo \
-       gnu/xml/dom/DomDocumentConfiguration.lo \
-       gnu/xml/dom/DomDocumentFragment.lo \
-       gnu/xml/dom/DomProcessingInstruction.lo \
-       gnu/xml/dom/Consumer.lo gnu/xml/dom/DomComment.lo \
-       gnu/xml/dom/DomCharacterData.lo gnu/xml/dom/DomExtern.lo \
-       gnu/xml/dom/DomEntityReference.lo \
-       gnu/xml/dom/DomNamedNodeMap.lo \
-       gnu/xml/dom/ImplementationList.lo \
-       gnu/xml/dom/ImplementationSource.lo gnu/xml/dom/DomImpl.lo \
-       gnu/xml/dom/DomDoctype.lo gnu/xml/dom/DomNode.lo \
-       gnu/xml/dom/DomXPathResult.lo \
-       gnu/xml/dom/DomDocumentBuilderFactory.lo \
-       gnu/xml/dom/DomText.lo gnu/xml/dom/DomNSResolverContext.lo \
-       gnu/xml/dom/DomNodeIterator.lo gnu/xml/dom/DomNotation.lo \
-       gnu/xml/dom/JAXPFactory.lo gnu/xml/dom/DomIterator.lo \
-       gnu/xml/dom/DomEvent.lo gnu/xml/dom/DomEntity.lo \
-       gnu/xml/dom/DomCDATASection.lo gnu/xml/dom/DomDOMException.lo \
-       gnu/xml/transform/GenerateIdFunction.lo \
-       gnu/xml/transform/FormatNumberFunction.lo \
-       gnu/xml/transform/ValueOfNode.lo \
-       gnu/xml/transform/ApplyImportsNode.lo \
-       gnu/xml/transform/WithParam.lo \
-       gnu/xml/transform/DocumentFunction.lo \
-       gnu/xml/transform/SAXSerializer.lo \
-       gnu/xml/transform/FunctionAvailableFunction.lo \
-       gnu/xml/transform/ElementAvailableFunction.lo \
-       gnu/xml/transform/IfNode.lo \
-       gnu/xml/transform/ApplyTemplatesNode.lo \
-       gnu/xml/transform/SortKey.lo gnu/xml/transform/Key.lo \
-       gnu/xml/transform/ElementNode.lo \
-       gnu/xml/transform/CurrentFunction.lo \
-       gnu/xml/transform/XSLComparator.lo \
-       gnu/xml/transform/CallTemplateNode.lo \
-       gnu/xml/transform/TemplatesImpl.lo \
-       gnu/xml/transform/ChooseNode.lo \
-       gnu/xml/transform/NumberNode.lo \
-       gnu/xml/transform/CopyOfNode.lo \
-       gnu/xml/transform/ParameterNode.lo \
-       gnu/xml/transform/TransformerFactoryImpl.lo \
-       gnu/xml/transform/TextNode.lo gnu/xml/transform/CopyNode.lo \
-       gnu/xml/transform/SystemPropertyFunction.lo \
-       gnu/xml/transform/Stylesheet.lo \
-       gnu/xml/transform/ProcessingInstructionNode.lo \
-       gnu/xml/transform/UnparsedEntityUriFunction.lo \
-       gnu/xml/transform/URIResolverEntityResolver.lo \
-       gnu/xml/transform/ErrorListenerErrorHandler.lo \
-       gnu/xml/transform/Bindings.lo \
-       gnu/xml/transform/AttributeSet.lo \
-       gnu/xml/transform/Template.lo gnu/xml/transform/MessageNode.lo \
-       gnu/xml/transform/LiteralNode.lo \
-       gnu/xml/transform/StreamSerializer.lo \
-       gnu/xml/transform/XSLURIResolver.lo \
-       gnu/xml/transform/AttributeNode.lo \
-       gnu/xml/transform/CommentNode.lo \
-       gnu/xml/transform/ForEachNode.lo \
-       gnu/xml/transform/KeyFunction.lo \
-       gnu/xml/transform/TransformerImpl.lo \
-       gnu/xml/transform/WhenNode.lo \
-       gnu/xml/transform/NodeNumberNode.lo \
-       gnu/xml/transform/OtherwiseNode.lo \
-       gnu/xml/transform/AbstractNumberNode.lo \
-       gnu/xml/transform/TemplateNode.lo \
-       gnu/xml/transform/TransformerOutputProperties.lo \
-       gnu/xml/transform/DOMSourceLocator.lo
-am__objects_18 = java/lang/ConcreteProcess.lo \
+am__objects_17 = java/lang/ConcreteProcess.lo \
        gnu/classpath/Configuration.lo
-@USING_BOEHMGC_TRUE@am__objects_19 = boehm.lo
-@USING_NOGC_TRUE@am__objects_20 = nogc.lo
-@SUPPLY_BACKTRACE_TRUE@am__objects_21 = sysdep/dwarf2-backtrace.lo
-@USING_POSIX_PLATFORM_TRUE@am__objects_22 = posix.lo
-@USING_WIN32_PLATFORM_TRUE@am__objects_23 = win32.lo
-@USING_ECOS_PLATFORM_TRUE@am__objects_24 = posix.lo
-@USING_DARWIN_CRT_TRUE@am__objects_25 = darwin.lo
-@USING_POSIX_THREADS_TRUE@am__objects_26 = posix-threads.lo
-@USING_WIN32_THREADS_TRUE@am__objects_27 = win32-threads.lo
-@USING_NO_THREADS_TRUE@am__objects_28 = no-threads.lo
+@USING_BOEHMGC_TRUE@am__objects_18 = boehm.lo
+@USING_NOGC_TRUE@am__objects_19 = nogc.lo
+@SUPPLY_BACKTRACE_TRUE@am__objects_20 = sysdep/dwarf2-backtrace.lo
+@USING_POSIX_PLATFORM_TRUE@am__objects_21 = posix.lo
+@USING_WIN32_PLATFORM_TRUE@am__objects_22 = win32.lo
+@USING_ECOS_PLATFORM_TRUE@am__objects_23 = posix.lo
+@USING_DARWIN_CRT_TRUE@am__objects_24 = darwin.lo
+@USING_POSIX_THREADS_TRUE@am__objects_25 = posix-threads.lo
+@USING_WIN32_THREADS_TRUE@am__objects_26 = win32-threads.lo
+@USING_NO_THREADS_TRUE@am__objects_27 = no-threads.lo
 am_libgcj0_convenience_la_OBJECTS = prims.lo jni.lo exception.lo \
        stacktrace.lo link.lo defineclass.lo interpret.lo verify.lo \
        $(am__objects_6) $(am__objects_7) $(am__objects_16) \
        $(am__objects_17) $(am__objects_18) $(am__objects_19) \
        $(am__objects_20) $(am__objects_21) $(am__objects_22) \
        $(am__objects_23) $(am__objects_24) $(am__objects_25) \
-       $(am__objects_26) $(am__objects_27) $(am__objects_28)
+       $(am__objects_26) $(am__objects_27)
 libgcj0_convenience_la_OBJECTS = $(am_libgcj0_convenience_la_OBJECTS)
 am_libgij_la_OBJECTS = gij.lo
 libgij_la_OBJECTS = $(am_libgij_la_OBJECTS)
@@ -5128,7 +4566,8 @@ AM_CXXFLAGS = \
        -DLIBDIR="\"$(libdir)\"" \
        -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \
        -DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \
-       -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\""
+       -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
+       -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\""
 
 AM_GCJFLAGS = \
        @LIBGCJ_JAVAFLAGS@ \
@@ -5160,13 +4599,17 @@ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
 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) \
-       $(gnu_xml_source_files) $(built_java_source_files) \
+       $(built_java_source_files) \
        $(BOEHMGC_SRC) $(NOGC_SRC) \
        $(BACKTRACE_SRC) \
        $(POSIX_PLATFORM_SRC) $(WIN32_PLATFORM_SRC) $(ECOS_PLATFORM_SRC) \
        $(DARWIN_CRT_SRC) \
        $(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC)
 
+libgcj0_convenience_la_LIBADD = \
+       gnu-xml.lo javax-imageio.lo \
+       javax-xml.lo gnu-java-beans.lo
+
 noinst_LTLIBRARIES = libgcj0_convenience.la
 libgcj_la_SOURCES = 
 nat_files = $(nat_source_files:.cc=.lo)
@@ -5179,8 +4622,6 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
        -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 
 libgcj_la_LIBADD = \
-       external/sax/libsax_convenience.la \
-       external/w3c_dom/libw3c_convenience.la \
        libgcj0_convenience.la \
        $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
 
@@ -5335,7 +4776,10 @@ all_java_source_files = \
     $(built_java_source_files) \
     $(gtk_awt_peer_sources) \
     $(xlib_java_source_files) \
-    $(gnu_xml_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) \
@@ -5437,40 +4881,7 @@ gnu/gcj/convert/Output_iconv.java \
 gnu/gcj/convert/UnicodeToBytes.java
 
 special_java_source_files = java/lang/Class.java java/lang/Object.java
-awt_java_source_files = \
-gnu/awt/LightweightRedirector.java \
-gnu/awt/j2d/AbstractGraphicsState.java \
-gnu/awt/j2d/DirectRasterGraphics.java \
-gnu/awt/j2d/Graphics2DImpl.java \
-gnu/awt/j2d/IntegerGraphicsState.java \
-gnu/awt/j2d/MappedRaster.java \
-gnu/java/awt/BitMaskExtent.java \
-gnu/java/awt/Buffers.java \
-gnu/java/awt/BitwiseXORComposite.java \
-gnu/java/awt/ComponentDataBlitOp.java \
-gnu/java/awt/ClasspathToolkit.java \
-gnu/java/awt/EmbeddedWindow.java \
-gnu/java/awt/EmbeddedWindowSupport.java \
-gnu/java/awt/EventModifier.java \
-gnu/java/awt/color/CieXyzConverter.java \
-gnu/java/awt/color/ClutProfileConverter.java \
-gnu/java/awt/color/ColorLookUpTable.java \
-gnu/java/awt/color/ColorSpaceConverter.java \
-gnu/java/awt/color/GrayProfileConverter.java \
-gnu/java/awt/color/GrayScaleConverter.java \
-gnu/java/awt/color/LinearRGBConverter.java \
-gnu/java/awt/color/ProfileHeader.java \
-gnu/java/awt/color/PyccConverter.java \
-gnu/java/awt/color/RgbProfileConverter.java \
-gnu/java/awt/color/SrgbConverter.java \
-gnu/java/awt/color/TagEntry.java \
-gnu/java/awt/color/ToneReproductionCurve.java \
-gnu/java/awt/image/ImageDecoder.java \
-gnu/java/awt/image/XBMDecoder.java \
-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_source_files = \
 gnu/java/beans/decoder/AbstractContext.java \
 gnu/java/beans/decoder/AbstractCreatableObjectContext.java \
 gnu/java/beans/decoder/AbstractElementHandler.java \
@@ -5522,7 +4933,42 @@ 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 \
+gnu/java/beans/IntrospectionIncubator.java
+
+awt_java_source_files = \
+gnu/awt/LightweightRedirector.java \
+gnu/awt/j2d/AbstractGraphicsState.java \
+gnu/awt/j2d/DirectRasterGraphics.java \
+gnu/awt/j2d/Graphics2DImpl.java \
+gnu/awt/j2d/IntegerGraphicsState.java \
+gnu/awt/j2d/MappedRaster.java \
+gnu/java/awt/BitMaskExtent.java \
+gnu/java/awt/Buffers.java \
+gnu/java/awt/BitwiseXORComposite.java \
+gnu/java/awt/ComponentDataBlitOp.java \
+gnu/java/awt/ClasspathToolkit.java \
+gnu/java/awt/EmbeddedWindow.java \
+gnu/java/awt/EmbeddedWindowSupport.java \
+gnu/java/awt/EventModifier.java \
+gnu/java/awt/color/CieXyzConverter.java \
+gnu/java/awt/color/ClutProfileConverter.java \
+gnu/java/awt/color/ColorLookUpTable.java \
+gnu/java/awt/color/ColorSpaceConverter.java \
+gnu/java/awt/color/GrayProfileConverter.java \
+gnu/java/awt/color/GrayScaleConverter.java \
+gnu/java/awt/color/LinearRGBConverter.java \
+gnu/java/awt/color/ProfileHeader.java \
+gnu/java/awt/color/PyccConverter.java \
+gnu/java/awt/color/RgbProfileConverter.java \
+gnu/java/awt/color/SrgbConverter.java \
+gnu/java/awt/color/TagEntry.java \
+gnu/java/awt/color/ToneReproductionCurve.java \
+gnu/java/awt/image/ImageDecoder.java \
+gnu/java/awt/image/XBMDecoder.java \
+gnu/java/awt/peer/EmbeddedWindowPeer.java \
+gnu/java/awt/peer/GLightweightPeer.java \
+gnu/java/awt/peer/ClasspathFontPeer.java \
+gnu/java/awt/peer/ClasspathTextLayoutPeer.java \
 java/applet/Applet.java \
 java/applet/AppletStub.java \
 java/applet/AppletContext.java \
@@ -6365,7 +5811,7 @@ gnu/java/rmi/server/UnicastRemoteStub.java \
 gnu/java/rmi/server/UnicastServer.java \
 gnu/java/rmi/server/UnicastServerRef.java
 
-javax_source_files = \
+javax_imageio_source_files = \
 javax/imageio/ImageWriteParam.java \
 javax/imageio/ImageReader.java \
 javax/imageio/ImageWriter.java \
@@ -6411,7 +5857,63 @@ javax/imageio/event/IIOWriteProgressListener.java \
 javax/imageio/ImageTranscoder.java \
 javax/imageio/ImageTypeSpecifier.java \
 javax/imageio/ImageIO.java \
-javax/imageio/IIOImage.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 \
@@ -6650,58 +6152,6 @@ javax/naming/NameClassPair.java  \
 javax/naming/RefAddr.java \
 javax/naming/CompositeName.java        \
 javax/naming/Name.java \
-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/security/cert/CertificateNotYetValidException.java \
 javax/security/cert/Certificate.java \
 javax/security/cert/X509Certificate.java \
@@ -7291,6 +6741,7 @@ 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/FileDeleter.java \
 gnu/gcj/runtime/FinalizerThread.java \
 gnu/gcj/runtime/JNIWeakRef.java \
@@ -9580,6 +9031,8 @@ gnu/gcj/io/MimeTypes.lo: gnu/gcj/io/$(am__dirstamp) \
        gnu/gcj/io/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/io/SimpleSHSStream.lo: gnu/gcj/io/$(am__dirstamp) \
        gnu/gcj/io/$(DEPDIR)/$(am__dirstamp)
+gnu/gcj/runtime/BootClassLoader.lo: gnu/gcj/runtime/$(am__dirstamp) \
+       gnu/gcj/runtime/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/runtime/FileDeleter.lo: gnu/gcj/runtime/$(am__dirstamp) \
        gnu/gcj/runtime/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/runtime/FinalizerThread.lo: gnu/gcj/runtime/$(am__dirstamp) \
@@ -12045,176 +11498,6 @@ gnu/java/awt/peer/ClasspathFontPeer.lo:  \
 gnu/java/awt/peer/ClasspathTextLayoutPeer.lo:  \
        gnu/java/awt/peer/$(am__dirstamp) \
        gnu/java/awt/peer/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/beans/decoder
-       @: > gnu/java/beans/decoder/$(am__dirstamp)
-gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/beans/decoder/$(DEPDIR)
-       @: > gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/AbstractContext.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/AbstractCreatableObjectContext.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/AbstractElementHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/AbstractObjectContext.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/ArrayContext.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/ArrayHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/AssemblyException.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/BooleanHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/ByteHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/CharHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/ClassHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/ConstructorContext.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/Context.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/DecoderContext.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/DefaultExceptionListener.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/DoubleHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/DummyContext.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/DummyHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/ElementHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/FloatHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/GrowableArrayContext.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/IndexContext.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/IntHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/JavaHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/LongHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/MethodContext.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/MethodFinder.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/NullHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/ObjectContext.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/ObjectHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/PersistenceParser.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/PropertyContext.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/ShortHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/SimpleHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/StaticMethodContext.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/StringHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/decoder/VoidHandler.lo:  \
-       gnu/java/beans/decoder/$(am__dirstamp) \
-       gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/editors/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/beans/editors
-       @: > gnu/java/beans/editors/$(am__dirstamp)
-gnu/java/beans/editors/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/beans/editors/$(DEPDIR)
-       @: > gnu/java/beans/editors/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/editors/ColorEditor.lo:  \
-       gnu/java/beans/editors/$(am__dirstamp) \
-       gnu/java/beans/editors/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/editors/FontEditor.lo:  \
-       gnu/java/beans/editors/$(am__dirstamp) \
-       gnu/java/beans/editors/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/editors/NativeBooleanEditor.lo:  \
-       gnu/java/beans/editors/$(am__dirstamp) \
-       gnu/java/beans/editors/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/editors/NativeByteEditor.lo:  \
-       gnu/java/beans/editors/$(am__dirstamp) \
-       gnu/java/beans/editors/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/editors/NativeDoubleEditor.lo:  \
-       gnu/java/beans/editors/$(am__dirstamp) \
-       gnu/java/beans/editors/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/editors/NativeFloatEditor.lo:  \
-       gnu/java/beans/editors/$(am__dirstamp) \
-       gnu/java/beans/editors/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/editors/NativeIntEditor.lo:  \
-       gnu/java/beans/editors/$(am__dirstamp) \
-       gnu/java/beans/editors/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/editors/NativeLongEditor.lo:  \
-       gnu/java/beans/editors/$(am__dirstamp) \
-       gnu/java/beans/editors/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/editors/NativeShortEditor.lo:  \
-       gnu/java/beans/editors/$(am__dirstamp) \
-       gnu/java/beans/editors/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/editors/StringEditor.lo:  \
-       gnu/java/beans/editors/$(am__dirstamp) \
-       gnu/java/beans/editors/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/beans
-       @: > gnu/java/beans/$(am__dirstamp)
-gnu/java/beans/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/java/beans/$(DEPDIR)
-       @: > gnu/java/beans/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/BeanInfoEmbryo.lo: gnu/java/beans/$(am__dirstamp) \
-       gnu/java/beans/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/DummyAppletContext.lo: gnu/java/beans/$(am__dirstamp) \
-       gnu/java/beans/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/DummyAppletStub.lo: gnu/java/beans/$(am__dirstamp) \
-       gnu/java/beans/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/ExplicitBeanInfo.lo: gnu/java/beans/$(am__dirstamp) \
-       gnu/java/beans/$(DEPDIR)/$(am__dirstamp)
-gnu/java/beans/IntrospectionIncubator.lo:  \
-       gnu/java/beans/$(am__dirstamp) \
-       gnu/java/beans/$(DEPDIR)/$(am__dirstamp)
 java/applet/$(am__dirstamp):
        @$(mkdir_p) java/applet
        @: > java/applet/$(am__dirstamp)
@@ -14141,162 +13424,6 @@ gnu/gcj/convert/Output_iconv.lo: gnu/gcj/convert/$(am__dirstamp) \
        gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/convert/UnicodeToBytes.lo: gnu/gcj/convert/$(am__dirstamp) \
        gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio
-       @: > javax/imageio/$(am__dirstamp)
-javax/imageio/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio/$(DEPDIR)
-       @: > javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/ImageWriteParam.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/ImageReader.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/ImageWriter.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/IIOException.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/IIOParamController.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/ImageReadParam.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/IIOParam.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio/spi
-       @: > javax/imageio/spi/$(am__dirstamp)
-javax/imageio/spi/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio/spi/$(DEPDIR)
-       @: > javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/IIORegistry.lo: javax/imageio/spi/$(am__dirstamp) \
-       javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/ImageWriterSpi.lo:  \
-       javax/imageio/spi/$(am__dirstamp) \
-       javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/ImageOutputStreamSpi.lo:  \
-       javax/imageio/spi/$(am__dirstamp) \
-       javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/ServiceRegistry.lo:  \
-       javax/imageio/spi/$(am__dirstamp) \
-       javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/ImageTranscoderSpi.lo:  \
-       javax/imageio/spi/$(am__dirstamp) \
-       javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/ImageReaderSpi.lo:  \
-       javax/imageio/spi/$(am__dirstamp) \
-       javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/IIOServiceProvider.lo:  \
-       javax/imageio/spi/$(am__dirstamp) \
-       javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/ImageReaderWriterSpi.lo:  \
-       javax/imageio/spi/$(am__dirstamp) \
-       javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/ImageInputStreamSpi.lo:  \
-       javax/imageio/spi/$(am__dirstamp) \
-       javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/spi/RegisterableService.lo:  \
-       javax/imageio/spi/$(am__dirstamp) \
-       javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio/metadata
-       @: > javax/imageio/metadata/$(am__dirstamp)
-javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio/metadata/$(DEPDIR)
-       @: > javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIOAttr.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIONamedNodeMap.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIONodeList.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIOMetadataFormatImpl.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIOInvalidTreeException.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIOMetadataFormat.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIOMetadataController.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIOMetadataNode.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/metadata/IIOMetadata.lo:  \
-       javax/imageio/metadata/$(am__dirstamp) \
-       javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio/stream
-       @: > javax/imageio/stream/$(am__dirstamp)
-javax/imageio/stream/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio/stream/$(DEPDIR)
-       @: > javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/FileImageOutputStream.lo:  \
-       javax/imageio/stream/$(am__dirstamp) \
-       javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/ImageInputStream.lo:  \
-       javax/imageio/stream/$(am__dirstamp) \
-       javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/IIOByteBuffer.lo:  \
-       javax/imageio/stream/$(am__dirstamp) \
-       javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/FileCacheImageInputStream.lo:  \
-       javax/imageio/stream/$(am__dirstamp) \
-       javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/ImageInputStreamImpl.lo:  \
-       javax/imageio/stream/$(am__dirstamp) \
-       javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/ImageOutputStreamImpl.lo:  \
-       javax/imageio/stream/$(am__dirstamp) \
-       javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/MemoryCacheImageInputStream.lo:  \
-       javax/imageio/stream/$(am__dirstamp) \
-       javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/FileCacheImageOutputStream.lo:  \
-       javax/imageio/stream/$(am__dirstamp) \
-       javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/ImageOutputStream.lo:  \
-       javax/imageio/stream/$(am__dirstamp) \
-       javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/MemoryCacheImageOutputStream.lo:  \
-       javax/imageio/stream/$(am__dirstamp) \
-       javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/stream/FileImageInputStream.lo:  \
-       javax/imageio/stream/$(am__dirstamp) \
-       javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/event/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio/event
-       @: > javax/imageio/event/$(am__dirstamp)
-javax/imageio/event/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/imageio/event/$(DEPDIR)
-       @: > javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/event/IIOReadProgressListener.lo:  \
-       javax/imageio/event/$(am__dirstamp) \
-       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/event/IIOWriteWarningListener.lo:  \
-       javax/imageio/event/$(am__dirstamp) \
-       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/event/IIOReadWarningListener.lo:  \
-       javax/imageio/event/$(am__dirstamp) \
-       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/event/IIOReadUpdateListener.lo:  \
-       javax/imageio/event/$(am__dirstamp) \
-       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/event/IIOWriteProgressListener.lo:  \
-       javax/imageio/event/$(am__dirstamp) \
-       javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/ImageTranscoder.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/ImageTypeSpecifier.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/ImageIO.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
-javax/imageio/IIOImage.lo: javax/imageio/$(am__dirstamp) \
-       javax/imageio/$(DEPDIR)/$(am__dirstamp)
 javax/net/$(am__dirstamp):
        @$(mkdir_p) javax/net
        @: > javax/net/$(am__dirstamp)
@@ -14994,208 +14121,6 @@ javax/naming/CompositeName.lo: javax/naming/$(am__dirstamp) \
        javax/naming/$(DEPDIR)/$(am__dirstamp)
 javax/naming/Name.lo: javax/naming/$(am__dirstamp) \
        javax/naming/$(DEPDIR)/$(am__dirstamp)
-javax/xml/xpath/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/xpath
-       @: > javax/xml/xpath/$(am__dirstamp)
-javax/xml/xpath/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/xpath/$(DEPDIR)
-       @: > javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-javax/xml/xpath/XPathConstants.lo: javax/xml/xpath/$(am__dirstamp) \
-       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-javax/xml/xpath/XPathFunction.lo: javax/xml/xpath/$(am__dirstamp) \
-       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-javax/xml/xpath/XPathVariableResolver.lo:  \
-       javax/xml/xpath/$(am__dirstamp) \
-       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-javax/xml/xpath/XPathExpressionException.lo:  \
-       javax/xml/xpath/$(am__dirstamp) \
-       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-javax/xml/xpath/XPathFunctionResolver.lo:  \
-       javax/xml/xpath/$(am__dirstamp) \
-       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-javax/xml/xpath/XPath.lo: javax/xml/xpath/$(am__dirstamp) \
-       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-javax/xml/xpath/XPathFactoryConfigurationException.lo:  \
-       javax/xml/xpath/$(am__dirstamp) \
-       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-javax/xml/xpath/XPathFactory.lo: javax/xml/xpath/$(am__dirstamp) \
-       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-javax/xml/xpath/XPathException.lo: javax/xml/xpath/$(am__dirstamp) \
-       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-javax/xml/xpath/XPathExpression.lo: javax/xml/xpath/$(am__dirstamp) \
-       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-javax/xml/xpath/XPathFunctionException.lo:  \
-       javax/xml/xpath/$(am__dirstamp) \
-       javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-javax/xml/validation/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/validation
-       @: > javax/xml/validation/$(am__dirstamp)
-javax/xml/validation/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/validation/$(DEPDIR)
-       @: > javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
-javax/xml/validation/ValidatorHandler.lo:  \
-       javax/xml/validation/$(am__dirstamp) \
-       javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
-javax/xml/validation/Validator.lo:  \
-       javax/xml/validation/$(am__dirstamp) \
-       javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
-javax/xml/validation/TypeInfoProvider.lo:  \
-       javax/xml/validation/$(am__dirstamp) \
-       javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
-javax/xml/validation/SchemaFactory.lo:  \
-       javax/xml/validation/$(am__dirstamp) \
-       javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
-javax/xml/validation/Schema.lo: javax/xml/validation/$(am__dirstamp) \
-       javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
-javax/xml/parsers/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/parsers
-       @: > javax/xml/parsers/$(am__dirstamp)
-javax/xml/parsers/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/parsers/$(DEPDIR)
-       @: > javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
-javax/xml/parsers/SAXParserFactory.lo:  \
-       javax/xml/parsers/$(am__dirstamp) \
-       javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
-javax/xml/parsers/FactoryConfigurationError.lo:  \
-       javax/xml/parsers/$(am__dirstamp) \
-       javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
-javax/xml/parsers/SAXParser.lo: javax/xml/parsers/$(am__dirstamp) \
-       javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
-javax/xml/parsers/DocumentBuilderFactory.lo:  \
-       javax/xml/parsers/$(am__dirstamp) \
-       javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
-javax/xml/parsers/ParserConfigurationException.lo:  \
-       javax/xml/parsers/$(am__dirstamp) \
-       javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
-javax/xml/parsers/DocumentBuilder.lo:  \
-       javax/xml/parsers/$(am__dirstamp) \
-       javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
-javax/xml/datatype/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/datatype
-       @: > javax/xml/datatype/$(am__dirstamp)
-javax/xml/datatype/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/datatype/$(DEPDIR)
-       @: > javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
-javax/xml/datatype/DatatypeFactory.lo:  \
-       javax/xml/datatype/$(am__dirstamp) \
-       javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
-javax/xml/datatype/XMLGregorianCalendar.lo:  \
-       javax/xml/datatype/$(am__dirstamp) \
-       javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
-javax/xml/datatype/Duration.lo: javax/xml/datatype/$(am__dirstamp) \
-       javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
-javax/xml/datatype/DatatypeConfigurationException.lo:  \
-       javax/xml/datatype/$(am__dirstamp) \
-       javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
-javax/xml/datatype/DatatypeConstants.lo:  \
-       javax/xml/datatype/$(am__dirstamp) \
-       javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
-javax/xml/$(am__dirstamp):
-       @$(mkdir_p) javax/xml
-       @: > javax/xml/$(am__dirstamp)
-javax/xml/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/$(DEPDIR)
-       @: > javax/xml/$(DEPDIR)/$(am__dirstamp)
-javax/xml/XMLConstants.lo: javax/xml/$(am__dirstamp) \
-       javax/xml/$(DEPDIR)/$(am__dirstamp)
-javax/xml/namespace/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/namespace
-       @: > javax/xml/namespace/$(am__dirstamp)
-javax/xml/namespace/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/namespace/$(DEPDIR)
-       @: > javax/xml/namespace/$(DEPDIR)/$(am__dirstamp)
-javax/xml/namespace/NamespaceContext.lo:  \
-       javax/xml/namespace/$(am__dirstamp) \
-       javax/xml/namespace/$(DEPDIR)/$(am__dirstamp)
-javax/xml/namespace/QName.lo: javax/xml/namespace/$(am__dirstamp) \
-       javax/xml/namespace/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/transform
-       @: > javax/xml/transform/$(am__dirstamp)
-javax/xml/transform/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/transform/$(DEPDIR)
-       @: > javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/TransformerException.lo:  \
-       javax/xml/transform/$(am__dirstamp) \
-       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/TransformerFactoryConfigurationError.lo:  \
-       javax/xml/transform/$(am__dirstamp) \
-       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/sax/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/transform/sax
-       @: > javax/xml/transform/sax/$(am__dirstamp)
-javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/transform/sax/$(DEPDIR)
-       @: > javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/sax/SAXResult.lo:  \
-       javax/xml/transform/sax/$(am__dirstamp) \
-       javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/sax/TransformerHandler.lo:  \
-       javax/xml/transform/sax/$(am__dirstamp) \
-       javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/sax/SAXTransformerFactory.lo:  \
-       javax/xml/transform/sax/$(am__dirstamp) \
-       javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/sax/SAXSource.lo:  \
-       javax/xml/transform/sax/$(am__dirstamp) \
-       javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/sax/TemplatesHandler.lo:  \
-       javax/xml/transform/sax/$(am__dirstamp) \
-       javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/OutputKeys.lo:  \
-       javax/xml/transform/$(am__dirstamp) \
-       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/stream/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/transform/stream
-       @: > javax/xml/transform/stream/$(am__dirstamp)
-javax/xml/transform/stream/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/transform/stream/$(DEPDIR)
-       @: > javax/xml/transform/stream/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/stream/StreamResult.lo:  \
-       javax/xml/transform/stream/$(am__dirstamp) \
-       javax/xml/transform/stream/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/stream/StreamSource.lo:  \
-       javax/xml/transform/stream/$(am__dirstamp) \
-       javax/xml/transform/stream/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/Source.lo: javax/xml/transform/$(am__dirstamp) \
-       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/SourceLocator.lo:  \
-       javax/xml/transform/$(am__dirstamp) \
-       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/ErrorListener.lo:  \
-       javax/xml/transform/$(am__dirstamp) \
-       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/TransformerConfigurationException.lo:  \
-       javax/xml/transform/$(am__dirstamp) \
-       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/Templates.lo: javax/xml/transform/$(am__dirstamp) \
-       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/Result.lo: javax/xml/transform/$(am__dirstamp) \
-       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/URIResolver.lo:  \
-       javax/xml/transform/$(am__dirstamp) \
-       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/dom/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/transform/dom
-       @: > javax/xml/transform/dom/$(am__dirstamp)
-javax/xml/transform/dom/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) javax/xml/transform/dom/$(DEPDIR)
-       @: > javax/xml/transform/dom/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/dom/DOMSource.lo:  \
-       javax/xml/transform/dom/$(am__dirstamp) \
-       javax/xml/transform/dom/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/dom/DOMLocator.lo:  \
-       javax/xml/transform/dom/$(am__dirstamp) \
-       javax/xml/transform/dom/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/dom/DOMResult.lo:  \
-       javax/xml/transform/dom/$(am__dirstamp) \
-       javax/xml/transform/dom/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/Transformer.lo:  \
-       javax/xml/transform/$(am__dirstamp) \
-       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
-javax/xml/transform/TransformerFactory.lo:  \
-       javax/xml/transform/$(am__dirstamp) \
-       javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
 javax/security/cert/$(am__dirstamp):
        @$(mkdir_p) javax/security/cert
        @: > javax/security/cert/$(am__dirstamp)
@@ -15682,426 +14607,6 @@ org/ietf/jgss/GSSCredential.lo: org/ietf/jgss/$(am__dirstamp) \
        org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
 org/ietf/jgss/ChannelBinding.lo: org/ietf/jgss/$(am__dirstamp) \
        org/ietf/jgss/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/xpath
-       @: > gnu/xml/xpath/$(am__dirstamp)
-gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/xpath/$(DEPDIR)
-       @: > gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/EqualityExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/NumberFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/StringLengthFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/NameFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/SumFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/Pattern.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/StringFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/NegativeExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/UnionExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/SubstringFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/Expr.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/XPathFactoryImpl.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/NormalizeSpaceFunction.lo:  \
-       gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/Constant.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/Predicate.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/Path.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/OrExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/LangFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/StartsWithFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/SubstringAfterFunction.lo:  \
-       gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/FloorFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/NotFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/Root.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/PositionFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/VariableReference.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/DocumentOrderComparator.lo:  \
-       gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/LocalNameFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/NamespaceUriFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/TranslateFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/FalseFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/AndExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/XPathParser.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/NamespaceTest.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/ConcatFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/NameTest.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/CountFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/IdFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/LastFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/XPathTokenizer.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/Steps.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/TrueFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/BooleanFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/ParenthesizedExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/XPathImpl.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/Selector.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/RoundFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/SubstringBeforeFunction.lo:  \
-       gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/Function.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/CeilingFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/RelationalExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/FunctionCall.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/NodeTypeTest.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/ArithmeticExpr.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/Test.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/xpath/ContainsFunction.lo: gnu/xml/xpath/$(am__dirstamp) \
-       gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/pipeline
-       @: > gnu/xml/pipeline/$(am__dirstamp)
-gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/pipeline/$(DEPDIR)
-       @: > gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/EventFilter.lo: gnu/xml/pipeline/$(am__dirstamp) \
-       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/NSFilter.lo: gnu/xml/pipeline/$(am__dirstamp) \
-       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/XsltFilter.lo: gnu/xml/pipeline/$(am__dirstamp) \
-       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/ValidationConsumer.lo:  \
-       gnu/xml/pipeline/$(am__dirstamp) \
-       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/PipelineFactory.lo: gnu/xml/pipeline/$(am__dirstamp) \
-       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/TextConsumer.lo: gnu/xml/pipeline/$(am__dirstamp) \
-       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/LinkFilter.lo: gnu/xml/pipeline/$(am__dirstamp) \
-       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/TeeConsumer.lo: gnu/xml/pipeline/$(am__dirstamp) \
-       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/DomConsumer.lo: gnu/xml/pipeline/$(am__dirstamp) \
-       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/EventConsumer.lo: gnu/xml/pipeline/$(am__dirstamp) \
-       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/WellFormednessFilter.lo:  \
-       gnu/xml/pipeline/$(am__dirstamp) \
-       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/XIncludeFilter.lo: gnu/xml/pipeline/$(am__dirstamp) \
-       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/pipeline/CallFilter.lo: gnu/xml/pipeline/$(am__dirstamp) \
-       gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/aelfred2/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/aelfred2
-       @: > gnu/xml/aelfred2/$(am__dirstamp)
-gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/aelfred2/$(DEPDIR)
-       @: > gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/aelfred2/XmlParser.lo: gnu/xml/aelfred2/$(am__dirstamp) \
-       gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/aelfred2/XmlReader.lo: gnu/xml/aelfred2/$(am__dirstamp) \
-       gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/aelfred2/JAXPFactory.lo: gnu/xml/aelfred2/$(am__dirstamp) \
-       gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/aelfred2/ContentHandler2.lo: gnu/xml/aelfred2/$(am__dirstamp) \
-       gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/aelfred2/SAXDriver.lo: gnu/xml/aelfred2/$(am__dirstamp) \
-       gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/util/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/util
-       @: > gnu/xml/util/$(am__dirstamp)
-gnu/xml/util/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/util/$(DEPDIR)
-       @: > gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/util/XCat.lo: gnu/xml/util/$(am__dirstamp) \
-       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/util/DomParser.lo: gnu/xml/util/$(am__dirstamp) \
-       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/util/XMLWriter.lo: gnu/xml/util/$(am__dirstamp) \
-       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/util/Resolver.lo: gnu/xml/util/$(am__dirstamp) \
-       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/util/DoParse.lo: gnu/xml/util/$(am__dirstamp) \
-       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/util/XHTMLWriter.lo: gnu/xml/util/$(am__dirstamp) \
-       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/util/SAXNullTransformerFactory.lo:  \
-       gnu/xml/util/$(am__dirstamp) \
-       gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/dom
-       @: > gnu/xml/dom/$(am__dirstamp)
-gnu/xml/dom/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/dom/$(DEPDIR)
-       @: > gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomXPathNSResolver.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/ls/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/dom/ls
-       @: > gnu/xml/dom/ls/$(am__dirstamp)
-gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/dom/ls/$(DEPDIR)
-       @: > gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/ls/FilteredSAXEventSink.lo:  \
-       gnu/xml/dom/ls/$(am__dirstamp) \
-       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/ls/DomLSException.lo: gnu/xml/dom/ls/$(am__dirstamp) \
-       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/ls/DomLSSerializer.lo: gnu/xml/dom/ls/$(am__dirstamp) \
-       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/ls/DomLSInput.lo: gnu/xml/dom/ls/$(am__dirstamp) \
-       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/ls/DomLSOutput.lo: gnu/xml/dom/ls/$(am__dirstamp) \
-       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/ls/SAXEventSink.lo: gnu/xml/dom/ls/$(am__dirstamp) \
-       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/ls/DomLSParser.lo: gnu/xml/dom/ls/$(am__dirstamp) \
-       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/ls/ReaderInputStream.lo: gnu/xml/dom/ls/$(am__dirstamp) \
-       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/ls/WriterOutputStream.lo: gnu/xml/dom/ls/$(am__dirstamp) \
-       gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomElement.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomNsNode.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomAttr.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DTDAttributeTypeInfo.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomDocumentBuilder.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DTDElementTypeInfo.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomDocument.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomXPathExpression.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomDocumentConfiguration.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomDocumentFragment.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomProcessingInstruction.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/Consumer.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomComment.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomCharacterData.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomExtern.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomEntityReference.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomNamedNodeMap.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/ImplementationList.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/ImplementationSource.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomImpl.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomDoctype.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomNode.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomXPathResult.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomDocumentBuilderFactory.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomText.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomNSResolverContext.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomNodeIterator.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomNotation.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/JAXPFactory.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomIterator.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomEvent.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomEntity.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomCDATASection.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomDOMException.lo: gnu/xml/dom/$(am__dirstamp) \
-       gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/transform
-       @: > gnu/xml/transform/$(am__dirstamp)
-gnu/xml/transform/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) gnu/xml/transform/$(DEPDIR)
-       @: > gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/GenerateIdFunction.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/FormatNumberFunction.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/ValueOfNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/ApplyImportsNode.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/WithParam.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/DocumentFunction.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/SAXSerializer.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/FunctionAvailableFunction.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/ElementAvailableFunction.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/IfNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/ApplyTemplatesNode.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/SortKey.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/Key.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/ElementNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/CurrentFunction.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/XSLComparator.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/CallTemplateNode.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/TemplatesImpl.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/ChooseNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/NumberNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/CopyOfNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/ParameterNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/TransformerFactoryImpl.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/TextNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/CopyNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/SystemPropertyFunction.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/Stylesheet.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/ProcessingInstructionNode.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/UnparsedEntityUriFunction.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/URIResolverEntityResolver.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/ErrorListenerErrorHandler.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/Bindings.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/AttributeSet.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/Template.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/MessageNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/LiteralNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/StreamSerializer.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/XSLURIResolver.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/AttributeNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/CommentNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/ForEachNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/KeyFunction.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/TransformerImpl.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/WhenNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/NodeNumberNode.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/OtherwiseNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/AbstractNumberNode.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/TemplateNode.lo: gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/TransformerOutputProperties.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/transform/DOMSourceLocator.lo:  \
-       gnu/xml/transform/$(am__dirstamp) \
-       gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
 java/lang/ConcreteProcess.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 gnu/classpath/Configuration.lo: gnu/classpath/$(am__dirstamp) \
@@ -16327,6 +14832,8 @@ mostlyclean-compile:
        -rm -f gnu/gcj/io/shs.lo
        -rm -f gnu/gcj/natCore.$(OBJEXT)
        -rm -f gnu/gcj/natCore.lo
+       -rm -f gnu/gcj/runtime/BootClassLoader.$(OBJEXT)
+       -rm -f gnu/gcj/runtime/BootClassLoader.lo
        -rm -f gnu/gcj/runtime/FileDeleter.$(OBJEXT)
        -rm -f gnu/gcj/runtime/FileDeleter.lo
        -rm -f gnu/gcj/runtime/FinalizerThread.$(OBJEXT)
@@ -16590,110 +15097,6 @@ mostlyclean-compile:
        -rm -f gnu/java/awt/peer/gtk/lib_gnu_java_awt_peer_gtk_la-GtkToolkit.lo
        -rm -f gnu/java/awt/peer/gtk/lib_gnu_java_awt_peer_gtk_la-GtkWindowPeer.$(OBJEXT)
        -rm -f gnu/java/awt/peer/gtk/lib_gnu_java_awt_peer_gtk_la-GtkWindowPeer.lo
-       -rm -f gnu/java/beans/BeanInfoEmbryo.$(OBJEXT)
-       -rm -f gnu/java/beans/BeanInfoEmbryo.lo
-       -rm -f gnu/java/beans/DummyAppletContext.$(OBJEXT)
-       -rm -f gnu/java/beans/DummyAppletContext.lo
-       -rm -f gnu/java/beans/DummyAppletStub.$(OBJEXT)
-       -rm -f gnu/java/beans/DummyAppletStub.lo
-       -rm -f gnu/java/beans/ExplicitBeanInfo.$(OBJEXT)
-       -rm -f gnu/java/beans/ExplicitBeanInfo.lo
-       -rm -f gnu/java/beans/IntrospectionIncubator.$(OBJEXT)
-       -rm -f gnu/java/beans/IntrospectionIncubator.lo
-       -rm -f gnu/java/beans/decoder/AbstractContext.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/AbstractContext.lo
-       -rm -f gnu/java/beans/decoder/AbstractCreatableObjectContext.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/AbstractCreatableObjectContext.lo
-       -rm -f gnu/java/beans/decoder/AbstractElementHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/AbstractElementHandler.lo
-       -rm -f gnu/java/beans/decoder/AbstractObjectContext.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/AbstractObjectContext.lo
-       -rm -f gnu/java/beans/decoder/ArrayContext.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/ArrayContext.lo
-       -rm -f gnu/java/beans/decoder/ArrayHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/ArrayHandler.lo
-       -rm -f gnu/java/beans/decoder/AssemblyException.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/AssemblyException.lo
-       -rm -f gnu/java/beans/decoder/BooleanHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/BooleanHandler.lo
-       -rm -f gnu/java/beans/decoder/ByteHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/ByteHandler.lo
-       -rm -f gnu/java/beans/decoder/CharHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/CharHandler.lo
-       -rm -f gnu/java/beans/decoder/ClassHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/ClassHandler.lo
-       -rm -f gnu/java/beans/decoder/ConstructorContext.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/ConstructorContext.lo
-       -rm -f gnu/java/beans/decoder/Context.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/Context.lo
-       -rm -f gnu/java/beans/decoder/DecoderContext.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/DecoderContext.lo
-       -rm -f gnu/java/beans/decoder/DefaultExceptionListener.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/DefaultExceptionListener.lo
-       -rm -f gnu/java/beans/decoder/DoubleHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/DoubleHandler.lo
-       -rm -f gnu/java/beans/decoder/DummyContext.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/DummyContext.lo
-       -rm -f gnu/java/beans/decoder/DummyHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/DummyHandler.lo
-       -rm -f gnu/java/beans/decoder/ElementHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/ElementHandler.lo
-       -rm -f gnu/java/beans/decoder/FloatHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/FloatHandler.lo
-       -rm -f gnu/java/beans/decoder/GrowableArrayContext.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/GrowableArrayContext.lo
-       -rm -f gnu/java/beans/decoder/IndexContext.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/IndexContext.lo
-       -rm -f gnu/java/beans/decoder/IntHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/IntHandler.lo
-       -rm -f gnu/java/beans/decoder/JavaHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/JavaHandler.lo
-       -rm -f gnu/java/beans/decoder/LongHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/LongHandler.lo
-       -rm -f gnu/java/beans/decoder/MethodContext.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/MethodContext.lo
-       -rm -f gnu/java/beans/decoder/MethodFinder.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/MethodFinder.lo
-       -rm -f gnu/java/beans/decoder/NullHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/NullHandler.lo
-       -rm -f gnu/java/beans/decoder/ObjectContext.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/ObjectContext.lo
-       -rm -f gnu/java/beans/decoder/ObjectHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/ObjectHandler.lo
-       -rm -f gnu/java/beans/decoder/PersistenceParser.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/PersistenceParser.lo
-       -rm -f gnu/java/beans/decoder/PropertyContext.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/PropertyContext.lo
-       -rm -f gnu/java/beans/decoder/ShortHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/ShortHandler.lo
-       -rm -f gnu/java/beans/decoder/SimpleHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/SimpleHandler.lo
-       -rm -f gnu/java/beans/decoder/StaticMethodContext.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/StaticMethodContext.lo
-       -rm -f gnu/java/beans/decoder/StringHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/StringHandler.lo
-       -rm -f gnu/java/beans/decoder/VoidHandler.$(OBJEXT)
-       -rm -f gnu/java/beans/decoder/VoidHandler.lo
-       -rm -f gnu/java/beans/editors/ColorEditor.$(OBJEXT)
-       -rm -f gnu/java/beans/editors/ColorEditor.lo
-       -rm -f gnu/java/beans/editors/FontEditor.$(OBJEXT)
-       -rm -f gnu/java/beans/editors/FontEditor.lo
-       -rm -f gnu/java/beans/editors/NativeBooleanEditor.$(OBJEXT)
-       -rm -f gnu/java/beans/editors/NativeBooleanEditor.lo
-       -rm -f gnu/java/beans/editors/NativeByteEditor.$(OBJEXT)
-       -rm -f gnu/java/beans/editors/NativeByteEditor.lo
-       -rm -f gnu/java/beans/editors/NativeDoubleEditor.$(OBJEXT)
-       -rm -f gnu/java/beans/editors/NativeDoubleEditor.lo
-       -rm -f gnu/java/beans/editors/NativeFloatEditor.$(OBJEXT)
-       -rm -f gnu/java/beans/editors/NativeFloatEditor.lo
-       -rm -f gnu/java/beans/editors/NativeIntEditor.$(OBJEXT)
-       -rm -f gnu/java/beans/editors/NativeIntEditor.lo
-       -rm -f gnu/java/beans/editors/NativeLongEditor.$(OBJEXT)
-       -rm -f gnu/java/beans/editors/NativeLongEditor.lo
-       -rm -f gnu/java/beans/editors/NativeShortEditor.$(OBJEXT)
-       -rm -f gnu/java/beans/editors/NativeShortEditor.lo
-       -rm -f gnu/java/beans/editors/StringEditor.$(OBJEXT)
-       -rm -f gnu/java/beans/editors/StringEditor.lo
        -rm -f gnu/java/io/ASN1ParsingException.$(OBJEXT)
        -rm -f gnu/java/io/ASN1ParsingException.lo
        -rm -f gnu/java/io/Base64InputStream.$(OBJEXT)
@@ -17470,354 +15873,6 @@ mostlyclean-compile:
        -rm -f gnu/regexp/RETokenWordBoundary.lo
        -rm -f gnu/regexp/UncheckedRE.$(OBJEXT)
        -rm -f gnu/regexp/UncheckedRE.lo
-       -rm -f gnu/xml/aelfred2/ContentHandler2.$(OBJEXT)
-       -rm -f gnu/xml/aelfred2/ContentHandler2.lo
-       -rm -f gnu/xml/aelfred2/JAXPFactory.$(OBJEXT)
-       -rm -f gnu/xml/aelfred2/JAXPFactory.lo
-       -rm -f gnu/xml/aelfred2/SAXDriver.$(OBJEXT)
-       -rm -f gnu/xml/aelfred2/SAXDriver.lo
-       -rm -f gnu/xml/aelfred2/XmlParser.$(OBJEXT)
-       -rm -f gnu/xml/aelfred2/XmlParser.lo
-       -rm -f gnu/xml/aelfred2/XmlReader.$(OBJEXT)
-       -rm -f gnu/xml/aelfred2/XmlReader.lo
-       -rm -f gnu/xml/dom/Consumer.$(OBJEXT)
-       -rm -f gnu/xml/dom/Consumer.lo
-       -rm -f gnu/xml/dom/DTDAttributeTypeInfo.$(OBJEXT)
-       -rm -f gnu/xml/dom/DTDAttributeTypeInfo.lo
-       -rm -f gnu/xml/dom/DTDElementTypeInfo.$(OBJEXT)
-       -rm -f gnu/xml/dom/DTDElementTypeInfo.lo
-       -rm -f gnu/xml/dom/DomAttr.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomAttr.lo
-       -rm -f gnu/xml/dom/DomCDATASection.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomCDATASection.lo
-       -rm -f gnu/xml/dom/DomCharacterData.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomCharacterData.lo
-       -rm -f gnu/xml/dom/DomComment.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomComment.lo
-       -rm -f gnu/xml/dom/DomDOMException.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomDOMException.lo
-       -rm -f gnu/xml/dom/DomDoctype.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomDoctype.lo
-       -rm -f gnu/xml/dom/DomDocument.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomDocument.lo
-       -rm -f gnu/xml/dom/DomDocumentBuilder.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomDocumentBuilder.lo
-       -rm -f gnu/xml/dom/DomDocumentBuilderFactory.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomDocumentBuilderFactory.lo
-       -rm -f gnu/xml/dom/DomDocumentConfiguration.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomDocumentConfiguration.lo
-       -rm -f gnu/xml/dom/DomDocumentFragment.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomDocumentFragment.lo
-       -rm -f gnu/xml/dom/DomElement.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomElement.lo
-       -rm -f gnu/xml/dom/DomEntity.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomEntity.lo
-       -rm -f gnu/xml/dom/DomEntityReference.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomEntityReference.lo
-       -rm -f gnu/xml/dom/DomEvent.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomEvent.lo
-       -rm -f gnu/xml/dom/DomExtern.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomExtern.lo
-       -rm -f gnu/xml/dom/DomImpl.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomImpl.lo
-       -rm -f gnu/xml/dom/DomIterator.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomIterator.lo
-       -rm -f gnu/xml/dom/DomNSResolverContext.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomNSResolverContext.lo
-       -rm -f gnu/xml/dom/DomNamedNodeMap.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomNamedNodeMap.lo
-       -rm -f gnu/xml/dom/DomNode.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomNode.lo
-       -rm -f gnu/xml/dom/DomNodeIterator.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomNodeIterator.lo
-       -rm -f gnu/xml/dom/DomNotation.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomNotation.lo
-       -rm -f gnu/xml/dom/DomNsNode.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomNsNode.lo
-       -rm -f gnu/xml/dom/DomProcessingInstruction.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomProcessingInstruction.lo
-       -rm -f gnu/xml/dom/DomText.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomText.lo
-       -rm -f gnu/xml/dom/DomXPathExpression.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomXPathExpression.lo
-       -rm -f gnu/xml/dom/DomXPathNSResolver.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomXPathNSResolver.lo
-       -rm -f gnu/xml/dom/DomXPathResult.$(OBJEXT)
-       -rm -f gnu/xml/dom/DomXPathResult.lo
-       -rm -f gnu/xml/dom/ImplementationList.$(OBJEXT)
-       -rm -f gnu/xml/dom/ImplementationList.lo
-       -rm -f gnu/xml/dom/ImplementationSource.$(OBJEXT)
-       -rm -f gnu/xml/dom/ImplementationSource.lo
-       -rm -f gnu/xml/dom/JAXPFactory.$(OBJEXT)
-       -rm -f gnu/xml/dom/JAXPFactory.lo
-       -rm -f gnu/xml/dom/ls/DomLSException.$(OBJEXT)
-       -rm -f gnu/xml/dom/ls/DomLSException.lo
-       -rm -f gnu/xml/dom/ls/DomLSInput.$(OBJEXT)
-       -rm -f gnu/xml/dom/ls/DomLSInput.lo
-       -rm -f gnu/xml/dom/ls/DomLSOutput.$(OBJEXT)
-       -rm -f gnu/xml/dom/ls/DomLSOutput.lo
-       -rm -f gnu/xml/dom/ls/DomLSParser.$(OBJEXT)
-       -rm -f gnu/xml/dom/ls/DomLSParser.lo
-       -rm -f gnu/xml/dom/ls/DomLSSerializer.$(OBJEXT)
-       -rm -f gnu/xml/dom/ls/DomLSSerializer.lo
-       -rm -f gnu/xml/dom/ls/FilteredSAXEventSink.$(OBJEXT)
-       -rm -f gnu/xml/dom/ls/FilteredSAXEventSink.lo
-       -rm -f gnu/xml/dom/ls/ReaderInputStream.$(OBJEXT)
-       -rm -f gnu/xml/dom/ls/ReaderInputStream.lo
-       -rm -f gnu/xml/dom/ls/SAXEventSink.$(OBJEXT)
-       -rm -f gnu/xml/dom/ls/SAXEventSink.lo
-       -rm -f gnu/xml/dom/ls/WriterOutputStream.$(OBJEXT)
-       -rm -f gnu/xml/dom/ls/WriterOutputStream.lo
-       -rm -f gnu/xml/pipeline/CallFilter.$(OBJEXT)
-       -rm -f gnu/xml/pipeline/CallFilter.lo
-       -rm -f gnu/xml/pipeline/DomConsumer.$(OBJEXT)
-       -rm -f gnu/xml/pipeline/DomConsumer.lo
-       -rm -f gnu/xml/pipeline/EventConsumer.$(OBJEXT)
-       -rm -f gnu/xml/pipeline/EventConsumer.lo
-       -rm -f gnu/xml/pipeline/EventFilter.$(OBJEXT)
-       -rm -f gnu/xml/pipeline/EventFilter.lo
-       -rm -f gnu/xml/pipeline/LinkFilter.$(OBJEXT)
-       -rm -f gnu/xml/pipeline/LinkFilter.lo
-       -rm -f gnu/xml/pipeline/NSFilter.$(OBJEXT)
-       -rm -f gnu/xml/pipeline/NSFilter.lo
-       -rm -f gnu/xml/pipeline/PipelineFactory.$(OBJEXT)
-       -rm -f gnu/xml/pipeline/PipelineFactory.lo
-       -rm -f gnu/xml/pipeline/TeeConsumer.$(OBJEXT)
-       -rm -f gnu/xml/pipeline/TeeConsumer.lo
-       -rm -f gnu/xml/pipeline/TextConsumer.$(OBJEXT)
-       -rm -f gnu/xml/pipeline/TextConsumer.lo
-       -rm -f gnu/xml/pipeline/ValidationConsumer.$(OBJEXT)
-       -rm -f gnu/xml/pipeline/ValidationConsumer.lo
-       -rm -f gnu/xml/pipeline/WellFormednessFilter.$(OBJEXT)
-       -rm -f gnu/xml/pipeline/WellFormednessFilter.lo
-       -rm -f gnu/xml/pipeline/XIncludeFilter.$(OBJEXT)
-       -rm -f gnu/xml/pipeline/XIncludeFilter.lo
-       -rm -f gnu/xml/pipeline/XsltFilter.$(OBJEXT)
-       -rm -f gnu/xml/pipeline/XsltFilter.lo
-       -rm -f gnu/xml/transform/AbstractNumberNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/AbstractNumberNode.lo
-       -rm -f gnu/xml/transform/ApplyImportsNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/ApplyImportsNode.lo
-       -rm -f gnu/xml/transform/ApplyTemplatesNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/ApplyTemplatesNode.lo
-       -rm -f gnu/xml/transform/AttributeNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/AttributeNode.lo
-       -rm -f gnu/xml/transform/AttributeSet.$(OBJEXT)
-       -rm -f gnu/xml/transform/AttributeSet.lo
-       -rm -f gnu/xml/transform/Bindings.$(OBJEXT)
-       -rm -f gnu/xml/transform/Bindings.lo
-       -rm -f gnu/xml/transform/CallTemplateNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/CallTemplateNode.lo
-       -rm -f gnu/xml/transform/ChooseNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/ChooseNode.lo
-       -rm -f gnu/xml/transform/CommentNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/CommentNode.lo
-       -rm -f gnu/xml/transform/CopyNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/CopyNode.lo
-       -rm -f gnu/xml/transform/CopyOfNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/CopyOfNode.lo
-       -rm -f gnu/xml/transform/CurrentFunction.$(OBJEXT)
-       -rm -f gnu/xml/transform/CurrentFunction.lo
-       -rm -f gnu/xml/transform/DOMSourceLocator.$(OBJEXT)
-       -rm -f gnu/xml/transform/DOMSourceLocator.lo
-       -rm -f gnu/xml/transform/DocumentFunction.$(OBJEXT)
-       -rm -f gnu/xml/transform/DocumentFunction.lo
-       -rm -f gnu/xml/transform/ElementAvailableFunction.$(OBJEXT)
-       -rm -f gnu/xml/transform/ElementAvailableFunction.lo
-       -rm -f gnu/xml/transform/ElementNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/ElementNode.lo
-       -rm -f gnu/xml/transform/ErrorListenerErrorHandler.$(OBJEXT)
-       -rm -f gnu/xml/transform/ErrorListenerErrorHandler.lo
-       -rm -f gnu/xml/transform/ForEachNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/ForEachNode.lo
-       -rm -f gnu/xml/transform/FormatNumberFunction.$(OBJEXT)
-       -rm -f gnu/xml/transform/FormatNumberFunction.lo
-       -rm -f gnu/xml/transform/FunctionAvailableFunction.$(OBJEXT)
-       -rm -f gnu/xml/transform/FunctionAvailableFunction.lo
-       -rm -f gnu/xml/transform/GenerateIdFunction.$(OBJEXT)
-       -rm -f gnu/xml/transform/GenerateIdFunction.lo
-       -rm -f gnu/xml/transform/IfNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/IfNode.lo
-       -rm -f gnu/xml/transform/Key.$(OBJEXT)
-       -rm -f gnu/xml/transform/Key.lo
-       -rm -f gnu/xml/transform/KeyFunction.$(OBJEXT)
-       -rm -f gnu/xml/transform/KeyFunction.lo
-       -rm -f gnu/xml/transform/LiteralNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/LiteralNode.lo
-       -rm -f gnu/xml/transform/MessageNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/MessageNode.lo
-       -rm -f gnu/xml/transform/NodeNumberNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/NodeNumberNode.lo
-       -rm -f gnu/xml/transform/NumberNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/NumberNode.lo
-       -rm -f gnu/xml/transform/OtherwiseNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/OtherwiseNode.lo
-       -rm -f gnu/xml/transform/ParameterNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/ParameterNode.lo
-       -rm -f gnu/xml/transform/ProcessingInstructionNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/ProcessingInstructionNode.lo
-       -rm -f gnu/xml/transform/SAXSerializer.$(OBJEXT)
-       -rm -f gnu/xml/transform/SAXSerializer.lo
-       -rm -f gnu/xml/transform/SortKey.$(OBJEXT)
-       -rm -f gnu/xml/transform/SortKey.lo
-       -rm -f gnu/xml/transform/StreamSerializer.$(OBJEXT)
-       -rm -f gnu/xml/transform/StreamSerializer.lo
-       -rm -f gnu/xml/transform/Stylesheet.$(OBJEXT)
-       -rm -f gnu/xml/transform/Stylesheet.lo
-       -rm -f gnu/xml/transform/SystemPropertyFunction.$(OBJEXT)
-       -rm -f gnu/xml/transform/SystemPropertyFunction.lo
-       -rm -f gnu/xml/transform/Template.$(OBJEXT)
-       -rm -f gnu/xml/transform/Template.lo
-       -rm -f gnu/xml/transform/TemplateNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/TemplateNode.lo
-       -rm -f gnu/xml/transform/TemplatesImpl.$(OBJEXT)
-       -rm -f gnu/xml/transform/TemplatesImpl.lo
-       -rm -f gnu/xml/transform/TextNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/TextNode.lo
-       -rm -f gnu/xml/transform/TransformerFactoryImpl.$(OBJEXT)
-       -rm -f gnu/xml/transform/TransformerFactoryImpl.lo
-       -rm -f gnu/xml/transform/TransformerImpl.$(OBJEXT)
-       -rm -f gnu/xml/transform/TransformerImpl.lo
-       -rm -f gnu/xml/transform/TransformerOutputProperties.$(OBJEXT)
-       -rm -f gnu/xml/transform/TransformerOutputProperties.lo
-       -rm -f gnu/xml/transform/URIResolverEntityResolver.$(OBJEXT)
-       -rm -f gnu/xml/transform/URIResolverEntityResolver.lo
-       -rm -f gnu/xml/transform/UnparsedEntityUriFunction.$(OBJEXT)
-       -rm -f gnu/xml/transform/UnparsedEntityUriFunction.lo
-       -rm -f gnu/xml/transform/ValueOfNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/ValueOfNode.lo
-       -rm -f gnu/xml/transform/WhenNode.$(OBJEXT)
-       -rm -f gnu/xml/transform/WhenNode.lo
-       -rm -f gnu/xml/transform/WithParam.$(OBJEXT)
-       -rm -f gnu/xml/transform/WithParam.lo
-       -rm -f gnu/xml/transform/XSLComparator.$(OBJEXT)
-       -rm -f gnu/xml/transform/XSLComparator.lo
-       -rm -f gnu/xml/transform/XSLURIResolver.$(OBJEXT)
-       -rm -f gnu/xml/transform/XSLURIResolver.lo
-       -rm -f gnu/xml/util/DoParse.$(OBJEXT)
-       -rm -f gnu/xml/util/DoParse.lo
-       -rm -f gnu/xml/util/DomParser.$(OBJEXT)
-       -rm -f gnu/xml/util/DomParser.lo
-       -rm -f gnu/xml/util/Resolver.$(OBJEXT)
-       -rm -f gnu/xml/util/Resolver.lo
-       -rm -f gnu/xml/util/SAXNullTransformerFactory.$(OBJEXT)
-       -rm -f gnu/xml/util/SAXNullTransformerFactory.lo
-       -rm -f gnu/xml/util/XCat.$(OBJEXT)
-       -rm -f gnu/xml/util/XCat.lo
-       -rm -f gnu/xml/util/XHTMLWriter.$(OBJEXT)
-       -rm -f gnu/xml/util/XHTMLWriter.lo
-       -rm -f gnu/xml/util/XMLWriter.$(OBJEXT)
-       -rm -f gnu/xml/util/XMLWriter.lo
-       -rm -f gnu/xml/xpath/AndExpr.$(OBJEXT)
-       -rm -f gnu/xml/xpath/AndExpr.lo
-       -rm -f gnu/xml/xpath/ArithmeticExpr.$(OBJEXT)
-       -rm -f gnu/xml/xpath/ArithmeticExpr.lo
-       -rm -f gnu/xml/xpath/BooleanFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/BooleanFunction.lo
-       -rm -f gnu/xml/xpath/CeilingFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/CeilingFunction.lo
-       -rm -f gnu/xml/xpath/ConcatFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/ConcatFunction.lo
-       -rm -f gnu/xml/xpath/Constant.$(OBJEXT)
-       -rm -f gnu/xml/xpath/Constant.lo
-       -rm -f gnu/xml/xpath/ContainsFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/ContainsFunction.lo
-       -rm -f gnu/xml/xpath/CountFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/CountFunction.lo
-       -rm -f gnu/xml/xpath/DocumentOrderComparator.$(OBJEXT)
-       -rm -f gnu/xml/xpath/DocumentOrderComparator.lo
-       -rm -f gnu/xml/xpath/EqualityExpr.$(OBJEXT)
-       -rm -f gnu/xml/xpath/EqualityExpr.lo
-       -rm -f gnu/xml/xpath/Expr.$(OBJEXT)
-       -rm -f gnu/xml/xpath/Expr.lo
-       -rm -f gnu/xml/xpath/FalseFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/FalseFunction.lo
-       -rm -f gnu/xml/xpath/FloorFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/FloorFunction.lo
-       -rm -f gnu/xml/xpath/Function.$(OBJEXT)
-       -rm -f gnu/xml/xpath/Function.lo
-       -rm -f gnu/xml/xpath/FunctionCall.$(OBJEXT)
-       -rm -f gnu/xml/xpath/FunctionCall.lo
-       -rm -f gnu/xml/xpath/IdFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/IdFunction.lo
-       -rm -f gnu/xml/xpath/LangFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/LangFunction.lo
-       -rm -f gnu/xml/xpath/LastFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/LastFunction.lo
-       -rm -f gnu/xml/xpath/LocalNameFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/LocalNameFunction.lo
-       -rm -f gnu/xml/xpath/NameFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/NameFunction.lo
-       -rm -f gnu/xml/xpath/NameTest.$(OBJEXT)
-       -rm -f gnu/xml/xpath/NameTest.lo
-       -rm -f gnu/xml/xpath/NamespaceTest.$(OBJEXT)
-       -rm -f gnu/xml/xpath/NamespaceTest.lo
-       -rm -f gnu/xml/xpath/NamespaceUriFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/NamespaceUriFunction.lo
-       -rm -f gnu/xml/xpath/NegativeExpr.$(OBJEXT)
-       -rm -f gnu/xml/xpath/NegativeExpr.lo
-       -rm -f gnu/xml/xpath/NodeTypeTest.$(OBJEXT)
-       -rm -f gnu/xml/xpath/NodeTypeTest.lo
-       -rm -f gnu/xml/xpath/NormalizeSpaceFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/NormalizeSpaceFunction.lo
-       -rm -f gnu/xml/xpath/NotFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/NotFunction.lo
-       -rm -f gnu/xml/xpath/NumberFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/NumberFunction.lo
-       -rm -f gnu/xml/xpath/OrExpr.$(OBJEXT)
-       -rm -f gnu/xml/xpath/OrExpr.lo
-       -rm -f gnu/xml/xpath/ParenthesizedExpr.$(OBJEXT)
-       -rm -f gnu/xml/xpath/ParenthesizedExpr.lo
-       -rm -f gnu/xml/xpath/Path.$(OBJEXT)
-       -rm -f gnu/xml/xpath/Path.lo
-       -rm -f gnu/xml/xpath/Pattern.$(OBJEXT)
-       -rm -f gnu/xml/xpath/Pattern.lo
-       -rm -f gnu/xml/xpath/PositionFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/PositionFunction.lo
-       -rm -f gnu/xml/xpath/Predicate.$(OBJEXT)
-       -rm -f gnu/xml/xpath/Predicate.lo
-       -rm -f gnu/xml/xpath/RelationalExpr.$(OBJEXT)
-       -rm -f gnu/xml/xpath/RelationalExpr.lo
-       -rm -f gnu/xml/xpath/Root.$(OBJEXT)
-       -rm -f gnu/xml/xpath/Root.lo
-       -rm -f gnu/xml/xpath/RoundFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/RoundFunction.lo
-       -rm -f gnu/xml/xpath/Selector.$(OBJEXT)
-       -rm -f gnu/xml/xpath/Selector.lo
-       -rm -f gnu/xml/xpath/StartsWithFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/StartsWithFunction.lo
-       -rm -f gnu/xml/xpath/Steps.$(OBJEXT)
-       -rm -f gnu/xml/xpath/Steps.lo
-       -rm -f gnu/xml/xpath/StringFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/StringFunction.lo
-       -rm -f gnu/xml/xpath/StringLengthFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/StringLengthFunction.lo
-       -rm -f gnu/xml/xpath/SubstringAfterFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/SubstringAfterFunction.lo
-       -rm -f gnu/xml/xpath/SubstringBeforeFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/SubstringBeforeFunction.lo
-       -rm -f gnu/xml/xpath/SubstringFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/SubstringFunction.lo
-       -rm -f gnu/xml/xpath/SumFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/SumFunction.lo
-       -rm -f gnu/xml/xpath/Test.$(OBJEXT)
-       -rm -f gnu/xml/xpath/Test.lo
-       -rm -f gnu/xml/xpath/TranslateFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/TranslateFunction.lo
-       -rm -f gnu/xml/xpath/TrueFunction.$(OBJEXT)
-       -rm -f gnu/xml/xpath/TrueFunction.lo
-       -rm -f gnu/xml/xpath/UnionExpr.$(OBJEXT)
-       -rm -f gnu/xml/xpath/UnionExpr.lo
-       -rm -f gnu/xml/xpath/VariableReference.$(OBJEXT)
-       -rm -f gnu/xml/xpath/VariableReference.lo
-       -rm -f gnu/xml/xpath/XPathFactoryImpl.$(OBJEXT)
-       -rm -f gnu/xml/xpath/XPathFactoryImpl.lo
-       -rm -f gnu/xml/xpath/XPathImpl.$(OBJEXT)
-       -rm -f gnu/xml/xpath/XPathImpl.lo
-       -rm -f gnu/xml/xpath/XPathParser.$(OBJEXT)
-       -rm -f gnu/xml/xpath/XPathParser.lo
-       -rm -f gnu/xml/xpath/XPathTokenizer.$(OBJEXT)
-       -rm -f gnu/xml/xpath/XPathTokenizer.lo
        -rm -f java/applet/Applet.$(OBJEXT)
        -rm -f java/applet/Applet.lo
        -rm -f java/applet/AppletContext.$(OBJEXT)
@@ -20210,98 +18265,6 @@ mostlyclean-compile:
        -rm -f javax/crypto/spec/RC5ParameterSpec.lo
        -rm -f javax/crypto/spec/SecretKeySpec.$(OBJEXT)
        -rm -f javax/crypto/spec/SecretKeySpec.lo
-       -rm -f javax/imageio/IIOException.$(OBJEXT)
-       -rm -f javax/imageio/IIOException.lo
-       -rm -f javax/imageio/IIOImage.$(OBJEXT)
-       -rm -f javax/imageio/IIOImage.lo
-       -rm -f javax/imageio/IIOParam.$(OBJEXT)
-       -rm -f javax/imageio/IIOParam.lo
-       -rm -f javax/imageio/IIOParamController.$(OBJEXT)
-       -rm -f javax/imageio/IIOParamController.lo
-       -rm -f javax/imageio/ImageIO.$(OBJEXT)
-       -rm -f javax/imageio/ImageIO.lo
-       -rm -f javax/imageio/ImageReadParam.$(OBJEXT)
-       -rm -f javax/imageio/ImageReadParam.lo
-       -rm -f javax/imageio/ImageReader.$(OBJEXT)
-       -rm -f javax/imageio/ImageReader.lo
-       -rm -f javax/imageio/ImageTranscoder.$(OBJEXT)
-       -rm -f javax/imageio/ImageTranscoder.lo
-       -rm -f javax/imageio/ImageTypeSpecifier.$(OBJEXT)
-       -rm -f javax/imageio/ImageTypeSpecifier.lo
-       -rm -f javax/imageio/ImageWriteParam.$(OBJEXT)
-       -rm -f javax/imageio/ImageWriteParam.lo
-       -rm -f javax/imageio/ImageWriter.$(OBJEXT)
-       -rm -f javax/imageio/ImageWriter.lo
-       -rm -f javax/imageio/event/IIOReadProgressListener.$(OBJEXT)
-       -rm -f javax/imageio/event/IIOReadProgressListener.lo
-       -rm -f javax/imageio/event/IIOReadUpdateListener.$(OBJEXT)
-       -rm -f javax/imageio/event/IIOReadUpdateListener.lo
-       -rm -f javax/imageio/event/IIOReadWarningListener.$(OBJEXT)
-       -rm -f javax/imageio/event/IIOReadWarningListener.lo
-       -rm -f javax/imageio/event/IIOWriteProgressListener.$(OBJEXT)
-       -rm -f javax/imageio/event/IIOWriteProgressListener.lo
-       -rm -f javax/imageio/event/IIOWriteWarningListener.$(OBJEXT)
-       -rm -f javax/imageio/event/IIOWriteWarningListener.lo
-       -rm -f javax/imageio/metadata/IIOAttr.$(OBJEXT)
-       -rm -f javax/imageio/metadata/IIOAttr.lo
-       -rm -f javax/imageio/metadata/IIOInvalidTreeException.$(OBJEXT)
-       -rm -f javax/imageio/metadata/IIOInvalidTreeException.lo
-       -rm -f javax/imageio/metadata/IIOMetadata.$(OBJEXT)
-       -rm -f javax/imageio/metadata/IIOMetadata.lo
-       -rm -f javax/imageio/metadata/IIOMetadataController.$(OBJEXT)
-       -rm -f javax/imageio/metadata/IIOMetadataController.lo
-       -rm -f javax/imageio/metadata/IIOMetadataFormat.$(OBJEXT)
-       -rm -f javax/imageio/metadata/IIOMetadataFormat.lo
-       -rm -f javax/imageio/metadata/IIOMetadataFormatImpl.$(OBJEXT)
-       -rm -f javax/imageio/metadata/IIOMetadataFormatImpl.lo
-       -rm -f javax/imageio/metadata/IIOMetadataNode.$(OBJEXT)
-       -rm -f javax/imageio/metadata/IIOMetadataNode.lo
-       -rm -f javax/imageio/metadata/IIONamedNodeMap.$(OBJEXT)
-       -rm -f javax/imageio/metadata/IIONamedNodeMap.lo
-       -rm -f javax/imageio/metadata/IIONodeList.$(OBJEXT)
-       -rm -f javax/imageio/metadata/IIONodeList.lo
-       -rm -f javax/imageio/spi/IIORegistry.$(OBJEXT)
-       -rm -f javax/imageio/spi/IIORegistry.lo
-       -rm -f javax/imageio/spi/IIOServiceProvider.$(OBJEXT)
-       -rm -f javax/imageio/spi/IIOServiceProvider.lo
-       -rm -f javax/imageio/spi/ImageInputStreamSpi.$(OBJEXT)
-       -rm -f javax/imageio/spi/ImageInputStreamSpi.lo
-       -rm -f javax/imageio/spi/ImageOutputStreamSpi.$(OBJEXT)
-       -rm -f javax/imageio/spi/ImageOutputStreamSpi.lo
-       -rm -f javax/imageio/spi/ImageReaderSpi.$(OBJEXT)
-       -rm -f javax/imageio/spi/ImageReaderSpi.lo
-       -rm -f javax/imageio/spi/ImageReaderWriterSpi.$(OBJEXT)
-       -rm -f javax/imageio/spi/ImageReaderWriterSpi.lo
-       -rm -f javax/imageio/spi/ImageTranscoderSpi.$(OBJEXT)
-       -rm -f javax/imageio/spi/ImageTranscoderSpi.lo
-       -rm -f javax/imageio/spi/ImageWriterSpi.$(OBJEXT)
-       -rm -f javax/imageio/spi/ImageWriterSpi.lo
-       -rm -f javax/imageio/spi/RegisterableService.$(OBJEXT)
-       -rm -f javax/imageio/spi/RegisterableService.lo
-       -rm -f javax/imageio/spi/ServiceRegistry.$(OBJEXT)
-       -rm -f javax/imageio/spi/ServiceRegistry.lo
-       -rm -f javax/imageio/stream/FileCacheImageInputStream.$(OBJEXT)
-       -rm -f javax/imageio/stream/FileCacheImageInputStream.lo
-       -rm -f javax/imageio/stream/FileCacheImageOutputStream.$(OBJEXT)
-       -rm -f javax/imageio/stream/FileCacheImageOutputStream.lo
-       -rm -f javax/imageio/stream/FileImageInputStream.$(OBJEXT)
-       -rm -f javax/imageio/stream/FileImageInputStream.lo
-       -rm -f javax/imageio/stream/FileImageOutputStream.$(OBJEXT)
-       -rm -f javax/imageio/stream/FileImageOutputStream.lo
-       -rm -f javax/imageio/stream/IIOByteBuffer.$(OBJEXT)
-       -rm -f javax/imageio/stream/IIOByteBuffer.lo
-       -rm -f javax/imageio/stream/ImageInputStream.$(OBJEXT)
-       -rm -f javax/imageio/stream/ImageInputStream.lo
-       -rm -f javax/imageio/stream/ImageInputStreamImpl.$(OBJEXT)
-       -rm -f javax/imageio/stream/ImageInputStreamImpl.lo
-       -rm -f javax/imageio/stream/ImageOutputStream.$(OBJEXT)
-       -rm -f javax/imageio/stream/ImageOutputStream.lo
-       -rm -f javax/imageio/stream/ImageOutputStreamImpl.$(OBJEXT)
-       -rm -f javax/imageio/stream/ImageOutputStreamImpl.lo
-       -rm -f javax/imageio/stream/MemoryCacheImageInputStream.$(OBJEXT)
-       -rm -f javax/imageio/stream/MemoryCacheImageInputStream.lo
-       -rm -f javax/imageio/stream/MemoryCacheImageOutputStream.$(OBJEXT)
-       -rm -f javax/imageio/stream/MemoryCacheImageOutputStream.lo
        -rm -f javax/naming/AuthenticationException.$(OBJEXT)
        -rm -f javax/naming/AuthenticationException.lo
        -rm -f javax/naming/AuthenticationNotSupportedException.$(OBJEXT)
@@ -21664,110 +19627,6 @@ mostlyclean-compile:
        -rm -f javax/transaction/xa/XAResource.lo
        -rm -f javax/transaction/xa/Xid.$(OBJEXT)
        -rm -f javax/transaction/xa/Xid.lo
-       -rm -f javax/xml/XMLConstants.$(OBJEXT)
-       -rm -f javax/xml/XMLConstants.lo
-       -rm -f javax/xml/datatype/DatatypeConfigurationException.$(OBJEXT)
-       -rm -f javax/xml/datatype/DatatypeConfigurationException.lo
-       -rm -f javax/xml/datatype/DatatypeConstants.$(OBJEXT)
-       -rm -f javax/xml/datatype/DatatypeConstants.lo
-       -rm -f javax/xml/datatype/DatatypeFactory.$(OBJEXT)
-       -rm -f javax/xml/datatype/DatatypeFactory.lo
-       -rm -f javax/xml/datatype/Duration.$(OBJEXT)
-       -rm -f javax/xml/datatype/Duration.lo
-       -rm -f javax/xml/datatype/XMLGregorianCalendar.$(OBJEXT)
-       -rm -f javax/xml/datatype/XMLGregorianCalendar.lo
-       -rm -f javax/xml/namespace/NamespaceContext.$(OBJEXT)
-       -rm -f javax/xml/namespace/NamespaceContext.lo
-       -rm -f javax/xml/namespace/QName.$(OBJEXT)
-       -rm -f javax/xml/namespace/QName.lo
-       -rm -f javax/xml/parsers/DocumentBuilder.$(OBJEXT)
-       -rm -f javax/xml/parsers/DocumentBuilder.lo
-       -rm -f javax/xml/parsers/DocumentBuilderFactory.$(OBJEXT)
-       -rm -f javax/xml/parsers/DocumentBuilderFactory.lo
-       -rm -f javax/xml/parsers/FactoryConfigurationError.$(OBJEXT)
-       -rm -f javax/xml/parsers/FactoryConfigurationError.lo
-       -rm -f javax/xml/parsers/ParserConfigurationException.$(OBJEXT)
-       -rm -f javax/xml/parsers/ParserConfigurationException.lo
-       -rm -f javax/xml/parsers/SAXParser.$(OBJEXT)
-       -rm -f javax/xml/parsers/SAXParser.lo
-       -rm -f javax/xml/parsers/SAXParserFactory.$(OBJEXT)
-       -rm -f javax/xml/parsers/SAXParserFactory.lo
-       -rm -f javax/xml/transform/ErrorListener.$(OBJEXT)
-       -rm -f javax/xml/transform/ErrorListener.lo
-       -rm -f javax/xml/transform/OutputKeys.$(OBJEXT)
-       -rm -f javax/xml/transform/OutputKeys.lo
-       -rm -f javax/xml/transform/Result.$(OBJEXT)
-       -rm -f javax/xml/transform/Result.lo
-       -rm -f javax/xml/transform/Source.$(OBJEXT)
-       -rm -f javax/xml/transform/Source.lo
-       -rm -f javax/xml/transform/SourceLocator.$(OBJEXT)
-       -rm -f javax/xml/transform/SourceLocator.lo
-       -rm -f javax/xml/transform/Templates.$(OBJEXT)
-       -rm -f javax/xml/transform/Templates.lo
-       -rm -f javax/xml/transform/Transformer.$(OBJEXT)
-       -rm -f javax/xml/transform/Transformer.lo
-       -rm -f javax/xml/transform/TransformerConfigurationException.$(OBJEXT)
-       -rm -f javax/xml/transform/TransformerConfigurationException.lo
-       -rm -f javax/xml/transform/TransformerException.$(OBJEXT)
-       -rm -f javax/xml/transform/TransformerException.lo
-       -rm -f javax/xml/transform/TransformerFactory.$(OBJEXT)
-       -rm -f javax/xml/transform/TransformerFactory.lo
-       -rm -f javax/xml/transform/TransformerFactoryConfigurationError.$(OBJEXT)
-       -rm -f javax/xml/transform/TransformerFactoryConfigurationError.lo
-       -rm -f javax/xml/transform/URIResolver.$(OBJEXT)
-       -rm -f javax/xml/transform/URIResolver.lo
-       -rm -f javax/xml/transform/dom/DOMLocator.$(OBJEXT)
-       -rm -f javax/xml/transform/dom/DOMLocator.lo
-       -rm -f javax/xml/transform/dom/DOMResult.$(OBJEXT)
-       -rm -f javax/xml/transform/dom/DOMResult.lo
-       -rm -f javax/xml/transform/dom/DOMSource.$(OBJEXT)
-       -rm -f javax/xml/transform/dom/DOMSource.lo
-       -rm -f javax/xml/transform/sax/SAXResult.$(OBJEXT)
-       -rm -f javax/xml/transform/sax/SAXResult.lo
-       -rm -f javax/xml/transform/sax/SAXSource.$(OBJEXT)
-       -rm -f javax/xml/transform/sax/SAXSource.lo
-       -rm -f javax/xml/transform/sax/SAXTransformerFactory.$(OBJEXT)
-       -rm -f javax/xml/transform/sax/SAXTransformerFactory.lo
-       -rm -f javax/xml/transform/sax/TemplatesHandler.$(OBJEXT)
-       -rm -f javax/xml/transform/sax/TemplatesHandler.lo
-       -rm -f javax/xml/transform/sax/TransformerHandler.$(OBJEXT)
-       -rm -f javax/xml/transform/sax/TransformerHandler.lo
-       -rm -f javax/xml/transform/stream/StreamResult.$(OBJEXT)
-       -rm -f javax/xml/transform/stream/StreamResult.lo
-       -rm -f javax/xml/transform/stream/StreamSource.$(OBJEXT)
-       -rm -f javax/xml/transform/stream/StreamSource.lo
-       -rm -f javax/xml/validation/Schema.$(OBJEXT)
-       -rm -f javax/xml/validation/Schema.lo
-       -rm -f javax/xml/validation/SchemaFactory.$(OBJEXT)
-       -rm -f javax/xml/validation/SchemaFactory.lo
-       -rm -f javax/xml/validation/TypeInfoProvider.$(OBJEXT)
-       -rm -f javax/xml/validation/TypeInfoProvider.lo
-       -rm -f javax/xml/validation/Validator.$(OBJEXT)
-       -rm -f javax/xml/validation/Validator.lo
-       -rm -f javax/xml/validation/ValidatorHandler.$(OBJEXT)
-       -rm -f javax/xml/validation/ValidatorHandler.lo
-       -rm -f javax/xml/xpath/XPath.$(OBJEXT)
-       -rm -f javax/xml/xpath/XPath.lo
-       -rm -f javax/xml/xpath/XPathConstants.$(OBJEXT)
-       -rm -f javax/xml/xpath/XPathConstants.lo
-       -rm -f javax/xml/xpath/XPathException.$(OBJEXT)
-       -rm -f javax/xml/xpath/XPathException.lo
-       -rm -f javax/xml/xpath/XPathExpression.$(OBJEXT)
-       -rm -f javax/xml/xpath/XPathExpression.lo
-       -rm -f javax/xml/xpath/XPathExpressionException.$(OBJEXT)
-       -rm -f javax/xml/xpath/XPathExpressionException.lo
-       -rm -f javax/xml/xpath/XPathFactory.$(OBJEXT)
-       -rm -f javax/xml/xpath/XPathFactory.lo
-       -rm -f javax/xml/xpath/XPathFactoryConfigurationException.$(OBJEXT)
-       -rm -f javax/xml/xpath/XPathFactoryConfigurationException.lo
-       -rm -f javax/xml/xpath/XPathFunction.$(OBJEXT)
-       -rm -f javax/xml/xpath/XPathFunction.lo
-       -rm -f javax/xml/xpath/XPathFunctionException.$(OBJEXT)
-       -rm -f javax/xml/xpath/XPathFunctionException.lo
-       -rm -f javax/xml/xpath/XPathFunctionResolver.$(OBJEXT)
-       -rm -f javax/xml/xpath/XPathFunctionResolver.lo
-       -rm -f javax/xml/xpath/XPathVariableResolver.$(OBJEXT)
-       -rm -f javax/xml/xpath/XPathVariableResolver.lo
        -rm -f jni/classpath/lib_gnu_java_awt_peer_gtk_la-native_state.$(OBJEXT)
        -rm -f jni/classpath/lib_gnu_java_awt_peer_gtk_la-native_state.lo
        -rm -f jni/gtk-peer/lib_gnu_java_awt_peer_gtk_la-gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.$(OBJEXT)
@@ -21948,6 +19807,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/io/$(DEPDIR)/SimpleSHSStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/io/$(DEPDIR)/natSimpleSHSStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/io/$(DEPDIR)/shs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/BootClassLoader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/FileDeleter.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/FinalizerThread.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/JNIWeakRef.Plo@am__quote@
@@ -22080,58 +19940,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/awt/peer/gtk/$(DEPDIR)/lib_gnu_java_awt_peer_gtk_la-GtkTextFieldPeer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/awt/peer/gtk/$(DEPDIR)/lib_gnu_java_awt_peer_gtk_la-GtkToolkit.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/awt/peer/gtk/$(DEPDIR)/lib_gnu_java_awt_peer_gtk_la-GtkWindowPeer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/$(DEPDIR)/BeanInfoEmbryo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/$(DEPDIR)/DummyAppletContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/$(DEPDIR)/DummyAppletStub.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/$(DEPDIR)/ExplicitBeanInfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/$(DEPDIR)/IntrospectionIncubator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/AbstractContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/AbstractCreatableObjectContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/AbstractElementHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/AbstractObjectContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/ArrayContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/ArrayHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/AssemblyException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/BooleanHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/ByteHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/CharHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/ClassHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/ConstructorContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/Context.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/DecoderContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/DefaultExceptionListener.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/DoubleHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/DummyContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/DummyHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/ElementHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/FloatHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/GrowableArrayContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/IndexContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/IntHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/JavaHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/LongHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/MethodContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/MethodFinder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/NullHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/ObjectContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/ObjectHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/PersistenceParser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/PropertyContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/ShortHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/SimpleHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/StaticMethodContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/StringHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/decoder/$(DEPDIR)/VoidHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/editors/$(DEPDIR)/ColorEditor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/editors/$(DEPDIR)/FontEditor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/editors/$(DEPDIR)/NativeBooleanEditor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/editors/$(DEPDIR)/NativeByteEditor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/editors/$(DEPDIR)/NativeDoubleEditor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/editors/$(DEPDIR)/NativeFloatEditor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/editors/$(DEPDIR)/NativeIntEditor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/editors/$(DEPDIR)/NativeLongEditor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/editors/$(DEPDIR)/NativeShortEditor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/beans/editors/$(DEPDIR)/StringEditor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/io/$(DEPDIR)/ASN1ParsingException.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/io/$(DEPDIR)/Base64InputStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/io/$(DEPDIR)/ClassLoaderObjectInputStream.Plo@am__quote@
@@ -22520,180 +20328,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/regexp/$(DEPDIR)/RETokenStart.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/regexp/$(DEPDIR)/RETokenWordBoundary.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/regexp/$(DEPDIR)/UncheckedRE.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/aelfred2/$(DEPDIR)/ContentHandler2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/aelfred2/$(DEPDIR)/JAXPFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/aelfred2/$(DEPDIR)/SAXDriver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/aelfred2/$(DEPDIR)/XmlParser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/aelfred2/$(DEPDIR)/XmlReader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/Consumer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DTDAttributeTypeInfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DTDElementTypeInfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomAttr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomCDATASection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomCharacterData.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomComment.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDOMException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDoctype.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocument.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocumentBuilder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocumentBuilderFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocumentConfiguration.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocumentFragment.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomEntity.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomEntityReference.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomEvent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomExtern.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomIterator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNSResolverContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNamedNodeMap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNodeIterator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNotation.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNsNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomProcessingInstruction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomText.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomXPathExpression.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomXPathNSResolver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomXPathResult.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/ImplementationList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/ImplementationSource.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/JAXPFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSInput.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSOutput.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSParser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSSerializer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/FilteredSAXEventSink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/ReaderInputStream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/SAXEventSink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/WriterOutputStream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/CallFilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/DomConsumer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/EventConsumer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/EventFilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/LinkFilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/NSFilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/PipelineFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/TeeConsumer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/TextConsumer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/ValidationConsumer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/WellFormednessFilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/XIncludeFilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/pipeline/$(DEPDIR)/XsltFilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/AbstractNumberNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ApplyImportsNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ApplyTemplatesNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/AttributeNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/AttributeSet.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/Bindings.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/CallTemplateNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ChooseNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/CommentNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/CopyNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/CopyOfNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/CurrentFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/DOMSourceLocator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/DocumentFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ElementAvailableFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ElementNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ErrorListenerErrorHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ForEachNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/FormatNumberFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/FunctionAvailableFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/GenerateIdFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/IfNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/Key.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/KeyFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/LiteralNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/MessageNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/NodeNumberNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/NumberNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/OtherwiseNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ParameterNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ProcessingInstructionNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/SAXSerializer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/SortKey.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/StreamSerializer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/Stylesheet.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/SystemPropertyFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/Template.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/TemplateNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/TemplatesImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/TextNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/TransformerFactoryImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/TransformerImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/TransformerOutputProperties.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/URIResolverEntityResolver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/UnparsedEntityUriFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/ValueOfNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/WhenNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/WithParam.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/XSLComparator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/transform/$(DEPDIR)/XSLURIResolver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/DoParse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/DomParser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/Resolver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/SAXNullTransformerFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/XCat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/XHTMLWriter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/util/$(DEPDIR)/XMLWriter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/AndExpr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/ArithmeticExpr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/BooleanFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/CeilingFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/ConcatFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Constant.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/ContainsFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/CountFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/DocumentOrderComparator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/EqualityExpr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Expr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/FalseFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/FloorFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Function.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/FunctionCall.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/IdFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/LangFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/LastFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/LocalNameFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NameFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NameTest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NamespaceTest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NamespaceUriFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NegativeExpr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NodeTypeTest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NormalizeSpaceFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NotFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/NumberFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/OrExpr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/ParenthesizedExpr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Path.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Pattern.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/PositionFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Predicate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/RelationalExpr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Root.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/RoundFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Selector.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/StartsWithFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Steps.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/StringFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/StringLengthFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/SubstringAfterFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/SubstringBeforeFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/SubstringFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/SumFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/Test.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/TranslateFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/TrueFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/UnionExpr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/VariableReference.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/XPathFactoryImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/XPathImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/XPathParser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/xpath/$(DEPDIR)/XPathTokenizer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/applet/$(DEPDIR)/Applet.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/applet/$(DEPDIR)/AppletContext.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/applet/$(DEPDIR)/AppletStub.Plo@am__quote@
@@ -23890,52 +21524,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@javax/crypto/spec/$(DEPDIR)/RC2ParameterSpec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@javax/crypto/spec/$(DEPDIR)/RC5ParameterSpec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@javax/crypto/spec/$(DEPDIR)/SecretKeySpec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/$(DEPDIR)/IIOException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/$(DEPDIR)/IIOImage.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/$(DEPDIR)/IIOParam.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/$(DEPDIR)/IIOParamController.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/$(DEPDIR)/ImageIO.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/$(DEPDIR)/ImageReadParam.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/$(DEPDIR)/ImageReader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/$(DEPDIR)/ImageTranscoder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/$(DEPDIR)/ImageTypeSpecifier.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/$(DEPDIR)/ImageWriteParam.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/$(DEPDIR)/ImageWriter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/event/$(DEPDIR)/IIOReadProgressListener.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/event/$(DEPDIR)/IIOReadUpdateListener.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/event/$(DEPDIR)/IIOReadWarningListener.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/event/$(DEPDIR)/IIOWriteProgressListener.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/event/$(DEPDIR)/IIOWriteWarningListener.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/metadata/$(DEPDIR)/IIOAttr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/metadata/$(DEPDIR)/IIOInvalidTreeException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/metadata/$(DEPDIR)/IIOMetadata.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/metadata/$(DEPDIR)/IIOMetadataController.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/metadata/$(DEPDIR)/IIOMetadataFormat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/metadata/$(DEPDIR)/IIOMetadataFormatImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/metadata/$(DEPDIR)/IIOMetadataNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/metadata/$(DEPDIR)/IIONamedNodeMap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/metadata/$(DEPDIR)/IIONodeList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/spi/$(DEPDIR)/IIORegistry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/spi/$(DEPDIR)/IIOServiceProvider.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/spi/$(DEPDIR)/ImageInputStreamSpi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/spi/$(DEPDIR)/ImageOutputStreamSpi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/spi/$(DEPDIR)/ImageReaderSpi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/spi/$(DEPDIR)/ImageReaderWriterSpi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/spi/$(DEPDIR)/ImageTranscoderSpi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/spi/$(DEPDIR)/ImageWriterSpi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/spi/$(DEPDIR)/RegisterableService.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/spi/$(DEPDIR)/ServiceRegistry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/stream/$(DEPDIR)/FileCacheImageInputStream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/stream/$(DEPDIR)/FileCacheImageOutputStream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/stream/$(DEPDIR)/FileImageInputStream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/stream/$(DEPDIR)/FileImageOutputStream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/stream/$(DEPDIR)/IIOByteBuffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/stream/$(DEPDIR)/ImageInputStream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/stream/$(DEPDIR)/ImageInputStreamImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/stream/$(DEPDIR)/ImageOutputStream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/stream/$(DEPDIR)/ImageOutputStreamImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/stream/$(DEPDIR)/MemoryCacheImageInputStream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/imageio/stream/$(DEPDIR)/MemoryCacheImageOutputStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@javax/naming/$(DEPDIR)/AuthenticationException.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@javax/naming/$(DEPDIR)/AuthenticationNotSupportedException.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@javax/naming/$(DEPDIR)/BinaryRefAddr.Plo@am__quote@
@@ -24617,58 +22205,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@javax/transaction/xa/$(DEPDIR)/XAException.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@javax/transaction/xa/$(DEPDIR)/XAResource.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@javax/transaction/xa/$(DEPDIR)/Xid.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/$(DEPDIR)/XMLConstants.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/datatype/$(DEPDIR)/DatatypeConfigurationException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/datatype/$(DEPDIR)/DatatypeConstants.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/datatype/$(DEPDIR)/DatatypeFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/datatype/$(DEPDIR)/Duration.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/datatype/$(DEPDIR)/XMLGregorianCalendar.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/namespace/$(DEPDIR)/NamespaceContext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/namespace/$(DEPDIR)/QName.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/parsers/$(DEPDIR)/DocumentBuilder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/parsers/$(DEPDIR)/DocumentBuilderFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/parsers/$(DEPDIR)/FactoryConfigurationError.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/parsers/$(DEPDIR)/ParserConfigurationException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/parsers/$(DEPDIR)/SAXParser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/parsers/$(DEPDIR)/SAXParserFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/ErrorListener.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/OutputKeys.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/Result.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/Source.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/SourceLocator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/Templates.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/Transformer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/TransformerConfigurationException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/TransformerException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/TransformerFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/TransformerFactoryConfigurationError.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/$(DEPDIR)/URIResolver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/dom/$(DEPDIR)/DOMLocator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/dom/$(DEPDIR)/DOMResult.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/dom/$(DEPDIR)/DOMSource.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/sax/$(DEPDIR)/SAXResult.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/sax/$(DEPDIR)/SAXSource.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/sax/$(DEPDIR)/SAXTransformerFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/sax/$(DEPDIR)/TemplatesHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/sax/$(DEPDIR)/TransformerHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/stream/$(DEPDIR)/StreamResult.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/transform/stream/$(DEPDIR)/StreamSource.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/validation/$(DEPDIR)/Schema.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/validation/$(DEPDIR)/SchemaFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/validation/$(DEPDIR)/TypeInfoProvider.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/validation/$(DEPDIR)/Validator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/validation/$(DEPDIR)/ValidatorHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPath.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathConstants.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathExpression.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathExpressionException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathFactoryConfigurationException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathFunction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathFunctionException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathFunctionResolver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@javax/xml/xpath/$(DEPDIR)/XPathVariableResolver.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@jni/classpath/$(DEPDIR)/lib_gnu_java_awt_peer_gtk_la-native_state.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@jni/gtk-peer/$(DEPDIR)/lib_gnu_java_awt_peer_gtk_la-gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@jni/gtk-peer/$(DEPDIR)/lib_gnu_java_awt_peer_gtk_la-gnu_java_awt_peer_gtk_GdkFontPeer.Plo@am__quote@
@@ -25553,9 +23089,6 @@ clean-libtool:
        -rm -rf gnu/java/awt/image/.libs gnu/java/awt/image/_libs
        -rm -rf gnu/java/awt/peer/.libs gnu/java/awt/peer/_libs
        -rm -rf gnu/java/awt/peer/gtk/.libs gnu/java/awt/peer/gtk/_libs
-       -rm -rf gnu/java/beans/.libs gnu/java/beans/_libs
-       -rm -rf gnu/java/beans/decoder/.libs gnu/java/beans/decoder/_libs
-       -rm -rf gnu/java/beans/editors/.libs gnu/java/beans/editors/_libs
        -rm -rf gnu/java/io/.libs gnu/java/io/_libs
        -rm -rf gnu/java/lang/.libs gnu/java/lang/_libs
        -rm -rf gnu/java/lang/reflect/.libs gnu/java/lang/reflect/_libs
@@ -25590,13 +23123,6 @@ clean-libtool:
        -rm -rf gnu/java/util/.libs gnu/java/util/_libs
        -rm -rf gnu/java/util/prefs/.libs gnu/java/util/prefs/_libs
        -rm -rf gnu/regexp/.libs gnu/regexp/_libs
-       -rm -rf gnu/xml/aelfred2/.libs gnu/xml/aelfred2/_libs
-       -rm -rf gnu/xml/dom/.libs gnu/xml/dom/_libs
-       -rm -rf gnu/xml/dom/ls/.libs gnu/xml/dom/ls/_libs
-       -rm -rf gnu/xml/pipeline/.libs gnu/xml/pipeline/_libs
-       -rm -rf gnu/xml/transform/.libs gnu/xml/transform/_libs
-       -rm -rf gnu/xml/util/.libs gnu/xml/util/_libs
-       -rm -rf gnu/xml/xpath/.libs gnu/xml/xpath/_libs
        -rm -rf java/applet/.libs java/applet/_libs
        -rm -rf java/awt/.libs java/awt/_libs
        -rm -rf java/awt/color/.libs java/awt/color/_libs
@@ -25647,11 +23173,6 @@ clean-libtool:
        -rm -rf javax/crypto/.libs javax/crypto/_libs
        -rm -rf javax/crypto/interfaces/.libs javax/crypto/interfaces/_libs
        -rm -rf javax/crypto/spec/.libs javax/crypto/spec/_libs
-       -rm -rf javax/imageio/.libs javax/imageio/_libs
-       -rm -rf javax/imageio/event/.libs javax/imageio/event/_libs
-       -rm -rf javax/imageio/metadata/.libs javax/imageio/metadata/_libs
-       -rm -rf javax/imageio/spi/.libs javax/imageio/spi/_libs
-       -rm -rf javax/imageio/stream/.libs javax/imageio/stream/_libs
        -rm -rf javax/naming/.libs javax/naming/_libs
        -rm -rf javax/naming/directory/.libs javax/naming/directory/_libs
        -rm -rf javax/naming/event/.libs javax/naming/event/_libs
@@ -25687,16 +23208,6 @@ clean-libtool:
        -rm -rf javax/swing/undo/.libs javax/swing/undo/_libs
        -rm -rf javax/transaction/.libs javax/transaction/_libs
        -rm -rf javax/transaction/xa/.libs javax/transaction/xa/_libs
-       -rm -rf javax/xml/.libs javax/xml/_libs
-       -rm -rf javax/xml/datatype/.libs javax/xml/datatype/_libs
-       -rm -rf javax/xml/namespace/.libs javax/xml/namespace/_libs
-       -rm -rf javax/xml/parsers/.libs javax/xml/parsers/_libs
-       -rm -rf javax/xml/transform/.libs javax/xml/transform/_libs
-       -rm -rf javax/xml/transform/dom/.libs javax/xml/transform/dom/_libs
-       -rm -rf javax/xml/transform/sax/.libs javax/xml/transform/sax/_libs
-       -rm -rf javax/xml/transform/stream/.libs javax/xml/transform/stream/_libs
-       -rm -rf javax/xml/validation/.libs javax/xml/validation/_libs
-       -rm -rf javax/xml/xpath/.libs javax/xml/xpath/_libs
        -rm -rf jni/classpath/.libs jni/classpath/_libs
        -rm -rf jni/gtk-peer/.libs jni/gtk-peer/_libs
        -rm -rf org/ietf/jgss/.libs org/ietf/jgss/_libs
@@ -25781,13 +23292,7 @@ uninstall-toolexecmainlibDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-       @failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
+       @set fnord $$MAKEFLAGS; amf=$$2; \
        dot_seen=no; \
        target=`echo $@ | sed s/-recursive//`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -25799,7 +23304,7 @@ $(RECURSIVE_TARGETS):
            local_target="$$target"; \
          fi; \
          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
+          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
        done; \
        if test "$$dot_seen" = "no"; then \
          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -25807,13 +23312,7 @@ $(RECURSIVE_TARGETS):
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-       @failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
+       @set fnord $$MAKEFLAGS; amf=$$2; \
        dot_seen=no; \
        case "$@" in \
          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -25834,7 +23333,7 @@ maintainer-clean-recursive:
            local_target="$$target"; \
          fi; \
          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
+          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
        done && test -z "$$fail"
 tags-recursive:
        list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -26109,12 +23608,6 @@ distclean-generic:
        -rm -f gnu/java/awt/peer/$(am__dirstamp)
        -rm -f gnu/java/awt/peer/gtk/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/java/awt/peer/gtk/$(am__dirstamp)
-       -rm -f gnu/java/beans/$(DEPDIR)/$(am__dirstamp)
-       -rm -f gnu/java/beans/$(am__dirstamp)
-       -rm -f gnu/java/beans/decoder/$(DEPDIR)/$(am__dirstamp)
-       -rm -f gnu/java/beans/decoder/$(am__dirstamp)
-       -rm -f gnu/java/beans/editors/$(DEPDIR)/$(am__dirstamp)
-       -rm -f gnu/java/beans/editors/$(am__dirstamp)
        -rm -f gnu/java/io/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/java/io/$(am__dirstamp)
        -rm -f gnu/java/lang/$(DEPDIR)/$(am__dirstamp)
@@ -26183,20 +23676,6 @@ distclean-generic:
        -rm -f gnu/java/util/prefs/$(am__dirstamp)
        -rm -f gnu/regexp/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/regexp/$(am__dirstamp)
-       -rm -f gnu/xml/aelfred2/$(DEPDIR)/$(am__dirstamp)
-       -rm -f gnu/xml/aelfred2/$(am__dirstamp)
-       -rm -f gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-       -rm -f gnu/xml/dom/$(am__dirstamp)
-       -rm -f gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
-       -rm -f gnu/xml/dom/ls/$(am__dirstamp)
-       -rm -f gnu/xml/pipeline/$(DEPDIR)/$(am__dirstamp)
-       -rm -f gnu/xml/pipeline/$(am__dirstamp)
-       -rm -f gnu/xml/transform/$(DEPDIR)/$(am__dirstamp)
-       -rm -f gnu/xml/transform/$(am__dirstamp)
-       -rm -f gnu/xml/util/$(DEPDIR)/$(am__dirstamp)
-       -rm -f gnu/xml/util/$(am__dirstamp)
-       -rm -f gnu/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-       -rm -f gnu/xml/xpath/$(am__dirstamp)
        -rm -f java/applet/$(DEPDIR)/$(am__dirstamp)
        -rm -f java/applet/$(am__dirstamp)
        -rm -f java/awt/$(DEPDIR)/$(am__dirstamp)
@@ -26297,16 +23776,6 @@ distclean-generic:
        -rm -f javax/crypto/interfaces/$(am__dirstamp)
        -rm -f javax/crypto/spec/$(DEPDIR)/$(am__dirstamp)
        -rm -f javax/crypto/spec/$(am__dirstamp)
-       -rm -f javax/imageio/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/imageio/$(am__dirstamp)
-       -rm -f javax/imageio/event/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/imageio/event/$(am__dirstamp)
-       -rm -f javax/imageio/metadata/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/imageio/metadata/$(am__dirstamp)
-       -rm -f javax/imageio/spi/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/imageio/spi/$(am__dirstamp)
-       -rm -f javax/imageio/stream/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/imageio/stream/$(am__dirstamp)
        -rm -f javax/naming/$(DEPDIR)/$(am__dirstamp)
        -rm -f javax/naming/$(am__dirstamp)
        -rm -f javax/naming/directory/$(DEPDIR)/$(am__dirstamp)
@@ -26377,26 +23846,6 @@ distclean-generic:
        -rm -f javax/transaction/$(am__dirstamp)
        -rm -f javax/transaction/xa/$(DEPDIR)/$(am__dirstamp)
        -rm -f javax/transaction/xa/$(am__dirstamp)
-       -rm -f javax/xml/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/xml/$(am__dirstamp)
-       -rm -f javax/xml/datatype/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/xml/datatype/$(am__dirstamp)
-       -rm -f javax/xml/namespace/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/xml/namespace/$(am__dirstamp)
-       -rm -f javax/xml/parsers/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/xml/parsers/$(am__dirstamp)
-       -rm -f javax/xml/transform/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/xml/transform/$(am__dirstamp)
-       -rm -f javax/xml/transform/dom/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/xml/transform/dom/$(am__dirstamp)
-       -rm -f javax/xml/transform/sax/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/xml/transform/sax/$(am__dirstamp)
-       -rm -f javax/xml/transform/stream/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/xml/transform/stream/$(am__dirstamp)
-       -rm -f javax/xml/validation/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/xml/validation/$(am__dirstamp)
-       -rm -f javax/xml/xpath/$(DEPDIR)/$(am__dirstamp)
-       -rm -f javax/xml/xpath/$(am__dirstamp)
        -rm -f jni/classpath/$(DEPDIR)/$(am__dirstamp)
        -rm -f jni/classpath/$(am__dirstamp)
        -rm -f jni/gtk-peer/$(DEPDIR)/$(am__dirstamp)
@@ -26417,7 +23866,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
 
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf ./$(DEPDIR) gnu/awt/$(DEPDIR) gnu/awt/j2d/$(DEPDIR) gnu/awt/xlib/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/awt/$(DEPDIR) gnu/java/awt/color/$(DEPDIR) gnu/java/awt/image/$(DEPDIR) gnu/java/awt/peer/$(DEPDIR) gnu/java/awt/peer/gtk/$(DEPDIR) gnu/java/beans/$(DEPDIR) gnu/java/beans/decoder/$(DEPDIR) gnu/java/beans/editors/$(DEPDIR) gnu/java/io/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/reflect/$(DEPDIR) gnu/java/locale/$(DEPDIR) gnu/java/math/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/net/protocol/file/$(DEPDIR) gnu/java/net/protocol/ftp/$(DEPDIR) gnu/java/net/protocol/gcjlib/$(DEPDIR) gnu/java/net/protocol/http/$(DEPDIR) gnu/java/net/protocol/http/event/$(DEPDIR) gnu/java/net/protocol/jar/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) gnu/java/nio/charset/$(DEPDIR) gnu/java/rmi/$(DEPDIR) gnu/java/rmi/dgc/$(DEPDIR) gnu/java/rmi/registry/$(DEPDIR) gnu/java/rmi/rmic/$(DEPDIR) gnu/java/rmi/server/$(DEPDIR) gnu/java/security/$(DEPDIR) gnu/java/security/action/$(DEPDIR) gnu/java/security/ber/$(DEPDIR) gnu/java/security/der/$(DEPDIR) gnu/java/security/pkcs/$(DEPDIR) gnu/java/security/provider/$(DEPDIR) gnu/java/security/util/$(DEPDIR) gnu/java/security/x509/$(DEPDIR) gnu/java/security/x509/ext/$(DEPDIR) gnu/java/text/$(DEPDIR) gnu/java/util/$(DEPDIR) gnu/java/util/prefs/$(DEPDIR) gnu/regexp/$(DEPDIR) gnu/xml/aelfred2/$(DEPDIR) gnu/xml/dom/$(DEPDIR) gnu/xml/dom/ls/$(DEPDIR) gnu/xml/pipeline/$(DEPDIR) gnu/xml/transform/$(DEPDIR) gnu/xml/util/$(DEPDIR) gnu/xml/xpath/$(DEPDIR) java/applet/$(DEPDIR) java/awt/$(DEPDIR) java/awt/color/$(DEPDIR) java/awt/datatransfer/$(DEPDIR) java/awt/dnd/$(DEPDIR) java/awt/dnd/peer/$(DEPDIR) java/awt/event/$(DEPDIR) java/awt/font/$(DEPDIR) java/awt/geom/$(DEPDIR) java/awt/im/$(DEPDIR) java/awt/im/spi/$(DEPDIR) java/awt/image/$(DEPDIR) java/awt/image/renderable/$(DEPDIR) java/awt/peer/$(DEPDIR) java/awt/print/$(DEPDIR) java/beans/$(DEPDIR) java/beans/beancontext/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/math/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/nio/channels/spi/$(DEPDIR) java/nio/charset/$(DEPDIR) java/nio/charset/spi/$(DEPDIR) java/rmi/$(DEPDIR) java/rmi/activation/$(DEPDIR) java/rmi/dgc/$(DEPDIR) java/rmi/registry/$(DEPDIR) java/rmi/server/$(DEPDIR) java/security/$(DEPDIR) java/security/acl/$(DEPDIR) java/security/cert/$(DEPDIR) java/security/interfaces/$(DEPDIR) java/security/spec/$(DEPDIR) java/sql/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/jar/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/prefs/$(DEPDIR) java/util/regex/$(DEPDIR) java/util/zip/$(DEPDIR) javax/accessibility/$(DEPDIR) javax/crypto/$(DEPDIR) javax/crypto/interfaces/$(DEPDIR) javax/crypto/spec/$(DEPDIR) javax/imageio/$(DEPDIR) javax/imageio/event/$(DEPDIR) javax/imageio/metadata/$(DEPDIR) javax/imageio/spi/$(DEPDIR) javax/imageio/stream/$(DEPDIR) javax/naming/$(DEPDIR) javax/naming/directory/$(DEPDIR) javax/naming/event/$(DEPDIR) javax/naming/ldap/$(DEPDIR) javax/naming/spi/$(DEPDIR) javax/net/$(DEPDIR) javax/net/ssl/$(DEPDIR) javax/print/$(DEPDIR) javax/print/attribute/$(DEPDIR) javax/print/attribute/standard/$(DEPDIR) javax/print/event/$(DEPDIR) javax/security/auth/$(DEPDIR) javax/security/auth/callback/$(DEPDIR) javax/security/auth/login/$(DEPDIR) javax/security/auth/spi/$(DEPDIR) javax/security/auth/x500/$(DEPDIR) javax/security/cert/$(DEPDIR) javax/security/sasl/$(DEPDIR) javax/sql/$(DEPDIR) javax/swing/$(DEPDIR) javax/swing/border/$(DEPDIR) javax/swing/colorchooser/$(DEPDIR) javax/swing/event/$(DEPDIR) javax/swing/filechooser/$(DEPDIR) javax/swing/plaf/$(DEPDIR) javax/swing/plaf/basic/$(DEPDIR) javax/swing/plaf/metal/$(DEPDIR) javax/swing/table/$(DEPDIR) javax/swing/text/$(DEPDIR) javax/swing/text/html/$(DEPDIR) javax/swing/text/html/parser/$(DEPDIR) javax/swing/tree/$(DEPDIR) javax/swing/undo/$(DEPDIR) javax/transaction/$(DEPDIR) javax/transaction/xa/$(DEPDIR) javax/xml/$(DEPDIR) javax/xml/datatype/$(DEPDIR) javax/xml/namespace/$(DEPDIR) javax/xml/parsers/$(DEPDIR) javax/xml/transform/$(DEPDIR) javax/xml/transform/dom/$(DEPDIR) javax/xml/transform/sax/$(DEPDIR) javax/xml/transform/stream/$(DEPDIR) javax/xml/validation/$(DEPDIR) javax/xml/xpath/$(DEPDIR) jni/classpath/$(DEPDIR) jni/gtk-peer/$(DEPDIR) org/ietf/jgss/$(DEPDIR) sysdep/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) gnu/awt/$(DEPDIR) gnu/awt/j2d/$(DEPDIR) gnu/awt/xlib/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/awt/$(DEPDIR) gnu/java/awt/color/$(DEPDIR) gnu/java/awt/image/$(DEPDIR) gnu/java/awt/peer/$(DEPDIR) gnu/java/awt/peer/gtk/$(DEPDIR) gnu/java/io/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/reflect/$(DEPDIR) gnu/java/locale/$(DEPDIR) gnu/java/math/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/net/protocol/file/$(DEPDIR) gnu/java/net/protocol/ftp/$(DEPDIR) gnu/java/net/protocol/gcjlib/$(DEPDIR) gnu/java/net/protocol/http/$(DEPDIR) gnu/java/net/protocol/http/event/$(DEPDIR) gnu/java/net/protocol/jar/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) gnu/java/nio/charset/$(DEPDIR) gnu/java/rmi/$(DEPDIR) gnu/java/rmi/dgc/$(DEPDIR) gnu/java/rmi/registry/$(DEPDIR) gnu/java/rmi/rmic/$(DEPDIR) gnu/java/rmi/server/$(DEPDIR) gnu/java/security/$(DEPDIR) gnu/java/security/action/$(DEPDIR) gnu/java/security/ber/$(DEPDIR) gnu/java/security/der/$(DEPDIR) gnu/java/security/pkcs/$(DEPDIR) gnu/java/security/provider/$(DEPDIR) gnu/java/security/util/$(DEPDIR) gnu/java/security/x509/$(DEPDIR) gnu/java/security/x509/ext/$(DEPDIR) gnu/java/text/$(DEPDIR) gnu/java/util/$(DEPDIR) gnu/java/util/prefs/$(DEPDIR) gnu/regexp/$(DEPDIR) java/applet/$(DEPDIR) java/awt/$(DEPDIR) java/awt/color/$(DEPDIR) java/awt/datatransfer/$(DEPDIR) java/awt/dnd/$(DEPDIR) java/awt/dnd/peer/$(DEPDIR) java/awt/event/$(DEPDIR) java/awt/font/$(DEPDIR) java/awt/geom/$(DEPDIR) java/awt/im/$(DEPDIR) java/awt/im/spi/$(DEPDIR) java/awt/image/$(DEPDIR) java/awt/image/renderable/$(DEPDIR) java/awt/peer/$(DEPDIR) java/awt/print/$(DEPDIR) java/beans/$(DEPDIR) java/beans/beancontext/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/math/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/nio/channels/spi/$(DEPDIR) java/nio/charset/$(DEPDIR) java/nio/charset/spi/$(DEPDIR) java/rmi/$(DEPDIR) java/rmi/activation/$(DEPDIR) java/rmi/dgc/$(DEPDIR) java/rmi/registry/$(DEPDIR) java/rmi/server/$(DEPDIR) java/security/$(DEPDIR) java/security/acl/$(DEPDIR) java/security/cert/$(DEPDIR) java/security/interfaces/$(DEPDIR) java/security/spec/$(DEPDIR) java/sql/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/jar/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/prefs/$(DEPDIR) java/util/regex/$(DEPDIR) java/util/zip/$(DEPDIR) javax/accessibility/$(DEPDIR) javax/crypto/$(DEPDIR) javax/crypto/interfaces/$(DEPDIR) javax/crypto/spec/$(DEPDIR) javax/naming/$(DEPDIR) javax/naming/directory/$(DEPDIR) javax/naming/event/$(DEPDIR) javax/naming/ldap/$(DEPDIR) javax/naming/spi/$(DEPDIR) javax/net/$(DEPDIR) javax/net/ssl/$(DEPDIR) javax/print/$(DEPDIR) javax/print/attribute/$(DEPDIR) javax/print/attribute/standard/$(DEPDIR) javax/print/event/$(DEPDIR) javax/security/auth/$(DEPDIR) javax/security/auth/callback/$(DEPDIR) javax/security/auth/login/$(DEPDIR) javax/security/auth/spi/$(DEPDIR) javax/security/auth/x500/$(DEPDIR) javax/security/cert/$(DEPDIR) javax/security/sasl/$(DEPDIR) javax/sql/$(DEPDIR) javax/swing/$(DEPDIR) javax/swing/border/$(DEPDIR) javax/swing/colorchooser/$(DEPDIR) javax/swing/event/$(DEPDIR) javax/swing/filechooser/$(DEPDIR) javax/swing/plaf/$(DEPDIR) javax/swing/plaf/basic/$(DEPDIR) javax/swing/plaf/metal/$(DEPDIR) javax/swing/table/$(DEPDIR) javax/swing/text/$(DEPDIR) javax/swing/text/html/$(DEPDIR) javax/swing/text/html/parser/$(DEPDIR) javax/swing/tree/$(DEPDIR) javax/swing/undo/$(DEPDIR) javax/transaction/$(DEPDIR) javax/transaction/xa/$(DEPDIR) jni/classpath/$(DEPDIR) jni/gtk-peer/$(DEPDIR) org/ietf/jgss/$(DEPDIR) sysdep/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-libtool distclean-local distclean-tags
@@ -26448,7 +23897,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
-       -rm -rf ./$(DEPDIR) gnu/awt/$(DEPDIR) gnu/awt/j2d/$(DEPDIR) gnu/awt/xlib/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/awt/$(DEPDIR) gnu/java/awt/color/$(DEPDIR) gnu/java/awt/image/$(DEPDIR) gnu/java/awt/peer/$(DEPDIR) gnu/java/awt/peer/gtk/$(DEPDIR) gnu/java/beans/$(DEPDIR) gnu/java/beans/decoder/$(DEPDIR) gnu/java/beans/editors/$(DEPDIR) gnu/java/io/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/reflect/$(DEPDIR) gnu/java/locale/$(DEPDIR) gnu/java/math/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/net/protocol/file/$(DEPDIR) gnu/java/net/protocol/ftp/$(DEPDIR) gnu/java/net/protocol/gcjlib/$(DEPDIR) gnu/java/net/protocol/http/$(DEPDIR) gnu/java/net/protocol/http/event/$(DEPDIR) gnu/java/net/protocol/jar/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) gnu/java/nio/charset/$(DEPDIR) gnu/java/rmi/$(DEPDIR) gnu/java/rmi/dgc/$(DEPDIR) gnu/java/rmi/registry/$(DEPDIR) gnu/java/rmi/rmic/$(DEPDIR) gnu/java/rmi/server/$(DEPDIR) gnu/java/security/$(DEPDIR) gnu/java/security/action/$(DEPDIR) gnu/java/security/ber/$(DEPDIR) gnu/java/security/der/$(DEPDIR) gnu/java/security/pkcs/$(DEPDIR) gnu/java/security/provider/$(DEPDIR) gnu/java/security/util/$(DEPDIR) gnu/java/security/x509/$(DEPDIR) gnu/java/security/x509/ext/$(DEPDIR) gnu/java/text/$(DEPDIR) gnu/java/util/$(DEPDIR) gnu/java/util/prefs/$(DEPDIR) gnu/regexp/$(DEPDIR) gnu/xml/aelfred2/$(DEPDIR) gnu/xml/dom/$(DEPDIR) gnu/xml/dom/ls/$(DEPDIR) gnu/xml/pipeline/$(DEPDIR) gnu/xml/transform/$(DEPDIR) gnu/xml/util/$(DEPDIR) gnu/xml/xpath/$(DEPDIR) java/applet/$(DEPDIR) java/awt/$(DEPDIR) java/awt/color/$(DEPDIR) java/awt/datatransfer/$(DEPDIR) java/awt/dnd/$(DEPDIR) java/awt/dnd/peer/$(DEPDIR) java/awt/event/$(DEPDIR) java/awt/font/$(DEPDIR) java/awt/geom/$(DEPDIR) java/awt/im/$(DEPDIR) java/awt/im/spi/$(DEPDIR) java/awt/image/$(DEPDIR) java/awt/image/renderable/$(DEPDIR) java/awt/peer/$(DEPDIR) java/awt/print/$(DEPDIR) java/beans/$(DEPDIR) java/beans/beancontext/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/math/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/nio/channels/spi/$(DEPDIR) java/nio/charset/$(DEPDIR) java/nio/charset/spi/$(DEPDIR) java/rmi/$(DEPDIR) java/rmi/activation/$(DEPDIR) java/rmi/dgc/$(DEPDIR) java/rmi/registry/$(DEPDIR) java/rmi/server/$(DEPDIR) java/security/$(DEPDIR) java/security/acl/$(DEPDIR) java/security/cert/$(DEPDIR) java/security/interfaces/$(DEPDIR) java/security/spec/$(DEPDIR) java/sql/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/jar/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/prefs/$(DEPDIR) java/util/regex/$(DEPDIR) java/util/zip/$(DEPDIR) javax/accessibility/$(DEPDIR) javax/crypto/$(DEPDIR) javax/crypto/interfaces/$(DEPDIR) javax/crypto/spec/$(DEPDIR) javax/imageio/$(DEPDIR) javax/imageio/event/$(DEPDIR) javax/imageio/metadata/$(DEPDIR) javax/imageio/spi/$(DEPDIR) javax/imageio/stream/$(DEPDIR) javax/naming/$(DEPDIR) javax/naming/directory/$(DEPDIR) javax/naming/event/$(DEPDIR) javax/naming/ldap/$(DEPDIR) javax/naming/spi/$(DEPDIR) javax/net/$(DEPDIR) javax/net/ssl/$(DEPDIR) javax/print/$(DEPDIR) javax/print/attribute/$(DEPDIR) javax/print/attribute/standard/$(DEPDIR) javax/print/event/$(DEPDIR) javax/security/auth/$(DEPDIR) javax/security/auth/callback/$(DEPDIR) javax/security/auth/login/$(DEPDIR) javax/security/auth/spi/$(DEPDIR) javax/security/auth/x500/$(DEPDIR) javax/security/cert/$(DEPDIR) javax/security/sasl/$(DEPDIR) javax/sql/$(DEPDIR) javax/swing/$(DEPDIR) javax/swing/border/$(DEPDIR) javax/swing/colorchooser/$(DEPDIR) javax/swing/event/$(DEPDIR) javax/swing/filechooser/$(DEPDIR) javax/swing/plaf/$(DEPDIR) javax/swing/plaf/basic/$(DEPDIR) javax/swing/plaf/metal/$(DEPDIR) javax/swing/table/$(DEPDIR) javax/swing/text/$(DEPDIR) javax/swing/text/html/$(DEPDIR) javax/swing/text/html/parser/$(DEPDIR) javax/swing/tree/$(DEPDIR) javax/swing/undo/$(DEPDIR) javax/transaction/$(DEPDIR) javax/transaction/xa/$(DEPDIR) javax/xml/$(DEPDIR) javax/xml/datatype/$(DEPDIR) javax/xml/namespace/$(DEPDIR) javax/xml/parsers/$(DEPDIR) javax/xml/transform/$(DEPDIR) javax/xml/transform/dom/$(DEPDIR) javax/xml/transform/sax/$(DEPDIR) javax/xml/transform/stream/$(DEPDIR) javax/xml/validation/$(DEPDIR) javax/xml/xpath/$(DEPDIR) jni/classpath/$(DEPDIR) jni/gtk-peer/$(DEPDIR) org/ietf/jgss/$(DEPDIR) sysdep/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) gnu/awt/$(DEPDIR) gnu/awt/j2d/$(DEPDIR) gnu/awt/xlib/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/awt/$(DEPDIR) gnu/java/awt/color/$(DEPDIR) gnu/java/awt/image/$(DEPDIR) gnu/java/awt/peer/$(DEPDIR) gnu/java/awt/peer/gtk/$(DEPDIR) gnu/java/io/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/reflect/$(DEPDIR) gnu/java/locale/$(DEPDIR) gnu/java/math/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/net/protocol/file/$(DEPDIR) gnu/java/net/protocol/ftp/$(DEPDIR) gnu/java/net/protocol/gcjlib/$(DEPDIR) gnu/java/net/protocol/http/$(DEPDIR) gnu/java/net/protocol/http/event/$(DEPDIR) gnu/java/net/protocol/jar/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) gnu/java/nio/charset/$(DEPDIR) gnu/java/rmi/$(DEPDIR) gnu/java/rmi/dgc/$(DEPDIR) gnu/java/rmi/registry/$(DEPDIR) gnu/java/rmi/rmic/$(DEPDIR) gnu/java/rmi/server/$(DEPDIR) gnu/java/security/$(DEPDIR) gnu/java/security/action/$(DEPDIR) gnu/java/security/ber/$(DEPDIR) gnu/java/security/der/$(DEPDIR) gnu/java/security/pkcs/$(DEPDIR) gnu/java/security/provider/$(DEPDIR) gnu/java/security/util/$(DEPDIR) gnu/java/security/x509/$(DEPDIR) gnu/java/security/x509/ext/$(DEPDIR) gnu/java/text/$(DEPDIR) gnu/java/util/$(DEPDIR) gnu/java/util/prefs/$(DEPDIR) gnu/regexp/$(DEPDIR) java/applet/$(DEPDIR) java/awt/$(DEPDIR) java/awt/color/$(DEPDIR) java/awt/datatransfer/$(DEPDIR) java/awt/dnd/$(DEPDIR) java/awt/dnd/peer/$(DEPDIR) java/awt/event/$(DEPDIR) java/awt/font/$(DEPDIR) java/awt/geom/$(DEPDIR) java/awt/im/$(DEPDIR) java/awt/im/spi/$(DEPDIR) java/awt/image/$(DEPDIR) java/awt/image/renderable/$(DEPDIR) java/awt/peer/$(DEPDIR) java/awt/print/$(DEPDIR) java/beans/$(DEPDIR) java/beans/beancontext/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/math/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/nio/channels/spi/$(DEPDIR) java/nio/charset/$(DEPDIR) java/nio/charset/spi/$(DEPDIR) java/rmi/$(DEPDIR) java/rmi/activation/$(DEPDIR) java/rmi/dgc/$(DEPDIR) java/rmi/registry/$(DEPDIR) java/rmi/server/$(DEPDIR) java/security/$(DEPDIR) java/security/acl/$(DEPDIR) java/security/cert/$(DEPDIR) java/security/interfaces/$(DEPDIR) java/security/spec/$(DEPDIR) java/sql/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/jar/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/prefs/$(DEPDIR) java/util/regex/$(DEPDIR) java/util/zip/$(DEPDIR) javax/accessibility/$(DEPDIR) javax/crypto/$(DEPDIR) javax/crypto/interfaces/$(DEPDIR) javax/crypto/spec/$(DEPDIR) javax/naming/$(DEPDIR) javax/naming/directory/$(DEPDIR) javax/naming/event/$(DEPDIR) javax/naming/ldap/$(DEPDIR) javax/naming/spi/$(DEPDIR) javax/net/$(DEPDIR) javax/net/ssl/$(DEPDIR) javax/print/$(DEPDIR) javax/print/attribute/$(DEPDIR) javax/print/attribute/standard/$(DEPDIR) javax/print/event/$(DEPDIR) javax/security/auth/$(DEPDIR) javax/security/auth/callback/$(DEPDIR) javax/security/auth/login/$(DEPDIR) javax/security/auth/spi/$(DEPDIR) javax/security/auth/x500/$(DEPDIR) javax/security/cert/$(DEPDIR) javax/security/sasl/$(DEPDIR) javax/sql/$(DEPDIR) javax/swing/$(DEPDIR) javax/swing/border/$(DEPDIR) javax/swing/colorchooser/$(DEPDIR) javax/swing/event/$(DEPDIR) javax/swing/filechooser/$(DEPDIR) javax/swing/plaf/$(DEPDIR) javax/swing/plaf/basic/$(DEPDIR) javax/swing/plaf/metal/$(DEPDIR) javax/swing/table/$(DEPDIR) javax/swing/text/$(DEPDIR) javax/swing/text/html/$(DEPDIR) javax/swing/text/html/parser/$(DEPDIR) javax/swing/tree/$(DEPDIR) javax/swing/undo/$(DEPDIR) javax/transaction/$(DEPDIR) javax/transaction/xa/$(DEPDIR) jni/classpath/$(DEPDIR) jni/gtk-peer/$(DEPDIR) org/ietf/jgss/$(DEPDIR) sysdep/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -26648,7 +24097,7 @@ clean-nat:
 $(javao_files) $(xlib_javao_files): %.lo: %.java
        $(LTGCJCOMPILE) -o $@ -c $<
 
-$(gtk_awt_peer_sources:.java=.lo) $(gnu_xml_source_files:.java=.lo): %.lo: %.java
+$(gtk_awt_peer_sources:.java=.lo): %.lo: %.java
        $(LTGCJCOMPILE) -fjni -o $@ -c $<
 
 libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
@@ -26664,6 +24113,26 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND
        $(lib_gnu_awt_xlib_la_LINK) -objectlist lib_gnu_awt_xlib.objectlist \
        -rpath $(toolexeclibdir) $(lib_gnu_awt_xlib_la_LDFLAGS) $(LIBS)
 
+gnu-xml.lo: $(gnu_xml_source_files)
+       $(MAKE) classes.stamp
+       $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-xml.lo \
+               `find gnu/xml -name '*.class' -print`
+
+javax-imageio.lo: $(javax_imageio_source_files)
+       $(MAKE) classes.stamp
+       $(LTGCJCOMPILE) -findirect-dispatch -c -o javax-imageio.lo \
+               `find javax/imageio -name '*.class' -print`
+
+javax-xml.lo: $(javax_xml_source_files)
+       $(MAKE) classes.stamp
+       $(LTGCJCOMPILE) -findirect-dispatch -c -o javax-xml.lo \
+               `find javax/xml -name '*.class' -print`
+
+gnu-java-beans.lo: $(gnu_java_beans_source_files)
+       $(MAKE) classes.stamp
+       $(LTGCJCOMPILE) -findirect-dispatch -c -o gnu-java-beans.lo \
+               `find gnu/java/beans -name '*.class' -print`
+
 %.h: %.class
        $(GCJH) -classpath '' -bootclasspath $(top_builddir) $(basename $<)
 
index 286f26a..32840e5 100644 (file)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.3 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+#                                                        -*- Autoconf -*-
+# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Generated from amversion.in; do not edit by hand.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
@@ -28,15 +40,26 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-        [AM_AUTOMAKE_VERSION([1.9.5])])
+        [AM_AUTOMAKE_VERSION([1.9.3])])
 
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+# AM_AUX_DIR_EXPAND
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
@@ -83,16 +106,26 @@ AC_PREREQ([2.50])dnl
 am_aux_dir=`cd $ac_aux_dir && pwd`
 ])
 
-# AM_CONDITIONAL                                            -*- Autoconf -*-
+# AM_CONDITIONAL                                              -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
 
-# serial 7
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 6
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -116,15 +149,26 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
+# serial 7                                             -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -133,6 +177,7 @@ fi])])
 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 
 
+
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
@@ -272,16 +317,27 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])
 ])
 
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
+# Generate code to set up dependency tracking.   -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+#   Free Software Foundation, Inc.
 
-#serial 3
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+#serial 2
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
@@ -340,14 +396,25 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Check for Java compiler.                                  -*- Autoconf -*-
+# Check for Java compiler.
 # For now we only handle the GNU compiler.
 
-# Copyright (C) 1999, 2000, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
 
 AC_DEFUN([AM_PROG_GCJ],[
 AC_CHECK_PROGS(GCJ, gcj, gcj)
@@ -359,19 +426,30 @@ AC_SUBST(GCJFLAGS)
 _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(GCJ)])
 ])
 
-# Do all the work for Automake.                             -*- Autoconf -*-
+# Do all the work for Automake.                            -*- Autoconf -*-
+
+# This macro actually does too much some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
 
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 11
 
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
@@ -473,27 +551,51 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
+
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+#                                                          -*- Autoconf -*-
+# Copyright (C) 2003  Free Software Foundation, Inc.
 
-# serial 2
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
 
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
@@ -508,17 +610,28 @@ fi
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
 
 AC_DEFUN([AM_MAINTAINER_MODE],
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
@@ -537,15 +650,26 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 
 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
-# Check to see how 'make' treats includes.                 -*- Autoconf -*-
+# Check to see how 'make' treats includes.     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
 
-# serial 3
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -589,17 +713,29 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
+# serial 2
 
 # AM_PROG_CC_C_O
 # --------------
 # Like AC_PROG_CC_C_O, but changed for automake.
+
+# Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
 AC_DEFUN([AM_PROG_CC_C_O],
 [AC_REQUIRE([AC_PROG_CC_C_O])dnl
 AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
@@ -617,16 +753,27 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
 fi
 ])
 
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+#  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -652,16 +799,27 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 # AM_PROG_MKDIR_P
 # ---------------
 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
+
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 # created by `make install' are always world readable, even if the
 # installer happens to have an overly restrictive umask (e.g. 077).
@@ -715,15 +873,26 @@ else
 fi
 AC_SUBST([mkdir_p])])
 
-# Helper functions for option handling.                     -*- Autoconf -*-
+# Helper functions for option handling.                    -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
 
-# serial 3
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -748,16 +917,28 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
 #
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Check to make sure that the build environment is sane.
+#
 
-# serial 4
+# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
 
 # AM_SANITY_CHECK
 # ---------------
@@ -800,14 +981,25 @@ Check your system clock])
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 # AM_PROG_INSTALL_STRIP
-# ---------------------
+
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
@@ -830,13 +1022,25 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2004  Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
 
-# serial 2
 
 # _AM_PROG_TAR(FORMAT)
 # --------------------
index 57f7c07..86248b2 100644 (file)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -382,13 +382,7 @@ uninstall-info-am:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-       @failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
+       @set fnord $$MAKEFLAGS; amf=$$2; \
        dot_seen=no; \
        target=`echo $@ | sed s/-recursive//`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -400,7 +394,7 @@ $(RECURSIVE_TARGETS):
            local_target="$$target"; \
          fi; \
          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
+          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
        done; \
        if test "$$dot_seen" = "no"; then \
          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -408,13 +402,7 @@ $(RECURSIVE_TARGETS):
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-       @failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
+       @set fnord $$MAKEFLAGS; amf=$$2; \
        dot_seen=no; \
        case "$@" in \
          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -435,7 +423,7 @@ maintainer-clean-recursive:
            local_target="$$target"; \
          fi; \
          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
+          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
        done && test -z "$$fail"
 tags-recursive:
        list='$(SUBDIRS)'; for subdir in $$list; do \
index 41760e5..d4bdf59 100644 (file)
@@ -5,6 +5,9 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 # May be used by various substitution variables.
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 
+## Needed because $(ZIP) is a relative path.
+MULTIBUILDTOP = ../../
+
 ## The compiler with whatever flags we want for both -c and -C
 ## compiles.
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
@@ -20,18 +23,24 @@ AM_GCJFLAGS = \
 
 BUILT_SOURCES = classes.stamp
 
-classes.stamp: $(libsax_convenience_la_SOURCES)
+sax.jar: classes.stamp
+       find org -name '*.class' -print | $(ZIP) -cfME@ $@
+
+classes.stamp: $(source_files)
        here=`pwd`; cd $(srcdir); \
-       $(GCJ_WITH_FLAGS) -C -d $$here $(libsax_convenience_la_SOURCES)
+       $(GCJ_WITH_FLAGS) -C -d $$here $(source_files)
        echo > classes.stamp
 
 mostlyclean-local:
        -find . -name '*.class' | xargs rm
-       -rm classes.stamp
+       -rm classes.stamp sax.jar
+
+toolexeclib_LTLIBRARIES = libsax-gcj.la
 
-noinst_LTLIBRARIES = libsax_convenience.la
+libsax_gcj_la_SOURCES =        sax.jar
+libsax_gcj_la_GCJFLAGS = -findirect-dispatch
 
-libsax_convenience_la_SOURCES =        \
+source_files = \
 org/xml/sax/SAXNotSupportedException.java \
 org/xml/sax/helpers/NamespaceSupport.java \
 org/xml/sax/helpers/AttributesImpl.java        \
index 88bac22..6ca3c62 100644 (file)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-SOURCES = $(libsax_convenience_la_SOURCES)
+SOURCES = $(libsax_gcj_la_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -58,38 +58,18 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 CONFIG_HEADER = $(top_builddir)/include/config.h \
        $(top_builddir)/gcj/libgcj-config.h
 CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libsax_convenience_la_LIBADD =
-am__dirstamp = $(am__leading_dot)dirstamp
-am_libsax_convenience_la_OBJECTS =  \
-       org/xml/sax/SAXNotSupportedException.lo \
-       org/xml/sax/helpers/NamespaceSupport.lo \
-       org/xml/sax/helpers/AttributesImpl.lo \
-       org/xml/sax/helpers/LocatorImpl.lo \
-       org/xml/sax/helpers/DefaultHandler.lo \
-       org/xml/sax/helpers/AttributeListImpl.lo \
-       org/xml/sax/helpers/ParserFactory.lo \
-       org/xml/sax/helpers/NewInstance.lo \
-       org/xml/sax/helpers/XMLFilterImpl.lo \
-       org/xml/sax/helpers/ParserAdapter.lo \
-       org/xml/sax/helpers/XMLReaderAdapter.lo \
-       org/xml/sax/helpers/XMLReaderFactory.lo \
-       org/xml/sax/HandlerBase.lo org/xml/sax/SAXException.lo \
-       org/xml/sax/ContentHandler.lo \
-       org/xml/sax/SAXNotRecognizedException.lo \
-       org/xml/sax/ErrorHandler.lo org/xml/sax/AttributeList.lo \
-       org/xml/sax/Locator.lo org/xml/sax/Attributes.lo \
-       org/xml/sax/SAXParseException.lo org/xml/sax/XMLFilter.lo \
-       org/xml/sax/EntityResolver.lo org/xml/sax/XMLReader.lo \
-       org/xml/sax/ext/Locator2.lo org/xml/sax/ext/LexicalHandler.lo \
-       org/xml/sax/ext/Attributes2Impl.lo \
-       org/xml/sax/ext/DeclHandler.lo org/xml/sax/ext/Attributes2.lo \
-       org/xml/sax/ext/EntityResolver2.lo \
-       org/xml/sax/ext/Locator2Impl.lo \
-       org/xml/sax/ext/DefaultHandler2.lo org/xml/sax/InputSource.lo \
-       org/xml/sax/DocumentHandler.lo org/xml/sax/DTDHandler.lo \
-       org/xml/sax/Parser.lo
-libsax_convenience_la_OBJECTS = $(am_libsax_convenience_la_OBJECTS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(toolexeclibdir)"
+toolexeclibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
+libsax_gcj_la_LIBADD =
+am_libsax_gcj_la_OBJECTS = libsax_gcj_la-sax.lo
+libsax_gcj_la_OBJECTS = $(am_libsax_gcj_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/gcj
 depcomp = $(SHELL) $(top_srcdir)/../depcomp
 am__depfiles_maybe = depfiles
@@ -99,8 +79,8 @@ LTGCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) $(AM_GCJFLAGS) \
 GCJLD = $(GCJ)
 GCJLINK = $(LIBTOOL) --mode=link $(GCJLD) $(AM_GCJFLAGS) $(GCJFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libsax_convenience_la_SOURCES)
-DIST_SOURCES = $(libsax_convenience_la_SOURCES)
+SOURCES = $(libsax_gcj_la_SOURCES)
+DIST_SOURCES = $(libsax_gcj_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -327,6 +307,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 
 # May be used by various substitution variables.
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+MULTIBUILDTOP = ../../
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
 BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir)
 AM_GCJFLAGS = \
@@ -337,8 +318,10 @@ AM_GCJFLAGS = \
        -Wno-deprecated
 
 BUILT_SOURCES = classes.stamp
-noinst_LTLIBRARIES = libsax_convenience.la
-libsax_convenience_la_SOURCES = \
+toolexeclib_LTLIBRARIES = libsax-gcj.la
+libsax_gcj_la_SOURCES = sax.jar
+libsax_gcj_la_GCJFLAGS = -findirect-dispatch
+source_files = \
 org/xml/sax/SAXNotSupportedException.java \
 org/xml/sax/helpers/NamespaceSupport.java \
 org/xml/sax/helpers/AttributesImpl.java        \
@@ -380,7 +363,7 @@ all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .java .lo .o .obj
+.SUFFIXES: .jar .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
@@ -410,235 +393,45 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+       test -z "$(toolexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexeclibdir)"
+       @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
+           f=$(am__strip_dir) \
+           echo " $(LIBTOOL) --mode=install $(toolexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(toolexeclibdir)/$$f'"; \
+           $(LIBTOOL) --mode=install $(toolexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(toolexeclibdir)/$$f"; \
+         else :; fi; \
+       done
+
+uninstall-toolexeclibLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @set -x; list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
+         p=$(am__strip_dir) \
+         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(toolexeclibdir)/$$p'"; \
+         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(toolexeclibdir)/$$p"; \
+       done
 
-clean-noinstLTLIBRARIES:
-       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-       @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+clean-toolexeclibLTLIBRARIES:
+       -test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES)
+       @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
          test "$$dir" != "$$p" || dir=.; \
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done
-org/xml/sax/$(am__dirstamp):
-       @$(mkdir_p) org/xml/sax
-       @: > org/xml/sax/$(am__dirstamp)
-org/xml/sax/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/xml/sax/$(DEPDIR)
-       @: > org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/SAXNotSupportedException.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/$(am__dirstamp):
-       @$(mkdir_p) org/xml/sax/helpers
-       @: > org/xml/sax/helpers/$(am__dirstamp)
-org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/xml/sax/helpers/$(DEPDIR)
-       @: > org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/NamespaceSupport.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/AttributesImpl.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/LocatorImpl.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/DefaultHandler.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/AttributeListImpl.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/ParserFactory.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/NewInstance.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/XMLFilterImpl.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/ParserAdapter.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/XMLReaderAdapter.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/helpers/XMLReaderFactory.lo:  \
-       org/xml/sax/helpers/$(am__dirstamp) \
-       org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/HandlerBase.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/SAXException.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ContentHandler.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/SAXNotRecognizedException.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ErrorHandler.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/AttributeList.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/Locator.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/Attributes.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/SAXParseException.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/XMLFilter.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/EntityResolver.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/XMLReader.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ext/$(am__dirstamp):
-       @$(mkdir_p) org/xml/sax/ext
-       @: > org/xml/sax/ext/$(am__dirstamp)
-org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/xml/sax/ext/$(DEPDIR)
-       @: > org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ext/Locator2.lo: org/xml/sax/ext/$(am__dirstamp) \
-       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ext/LexicalHandler.lo: org/xml/sax/ext/$(am__dirstamp) \
-       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ext/Attributes2Impl.lo: org/xml/sax/ext/$(am__dirstamp) \
-       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ext/DeclHandler.lo: org/xml/sax/ext/$(am__dirstamp) \
-       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ext/Attributes2.lo: org/xml/sax/ext/$(am__dirstamp) \
-       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ext/EntityResolver2.lo: org/xml/sax/ext/$(am__dirstamp) \
-       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ext/Locator2Impl.lo: org/xml/sax/ext/$(am__dirstamp) \
-       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/ext/DefaultHandler2.lo: org/xml/sax/ext/$(am__dirstamp) \
-       org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/InputSource.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/DocumentHandler.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/DTDHandler.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-org/xml/sax/Parser.lo: org/xml/sax/$(am__dirstamp) \
-       org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-libsax_convenience.la: $(libsax_convenience_la_OBJECTS) $(libsax_convenience_la_DEPENDENCIES) 
-       $(GCJLINK)  $(libsax_convenience_la_LDFLAGS) $(libsax_convenience_la_OBJECTS) $(libsax_convenience_la_LIBADD) $(LIBS)
+libsax-gcj.la: $(libsax_gcj_la_OBJECTS) $(libsax_gcj_la_DEPENDENCIES) 
+       $(GCJLINK) -rpath $(toolexeclibdir) $(libsax_gcj_la_LDFLAGS) $(libsax_gcj_la_OBJECTS) $(libsax_gcj_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f org/xml/sax/AttributeList.$(OBJEXT)
-       -rm -f org/xml/sax/AttributeList.lo
-       -rm -f org/xml/sax/Attributes.$(OBJEXT)
-       -rm -f org/xml/sax/Attributes.lo
-       -rm -f org/xml/sax/ContentHandler.$(OBJEXT)
-       -rm -f org/xml/sax/ContentHandler.lo
-       -rm -f org/xml/sax/DTDHandler.$(OBJEXT)
-       -rm -f org/xml/sax/DTDHandler.lo
-       -rm -f org/xml/sax/DocumentHandler.$(OBJEXT)
-       -rm -f org/xml/sax/DocumentHandler.lo
-       -rm -f org/xml/sax/EntityResolver.$(OBJEXT)
-       -rm -f org/xml/sax/EntityResolver.lo
-       -rm -f org/xml/sax/ErrorHandler.$(OBJEXT)
-       -rm -f org/xml/sax/ErrorHandler.lo
-       -rm -f org/xml/sax/HandlerBase.$(OBJEXT)
-       -rm -f org/xml/sax/HandlerBase.lo
-       -rm -f org/xml/sax/InputSource.$(OBJEXT)
-       -rm -f org/xml/sax/InputSource.lo
-       -rm -f org/xml/sax/Locator.$(OBJEXT)
-       -rm -f org/xml/sax/Locator.lo
-       -rm -f org/xml/sax/Parser.$(OBJEXT)
-       -rm -f org/xml/sax/Parser.lo
-       -rm -f org/xml/sax/SAXException.$(OBJEXT)
-       -rm -f org/xml/sax/SAXException.lo
-       -rm -f org/xml/sax/SAXNotRecognizedException.$(OBJEXT)
-       -rm -f org/xml/sax/SAXNotRecognizedException.lo
-       -rm -f org/xml/sax/SAXNotSupportedException.$(OBJEXT)
-       -rm -f org/xml/sax/SAXNotSupportedException.lo
-       -rm -f org/xml/sax/SAXParseException.$(OBJEXT)
-       -rm -f org/xml/sax/SAXParseException.lo
-       -rm -f org/xml/sax/XMLFilter.$(OBJEXT)
-       -rm -f org/xml/sax/XMLFilter.lo
-       -rm -f org/xml/sax/XMLReader.$(OBJEXT)
-       -rm -f org/xml/sax/XMLReader.lo
-       -rm -f org/xml/sax/ext/Attributes2.$(OBJEXT)
-       -rm -f org/xml/sax/ext/Attributes2.lo
-       -rm -f org/xml/sax/ext/Attributes2Impl.$(OBJEXT)
-       -rm -f org/xml/sax/ext/Attributes2Impl.lo
-       -rm -f org/xml/sax/ext/DeclHandler.$(OBJEXT)
-       -rm -f org/xml/sax/ext/DeclHandler.lo
-       -rm -f org/xml/sax/ext/DefaultHandler2.$(OBJEXT)
-       -rm -f org/xml/sax/ext/DefaultHandler2.lo
-       -rm -f org/xml/sax/ext/EntityResolver2.$(OBJEXT)
-       -rm -f org/xml/sax/ext/EntityResolver2.lo
-       -rm -f org/xml/sax/ext/LexicalHandler.$(OBJEXT)
-       -rm -f org/xml/sax/ext/LexicalHandler.lo
-       -rm -f org/xml/sax/ext/Locator2.$(OBJEXT)
-       -rm -f org/xml/sax/ext/Locator2.lo
-       -rm -f org/xml/sax/ext/Locator2Impl.$(OBJEXT)
-       -rm -f org/xml/sax/ext/Locator2Impl.lo
-       -rm -f org/xml/sax/helpers/AttributeListImpl.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/AttributeListImpl.lo
-       -rm -f org/xml/sax/helpers/AttributesImpl.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/AttributesImpl.lo
-       -rm -f org/xml/sax/helpers/DefaultHandler.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/DefaultHandler.lo
-       -rm -f org/xml/sax/helpers/LocatorImpl.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/LocatorImpl.lo
-       -rm -f org/xml/sax/helpers/NamespaceSupport.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/NamespaceSupport.lo
-       -rm -f org/xml/sax/helpers/NewInstance.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/NewInstance.lo
-       -rm -f org/xml/sax/helpers/ParserAdapter.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/ParserAdapter.lo
-       -rm -f org/xml/sax/helpers/ParserFactory.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/ParserFactory.lo
-       -rm -f org/xml/sax/helpers/XMLFilterImpl.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/XMLFilterImpl.lo
-       -rm -f org/xml/sax/helpers/XMLReaderAdapter.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/XMLReaderAdapter.lo
-       -rm -f org/xml/sax/helpers/XMLReaderFactory.$(OBJEXT)
-       -rm -f org/xml/sax/helpers/XMLReaderFactory.lo
 
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/AttributeList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Attributes.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/ContentHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/DTDHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/DocumentHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/EntityResolver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/ErrorHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/HandlerBase.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/InputSource.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Locator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Parser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXNotRecognizedException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXNotSupportedException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXParseException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/XMLFilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/XMLReader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Attributes2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Attributes2Impl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/DeclHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/DefaultHandler2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/EntityResolver2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/LexicalHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Locator2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Locator2Impl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/AttributeListImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/AttributesImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/DefaultHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/LocatorImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/NamespaceSupport.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/NewInstance.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/ParserAdapter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/ParserFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLFilterImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLReaderAdapter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLReaderFactory.Plo@am__quote@
-
-.java.o:
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsax_gcj_la-sax.Plo@am__quote@
+
+.jar.o:
 @am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
 @am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
 @am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
@@ -646,7 +439,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ $<
 
-.java.obj:
+.jar.obj:
 @am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
 @am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
@@ -654,7 +447,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-.java.lo:
+.jar.lo:
 @am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
 @am__fastdepGCJ_TRUE@  if $(LTGCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
 @am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
@@ -662,14 +455,18 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepGCJ_FALSE@ $(LTGCJCOMPILE) -c -o $@ $<
 
+libsax_gcj_la-sax.lo: sax.jar
+@am__fastdepGCJ_TRUE@  if $(LIBTOOL) --mode=compile $(GCJ) $(libsax_gcj_la_GCJFLAGS) $(GCJFLAGS) -MT libsax_gcj_la-sax.lo -MD -MP -MF "$(DEPDIR)/libsax_gcj_la-sax.Tpo" -c -o libsax_gcj_la-sax.lo `test -f 'sax.jar' || echo '$(srcdir)/'`sax.jar; \
+@am__fastdepGCJ_TRUE@  then mv -f "$(DEPDIR)/libsax_gcj_la-sax.Tpo" "$(DEPDIR)/libsax_gcj_la-sax.Plo"; else rm -f "$(DEPDIR)/libsax_gcj_la-sax.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='sax.jar' object='libsax_gcj_la-sax.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepGCJ_FALSE@ $(LIBTOOL) --mode=compile $(GCJ) $(libsax_gcj_la_GCJFLAGS) $(GCJFLAGS) -c -o libsax_gcj_la-sax.lo `test -f 'sax.jar' || echo '$(srcdir)/'`sax.jar
+
 mostlyclean-libtool:
        -rm -f *.lo
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf org/xml/sax/.libs org/xml/sax/_libs
-       -rm -rf org/xml/sax/ext/.libs org/xml/sax/ext/_libs
-       -rm -rf org/xml/sax/helpers/.libs org/xml/sax/helpers/_libs
 
 distclean-libtool:
        -rm -f libtool
@@ -755,6 +552,9 @@ check: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
+       for dir in "$(DESTDIR)$(toolexeclibdir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
 install: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
@@ -776,12 +576,6 @@ clean-generic:
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -rm -f org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/xml/sax/$(am__dirstamp)
-       -rm -f org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/xml/sax/ext/$(am__dirstamp)
-       -rm -f org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/xml/sax/helpers/$(am__dirstamp)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -789,11 +583,11 @@ maintainer-clean-generic:
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-toolexeclibLTLIBRARIES \
        mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf org/xml/sax/$(DEPDIR) org/xml/sax/ext/$(DEPDIR) org/xml/sax/helpers/$(DEPDIR)
+       -rm -rf ./$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-libtool distclean-tags
@@ -810,7 +604,7 @@ info-am:
 
 install-data-am:
 
-install-exec-am:
+install-exec-am: install-toolexeclibLTLIBRARIES
 
 install-info: install-info-am
 
@@ -819,7 +613,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf org/xml/sax/$(DEPDIR) org/xml/sax/ext/$(DEPDIR) org/xml/sax/helpers/$(DEPDIR)
+       -rm -rf ./$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -836,29 +630,33 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-       clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+       clean-libtool clean-toolexeclibLTLIBRARIES ctags distclean \
        distclean-compile distclean-generic distclean-libtool \
        distclean-tags distdir dvi dvi-am html html-am info info-am \
        install install-am install-data install-data-am install-exec \
        install-exec-am install-info install-info-am install-man \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-       mostlyclean-local pdf pdf-am ps ps-am tags uninstall \
-       uninstall-am uninstall-info-am
+       install-strip install-toolexeclibLTLIBRARIES installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+       pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
+       uninstall-toolexeclibLTLIBRARIES
+
 
+sax.jar: classes.stamp
+       find org -name '*.class' -print | $(ZIP) -cfME@ $@
 
-classes.stamp: $(libsax_convenience_la_SOURCES)
+classes.stamp: $(source_files)
        here=`pwd`; cd $(srcdir); \
-       $(GCJ_WITH_FLAGS) -C -d $$here $(libsax_convenience_la_SOURCES)
+       $(GCJ_WITH_FLAGS) -C -d $$here $(source_files)
        echo > classes.stamp
 
 mostlyclean-local:
        -find . -name '*.class' | xargs rm
-       -rm classes.stamp
+       -rm classes.stamp sax.jar
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
index 01e11fa..52472fa 100644 (file)
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // This class is in the Public Domain.  NO WARRANTY!
-// $Id: NamespaceSupport.java,v 1.1 2004/12/23 22:38:42 mark Exp $
+// $Id: NamespaceSupport.java,v 1.1 2005/02/02 00:41:54 tromey Exp $
 
 package org.xml.sax.helpers;
 
@@ -113,7 +113,8 @@ public class NamespaceSupport
     /**
      * An empty enumeration.
      */
-    private final static Enumeration EMPTY_ENUMERATION =
+    // GCJ LOCAL: work around gcj bug by making this package-private
+    final static Enumeration EMPTY_ENUMERATION =
        new Vector().elements();
 
 \f
index 9eaa39a..f94e562 100644 (file)
@@ -5,6 +5,9 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 # May be used by various substitution variables.
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 
+## Needed because $(ZIP) is a relative path.
+MULTIBUILDTOP = ../../
+
 ## The compiler with whatever flags we want for both -c and -C
 ## compiles.
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
@@ -20,18 +23,24 @@ AM_GCJFLAGS = \
 
 BUILT_SOURCES = classes.stamp
 
-classes.stamp: $(libw3c_convenience_la_SOURCES)
+w3c.jar: classes.stamp
+       find org -name '*.class' -print | $(ZIP) -cfME@ $@
+
+classes.stamp: $(source_files)
        here=`pwd`; cd $(srcdir); \
-       $(GCJ_WITH_FLAGS) -C -d $$here $(libw3c_convenience_la_SOURCES)
+       $(GCJ_WITH_FLAGS) -C -d $$here $(source_files)
        echo > classes.stamp
 
 mostlyclean-local:
        -find . -name '*.class' | xargs rm
-       -rm classes.stamp
+       -rm classes.stamp w3c.jar
+
+toolexeclib_LTLIBRARIES = libw3c-gcj.la
 
-noinst_LTLIBRARIES = libw3c_convenience.la
+libw3c_gcj_la_SOURCES =        w3c.jar
+libw3c_gcj_la_GCJFLAGS = -findirect-dispatch
 
-libw3c_convenience_la_SOURCES =        \
+source_files = \
 org/w3c/dom/xpath/XPathNamespace.java \
 org/w3c/dom/xpath/XPathResult.java \
 org/w3c/dom/xpath/XPathException.java \
index 8d64e75..6aef501 100644 (file)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-SOURCES = $(libw3c_convenience_la_SOURCES)
+SOURCES = $(libw3c_gcj_la_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -58,132 +58,18 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 CONFIG_HEADER = $(top_builddir)/include/config.h \
        $(top_builddir)/gcj/libgcj-config.h
 CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libw3c_convenience_la_LIBADD =
-am__dirstamp = $(am__leading_dot)dirstamp
-am_libw3c_convenience_la_OBJECTS =  \
-       org/w3c/dom/xpath/XPathNamespace.lo \
-       org/w3c/dom/xpath/XPathResult.lo \
-       org/w3c/dom/xpath/XPathException.lo \
-       org/w3c/dom/xpath/XPathExpression.lo \
-       org/w3c/dom/xpath/XPathNSResolver.lo \
-       org/w3c/dom/xpath/XPathEvaluator.lo \
-       org/w3c/dom/DOMException.lo org/w3c/dom/Comment.lo \
-       org/w3c/dom/stylesheets/DocumentStyle.lo \
-       org/w3c/dom/stylesheets/MediaList.lo \
-       org/w3c/dom/stylesheets/LinkStyle.lo \
-       org/w3c/dom/stylesheets/StyleSheet.lo \
-       org/w3c/dom/stylesheets/StyleSheetList.lo org/w3c/dom/Attr.lo \
-       org/w3c/dom/Notation.lo org/w3c/dom/TypeInfo.lo \
-       org/w3c/dom/html2/HTMLIsIndexElement.lo \
-       org/w3c/dom/html2/HTMLTableColElement.lo \
-       org/w3c/dom/html2/HTMLLinkElement.lo \
-       org/w3c/dom/html2/HTMLTitleElement.lo \
-       org/w3c/dom/html2/HTMLBRElement.lo \
-       org/w3c/dom/html2/HTMLHeadElement.lo \
-       org/w3c/dom/html2/HTMLHtmlElement.lo \
-       org/w3c/dom/html2/HTMLScriptElement.lo \
-       org/w3c/dom/html2/HTMLTableRowElement.lo \
-       org/w3c/dom/html2/HTMLOptionsCollection.lo \
-       org/w3c/dom/html2/HTMLTableCellElement.lo \
-       org/w3c/dom/html2/HTMLDListElement.lo \
-       org/w3c/dom/html2/HTMLFieldSetElement.lo \
-       org/w3c/dom/html2/HTMLImageElement.lo \
-       org/w3c/dom/html2/HTMLHRElement.lo \
-       org/w3c/dom/html2/HTMLModElement.lo \
-       org/w3c/dom/html2/HTMLHeadingElement.lo \
-       org/w3c/dom/html2/HTMLTableElement.lo \
-       org/w3c/dom/html2/HTMLAreaElement.lo \
-       org/w3c/dom/html2/HTMLOptGroupElement.lo \
-       org/w3c/dom/html2/HTMLIFrameElement.lo \
-       org/w3c/dom/html2/HTMLDirectoryElement.lo \
-       org/w3c/dom/html2/HTMLParamElement.lo \
-       org/w3c/dom/html2/HTMLLegendElement.lo \
-       org/w3c/dom/html2/HTMLFrameElement.lo \
-       org/w3c/dom/html2/HTMLFormElement.lo \
-       org/w3c/dom/html2/HTMLStyleElement.lo \
-       org/w3c/dom/html2/HTMLFrameSetElement.lo \
-       org/w3c/dom/html2/HTMLCollection.lo \
-       org/w3c/dom/html2/HTMLAnchorElement.lo \
-       org/w3c/dom/html2/HTMLLabelElement.lo \
-       org/w3c/dom/html2/HTMLBodyElement.lo \
-       org/w3c/dom/html2/HTMLOptionElement.lo \
-       org/w3c/dom/html2/HTMLTableSectionElement.lo \
-       org/w3c/dom/html2/HTMLAppletElement.lo \
-       org/w3c/dom/html2/HTMLSelectElement.lo \
-       org/w3c/dom/html2/HTMLMetaElement.lo \
-       org/w3c/dom/html2/HTMLMenuElement.lo \
-       org/w3c/dom/html2/HTMLDivElement.lo \
-       org/w3c/dom/html2/HTMLLIElement.lo \
-       org/w3c/dom/html2/HTMLFontElement.lo \
-       org/w3c/dom/html2/HTMLOListElement.lo \
-       org/w3c/dom/html2/HTMLBaseFontElement.lo \
-       org/w3c/dom/html2/HTMLElement.lo \
-       org/w3c/dom/html2/HTMLTableCaptionElement.lo \
-       org/w3c/dom/html2/HTMLTextAreaElement.lo \
-       org/w3c/dom/html2/HTMLPreElement.lo \
-       org/w3c/dom/html2/HTMLObjectElement.lo \
-       org/w3c/dom/html2/HTMLBaseElement.lo \
-       org/w3c/dom/html2/HTMLUListElement.lo \
-       org/w3c/dom/html2/HTMLMapElement.lo \
-       org/w3c/dom/html2/HTMLParagraphElement.lo \
-       org/w3c/dom/html2/HTMLButtonElement.lo \
-       org/w3c/dom/html2/HTMLQuoteElement.lo \
-       org/w3c/dom/html2/HTMLInputElement.lo \
-       org/w3c/dom/html2/HTMLDocument.lo org/w3c/dom/ls/LSParser.lo \
-       org/w3c/dom/ls/LSSerializerFilter.lo \
-       org/w3c/dom/ls/LSLoadEvent.lo \
-       org/w3c/dom/ls/DOMImplementationLS.lo \
-       org/w3c/dom/ls/LSException.lo org/w3c/dom/ls/LSSerializer.lo \
-       org/w3c/dom/ls/LSResourceResolver.lo \
-       org/w3c/dom/ls/LSOutput.lo org/w3c/dom/ls/LSInput.lo \
-       org/w3c/dom/ls/LSProgressEvent.lo \
-       org/w3c/dom/ls/LSParserFilter.lo org/w3c/dom/DOMLocator.lo \
-       org/w3c/dom/DOMStringList.lo org/w3c/dom/DocumentFragment.lo \
-       org/w3c/dom/events/MutationEvent.lo \
-       org/w3c/dom/events/UIEvent.lo \
-       org/w3c/dom/events/EventListener.lo \
-       org/w3c/dom/events/Event.lo org/w3c/dom/events/MouseEvent.lo \
-       org/w3c/dom/events/EventTarget.lo \
-       org/w3c/dom/events/DocumentEvent.lo \
-       org/w3c/dom/events/EventException.lo \
-       org/w3c/dom/EntityReference.lo org/w3c/dom/DOMErrorHandler.lo \
-       org/w3c/dom/views/AbstractView.lo \
-       org/w3c/dom/views/DocumentView.lo org/w3c/dom/DOMError.lo \
-       org/w3c/dom/bootstrap/DOMImplementationRegistry.lo \
-       org/w3c/dom/traversal/TreeWalker.lo \
-       org/w3c/dom/traversal/NodeFilter.lo \
-       org/w3c/dom/traversal/DocumentTraversal.lo \
-       org/w3c/dom/traversal/NodeIterator.lo \
-       org/w3c/dom/CharacterData.lo org/w3c/dom/DOMConfiguration.lo \
-       org/w3c/dom/css/CSSRule.lo org/w3c/dom/css/Rect.lo \
-       org/w3c/dom/css/CSSStyleSheet.lo \
-       org/w3c/dom/css/CSSFontFaceRule.lo \
-       org/w3c/dom/css/CSSPrimitiveValue.lo \
-       org/w3c/dom/css/CSSRuleList.lo org/w3c/dom/css/ViewCSS.lo \
-       org/w3c/dom/css/CSSStyleRule.lo \
-       org/w3c/dom/css/CSSUnknownRule.lo org/w3c/dom/css/RGBColor.lo \
-       org/w3c/dom/css/ElementCSSInlineStyle.lo \
-       org/w3c/dom/css/CSSMediaRule.lo \
-       org/w3c/dom/css/CSS2Properties.lo org/w3c/dom/css/CSSValue.lo \
-       org/w3c/dom/css/CSSStyleDeclaration.lo \
-       org/w3c/dom/css/DOMImplementationCSS.lo \
-       org/w3c/dom/css/CSSCharsetRule.lo org/w3c/dom/css/Counter.lo \
-       org/w3c/dom/css/CSSPageRule.lo org/w3c/dom/css/DocumentCSS.lo \
-       org/w3c/dom/css/CSSValueList.lo \
-       org/w3c/dom/css/CSSImportRule.lo org/w3c/dom/NameList.lo \
-       org/w3c/dom/Element.lo org/w3c/dom/Document.lo \
-       org/w3c/dom/ranges/Range.lo \
-       org/w3c/dom/ranges/RangeException.lo \
-       org/w3c/dom/ranges/DocumentRange.lo \
-       org/w3c/dom/DOMImplementationList.lo org/w3c/dom/Entity.lo \
-       org/w3c/dom/UserDataHandler.lo \
-       org/w3c/dom/DOMImplementation.lo org/w3c/dom/CDATASection.lo \
-       org/w3c/dom/ProcessingInstruction.lo org/w3c/dom/Node.lo \
-       org/w3c/dom/NamedNodeMap.lo org/w3c/dom/NodeList.lo \
-       org/w3c/dom/Text.lo org/w3c/dom/DocumentType.lo \
-       org/w3c/dom/DOMImplementationSource.lo
-libw3c_convenience_la_OBJECTS = $(am_libw3c_convenience_la_OBJECTS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(toolexeclibdir)"
+toolexeclibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
+libw3c_gcj_la_LIBADD =
+am_libw3c_gcj_la_OBJECTS = libw3c_gcj_la-w3c.lo
+libw3c_gcj_la_OBJECTS = $(am_libw3c_gcj_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/gcj
 depcomp = $(SHELL) $(top_srcdir)/../depcomp
 am__depfiles_maybe = depfiles
@@ -193,8 +79,8 @@ LTGCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) $(AM_GCJFLAGS) \
 GCJLD = $(GCJ)
 GCJLINK = $(LIBTOOL) --mode=link $(GCJLD) $(AM_GCJFLAGS) $(GCJFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libw3c_convenience_la_SOURCES)
-DIST_SOURCES = $(libw3c_convenience_la_SOURCES)
+SOURCES = $(libw3c_gcj_la_SOURCES)
+DIST_SOURCES = $(libw3c_gcj_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -421,6 +307,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 
 # May be used by various substitution variables.
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+MULTIBUILDTOP = ../../
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
 BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir)
 AM_GCJFLAGS = \
@@ -431,8 +318,10 @@ AM_GCJFLAGS = \
        -Wno-deprecated
 
 BUILT_SOURCES = classes.stamp
-noinst_LTLIBRARIES = libw3c_convenience.la
-libw3c_convenience_la_SOURCES = \
+toolexeclib_LTLIBRARIES = libw3c-gcj.la
+libw3c_gcj_la_SOURCES = w3c.jar
+libw3c_gcj_la_GCJFLAGS = -findirect-dispatch
+source_files = \
 org/w3c/dom/xpath/XPathNamespace.java \
 org/w3c/dom/xpath/XPathResult.java \
 org/w3c/dom/xpath/XPathException.java \
@@ -584,7 +473,7 @@ all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .java .lo .o .obj
+.SUFFIXES: .jar .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
@@ -614,897 +503,45 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+       test -z "$(toolexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexeclibdir)"
+       @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
+           f=$(am__strip_dir) \
+           echo " $(LIBTOOL) --mode=install $(toolexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(toolexeclibdir)/$$f'"; \
+           $(LIBTOOL) --mode=install $(toolexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(toolexeclibdir)/$$f"; \
+         else :; fi; \
+       done
+
+uninstall-toolexeclibLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @set -x; list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
+         p=$(am__strip_dir) \
+         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(toolexeclibdir)/$$p'"; \
+         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(toolexeclibdir)/$$p"; \
+       done
 
-clean-noinstLTLIBRARIES:
-       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-       @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+clean-toolexeclibLTLIBRARIES:
+       -test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES)
+       @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
          test "$$dir" != "$$p" || dir=.; \
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done
-org/w3c/dom/xpath/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/xpath
-       @: > org/w3c/dom/xpath/$(am__dirstamp)
-org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/xpath/$(DEPDIR)
-       @: > org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/xpath/XPathNamespace.lo:  \
-       org/w3c/dom/xpath/$(am__dirstamp) \
-       org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/xpath/XPathResult.lo: org/w3c/dom/xpath/$(am__dirstamp) \
-       org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/xpath/XPathException.lo:  \
-       org/w3c/dom/xpath/$(am__dirstamp) \
-       org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/xpath/XPathExpression.lo:  \
-       org/w3c/dom/xpath/$(am__dirstamp) \
-       org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/xpath/XPathNSResolver.lo:  \
-       org/w3c/dom/xpath/$(am__dirstamp) \
-       org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/xpath/XPathEvaluator.lo:  \
-       org/w3c/dom/xpath/$(am__dirstamp) \
-       org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom
-       @: > org/w3c/dom/$(am__dirstamp)
-org/w3c/dom/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/$(DEPDIR)
-       @: > org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DOMException.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Comment.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/stylesheets/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/stylesheets
-       @: > org/w3c/dom/stylesheets/$(am__dirstamp)
-org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/stylesheets/$(DEPDIR)
-       @: > org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/stylesheets/DocumentStyle.lo:  \
-       org/w3c/dom/stylesheets/$(am__dirstamp) \
-       org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/stylesheets/MediaList.lo:  \
-       org/w3c/dom/stylesheets/$(am__dirstamp) \
-       org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/stylesheets/LinkStyle.lo:  \
-       org/w3c/dom/stylesheets/$(am__dirstamp) \
-       org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/stylesheets/StyleSheet.lo:  \
-       org/w3c/dom/stylesheets/$(am__dirstamp) \
-       org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/stylesheets/StyleSheetList.lo:  \
-       org/w3c/dom/stylesheets/$(am__dirstamp) \
-       org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Attr.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Notation.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/TypeInfo.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/html2
-       @: > org/w3c/dom/html2/$(am__dirstamp)
-org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/html2/$(DEPDIR)
-       @: > org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLIsIndexElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLTableColElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLLinkElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLTitleElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLBRElement.lo: org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLHeadElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLHtmlElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLScriptElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLTableRowElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLOptionsCollection.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLTableCellElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLDListElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLFieldSetElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLImageElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLHRElement.lo: org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLModElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLHeadingElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLTableElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLAreaElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLOptGroupElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLIFrameElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLDirectoryElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLParamElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLLegendElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLFrameElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLFormElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLStyleElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLFrameSetElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLCollection.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLAnchorElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLLabelElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLBodyElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLOptionElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLTableSectionElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLAppletElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLSelectElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLMetaElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLMenuElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLDivElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLLIElement.lo: org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLFontElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLOListElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLBaseFontElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLElement.lo: org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLTableCaptionElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLTextAreaElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLPreElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLObjectElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLBaseElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLUListElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLMapElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLParagraphElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLButtonElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLQuoteElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLInputElement.lo:  \
-       org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/html2/HTMLDocument.lo: org/w3c/dom/html2/$(am__dirstamp) \
-       org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ls/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/ls
-       @: > org/w3c/dom/ls/$(am__dirstamp)
-org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/ls/$(DEPDIR)
-       @: > org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ls/LSParser.lo: org/w3c/dom/ls/$(am__dirstamp) \
-       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ls/LSSerializerFilter.lo: org/w3c/dom/ls/$(am__dirstamp) \
-       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ls/LSLoadEvent.lo: org/w3c/dom/ls/$(am__dirstamp) \
-       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ls/DOMImplementationLS.lo: org/w3c/dom/ls/$(am__dirstamp) \
-       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ls/LSException.lo: org/w3c/dom/ls/$(am__dirstamp) \
-       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ls/LSSerializer.lo: org/w3c/dom/ls/$(am__dirstamp) \
-       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ls/LSResourceResolver.lo: org/w3c/dom/ls/$(am__dirstamp) \
-       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ls/LSOutput.lo: org/w3c/dom/ls/$(am__dirstamp) \
-       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ls/LSInput.lo: org/w3c/dom/ls/$(am__dirstamp) \
-       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ls/LSProgressEvent.lo: org/w3c/dom/ls/$(am__dirstamp) \
-       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ls/LSParserFilter.lo: org/w3c/dom/ls/$(am__dirstamp) \
-       org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DOMLocator.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DOMStringList.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DocumentFragment.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/events/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/events
-       @: > org/w3c/dom/events/$(am__dirstamp)
-org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/events/$(DEPDIR)
-       @: > org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/events/MutationEvent.lo:  \
-       org/w3c/dom/events/$(am__dirstamp) \
-       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/events/UIEvent.lo: org/w3c/dom/events/$(am__dirstamp) \
-       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/events/EventListener.lo:  \
-       org/w3c/dom/events/$(am__dirstamp) \
-       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/events/Event.lo: org/w3c/dom/events/$(am__dirstamp) \
-       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/events/MouseEvent.lo: org/w3c/dom/events/$(am__dirstamp) \
-       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/events/EventTarget.lo: org/w3c/dom/events/$(am__dirstamp) \
-       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/events/DocumentEvent.lo:  \
-       org/w3c/dom/events/$(am__dirstamp) \
-       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/events/EventException.lo:  \
-       org/w3c/dom/events/$(am__dirstamp) \
-       org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/EntityReference.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DOMErrorHandler.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/views/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/views
-       @: > org/w3c/dom/views/$(am__dirstamp)
-org/w3c/dom/views/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/views/$(DEPDIR)
-       @: > org/w3c/dom/views/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/views/AbstractView.lo: org/w3c/dom/views/$(am__dirstamp) \
-       org/w3c/dom/views/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/views/DocumentView.lo: org/w3c/dom/views/$(am__dirstamp) \
-       org/w3c/dom/views/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DOMError.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/bootstrap/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/bootstrap
-       @: > org/w3c/dom/bootstrap/$(am__dirstamp)
-org/w3c/dom/bootstrap/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/bootstrap/$(DEPDIR)
-       @: > org/w3c/dom/bootstrap/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/bootstrap/DOMImplementationRegistry.lo:  \
-       org/w3c/dom/bootstrap/$(am__dirstamp) \
-       org/w3c/dom/bootstrap/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/traversal/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/traversal
-       @: > org/w3c/dom/traversal/$(am__dirstamp)
-org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/traversal/$(DEPDIR)
-       @: > org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/traversal/TreeWalker.lo:  \
-       org/w3c/dom/traversal/$(am__dirstamp) \
-       org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/traversal/NodeFilter.lo:  \
-       org/w3c/dom/traversal/$(am__dirstamp) \
-       org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/traversal/DocumentTraversal.lo:  \
-       org/w3c/dom/traversal/$(am__dirstamp) \
-       org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/traversal/NodeIterator.lo:  \
-       org/w3c/dom/traversal/$(am__dirstamp) \
-       org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/CharacterData.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DOMConfiguration.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/css
-       @: > org/w3c/dom/css/$(am__dirstamp)
-org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/css/$(DEPDIR)
-       @: > org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSRule.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/Rect.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSStyleSheet.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSFontFaceRule.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSPrimitiveValue.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSRuleList.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/ViewCSS.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSStyleRule.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSUnknownRule.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/RGBColor.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/ElementCSSInlineStyle.lo:  \
-       org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSMediaRule.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSS2Properties.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSValue.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSStyleDeclaration.lo:  \
-       org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/DOMImplementationCSS.lo:  \
-       org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSCharsetRule.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/Counter.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSPageRule.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/DocumentCSS.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSValueList.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/css/CSSImportRule.lo: org/w3c/dom/css/$(am__dirstamp) \
-       org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/NameList.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Element.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Document.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ranges/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/ranges
-       @: > org/w3c/dom/ranges/$(am__dirstamp)
-org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) org/w3c/dom/ranges/$(DEPDIR)
-       @: > org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ranges/Range.lo: org/w3c/dom/ranges/$(am__dirstamp) \
-       org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ranges/RangeException.lo:  \
-       org/w3c/dom/ranges/$(am__dirstamp) \
-       org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ranges/DocumentRange.lo:  \
-       org/w3c/dom/ranges/$(am__dirstamp) \
-       org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DOMImplementationList.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Entity.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/UserDataHandler.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DOMImplementation.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/CDATASection.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/ProcessingInstruction.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Node.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/NamedNodeMap.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/NodeList.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/Text.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DocumentType.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-org/w3c/dom/DOMImplementationSource.lo: org/w3c/dom/$(am__dirstamp) \
-       org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-libw3c_convenience.la: $(libw3c_convenience_la_OBJECTS) $(libw3c_convenience_la_DEPENDENCIES) 
-       $(GCJLINK)  $(libw3c_convenience_la_LDFLAGS) $(libw3c_convenience_la_OBJECTS) $(libw3c_convenience_la_LIBADD) $(LIBS)
+libw3c-gcj.la: $(libw3c_gcj_la_OBJECTS) $(libw3c_gcj_la_DEPENDENCIES) 
+       $(GCJLINK) -rpath $(toolexeclibdir) $(libw3c_gcj_la_LDFLAGS) $(libw3c_gcj_la_OBJECTS) $(libw3c_gcj_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f org/w3c/dom/Attr.$(OBJEXT)
-       -rm -f org/w3c/dom/Attr.lo
-       -rm -f org/w3c/dom/CDATASection.$(OBJEXT)
-       -rm -f org/w3c/dom/CDATASection.lo
-       -rm -f org/w3c/dom/CharacterData.$(OBJEXT)
-       -rm -f org/w3c/dom/CharacterData.lo
-       -rm -f org/w3c/dom/Comment.$(OBJEXT)
-       -rm -f org/w3c/dom/Comment.lo
-       -rm -f org/w3c/dom/DOMConfiguration.$(OBJEXT)
-       -rm -f org/w3c/dom/DOMConfiguration.lo
-       -rm -f org/w3c/dom/DOMError.$(OBJEXT)
-       -rm -f org/w3c/dom/DOMError.lo
-       -rm -f org/w3c/dom/DOMErrorHandler.$(OBJEXT)
-       -rm -f org/w3c/dom/DOMErrorHandler.lo
-       -rm -f org/w3c/dom/DOMException.$(OBJEXT)
-       -rm -f org/w3c/dom/DOMException.lo
-       -rm -f org/w3c/dom/DOMImplementation.$(OBJEXT)
-       -rm -f org/w3c/dom/DOMImplementation.lo
-       -rm -f org/w3c/dom/DOMImplementationList.$(OBJEXT)
-       -rm -f org/w3c/dom/DOMImplementationList.lo
-       -rm -f org/w3c/dom/DOMImplementationSource.$(OBJEXT)
-       -rm -f org/w3c/dom/DOMImplementationSource.lo
-       -rm -f org/w3c/dom/DOMLocator.$(OBJEXT)
-       -rm -f org/w3c/dom/DOMLocator.lo
-       -rm -f org/w3c/dom/DOMStringList.$(OBJEXT)
-       -rm -f org/w3c/dom/DOMStringList.lo
-       -rm -f org/w3c/dom/Document.$(OBJEXT)
-       -rm -f org/w3c/dom/Document.lo
-       -rm -f org/w3c/dom/DocumentFragment.$(OBJEXT)
-       -rm -f org/w3c/dom/DocumentFragment.lo
-       -rm -f org/w3c/dom/DocumentType.$(OBJEXT)
-       -rm -f org/w3c/dom/DocumentType.lo
-       -rm -f org/w3c/dom/Element.$(OBJEXT)
-       -rm -f org/w3c/dom/Element.lo
-       -rm -f org/w3c/dom/Entity.$(OBJEXT)
-       -rm -f org/w3c/dom/Entity.lo
-       -rm -f org/w3c/dom/EntityReference.$(OBJEXT)
-       -rm -f org/w3c/dom/EntityReference.lo
-       -rm -f org/w3c/dom/NameList.$(OBJEXT)
-       -rm -f org/w3c/dom/NameList.lo
-       -rm -f org/w3c/dom/NamedNodeMap.$(OBJEXT)
-       -rm -f org/w3c/dom/NamedNodeMap.lo
-       -rm -f org/w3c/dom/Node.$(OBJEXT)
-       -rm -f org/w3c/dom/Node.lo
-       -rm -f org/w3c/dom/NodeList.$(OBJEXT)
-       -rm -f org/w3c/dom/NodeList.lo
-       -rm -f org/w3c/dom/Notation.$(OBJEXT)
-       -rm -f org/w3c/dom/Notation.lo
-       -rm -f org/w3c/dom/ProcessingInstruction.$(OBJEXT)
-       -rm -f org/w3c/dom/ProcessingInstruction.lo
-       -rm -f org/w3c/dom/Text.$(OBJEXT)
-       -rm -f org/w3c/dom/Text.lo
-       -rm -f org/w3c/dom/TypeInfo.$(OBJEXT)
-       -rm -f org/w3c/dom/TypeInfo.lo
-       -rm -f org/w3c/dom/UserDataHandler.$(OBJEXT)
-       -rm -f org/w3c/dom/UserDataHandler.lo
-       -rm -f org/w3c/dom/bootstrap/DOMImplementationRegistry.$(OBJEXT)
-       -rm -f org/w3c/dom/bootstrap/DOMImplementationRegistry.lo
-       -rm -f org/w3c/dom/css/CSS2Properties.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSS2Properties.lo
-       -rm -f org/w3c/dom/css/CSSCharsetRule.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSCharsetRule.lo
-       -rm -f org/w3c/dom/css/CSSFontFaceRule.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSFontFaceRule.lo
-       -rm -f org/w3c/dom/css/CSSImportRule.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSImportRule.lo
-       -rm -f org/w3c/dom/css/CSSMediaRule.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSMediaRule.lo
-       -rm -f org/w3c/dom/css/CSSPageRule.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSPageRule.lo
-       -rm -f org/w3c/dom/css/CSSPrimitiveValue.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSPrimitiveValue.lo
-       -rm -f org/w3c/dom/css/CSSRule.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSRule.lo
-       -rm -f org/w3c/dom/css/CSSRuleList.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSRuleList.lo
-       -rm -f org/w3c/dom/css/CSSStyleDeclaration.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSStyleDeclaration.lo
-       -rm -f org/w3c/dom/css/CSSStyleRule.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSStyleRule.lo
-       -rm -f org/w3c/dom/css/CSSStyleSheet.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSStyleSheet.lo
-       -rm -f org/w3c/dom/css/CSSUnknownRule.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSUnknownRule.lo
-       -rm -f org/w3c/dom/css/CSSValue.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSValue.lo
-       -rm -f org/w3c/dom/css/CSSValueList.$(OBJEXT)
-       -rm -f org/w3c/dom/css/CSSValueList.lo
-       -rm -f org/w3c/dom/css/Counter.$(OBJEXT)
-       -rm -f org/w3c/dom/css/Counter.lo
-       -rm -f org/w3c/dom/css/DOMImplementationCSS.$(OBJEXT)
-       -rm -f org/w3c/dom/css/DOMImplementationCSS.lo
-       -rm -f org/w3c/dom/css/DocumentCSS.$(OBJEXT)
-       -rm -f org/w3c/dom/css/DocumentCSS.lo
-       -rm -f org/w3c/dom/css/ElementCSSInlineStyle.$(OBJEXT)
-       -rm -f org/w3c/dom/css/ElementCSSInlineStyle.lo
-       -rm -f org/w3c/dom/css/RGBColor.$(OBJEXT)
-       -rm -f org/w3c/dom/css/RGBColor.lo
-       -rm -f org/w3c/dom/css/Rect.$(OBJEXT)
-       -rm -f org/w3c/dom/css/Rect.lo
-       -rm -f org/w3c/dom/css/ViewCSS.$(OBJEXT)
-       -rm -f org/w3c/dom/css/ViewCSS.lo
-       -rm -f org/w3c/dom/events/DocumentEvent.$(OBJEXT)
-       -rm -f org/w3c/dom/events/DocumentEvent.lo
-       -rm -f org/w3c/dom/events/Event.$(OBJEXT)
-       -rm -f org/w3c/dom/events/Event.lo
-       -rm -f org/w3c/dom/events/EventException.$(OBJEXT)
-       -rm -f org/w3c/dom/events/EventException.lo
-       -rm -f org/w3c/dom/events/EventListener.$(OBJEXT)
-       -rm -f org/w3c/dom/events/EventListener.lo
-       -rm -f org/w3c/dom/events/EventTarget.$(OBJEXT)
-       -rm -f org/w3c/dom/events/EventTarget.lo
-       -rm -f org/w3c/dom/events/MouseEvent.$(OBJEXT)
-       -rm -f org/w3c/dom/events/MouseEvent.lo
-       -rm -f org/w3c/dom/events/MutationEvent.$(OBJEXT)
-       -rm -f org/w3c/dom/events/MutationEvent.lo
-       -rm -f org/w3c/dom/events/UIEvent.$(OBJEXT)
-       -rm -f org/w3c/dom/events/UIEvent.lo
-       -rm -f org/w3c/dom/html2/HTMLAnchorElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLAnchorElement.lo
-       -rm -f org/w3c/dom/html2/HTMLAppletElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLAppletElement.lo
-       -rm -f org/w3c/dom/html2/HTMLAreaElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLAreaElement.lo
-       -rm -f org/w3c/dom/html2/HTMLBRElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLBRElement.lo
-       -rm -f org/w3c/dom/html2/HTMLBaseElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLBaseElement.lo
-       -rm -f org/w3c/dom/html2/HTMLBaseFontElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLBaseFontElement.lo
-       -rm -f org/w3c/dom/html2/HTMLBodyElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLBodyElement.lo
-       -rm -f org/w3c/dom/html2/HTMLButtonElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLButtonElement.lo
-       -rm -f org/w3c/dom/html2/HTMLCollection.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLCollection.lo
-       -rm -f org/w3c/dom/html2/HTMLDListElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLDListElement.lo
-       -rm -f org/w3c/dom/html2/HTMLDirectoryElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLDirectoryElement.lo
-       -rm -f org/w3c/dom/html2/HTMLDivElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLDivElement.lo
-       -rm -f org/w3c/dom/html2/HTMLDocument.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLDocument.lo
-       -rm -f org/w3c/dom/html2/HTMLElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLElement.lo
-       -rm -f org/w3c/dom/html2/HTMLFieldSetElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLFieldSetElement.lo
-       -rm -f org/w3c/dom/html2/HTMLFontElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLFontElement.lo
-       -rm -f org/w3c/dom/html2/HTMLFormElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLFormElement.lo
-       -rm -f org/w3c/dom/html2/HTMLFrameElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLFrameElement.lo
-       -rm -f org/w3c/dom/html2/HTMLFrameSetElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLFrameSetElement.lo
-       -rm -f org/w3c/dom/html2/HTMLHRElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLHRElement.lo
-       -rm -f org/w3c/dom/html2/HTMLHeadElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLHeadElement.lo
-       -rm -f org/w3c/dom/html2/HTMLHeadingElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLHeadingElement.lo
-       -rm -f org/w3c/dom/html2/HTMLHtmlElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLHtmlElement.lo
-       -rm -f org/w3c/dom/html2/HTMLIFrameElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLIFrameElement.lo
-       -rm -f org/w3c/dom/html2/HTMLImageElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLImageElement.lo
-       -rm -f org/w3c/dom/html2/HTMLInputElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLInputElement.lo
-       -rm -f org/w3c/dom/html2/HTMLIsIndexElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLIsIndexElement.lo
-       -rm -f org/w3c/dom/html2/HTMLLIElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLLIElement.lo
-       -rm -f org/w3c/dom/html2/HTMLLabelElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLLabelElement.lo
-       -rm -f org/w3c/dom/html2/HTMLLegendElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLLegendElement.lo
-       -rm -f org/w3c/dom/html2/HTMLLinkElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLLinkElement.lo
-       -rm -f org/w3c/dom/html2/HTMLMapElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLMapElement.lo
-       -rm -f org/w3c/dom/html2/HTMLMenuElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLMenuElement.lo
-       -rm -f org/w3c/dom/html2/HTMLMetaElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLMetaElement.lo
-       -rm -f org/w3c/dom/html2/HTMLModElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLModElement.lo
-       -rm -f org/w3c/dom/html2/HTMLOListElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLOListElement.lo
-       -rm -f org/w3c/dom/html2/HTMLObjectElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLObjectElement.lo
-       -rm -f org/w3c/dom/html2/HTMLOptGroupElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLOptGroupElement.lo
-       -rm -f org/w3c/dom/html2/HTMLOptionElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLOptionElement.lo
-       -rm -f org/w3c/dom/html2/HTMLOptionsCollection.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLOptionsCollection.lo
-       -rm -f org/w3c/dom/html2/HTMLParagraphElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLParagraphElement.lo
-       -rm -f org/w3c/dom/html2/HTMLParamElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLParamElement.lo
-       -rm -f org/w3c/dom/html2/HTMLPreElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLPreElement.lo
-       -rm -f org/w3c/dom/html2/HTMLQuoteElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLQuoteElement.lo
-       -rm -f org/w3c/dom/html2/HTMLScriptElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLScriptElement.lo
-       -rm -f org/w3c/dom/html2/HTMLSelectElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLSelectElement.lo
-       -rm -f org/w3c/dom/html2/HTMLStyleElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLStyleElement.lo
-       -rm -f org/w3c/dom/html2/HTMLTableCaptionElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLTableCaptionElement.lo
-       -rm -f org/w3c/dom/html2/HTMLTableCellElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLTableCellElement.lo
-       -rm -f org/w3c/dom/html2/HTMLTableColElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLTableColElement.lo
-       -rm -f org/w3c/dom/html2/HTMLTableElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLTableElement.lo
-       -rm -f org/w3c/dom/html2/HTMLTableRowElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLTableRowElement.lo
-       -rm -f org/w3c/dom/html2/HTMLTableSectionElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLTableSectionElement.lo
-       -rm -f org/w3c/dom/html2/HTMLTextAreaElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLTextAreaElement.lo
-       -rm -f org/w3c/dom/html2/HTMLTitleElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLTitleElement.lo
-       -rm -f org/w3c/dom/html2/HTMLUListElement.$(OBJEXT)
-       -rm -f org/w3c/dom/html2/HTMLUListElement.lo
-       -rm -f org/w3c/dom/ls/DOMImplementationLS.$(OBJEXT)
-       -rm -f org/w3c/dom/ls/DOMImplementationLS.lo
-       -rm -f org/w3c/dom/ls/LSException.$(OBJEXT)
-       -rm -f org/w3c/dom/ls/LSException.lo
-       -rm -f org/w3c/dom/ls/LSInput.$(OBJEXT)
-       -rm -f org/w3c/dom/ls/LSInput.lo
-       -rm -f org/w3c/dom/ls/LSLoadEvent.$(OBJEXT)
-       -rm -f org/w3c/dom/ls/LSLoadEvent.lo
-       -rm -f org/w3c/dom/ls/LSOutput.$(OBJEXT)
-       -rm -f org/w3c/dom/ls/LSOutput.lo
-       -rm -f org/w3c/dom/ls/LSParser.$(OBJEXT)
-       -rm -f org/w3c/dom/ls/LSParser.lo
-       -rm -f org/w3c/dom/ls/LSParserFilter.$(OBJEXT)
-       -rm -f org/w3c/dom/ls/LSParserFilter.lo
-       -rm -f org/w3c/dom/ls/LSProgressEvent.$(OBJEXT)
-       -rm -f org/w3c/dom/ls/LSProgressEvent.lo
-       -rm -f org/w3c/dom/ls/LSResourceResolver.$(OBJEXT)
-       -rm -f org/w3c/dom/ls/LSResourceResolver.lo
-       -rm -f org/w3c/dom/ls/LSSerializer.$(OBJEXT)
-       -rm -f org/w3c/dom/ls/LSSerializer.lo
-       -rm -f org/w3c/dom/ls/LSSerializerFilter.$(OBJEXT)
-       -rm -f org/w3c/dom/ls/LSSerializerFilter.lo
-       -rm -f org/w3c/dom/ranges/DocumentRange.$(OBJEXT)
-       -rm -f org/w3c/dom/ranges/DocumentRange.lo
-       -rm -f org/w3c/dom/ranges/Range.$(OBJEXT)
-       -rm -f org/w3c/dom/ranges/Range.lo
-       -rm -f org/w3c/dom/ranges/RangeException.$(OBJEXT)
-       -rm -f org/w3c/dom/ranges/RangeException.lo
-       -rm -f org/w3c/dom/stylesheets/DocumentStyle.$(OBJEXT)
-       -rm -f org/w3c/dom/stylesheets/DocumentStyle.lo
-       -rm -f org/w3c/dom/stylesheets/LinkStyle.$(OBJEXT)
-       -rm -f org/w3c/dom/stylesheets/LinkStyle.lo
-       -rm -f org/w3c/dom/stylesheets/MediaList.$(OBJEXT)
-       -rm -f org/w3c/dom/stylesheets/MediaList.lo
-       -rm -f org/w3c/dom/stylesheets/StyleSheet.$(OBJEXT)
-       -rm -f org/w3c/dom/stylesheets/StyleSheet.lo
-       -rm -f org/w3c/dom/stylesheets/StyleSheetList.$(OBJEXT)
-       -rm -f org/w3c/dom/stylesheets/StyleSheetList.lo
-       -rm -f org/w3c/dom/traversal/DocumentTraversal.$(OBJEXT)
-       -rm -f org/w3c/dom/traversal/DocumentTraversal.lo
-       -rm -f org/w3c/dom/traversal/NodeFilter.$(OBJEXT)
-       -rm -f org/w3c/dom/traversal/NodeFilter.lo
-       -rm -f org/w3c/dom/traversal/NodeIterator.$(OBJEXT)
-       -rm -f org/w3c/dom/traversal/NodeIterator.lo
-       -rm -f org/w3c/dom/traversal/TreeWalker.$(OBJEXT)
-       -rm -f org/w3c/dom/traversal/TreeWalker.lo
-       -rm -f org/w3c/dom/views/AbstractView.$(OBJEXT)
-       -rm -f org/w3c/dom/views/AbstractView.lo
-       -rm -f org/w3c/dom/views/DocumentView.$(OBJEXT)
-       -rm -f org/w3c/dom/views/DocumentView.lo
-       -rm -f org/w3c/dom/xpath/XPathEvaluator.$(OBJEXT)
-       -rm -f org/w3c/dom/xpath/XPathEvaluator.lo
-       -rm -f org/w3c/dom/xpath/XPathException.$(OBJEXT)
-       -rm -f org/w3c/dom/xpath/XPathException.lo
-       -rm -f org/w3c/dom/xpath/XPathExpression.$(OBJEXT)
-       -rm -f org/w3c/dom/xpath/XPathExpression.lo
-       -rm -f org/w3c/dom/xpath/XPathNSResolver.$(OBJEXT)
-       -rm -f org/w3c/dom/xpath/XPathNSResolver.lo
-       -rm -f org/w3c/dom/xpath/XPathNamespace.$(OBJEXT)
-       -rm -f org/w3c/dom/xpath/XPathNamespace.lo
-       -rm -f org/w3c/dom/xpath/XPathResult.$(OBJEXT)
-       -rm -f org/w3c/dom/xpath/XPathResult.lo
 
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Attr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/CDATASection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/CharacterData.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Comment.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMConfiguration.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMError.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMErrorHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMImplementation.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMImplementationList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMImplementationSource.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMLocator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DOMStringList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Document.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DocumentFragment.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/DocumentType.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Element.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Entity.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/EntityReference.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/NameList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/NamedNodeMap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Node.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/NodeList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Notation.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/ProcessingInstruction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/Text.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/TypeInfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/$(DEPDIR)/UserDataHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/bootstrap/$(DEPDIR)/DOMImplementationRegistry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSS2Properties.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSCharsetRule.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSFontFaceRule.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSImportRule.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSMediaRule.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSPageRule.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSPrimitiveValue.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSRule.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSRuleList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSStyleDeclaration.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSStyleRule.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSStyleSheet.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSUnknownRule.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSValue.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/CSSValueList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/Counter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/DOMImplementationCSS.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/DocumentCSS.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/ElementCSSInlineStyle.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/RGBColor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/Rect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/css/$(DEPDIR)/ViewCSS.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/DocumentEvent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/Event.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/EventException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/EventListener.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/EventTarget.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/MouseEvent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/MutationEvent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/events/$(DEPDIR)/UIEvent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLAnchorElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLAppletElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLAreaElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLBRElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLBaseElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLBaseFontElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLBodyElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLButtonElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLCollection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLDListElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLDirectoryElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLDivElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLDocument.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLFieldSetElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLFontElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLFormElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLFrameElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLFrameSetElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLHRElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLHeadElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLHeadingElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLHtmlElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLIFrameElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLImageElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLInputElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLIsIndexElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLLIElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLLabelElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLLegendElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLLinkElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLMapElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLMenuElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLMetaElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLModElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLOListElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLObjectElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLOptGroupElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLOptionElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLOptionsCollection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLParagraphElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLParamElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLPreElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLQuoteElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLScriptElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLSelectElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLStyleElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTableCaptionElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTableCellElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTableColElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTableElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTableRowElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTableSectionElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTextAreaElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLTitleElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/html2/$(DEPDIR)/HTMLUListElement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/DOMImplementationLS.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSInput.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSLoadEvent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSOutput.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSParser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSParserFilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSProgressEvent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSResourceResolver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSSerializer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ls/$(DEPDIR)/LSSerializerFilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ranges/$(DEPDIR)/DocumentRange.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ranges/$(DEPDIR)/Range.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/ranges/$(DEPDIR)/RangeException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/stylesheets/$(DEPDIR)/DocumentStyle.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/stylesheets/$(DEPDIR)/LinkStyle.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/stylesheets/$(DEPDIR)/MediaList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/stylesheets/$(DEPDIR)/StyleSheet.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/stylesheets/$(DEPDIR)/StyleSheetList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/traversal/$(DEPDIR)/DocumentTraversal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/traversal/$(DEPDIR)/NodeFilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/traversal/$(DEPDIR)/NodeIterator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/traversal/$(DEPDIR)/TreeWalker.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/views/$(DEPDIR)/AbstractView.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/views/$(DEPDIR)/DocumentView.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/xpath/$(DEPDIR)/XPathEvaluator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/xpath/$(DEPDIR)/XPathException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/xpath/$(DEPDIR)/XPathExpression.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/xpath/$(DEPDIR)/XPathNSResolver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/xpath/$(DEPDIR)/XPathNamespace.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@org/w3c/dom/xpath/$(DEPDIR)/XPathResult.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libw3c_gcj_la-w3c.Plo@am__quote@
 
-.java.o:
+.jar.o:
 @am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
 @am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
 @am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
@@ -1512,7 +549,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ $<
 
-.java.obj:
+.jar.obj:
 @am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
 @am__fastdepGCJ_TRUE@  if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
@@ -1520,7 +557,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-.java.lo:
+.jar.lo:
 @am__fastdepGCJ_TRUE@  depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
 @am__fastdepGCJ_TRUE@  if $(LTGCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
 @am__fastdepGCJ_TRUE@  then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
@@ -1528,22 +565,18 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepGCJ_FALSE@ $(LTGCJCOMPILE) -c -o $@ $<
 
+libw3c_gcj_la-w3c.lo: w3c.jar
+@am__fastdepGCJ_TRUE@  if $(LIBTOOL) --mode=compile $(GCJ) $(libw3c_gcj_la_GCJFLAGS) $(GCJFLAGS) -MT libw3c_gcj_la-w3c.lo -MD -MP -MF "$(DEPDIR)/libw3c_gcj_la-w3c.Tpo" -c -o libw3c_gcj_la-w3c.lo `test -f 'w3c.jar' || echo '$(srcdir)/'`w3c.jar; \
+@am__fastdepGCJ_TRUE@  then mv -f "$(DEPDIR)/libw3c_gcj_la-w3c.Tpo" "$(DEPDIR)/libw3c_gcj_la-w3c.Plo"; else rm -f "$(DEPDIR)/libw3c_gcj_la-w3c.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     source='w3c.jar' object='libw3c_gcj_la-w3c.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepGCJ_FALSE@     DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepGCJ_FALSE@ $(LIBTOOL) --mode=compile $(GCJ) $(libw3c_gcj_la_GCJFLAGS) $(GCJFLAGS) -c -o libw3c_gcj_la-w3c.lo `test -f 'w3c.jar' || echo '$(srcdir)/'`w3c.jar
+
 mostlyclean-libtool:
        -rm -f *.lo
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf org/w3c/dom/.libs org/w3c/dom/_libs
-       -rm -rf org/w3c/dom/bootstrap/.libs org/w3c/dom/bootstrap/_libs
-       -rm -rf org/w3c/dom/css/.libs org/w3c/dom/css/_libs
-       -rm -rf org/w3c/dom/events/.libs org/w3c/dom/events/_libs
-       -rm -rf org/w3c/dom/html2/.libs org/w3c/dom/html2/_libs
-       -rm -rf org/w3c/dom/ls/.libs org/w3c/dom/ls/_libs
-       -rm -rf org/w3c/dom/ranges/.libs org/w3c/dom/ranges/_libs
-       -rm -rf org/w3c/dom/stylesheets/.libs org/w3c/dom/stylesheets/_libs
-       -rm -rf org/w3c/dom/traversal/.libs org/w3c/dom/traversal/_libs
-       -rm -rf org/w3c/dom/views/.libs org/w3c/dom/views/_libs
-       -rm -rf org/w3c/dom/xpath/.libs org/w3c/dom/xpath/_libs
 
 distclean-libtool:
        -rm -f libtool
@@ -1629,6 +662,9 @@ check: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
+       for dir in "$(DESTDIR)$(toolexeclibdir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
 install: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
@@ -1650,28 +686,6 @@ clean-generic:
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -rm -f org/w3c/dom/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/$(am__dirstamp)
-       -rm -f org/w3c/dom/bootstrap/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/bootstrap/$(am__dirstamp)
-       -rm -f org/w3c/dom/css/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/css/$(am__dirstamp)
-       -rm -f org/w3c/dom/events/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/events/$(am__dirstamp)
-       -rm -f org/w3c/dom/html2/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/html2/$(am__dirstamp)
-       -rm -f org/w3c/dom/ls/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/ls/$(am__dirstamp)
-       -rm -f org/w3c/dom/ranges/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/ranges/$(am__dirstamp)
-       -rm -f org/w3c/dom/stylesheets/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/stylesheets/$(am__dirstamp)
-       -rm -f org/w3c/dom/traversal/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/traversal/$(am__dirstamp)
-       -rm -f org/w3c/dom/views/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/views/$(am__dirstamp)
-       -rm -f org/w3c/dom/xpath/$(DEPDIR)/$(am__dirstamp)
-       -rm -f org/w3c/dom/xpath/$(am__dirstamp)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -1679,11 +693,11 @@ maintainer-clean-generic:
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-toolexeclibLTLIBRARIES \
        mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf org/w3c/dom/$(DEPDIR) org/w3c/dom/bootstrap/$(DEPDIR) org/w3c/dom/css/$(DEPDIR) org/w3c/dom/events/$(DEPDIR) org/w3c/dom/html2/$(DEPDIR) org/w3c/dom/ls/$(DEPDIR) org/w3c/dom/ranges/$(DEPDIR) org/w3c/dom/stylesheets/$(DEPDIR) org/w3c/dom/traversal/$(DEPDIR) org/w3c/dom/views/$(DEPDIR) org/w3c/dom/xpath/$(DEPDIR)
+       -rm -rf ./$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-libtool distclean-tags
@@ -1700,7 +714,7 @@ info-am:
 
 install-data-am:
 
-install-exec-am:
+install-exec-am: install-toolexeclibLTLIBRARIES
 
 install-info: install-info-am
 
@@ -1709,7 +723,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf org/w3c/dom/$(DEPDIR) org/w3c/dom/bootstrap/$(DEPDIR) org/w3c/dom/css/$(DEPDIR) org/w3c/dom/events/$(DEPDIR) org/w3c/dom/html2/$(DEPDIR) org/w3c/dom/ls/$(DEPDIR) org/w3c/dom/ranges/$(DEPDIR) org/w3c/dom/stylesheets/$(DEPDIR) org/w3c/dom/traversal/$(DEPDIR) org/w3c/dom/views/$(DEPDIR) org/w3c/dom/xpath/$(DEPDIR)
+       -rm -rf ./$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1726,29 +740,33 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-       clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+       clean-libtool clean-toolexeclibLTLIBRARIES ctags distclean \
        distclean-compile distclean-generic distclean-libtool \
        distclean-tags distdir dvi dvi-am html html-am info info-am \
        install install-am install-data install-data-am install-exec \
        install-exec-am install-info install-info-am install-man \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-       mostlyclean-local pdf pdf-am ps ps-am tags uninstall \
-       uninstall-am uninstall-info-am
+       install-strip install-toolexeclibLTLIBRARIES installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+       pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
+       uninstall-toolexeclibLTLIBRARIES
+
 
+w3c.jar: classes.stamp
+       find org -name '*.class' -print | $(ZIP) -cfME@ $@
 
-classes.stamp: $(libw3c_convenience_la_SOURCES)
+classes.stamp: $(source_files)
        here=`pwd`; cd $(srcdir); \
-       $(GCJ_WITH_FLAGS) -C -d $$here $(libw3c_convenience_la_SOURCES)
+       $(GCJ_WITH_FLAGS) -C -d $$here $(source_files)
        echo > classes.stamp
 
 mostlyclean-local:
        -find . -name '*.class' | xargs rm
-       -rm classes.stamp
+       -rm classes.stamp w3c.jar
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
index dcb332a..ebf125d 100644 (file)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/libjava/gnu/gcj/runtime/BootClassLoader.java b/libjava/gnu/gcj/runtime/BootClassLoader.java
new file mode 100644 (file)
index 0000000..6223c73
--- /dev/null
@@ -0,0 +1,102 @@
+/* Copyright (C) 2005  Free Software Foundation
+
+   This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
+details.  */
+
+package gnu.gcj.runtime;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.StringTokenizer;
+
+/**
+ * This is a helper for the bootstrap class loader.  It is a
+ * URLClassLoader so that we can read a class path and re-use all the
+ * existing code for finding classes, extracting them from jars, etc.
+ * However, it is never called the way that an ordinary ClassLoader is
+ * called.  For instance, loadClass() is never used.
+ */
+public final class BootClassLoader extends URLClassLoader
+{
+  BootClassLoader(String libdir)
+  {
+    super(new URL[0]);
+
+    // Add the contents of the endorsed directories.
+    StringTokenizer st
+      = new StringTokenizer (System.getProperty ("java.endorsed.dirs", ""),
+                            File.pathSeparator);
+    try
+      {
+       while (st.hasMoreElements ())
+         {
+           String dirname = st.nextToken ();
+           File dir = new File (dirname);
+            if (dir.exists ())
+             {
+               if (! dirname.endsWith (File.separator))
+                 dirname = dirname + File.separator;
+               String files[] = dir.list (new FilenameFilter ()
+                 {
+                   public boolean accept (File dir, String name)
+                   {
+                     return name.endsWith (".jar") || name.endsWith (".zip");
+                   }
+                 });
+               for (int i = files.length - 1; i >= 0; i--)
+                 addURL(new URL("file", "", -1, dirname + files[i]));
+             }
+         }
+
+       String w3clib = (libdir + File.separator
+                        + System.mapLibraryName ("w3c-gcj"));
+       addURL(new URL("gcjlib", "", -1, w3clib));
+       String saxlib = (libdir + File.separator
+                        + System.mapLibraryName ("sax-gcj"));
+       addURL(new URL("gcjlib", "", -1, saxlib));
+      }
+    catch (java.net.MalformedURLException x)
+      {
+       // This should never happen.
+       throw new RuntimeException(x);
+      }
+  }
+
+  public Class bootLoadClass(String name)
+    throws ClassNotFoundException
+  {
+    Class c = findLoadedClass(name);
+    if (c == null)
+      {
+       try
+         {
+           // We could hack URLClassLoader to make this more
+           // efficient, if it mattered.
+           c = findClass(name);
+         }
+       catch (ClassNotFoundException _)
+         {
+           c = null;
+         }
+      }
+    return c;
+  }
+
+  public URL bootGetResource(String name)
+  {
+    return findResource(name);
+  }
+
+  public Enumeration bootGetResources(String name) throws IOException
+  {
+    return findResources(name);
+  }
+}
index 006dc13..ff585a8 100644 (file)
@@ -60,137 +60,172 @@ import javax.xml.parsers.SAXParserFactory;
  *
  * @author David Brownell
  */
-public final class JAXPFactory extends SAXParserFactory
+public final class JAXPFactory
+  extends SAXParserFactory
 {
-    private Hashtable  flags = new Hashtable ();
-
-    /**
-     * Constructs a factory which normally returns a non-validating
-     * parser.
-     */
-    public JAXPFactory () { }
-
-    public SAXParser newSAXParser ()
+  
+  private Hashtable flags = new Hashtable();
+
+  /**
+   * Constructs a factory which normally returns a non-validating
+   * parser.
+   */
+  public JAXPFactory()
+  {
+  }
+
+  public SAXParser newSAXParser()
     throws ParserConfigurationException, SAXException
+  {
+    JaxpParser jaxp = new JaxpParser();
+    Enumeration e = flags.keys();
+    XMLReader parser = jaxp.getXMLReader();
+
+    parser.setFeature(SAXDriver.FEATURE + "namespaces",
+                      isNamespaceAware());
+    parser.setFeature(SAXDriver.FEATURE + "validation",
+                      isValidating());
+    // that makes SAX2 feature flags trump JAXP
+    
+    while (e.hasMoreElements())
+      {
+        String uri = (String) e.nextElement();
+        Boolean value = (Boolean) flags.get(uri);
+        parser.setFeature(uri, value.booleanValue());
+      }
+
+    return jaxp;
+  }
+
+  // yes, this "feature transfer" mechanism doesn't play well
+  
+  public void setFeature(String name, boolean value) 
+    throws ParserConfigurationException, SAXNotRecognizedException,
+           SAXNotSupportedException
+  {
+    try
+      {
+        // force "early" detection of errors where possible
+        // (flags can't necessarily be set before parsing)
+        new JaxpParser().getXMLReader().setFeature(name, value);
+        
+        flags.put(name, new Boolean(value));
+      }
+    catch (SAXNotRecognizedException e)
+      {
+        throw new SAXNotRecognizedException(name);
+      }
+    catch (SAXNotSupportedException e)
+      {
+        throw new SAXNotSupportedException(name);
+      }
+    catch (Exception e)
+      {
+        throw new ParserConfigurationException(e.getClass().getName()
+                                               + ": "
+                                               + e.getMessage());
+      }
+  }
+
+  public boolean getFeature(String name) 
+    throws ParserConfigurationException, SAXNotRecognizedException,
+           SAXNotSupportedException
+  {
+    Boolean value = (Boolean) flags.get(name);
+    
+    if (value != null)
+      {
+        return value.booleanValue();
+      }
+    else
+      {
+        try
+          {
+            return new JaxpParser().getXMLReader().getFeature(name);
+          }
+        catch (SAXNotRecognizedException e)
+          {
+            throw new SAXNotRecognizedException(name);
+          }
+        catch (SAXNotSupportedException e)
+          {
+            throw new SAXNotSupportedException(name);
+          }
+        catch (SAXException e)
+          {
+            throw new ParserConfigurationException(e.getClass().getName()
+                                                   + ": "
+                                                   + e.getMessage());
+          }
+      }
+  }
+           
+  private static class JaxpParser
+    extends SAXParser
+  {
+    
+    private XmlReader ae2 = new XmlReader();
+    private XMLReaderAdapter parser = null;
+    
+    JaxpParser()
     {
-       JaxpParser      jaxp = new JaxpParser ();
-       Enumeration     e = flags.keys ();
-       XMLReader       parser = jaxp.getXMLReader ();
-
-       parser.setFeature (
-               SAXDriver.FEATURE + "namespaces",
-               isNamespaceAware ());
-       parser.setFeature (
-               SAXDriver.FEATURE + "validation",
-               isValidating ());
-       // that makes SAX2 feature flags trump JAXP
-
-       while (e.hasMoreElements ()) {
-           String      uri = (String) e.nextElement ();
-           Boolean     value = (Boolean) flags.get (uri);
-           parser.setFeature (uri, value.booleanValue ());
-       }
-
-       return jaxp;
     }
 
-    // yes, this "feature transfer" mechanism doesn't play well
+    public void setProperty(String id, Object value) 
+      throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+      ae2.setProperty(id, value);
+    }
 
-    public void setFeature (String name, boolean value) 
-    throws
-       ParserConfigurationException,
-       SAXNotRecognizedException,
-       SAXNotSupportedException
+    public Object getProperty(String id) 
+      throws SAXNotRecognizedException, SAXNotSupportedException
     {
-       try {
-           // force "early" detection of errors where possible
-           // (flags can't necessarily be set before parsing)
-           new JaxpParser ().getXMLReader ().setFeature (name, value);
-
-           flags.put (name, new Boolean (value));
-       } catch (SAXNotRecognizedException e) {
-           throw new SAXNotRecognizedException (name);
-       } catch (SAXNotSupportedException e) {
-           throw new SAXNotSupportedException (name);
-       } catch (Exception e) {
-           throw new ParserConfigurationException (
-                 e.getClass ().getName ()
-               + ": "
-               + e.getMessage ());
-       }
+      return ae2.getProperty(id);
     }
 
-    public boolean getFeature (String name) 
-    throws
-       ParserConfigurationException,
-       SAXNotRecognizedException,
-       SAXNotSupportedException
+    public Parser getParser()
+      throws SAXException
     {
-       Boolean value = (Boolean) flags.get (name);
-       
-       if (value != null)
-           return value.booleanValue ();
-       else
-           try {
-               return new JaxpParser ().getXMLReader ().getFeature (name);
-           } catch (SAXNotRecognizedException e) {
-               throw new SAXNotRecognizedException (name);
-           } catch (SAXNotSupportedException e) {
-               throw new SAXNotSupportedException (name);
-           } catch (SAXException e) {
-               throw new ParserConfigurationException (
-                     e.getClass ().getName ()
-                   + ": "
-                   + e.getMessage ());
-           }
+      if (parser == null)
+        {
+          parser = new XMLReaderAdapter(ae2);
+        }
+      return parser;
     }
 
-    private static class JaxpParser extends SAXParser
+    public XMLReader getXMLReader ()
+      throws SAXException
     {
-       private XmlReader       ae2 = new XmlReader ();
-       private XMLReaderAdapter parser = null;
-
-       JaxpParser () { }
-
-       public void setProperty (String id, Object value) 
-       throws SAXNotRecognizedException, SAXNotSupportedException
-           { ae2.setProperty (id, value); }
-
-       public Object getProperty (String id) 
-       throws SAXNotRecognizedException, SAXNotSupportedException
-           { return ae2.getProperty (id); }
-
-       public Parser getParser ()
-       throws SAXException
-       { 
-           if (parser == null)
-               parser = new XMLReaderAdapter (ae2);
-           return parser;
-       }
-
-       public XMLReader getXMLReader ()
-       throws SAXException
-           { return ae2; }
-
-       public boolean isNamespaceAware ()
-       {
-           try {
-               return ae2.getFeature (SAXDriver.FEATURE + "namespaces");
-           } catch (Exception e) {
-               throw new Error ();
-           }
-       }
-
-       public boolean isValidating ()
-       {
-           try {
-               return ae2.getFeature (SAXDriver.FEATURE + "validation");
-           } catch (Exception e) {
-               throw new Error ();
-           }
-       }
-
-        // TODO isXIncludeAware()
-        
+      return ae2;
     }
+
+    public boolean isNamespaceAware()
+    {
+      try
+        {
+          return ae2.getFeature(SAXDriver.FEATURE + "namespaces");
+        }
+      catch (Exception e)
+        {
+          throw new Error();
+        }
+    }
+    
+    public boolean isValidating()
+    {
+      try
+        {
+          return ae2.getFeature(SAXDriver.FEATURE + "validation");
+        }
+      catch (Exception e)
+        {
+          throw new Error();
+        }
+    }
+    
+    // TODO isXIncludeAware()
+    
+  }
+  
 }
+
index 0e7b3c7..003a736 100644 (file)
@@ -60,15 +60,11 @@ import java.net.URL;
 import java.util.Locale;
 import java.util.Stack;
 
-// maintaining 1.1 compatibility for now ... more portable, PJava, etc
-// Iterator, Hashmap and ArrayList ought to be faster
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Vector;
 
 import org.xml.sax.*;
 import org.xml.sax.ext.*;
@@ -133,1276 +129,1494 @@ import org.xml.sax.helpers.NamespaceSupport;
  * @see org.xml.sax.Parser
  */
 final public class SAXDriver
-    implements Locator, Attributes2, XMLReader, Parser, AttributeList
+  implements Locator, Attributes2, XMLReader, Parser, AttributeList
 {
-    private final DefaultHandler2      base = new DefaultHandler2 ();
-    private XmlParser                  parser;
-
-    private EntityResolver             entityResolver = base;
-    private EntityResolver2            resolver2 = null;
-    private ContentHandler             contentHandler = base;
-    private DTDHandler                 dtdHandler = base;
-    private ErrorHandler               errorHandler = base;
-    private DeclHandler                        declHandler = base;
-    private LexicalHandler             lexicalHandler = base;
-
-    private String                     elementName;
-    private Stack                      entityStack;
-
-    // one vector (of object/struct): faster, smaller
-    private List                       attributesList;
-
-    private boolean                    namespaces = true;
-    private boolean                    xmlNames = false;
-    private boolean                    extGE = true;
-    private boolean                    extPE = true;
-    private boolean                    resolveAll = true;
-    private boolean                    useResolver2 = true;
-    private boolean                     stringInterning = true;
-
-    private int                                attributeCount;
-    private boolean                    attributes;
-    private String                     nsTemp [];
-    private NamespaceSupport           prefixStack;
+  
+  private final DefaultHandler2 base = new DefaultHandler2();
+  private XmlParser parser;
+  
+  private EntityResolver entityResolver = base;
+  private EntityResolver2 resolver2 = null;
+  private ContentHandler contentHandler = base;
+  private DTDHandler dtdHandler = base;
+  private ErrorHandler errorHandler = base;
+  private DeclHandler declHandler = base;
+  private LexicalHandler lexicalHandler = base;
+  
+  private String elementName;
+  private Stack entityStack;
+  
+  // one vector (of object/struct): faster, smaller
+  private List attributesList;
+  
+  private boolean namespaces = true;
+  private boolean xmlNames = false;
+  private boolean extGE = true;
+  private boolean extPE = true;
+  private boolean resolveAll = true;
+  private boolean useResolver2 = true;
+  
+  // package private to allow (read-only) access in XmlParser
+  boolean stringInterning = true;
+  
+  private int attributeCount;
+  private boolean attributes;
+  private String[] nsTemp;
+  private NamespaceSupport prefixStack;
+  
+  //
+  // Constructor.
+  //
+
+  /**
+   * Constructs a SAX Parser.
+   */
+  public SAXDriver()
+  {
+    reset();
+  }
 
-    //
-    // Constructor.
-    //
+  private void reset()
+  {
+    elementName = null;
+    entityStack = new Stack();
+    attributesList = Collections.synchronizedList(new ArrayList());
+    attributeCount = 0;
+    attributes = false;
+    nsTemp = new String[3];
+    prefixStack = null;
+  }
 
-    /** Constructs a SAX Parser.  */
-    public SAXDriver ()
-    {
-      reset ();
-    }
 
-    private void reset ()
-    {
-      elementName = null;
-      entityStack = new Stack ();
-      attributesList = Collections.synchronizedList(new ArrayList());
-      attributeCount = 0;
-      attributes = false;
-      nsTemp = new String[3];
-      prefixStack = null;
-    }
+  //
+  // Implementation of org.xml.sax.Parser.
+  //
 
+  /**
+   * <b>SAX1</b>: Sets the locale used for diagnostics; currently,
+   * only locales using the English language are supported.
+   * @param locale The locale for which diagnostics will be generated
+   */
+  public void setLocale(Locale locale)
+    throws SAXException
+  {
+    if ("en".equals(locale.getLanguage()))
+      {
+        return;
+      }
+    throw new SAXException ("AElfred2 only supports English locales.");
+  }
 
-    //
-    // Implementation of org.xml.sax.Parser.
-    //
+  /**
+   * <b>SAX2</b>: Returns the object used when resolving external
+   * entities during parsing (both general and parameter entities).
+   */
+  public EntityResolver getEntityResolver()
+  {
+    return (entityResolver == base) ? null : entityResolver;
+  }
 
-    /**
-     * <b>SAX1</b>: Sets the locale used for diagnostics; currently,
-     * only locales using the English language are supported.
-     * @param locale The locale for which diagnostics will be generated
-     */
-    public void setLocale (Locale locale)
-    throws SAXException
-    {
-       if ("en".equals (locale.getLanguage ()))
-           return ;
+  /**
+   * <b>SAX1, SAX2</b>: Set the entity resolver for this parser.
+   * @param handler The object to receive entity events.
+   */
+  public void setEntityResolver(EntityResolver resolver)
+  {
+    if (resolver instanceof EntityResolver2)
+      {
+        resolver2 = (EntityResolver2) resolver;
+      }
+    else
+      {
+        resolver2 = null;
+      }
+    if (resolver == null)
+      {
+        resolver = base;
+      }
+    entityResolver = resolver;
+  }
 
-       throw new SAXException ("AElfred2 only supports English locales.");
-    }
+  /**
+   * <b>SAX2</b>: Returns the object used to process declarations related
+   * to notations and unparsed entities.
+   */
+  public DTDHandler getDTDHandler()
+  {
+    return (dtdHandler == base) ? null : dtdHandler;
+  }
 
+  /**
+   * <b>SAX1, SAX2</b>: Set the DTD handler for this parser.
+   * @param handler The object to receive DTD events.
+   */
+  public void setDTDHandler(DTDHandler handler)
+  {
+    if (handler == null)
+      {
+        handler = base;
+      }
+    this.dtdHandler = handler;
+  }
 
-    /**
-     * <b>SAX2</b>: Returns the object used when resolving external
-     * entities during parsing (both general and parameter entities).
-     */
-    public EntityResolver getEntityResolver ()
-    {
-       return (entityResolver == base) ? null : entityResolver;
-    }
 
-    /**
-     * <b>SAX1, SAX2</b>: Set the entity resolver for this parser.
-     * @param handler The object to receive entity events.
-     */
-    public void setEntityResolver (EntityResolver resolver)
-    {
-       if (resolver instanceof EntityResolver2)
-           resolver2 = (EntityResolver2) resolver;
-       else
-           resolver2 = null;
-       if (resolver == null)
-           resolver = base;
-       entityResolver = resolver;
-    }
+  /**
+   * <b>SAX1</b>: Set the document handler for this parser.  If a
+   * content handler was set, this document handler will supplant it.
+   * The parser is set to report all XML 1.0 names rather than to
+   * filter out "xmlns" attributes (the "namespace-prefixes" feature
+   * is set to true).
+   *
+   * @deprecated SAX2 programs should use the XMLReader interface
+   *  and a ContentHandler.
+   *
+   * @param handler The object to receive document events.
+   */
+  public void setDocumentHandler(DocumentHandler handler)
+  {
+    contentHandler = new Adapter(handler);
+    xmlNames = true;
+  }
 
+  /**
+   * <b>SAX2</b>: Returns the object used to report the logical
+   * content of an XML document.
+   */
+  public ContentHandler getContentHandler()
+  {
+    return (contentHandler == base) ? null : contentHandler;
+  }
 
-    /**
-     * <b>SAX2</b>: Returns the object used to process declarations related
-     * to notations and unparsed entities.
-     */
-    public DTDHandler getDTDHandler ()
-    {
-       return (dtdHandler == base) ? null : dtdHandler;
-    }
+  /**
+   * <b>SAX2</b>: Assigns the object used to report the logical
+   * content of an XML document.  If a document handler was set,
+   * this content handler will supplant it (but XML 1.0 style name
+   * reporting may remain enabled).
+   */
+  public void setContentHandler(ContentHandler handler)
+  {
+    if (handler == null)
+      {
+        handler = base;
+      }
+    contentHandler = handler;
+  }
 
-    /**
-     * <b>SAX1, SAX2</b>: Set the DTD handler for this parser.
-     * @param handler The object to receive DTD events.
-     */
-    public void setDTDHandler (DTDHandler handler)
-    {
-       if (handler == null)
-           handler = base;
-       this.dtdHandler = handler;
-    }
+  /**
+   * <b>SAX1, SAX2</b>: Set the error handler for this parser.
+   * @param handler The object to receive error events.
+   */
+  public void setErrorHandler(ErrorHandler handler)
+  {
+    if (handler == null)
+      {
+        handler = base;
+      }
+    this.errorHandler = handler;
+  }
 
+  /**
+   * <b>SAX2</b>: Returns the object used to receive callbacks for XML
+   * errors of all levels (fatal, nonfatal, warning); this is never null;
+   */
+  public ErrorHandler getErrorHandler()
+  {
+    return (errorHandler == base) ? null : errorHandler;
+  }
 
-    /**
-     * <b>SAX1</b>: Set the document handler for this parser.  If a
-     * content handler was set, this document handler will supplant it.
-     * The parser is set to report all XML 1.0 names rather than to
-     * filter out "xmlns" attributes (the "namespace-prefixes" feature
-     * is set to true).
-     *
-     * @deprecated SAX2 programs should use the XMLReader interface
-     * and a ContentHandler.
-     *
-     * @param handler The object to receive document events.
-     */
-    public void setDocumentHandler (DocumentHandler handler)
-    {
-       contentHandler = new Adapter (handler);
-       xmlNames = true;
-    }
+  /**
+   * <b>SAX1, SAX2</b>: Auxiliary API to parse an XML document, used mostly
+   * when no URI is available.
+   * If you want anything useful to happen, you should set
+   * at least one type of handler.
+   * @param source The XML input source.  Don't set 'encoding' unless
+   *  you know for a fact that it's correct.
+   * @see #setEntityResolver
+   * @see #setDTDHandler
+   * @see #setContentHandler
+   * @see #setErrorHandler
+   * @exception SAXException The handlers may throw any SAXException,
+   *  and the parser normally throws SAXParseException objects.
+   * @exception IOException IOExceptions are normally through through
+   *  the parser if there are problems reading the source document.
+   */
+  public void parse(InputSource source)
+    throws SAXException, IOException
+  {
+    synchronized (base)
+      {
+        parser = new XmlParser();
+        if (namespaces)
+          {
+            prefixStack = new NamespaceSupport();
+          }
+        else if (!xmlNames)
+          {
+            throw new IllegalStateException();
+          }
+        parser.setHandler(this);
+        
+        try
+          {
+            Reader r = source.getCharacterStream();
+            InputStream in = source.getByteStream();
+                        
+            parser.doParse(source.getSystemId(),
+                           source.getPublicId(),
+                           r,
+                           in,
+                           source.getEncoding());
+          }
+        catch (SAXException e)
+          {
+            throw e;
+          }
+        catch (IOException e)
+          {
+            throw e;
+          }
+        catch (RuntimeException e)
+          {
+            throw e;
+          }
+        catch (Exception e)
+          {
+            throw new SAXParseException(e.getMessage(), this, e);
+          }
+        finally
+          {
+            contentHandler.endDocument();
+            reset();
+          }
+      }
+  }
 
-    /**
-     * <b>SAX2</b>: Returns the object used to report the logical
-     * content of an XML document.
-     */
-    public ContentHandler getContentHandler ()
-    {
-       return contentHandler == base ? null : contentHandler;
-    }
+  /**
+   * <b>SAX1, SAX2</b>: Preferred API to parse an XML document, using a
+   * system identifier (URI).
+   */
+  public void parse(String systemId)
+    throws SAXException, IOException
+  {
+    parse(new InputSource(systemId));
+  }
 
-    /**
-     * <b>SAX2</b>: Assigns the object used to report the logical
-     * content of an XML document.  If a document handler was set,
-     * this content handler will supplant it (but XML 1.0 style name
-     * reporting may remain enabled).
-     */
-    public void setContentHandler (ContentHandler handler)
-    {
-       if (handler == null)
-           handler = base;
-       contentHandler = handler;
-    }
+  //
+  // Implementation of SAX2 "XMLReader" interface
+  //
+  static final String FEATURE = "http://xml.org/sax/features/";
+  static final String PROPERTY = "http://xml.org/sax/properties/";
+
+  /**
+   * <b>SAX2</b>: Tells the value of the specified feature flag.
+   *
+   * @exception SAXNotRecognizedException thrown if the feature flag
+   *  is neither built in, nor yet assigned.
+   */
+  public boolean getFeature(String featureId)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    if ((FEATURE + "validation").equals(featureId))
+      {
+        return false;
+      }
 
-    /**
-     * <b>SAX1, SAX2</b>: Set the error handler for this parser.
-     * @param handler The object to receive error events.
-     */
-    public void setErrorHandler (ErrorHandler handler)
-    {
-       if (handler == null)
-           handler = base;
-       this.errorHandler = handler;
-    }
+    // external entities (both types) are optionally included
+    if ((FEATURE + "external-general-entities").equals(featureId))
+      {
+        return extGE;
+      }
+    if ((FEATURE + "external-parameter-entities").equals(featureId))
+      {
+        return extPE;
+      }
+    
+    // element/attribute names are as written in document; no mangling
+    if ((FEATURE + "namespace-prefixes").equals(featureId))
+      {
+        return xmlNames;
+      }
 
-    /**
-     * <b>SAX2</b>: Returns the object used to receive callbacks for XML
-     * errors of all levels (fatal, nonfatal, warning); this is never null;
-     */
-    public ErrorHandler getErrorHandler ()
-       { return errorHandler == base ? null : errorHandler; }
-
-
-    /**
-     * <b>SAX1, SAX2</b>: Auxiliary API to parse an XML document, used mostly
-     * when no URI is available.
-     * If you want anything useful to happen, you should set
-     * at least one type of handler.
-     * @param source The XML input source.  Don't set 'encoding' unless
-     * you know for a fact that it's correct.
-     * @see #setEntityResolver
-     * @see #setDTDHandler
-     * @see #setContentHandler
-     * @see #setErrorHandler
-     * @exception SAXException The handlers may throw any SAXException,
-     * and the parser normally throws SAXParseException objects.
-     * @exception IOException IOExceptions are normally through through
-     * the parser if there are problems reading the source document.
-     */
-    public void parse (InputSource source)
-    throws SAXException, IOException
-    {
-       synchronized (base) {
-           parser = new XmlParser ();
-           if (namespaces)
-               prefixStack = new NamespaceSupport ();
-           else if (!xmlNames)
-               throw new IllegalStateException ();
-           parser.setHandler (this);
-
-           try {
-
-             Reader r = source.getCharacterStream();
-             InputStream in = source.getByteStream();
-
-             
-               parser.doParse (source.getSystemId (),
-                             source.getPublicId (),
-                             r,
-                             in,
-                             source.getEncoding ());
-           } catch (SAXException e) {
-               throw e;
-           } catch (IOException e) {
-               throw e;
-           } catch (RuntimeException e) {
-               throw e;
-           } catch (Exception e) {
-               throw new SAXParseException (e.getMessage (), this, e);
-           } finally {
-               contentHandler.endDocument ();
-                reset();
-           }
-       }
-    }
+    // report element/attribute namespaces?
+    if ((FEATURE + "namespaces").equals(featureId))
+      {
+        return namespaces;
+      }
 
+    // all PEs and GEs are reported
+    if ((FEATURE + "lexical-handler/parameter-entities").equals(featureId))
+      {
+        return true;
+      }
 
-    /**
-     * <b>SAX1, SAX2</b>: Preferred API to parse an XML document, using a
-     * system identifier (URI).
-     */
-    public void parse (String systemId)
-    throws SAXException, IOException
-    {
-       parse (new InputSource (systemId));
-    }
+    // default is true
+    if ((FEATURE + "string-interning").equals(featureId))
+      {
+        return stringInterning;
+      }
+  
+    // EXTENSIONS 1.1
+    
+    // always returns isSpecified info
+    if ((FEATURE + "use-attributes2").equals(featureId))
+      {
+        return true;
+      }
+  
+    // meaningful between startDocument/endDocument
+    if ((FEATURE + "is-standalone").equals(featureId))
+      {
+        if (parser == null)
+          {
+            throw new SAXNotSupportedException(featureId);
+          }
+        return parser.isStandalone();
+      }
 
-    //
-    // Implementation of SAX2 "XMLReader" interface
-    //
-    static final String        FEATURE = "http://xml.org/sax/features/";
-    static final String        PROPERTY = "http://xml.org/sax/properties/";
-
-    /**
-     * <b>SAX2</b>: Tells the value of the specified feature flag.
-     *
-     * @exception SAXNotRecognizedException thrown if the feature flag
-     * is neither built in, nor yet assigned.
-     */
-    public boolean getFeature (String featureId)
-    throws SAXNotRecognizedException, SAXNotSupportedException
-    {
-       if ((FEATURE + "validation").equals (featureId))
-           return false;
-
-       // external entities (both types) are optionally included
-       if ((FEATURE + "external-general-entities").equals (featureId))
-           return extGE;
-       if ((FEATURE + "external-parameter-entities") .equals (featureId))
-           return extPE;
-
-       // element/attribute names are as written in document; no mangling
-       if ((FEATURE + "namespace-prefixes").equals (featureId))
-           return xmlNames;
-
-       // report element/attribute namespaces?
-       if ((FEATURE + "namespaces").equals (featureId))
-           return namespaces;
-
-       // all PEs and GEs are reported
-       if ((FEATURE + "lexical-handler/parameter-entities").equals (featureId))
-           return true;
-
-       // default is true
-       if ((FEATURE + "string-interning").equals (featureId))
-           return stringInterning;
-       
-       // EXTENSIONS 1.1
-
-       // always returns isSpecified info
-       if ((FEATURE + "use-attributes2").equals (featureId))
-           return true;
-       
-       // meaningful between startDocument/endDocument
-       if ((FEATURE + "is-standalone").equals (featureId)) {
-           if (parser == null)
-               throw new SAXNotSupportedException (featureId);
-           return parser.isStandalone ();
-       }
-
-       // optionally don't absolutize URIs in declarations
-       if ((FEATURE + "resolve-dtd-uris").equals (featureId))
-           return resolveAll;
-
-       // optionally use resolver2 interface methods, if possible
-       if ((FEATURE + "use-entity-resolver2").equals (featureId))
-           return useResolver2;
-       
-       throw new SAXNotRecognizedException (featureId);
-    }
+    // optionally don't absolutize URIs in declarations
+    if ((FEATURE + "resolve-dtd-uris").equals(featureId))
+      {
+        return resolveAll;
+      }
+
+    // optionally use resolver2 interface methods, if possible
+    if ((FEATURE + "use-entity-resolver2").equals(featureId))
+      {
+        return useResolver2;
+      }
+  
+    throw new SAXNotRecognizedException(featureId);
+  }
 
-    // package private
-    DeclHandler getDeclHandler () { return declHandler; }
+  // package private
+  DeclHandler getDeclHandler()
+  {
+    return declHandler;
+  }
 
-    // package private
-    boolean resolveURIs () { return resolveAll; }
+  // package private
+  boolean resolveURIs()
+  {
+    return resolveAll;
+  }
 
-    /**
-     * <b>SAX2</b>:  Returns the specified property.
-     *
-     * @exception SAXNotRecognizedException thrown if the property value
-     * is neither built in, nor yet stored.
-     */
-    public Object getProperty (String propertyId)
+  /**
+   * <b>SAX2</b>:  Returns the specified property.
+   *
+   * @exception SAXNotRecognizedException thrown if the property value
+    is neither built in, nor yet stored.
+   */
+  public Object getProperty(String propertyId)
     throws SAXNotRecognizedException
-    {
-       if ((PROPERTY + "declaration-handler").equals (propertyId))
-           return declHandler == base ? null : declHandler;
-
-       if ((PROPERTY + "lexical-handler").equals (propertyId))
-           return lexicalHandler == base ? null : lexicalHandler;
-       
-       // unknown properties
-       throw new SAXNotRecognizedException (propertyId);
-    }
+  {
+    if ((PROPERTY + "declaration-handler").equals(propertyId))
+      {
+        return (declHandler == base) ? null : declHandler;
+      }
 
-    /**
-     * <b>SAX2</b>:  Sets the state of feature flags in this parser.  Some
-     * built-in feature flags are mutable.
-     */
-    public void setFeature (String featureId, boolean value)
-    throws SAXNotRecognizedException, SAXNotSupportedException
-    {
-       boolean state;
-       
-       // Features with a defined value, we just change it if we can.
-       state = getFeature (featureId);
-
-       if (state == value)
-           return;
-       if (parser != null)
-           throw new SAXNotSupportedException ("not while parsing");
-
-       if ((FEATURE + "namespace-prefixes").equals (featureId)) {
-           // in this implementation, this only affects xmlns reporting
-           xmlNames = value;
-           // forcibly prevent illegal parser state
-           if (!xmlNames)
-               namespaces = true;
-           return;
-       }
-
-       if ((FEATURE + "namespaces").equals (featureId)) {
-           namespaces = value;
-           // forcibly prevent illegal parser state
-           if (!namespaces)
-               xmlNames = true;
-           return;
-       }
-
-       if ((FEATURE + "external-general-entities").equals (featureId)) {
-           extGE = value;
-           return;
-       }
-       if ((FEATURE + "external-parameter-entities") .equals (featureId)) {
-           extPE = value;
-           return;
-       }
-       if ((FEATURE + "resolve-dtd-uris").equals (featureId)) {
-           resolveAll = value;
-           return;
-       }
-
-       if ((FEATURE + "use-entity-resolver2").equals (featureId)) {
-           useResolver2 = value;
-           return;
-       }
-
-       throw new SAXNotRecognizedException (featureId);
-    }
+    if ((PROPERTY + "lexical-handler").equals(propertyId))
+      {
+        return (lexicalHandler == base) ? null : lexicalHandler;
+      }
+    
+    // unknown properties
+    throw new SAXNotRecognizedException(propertyId);
+  }
 
-    /**
-     * <b>SAX2</b>:  Assigns the specified property.  Like SAX1 handlers,
-     * these may be changed at any time.
-     */
-    public void setProperty (String propertyId, Object value)
+  /**
+   * <b>SAX2</b>:  Sets the state of feature flags in this parser.  Some
+   * built-in feature flags are mutable.
+   */
+  public void setFeature(String featureId, boolean value)
     throws SAXNotRecognizedException, SAXNotSupportedException
-    {
-       // see if the property is recognized
-       getProperty (propertyId);
-
-       // Properties with a defined value, we just change it if we can.
-
-       if ((PROPERTY + "declaration-handler").equals (propertyId)) {
-           if (value == null)
-               declHandler = base;
-           else if (! (value instanceof DeclHandler))
-               throw new SAXNotSupportedException (propertyId);
-           else
-               declHandler = (DeclHandler) value;
-           return ;
-       }
-
-       if ((PROPERTY + "lexical-handler").equals (propertyId)) {
-           if (value == null)
-               lexicalHandler = base;
-           else if (! (value instanceof LexicalHandler))
-               throw new SAXNotSupportedException (propertyId);
-           else
-               lexicalHandler = (LexicalHandler) value;
-           return ;
-       }
-
-       throw new SAXNotSupportedException (propertyId);
-    }
+  {
+    boolean state;
+  
+    // Features with a defined value, we just change it if we can.
+    state = getFeature (featureId);
+    
+    if (state == value)
+      {
+        return;
+      }
+    if (parser != null)
+      {
+        throw new SAXNotSupportedException("not while parsing");
+      }
 
+    if ((FEATURE + "namespace-prefixes").equals(featureId))
+      {
+        // in this implementation, this only affects xmlns reporting
+        xmlNames = value;
+        // forcibly prevent illegal parser state
+        if (!xmlNames)
+          {
+            namespaces = true;
+          }
+        return;
+      }
 
-    //
-    // This is where the driver receives XmlParser callbacks and translates
-    // them into SAX callbacks.  Some more callbacks have been added for
-    // SAX2 support.
-    //
+    if ((FEATURE + "namespaces").equals(featureId))
+      {
+        namespaces = value;
+        // forcibly prevent illegal parser state
+        if (!namespaces)
+          {
+            xmlNames = true;
+          }
+        return;
+      }
+
+    if ((FEATURE + "external-general-entities").equals(featureId))
+      {
+        extGE = value;
+        return;
+      }
+    if ((FEATURE + "external-parameter-entities").equals(featureId))
+      {
+        extPE = value;
+        return;
+      }
+    if ((FEATURE + "resolve-dtd-uris").equals(featureId))
+      {
+        resolveAll = value;
+        return;
+      }
 
-    void startDocument ()
+    if ((FEATURE + "use-entity-resolver2").equals(featureId))
+      {
+        useResolver2 = value;
+        return;
+      }
+
+    throw new SAXNotRecognizedException(featureId);
+  }
+
+  /**
+   * <b>SAX2</b>:  Assigns the specified property.  Like SAX1 handlers,
+   * these may be changed at any time.
+   */
+  public void setProperty(String propertyId, Object value)
+    throws SAXNotRecognizedException, SAXNotSupportedException
+  {
+    // see if the property is recognized
+    getProperty(propertyId);
+    
+    // Properties with a defined value, we just change it if we can.
+    
+    if ((PROPERTY + "declaration-handler").equals(propertyId))
+      {
+        if (value == null)
+          {
+            declHandler = base;
+          }
+        else if (!(value instanceof DeclHandler))
+          {
+            throw new SAXNotSupportedException(propertyId);
+          }
+        else
+          {
+            declHandler = (DeclHandler) value;
+          }
+        return ;
+      }
+    
+    if ((PROPERTY + "lexical-handler").equals(propertyId))
+      {
+        if (value == null)
+          {
+            lexicalHandler = base;
+          }
+        else if (!(value instanceof LexicalHandler))
+          {
+            throw new SAXNotSupportedException(propertyId);
+          }
+        else
+          {
+            lexicalHandler = (LexicalHandler) value;
+          }
+        return;
+      }
+    
+    throw new SAXNotSupportedException(propertyId);
+  }
+
+  //
+  // This is where the driver receives XmlParser callbacks and translates
+  // them into SAX callbacks.  Some more callbacks have been added for
+  // SAX2 support.
+  //
+
+  void startDocument()
     throws SAXException
-    {
-       contentHandler.setDocumentLocator (this);
-       contentHandler.startDocument ();
-       attributesList.clear ();
-    }
+  {
+    contentHandler.setDocumentLocator(this);
+    contentHandler.startDocument();
+    attributesList.clear();
+  }
 
-    void xmlDecl(String version,
-                 String encoding,
-                 boolean standalone,
-                 String inputEncoding)
-      throws SAXException
-    {
-      if (contentHandler instanceof ContentHandler2)
-        {
-          ((ContentHandler2) contentHandler).xmlDecl(version,
-                                                     encoding,
-                                                     standalone,
-                                                     inputEncoding);
-        }
-    }
+  void xmlDecl(String version,
+               String encoding,
+               boolean standalone,
+               String inputEncoding)
+    throws SAXException
+  {
+    if (contentHandler instanceof ContentHandler2)
+      {
+        ((ContentHandler2) contentHandler).xmlDecl(version,
+                                                   encoding,
+                                                   standalone,
+                                                   inputEncoding);
+      }
+  }
 
-    void skippedEntity (String name)
+  void skippedEntity(String name)
     throws SAXException
-       { contentHandler.skippedEntity (name); }
+  {
+    contentHandler.skippedEntity(name);
+  }
 
-    InputSource getExternalSubset (String name, String baseURI)
+  InputSource getExternalSubset(String name, String baseURI)
     throws SAXException, IOException
-    {
-       if (resolver2 == null || !useResolver2 || !extPE)
-           return null;
-       return resolver2.getExternalSubset (name, baseURI);
-    }
+  {
+    if (resolver2 == null || !useResolver2 || !extPE)
+      {
+        return null;
+      }
+    return resolver2.getExternalSubset(name, baseURI);
+  }
 
-    InputSource resolveEntity (boolean isPE, String name,
-       InputSource in, String baseURI)
+  InputSource resolveEntity(boolean isPE, String name,
+                            InputSource in, String baseURI)
     throws SAXException, IOException
-    {
-       InputSource     source;
-
-       // external entities might be skipped
-       if (isPE && !extPE)
-           return null;
-       if (!isPE && !extGE)
-           return null;
-
-       // ... or not
-       lexicalHandler.startEntity (name);
-       if (resolver2 != null && useResolver2) {
-           source = resolver2.resolveEntity (name, in.getPublicId (),
-                       baseURI, in.getSystemId ());
-           if (source == null) {
-               in.setSystemId (absolutize (baseURI,
-                               in.getSystemId (), false));
-               source = in;
-           }
-       } else {
-           in.setSystemId (absolutize (baseURI, in.getSystemId (), false));
-           source = entityResolver.resolveEntity (in.getPublicId (),
-                       in.getSystemId ());
-           if (source == null)
-               source = in;
-       }
-       startExternalEntity (name, source.getSystemId (), true);
-       return source;
-    }
+  {
+    InputSource  source;
+    
+    // external entities might be skipped
+    if (isPE && !extPE)
+      {
+        return null;
+      }
+    if (!isPE && !extGE)
+      {
+        return null;
+      }
 
-    // absolutize a system ID relative to the specified base URI
-    // (temporarily) package-visible for external entity decls
-    String absolutize (String baseURI, String systemId, boolean nice)
+    // ... or not
+    lexicalHandler.startEntity(name);
+    if (resolver2 != null && useResolver2)
+      {
+        source = resolver2.resolveEntity(name, in.getPublicId(),
+                                         baseURI, in.getSystemId());
+        if (source == null)
+          {
+            in.setSystemId(absolutize(baseURI,
+                                      in.getSystemId(), false));
+            source = in;
+          }
+      }
+    else
+      {
+        in.setSystemId(absolutize(baseURI, in.getSystemId(), false));
+        source = entityResolver.resolveEntity(in.getPublicId(),
+                                              in.getSystemId());
+        if (source == null)
+          {
+            source = in;
+          }
+      }
+    startExternalEntity(name, source.getSystemId(), true);
+    return source;
+  }
+
+  // absolutize a system ID relative to the specified base URI
+  // (temporarily) package-visible for external entity decls
+  String absolutize(String baseURI, String systemId, boolean nice)
     throws MalformedURLException, SAXException
-    {
-       // FIXME normalize system IDs -- when?
-       // - Convert to UTF-8
-       // - Map reserved and non-ASCII characters to %HH
-
-       try {
-           if (baseURI == null) {
-               warn ("No base URI; hope this SYSTEM id is absolute: "
-                       + systemId);
-               return new URL (systemId).toString ();
-           } else
-               return new URL (new URL (baseURI), systemId).toString ();
-
-       } catch (MalformedURLException e) {
-
-           // Let unknown URI schemes pass through unless we need
-           // the JVM to map them to i/o streams for us...
-           if (!nice)
-               throw e;
-
-           // sometimes sysids for notations or unparsed entities
-           // aren't really URIs...
-           warn ("Can't absolutize SYSTEM id: " + e.getMessage ());
-           return systemId;
-       }
-    }
+  {
+    // FIXME normalize system IDs -- when?
+    // - Convert to UTF-8
+    // - Map reserved and non-ASCII characters to %HH
+    
+    try
+      {
+        if (baseURI == null)
+          {
+            if (XmlParser.uriWarnings)
+              {
+                warn ("No base URI; hope this SYSTEM id is absolute: "
+                      + systemId);
+              }
+            return new URL(systemId).toString();
+          }
+        else
+          {
+            return new URL(new URL(baseURI), systemId).toString();
+          }
+      }
+    catch (MalformedURLException e)
+      {
+        // Let unknown URI schemes pass through unless we need
+        // the JVM to map them to i/o streams for us...
+        if (!nice)
+          {
+            throw e;
+          }
+        
+        // sometimes sysids for notations or unparsed entities
+        // aren't really URIs...
+        warn("Can't absolutize SYSTEM id: " + e.getMessage());
+        return systemId;
+      }
+  }
 
-    void startExternalEntity (String name, String systemId,
-       boolean stackOnly)
+  void startExternalEntity(String name, String systemId, boolean stackOnly)
     throws SAXException
-    {
-       // The following warning was deleted because the application has the
-       // option of not setting systemId. Sun's JAXP or Xerces seems to
-       // ignore this case.
-       /*
-       if (systemId == null)
-           warn ("URI was not reported to parser for entity " + name);
-       */
-       if (!stackOnly)         // spliced [dtd] needs startEntity
-           lexicalHandler.startEntity (name);
-       entityStack.push (systemId);
-    }
+  {
+    // The following warning was deleted because the application has the
+    // option of not setting systemId. Sun's JAXP or Xerces seems to
+    // ignore this case.
+    /*
+       if (systemId == null)
+       warn ("URI was not reported to parser for entity " + name);
+     */
+    if (!stackOnly)  // spliced [dtd] needs startEntity
+      {
+        lexicalHandler.startEntity(name);
+      }
+    entityStack.push(systemId);
+  }
 
-    void endExternalEntity (String name)
+  void endExternalEntity(String name)
     throws SAXException
-    {
-       if (!"[document]".equals (name))
-           lexicalHandler.endEntity (name);
-       entityStack.pop ();
-    }
+  {
+    if (!"[document]".equals(name))
+      {
+        lexicalHandler.endEntity(name);
+      }
+    entityStack.pop();
+  }
 
-    void startInternalEntity (String name)
+  void startInternalEntity(String name)
     throws SAXException
-    {
-       lexicalHandler.startEntity (name);
-    }
+  {
+    lexicalHandler.startEntity(name);
+  }
 
-    void endInternalEntity (String name)
+  void endInternalEntity(String name)
     throws SAXException
-    {
-       lexicalHandler.endEntity (name);
-    }
+  {
+    lexicalHandler.endEntity(name);
+  }
 
-    void doctypeDecl (String name, String publicId, String systemId)
+  void doctypeDecl(String name, String publicId, String systemId)
     throws SAXException
-    {
-       lexicalHandler.startDTD (name, publicId, systemId);
-       
-       // ... the "name" is a declaration and should be given
-       // to the DeclHandler (but sax2 doesn't).
-
-       // the IDs for the external subset are lexical details,
-       // as are the contents of the internal subset; but sax2
-       // doesn't provide the internal subset "pre-parse"
-    }
-
-    void notationDecl (String name, String ids [])
+  {
+    lexicalHandler.startDTD(name, publicId, systemId);
+  
+    // ... the "name" is a declaration and should be given
+    // to the DeclHandler (but sax2 doesn't).
+    
+    // the IDs for the external subset are lexical details,
+    // as are the contents of the internal subset; but sax2
+    // doesn't provide the internal subset "pre-parse"
+  }
+  
+  void notationDecl(String name, String publicId, String systemId,
+                    String baseUri)
     throws SAXException
-    {
-       try {
-           dtdHandler.notationDecl (name, ids [0],
-               (resolveAll && ids [1] != null)
-                       ? absolutize (ids [2], ids [1], true)
-                       : ids [1]);
-       } catch (IOException e) {
-           // "can't happen"
-           throw new SAXParseException (e.getMessage (), this, e);
-       }
-    }
+  {
+    try
+      {
+        dtdHandler.notationDecl(name, publicId,
+                                (resolveAll && systemId != null)
+                                ? absolutize(baseUri, systemId, true)
+                                : systemId);
+      }
+    catch (IOException e)
+      {
+        // "can't happen"
+        throw new SAXParseException(e.getMessage(), this, e);
+      }
+  }
 
-    void unparsedEntityDecl (String name, String ids [], String notation)
+  void unparsedEntityDecl(String name, String publicId, String systemId,
+                          String baseUri, String notation)
     throws SAXException
-    {
-       try {
-           dtdHandler.unparsedEntityDecl (name, ids [0],
-                   resolveAll
-                       ? absolutize (ids [2], ids [1], true)
-                       : ids [1],
-                   notation);
-       } catch (IOException e) {
-           // "can't happen"
-           throw new SAXParseException (e.getMessage (), this, e);
-       }
-    }
+  {
+    try
+      {
+        dtdHandler.unparsedEntityDecl(name, publicId,
+                                      resolveAll
+                                      ? absolutize(baseUri, systemId, true)
+                                      : systemId,
+                                      notation);
+      }
+    catch (IOException e)
+      {
+        // "can't happen"
+        throw new SAXParseException(e.getMessage(), this, e);
+      }
+  }
 
-    void endDoctype ()
+  void endDoctype()
     throws SAXException
-    {
-       lexicalHandler.endDTD ();
-    }
+  {
+    lexicalHandler.endDTD();
+  }
 
-    private void declarePrefix (String prefix, String uri)
+  private void declarePrefix(String prefix, String uri)
     throws SAXException
-    {
-       int index = uri.indexOf (':');
-
-       // many versions of nwalsh docbook stylesheets 
-       // have bogus URLs; so this can't be an error...
-       if (index < 1 && uri.length () != 0)
-           warn ("relative URI for namespace: " + uri);
-
-       // FIXME:  char [0] must be ascii alpha; chars [1..index]
-       // must be ascii alphanumeric or in "+-." [RFC 2396]
-       
-       //Namespace Constraints
-       //name for xml prefix must be http://www.w3.org/XML/1998/namespace
-       boolean prefixEquality = prefix.equals("xml");
-       boolean uriEquality = uri.equals("http://www.w3.org/XML/1998/namespace");
-       if ((prefixEquality || uriEquality) && !(prefixEquality && uriEquality))
-          fatal ("xml is by definition bound to the namespace name " +
-                       "http://www.w3.org/XML/1998/namespace");
-       
-        //xmlns prefix declaration is illegal but xml prefix declaration is llegal...
-       if (prefixEquality && uriEquality)
-          return;
-       
-        //name for xmlns prefix must be http://www.w3.org/2000/xmlns/
-       prefixEquality = prefix.equals("xmlns");
-       uriEquality = uri.equals("http://www.w3.org/2000/xmlns/");
-       if ((prefixEquality || uriEquality) && !(prefixEquality && uriEquality))
-          fatal("http://www.w3.org/2000/xmlns/ is by definition bound" +
-                       " to prefix xmlns");
-       
-       //even if the uri is http://www.w3.org/2000/xmlns/ it is illegal to declare it
-       if (prefixEquality && uriEquality)
-          fatal ("declaring the xmlns prefix is illegal");
-               
-       uri = uri.intern ();
-       prefixStack.declarePrefix (prefix, uri);
-       contentHandler.startPrefixMapping (prefix, uri);
-    }
+  {
+    int index = uri.indexOf(':');
+
+    // many versions of nwalsh docbook stylesheets 
+    // have bogus URLs; so this can't be an error...
+    if (index < 1 && uri.length() != 0)
+      {
+        warn("relative URI for namespace: " + uri);
+      }
 
-    void attribute (String qname, String value, boolean isSpecified)
-    throws SAXException
-    {
-       if (!attributes) {
-           attributes = true;
-           if (namespaces)
-               prefixStack.pushContext ();
-       }
-
-       // process namespace decls immediately;
-       // then maybe forget this as an attribute
-       if (namespaces) {
-           int index;
-
-      // default NS declaration?
-      if (getFeature (FEATURE + "string-interning")) {
-        if ("xmlns" == qname) {
-          declarePrefix ("", value);
-          if (!xmlNames)
-            return;
-        }
-        // NS prefix declaration?
-        else if ((index = qname.indexOf (':')) == 5
-                 && qname.startsWith ("xmlns")) {
-          String               prefix = qname.substring (6);
-          
-          if (prefix.equals(""))
-               fatal ("missing prefix in namespace declaration attribute");    
-          if (value.length () == 0) {
-            verror ("missing URI in namespace declaration attribute: "
-                    + qname);
-          } else
-            declarePrefix (prefix, value);
-          if (!xmlNames)
-            return;
-        }
-      } else {
-        if ("xmlns".equals(qname)) {
-          declarePrefix ("", value);
-          if (!xmlNames)
-            return;
-        }
-        // NS prefix declaration?
-        else if ((index = qname.indexOf (':')) == 5
-                 && qname.startsWith ("xmlns")) {
-          String               prefix = qname.substring (6);
-          
-          if (value.length () == 0) {
-            verror ("missing URI in namespace decl attribute: "
-                    + qname);
-          } else
-            declarePrefix (prefix, value);
-          if (!xmlNames)
-            return;
-        }
+    // FIXME:  char [0] must be ascii alpha; chars [1..index]
+    // must be ascii alphanumeric or in "+-." [RFC 2396]
+    
+    //Namespace Constraints
+    //name for xml prefix must be http://www.w3.org/XML/1998/namespace
+    boolean prefixEquality = prefix.equals("xml");
+    boolean uriEquality = uri.equals("http://www.w3.org/XML/1998/namespace");
+    if ((prefixEquality || uriEquality) && !(prefixEquality && uriEquality))
+      {
+        fatal("xml is by definition bound to the namespace name " +
+              "http://www.w3.org/XML/1998/namespace");
+      }
+  
+    //xmlns prefix declaration is illegal but xml prefix declaration is llegal...
+    if (prefixEquality && uriEquality)
+      {
+        return;
       }
+  
+    //name for xmlns prefix must be http://www.w3.org/2000/xmlns/
+    prefixEquality = prefix.equals("xmlns");
+    uriEquality = uri.equals("http://www.w3.org/2000/xmlns/");
+    if ((prefixEquality || uriEquality) && !(prefixEquality && uriEquality))
+      {
+        fatal("http://www.w3.org/2000/xmlns/ is by definition bound" +
+              " to prefix xmlns");
+      }
+  
+    //even if the uri is http://www.w3.org/2000/xmlns/
+    // it is illegal to declare it
+    if (prefixEquality && uriEquality)
+      {
+        fatal ("declaring the xmlns prefix is illegal");
+      }
+  
+    uri = uri.intern();
+    prefixStack.declarePrefix(prefix, uri);
+    contentHandler.startPrefixMapping(prefix, uri);
   }
-       // remember this attribute ...
-
-       attributeCount++;
-       
-       // attribute type comes from querying parser's DTD records
-       attributesList.add(new Attribute(qname, value, isSpecified));
-
-    }
 
-    void startElement (String elname)
+  void attribute(String qname, String value, boolean isSpecified)
     throws SAXException
-    {
-       ContentHandler handler = contentHandler;
-
-       //
-       // NOTE:  this implementation of namespace support adds something
-       // like six percent to parsing CPU time, in a large (~50 MB)
-       // document that doesn't use namespaces at all.  (Measured by PC
-       // sampling, with a bug where endElement processing was omitted.)
-       // [Measurement referred to older implementation, older JVM ...]
-       //
-       // It ought to become notably faster in such cases.  Most
-       // costs are the prefix stack calling Hashtable.get() (2%),
-       // String.hashCode() (1.5%) and about 1.3% each for pushing
-       // the context, and two chunks of name processing.
-       //
-
-       if (!attributes) {
-           if (namespaces)
-               prefixStack.pushContext ();
-       } else if (namespaces) {
-
-           // now we can patch up namespace refs; we saw all the
-           // declarations, so now we'll do the Right Thing
-           Iterator itt = attributesList.iterator ();
-           while(itt.hasNext())
-           {
-               Attribute attribute = (Attribute) itt.next();
-               String  qname = attribute.name;
-               int     index;
-
-    // default NS declaration?
-    if (getFeature (FEATURE + "string-interning")) {
-      if ("xmlns" == qname)
-                   continue;
-    } else {
-      if ("xmlns".equals(qname))
-                   continue;
-    }
-               //Illegal in the new Namespaces Draft
-               //should it be only in 1.1 docs??
-               if (qname.equals (":"))
-                   fatal ("namespace names consisting of a single colon " +
-                               "character are invalid");
-               index = qname.indexOf (':');
-
-               // NS prefix declaration?
-               if (index == 5 && qname.startsWith ("xmlns"))
-                   continue;
-
-               // it's not a NS decl; patch namespace info items
-               if (prefixStack.processName (qname, nsTemp, true) == null)
-                   fatal ("undeclared attribute prefix in: " + qname);
-               else {
-                   attribute.nameSpace = nsTemp[0];
-                   attribute.localName = nsTemp[1];
-               }
-           }
-       }
-
-       // save element name so attribute callbacks work
-       elementName = elname;
-       if (namespaces) {
-           if (prefixStack.processName (elname, nsTemp, false) == null) {
-               fatal ("undeclared element prefix in: " + elname);
-               nsTemp [0] = nsTemp [1] = "";
-           }
-           handler.startElement (nsTemp [0], nsTemp [1], elname, this);
-       } else
-           handler.startElement ("", "", elname, this);
-       // elementName = null;
-
-       // elements with no attributes are pretty common!
-       if (attributes) {
-           attributesList.clear();
-           attributeCount = 0;
-           attributes = false;
-       }
-    }
-
-    void endElement (String elname)
+  {
+    if (!attributes)
+      {
+        attributes = true;
+        if (namespaces)
+          {
+            prefixStack.pushContext();
+          }
+      }
+    
+    // process namespace decls immediately;
+    // then maybe forget this as an attribute
+    if (namespaces)
+      {
+        int index;
+        
+        // default NS declaration?
+        if (stringInterning)
+          {
+            if ("xmlns" == qname)
+              {
+                declarePrefix("", value);
+                if (!xmlNames)
+                  {
+                    return;
+                  }
+              }
+            // NS prefix declaration?
+            else if ((index = qname.indexOf(':')) == 5
+                     && qname.startsWith("xmlns"))
+              {
+                String prefix = qname.substring(6);
+              
+                if (prefix.equals(""))
+                  {
+                    fatal("missing prefix " +
+                          "in namespace declaration attribute");  
+                  }
+                if (value.length() == 0)
+                  {
+                    verror("missing URI in namespace declaration attribute: "
+                           + qname);
+                  }
+                else
+                  {
+                    declarePrefix(prefix, value);
+                  }
+                if (!xmlNames)
+                  {
+                    return;
+                  }
+              }
+          }
+        else
+          {
+            if ("xmlns".equals(qname))
+              {
+                declarePrefix("", value);
+                if (!xmlNames)
+                  {
+                    return;
+                  }
+              }
+            // NS prefix declaration?
+            else if ((index = qname.indexOf(':')) == 5
+                     && qname.startsWith("xmlns"))
+              {
+                String prefix = qname.substring(6);
+                
+                if (value.length() == 0)
+                  {
+                    verror("missing URI in namespace decl attribute: "
+                           + qname);
+                  }
+                else
+                  {
+                    declarePrefix(prefix, value);
+                  }
+                if (!xmlNames)
+                  {
+                    return;
+                  }
+              }
+          }
+      }
+    // remember this attribute ...
+    attributeCount++;
+    
+    // attribute type comes from querying parser's DTD records
+    attributesList.add(new Attribute(qname, value, isSpecified));
+    
+  }
+  
+  void startElement(String elname)
     throws SAXException
-    {
-       ContentHandler  handler = contentHandler;
-
-       if (!namespaces) {
-           handler.endElement ("", "", elname);
-           return;
-       }
-       prefixStack.processName (elname, nsTemp, false);
-       handler.endElement (nsTemp [0], nsTemp [1], elname);
+  {
+    ContentHandler handler = contentHandler;
 
-       Enumeration     prefixes = prefixStack.getDeclaredPrefixes ();
+    //
+    // NOTE:  this implementation of namespace support adds something
+    // like six percent to parsing CPU time, in a large (~50 MB)
+    // document that doesn't use namespaces at all.  (Measured by PC
+    // sampling, with a bug where endElement processing was omitted.)
+    // [Measurement referred to older implementation, older JVM ...]
+    //
+    // It ought to become notably faster in such cases.  Most
+    // costs are the prefix stack calling Hashtable.get() (2%),
+    // String.hashCode() (1.5%) and about 1.3% each for pushing
+    // the context, and two chunks of name processing.
+    //
+    
+    if (!attributes)
+      {
+        if (namespaces)
+          {
+            prefixStack.pushContext();
+          }
+      }
+    else if (namespaces)
+      {
+      
+        // now we can patch up namespace refs; we saw all the
+        // declarati