PatchSet 7391 Date: 2006/08/22 12:24:34 Author: robilad Branch: HEAD Tag: (none) Log: resynced with GNU Classpath 0.92 and switched kaffe to use GNU Classpath's nio libs as far as possible
2006-08-22 Dalibor Topic <[EMAIL PROTECTED]> Switched nio libraries to GNU Classpath's version. * Makefile.am (BUILD_ENVIRONMENT-make): Set KAFFELIBRARYPATH to GNU Classpath's java-nio native library. * configure.ac (JAVA_LIBS) Removed kaffe's native nio library. Dont disable core jni libraries when building GNU Classpath. Don't output Makefile for Kaffe's native nio libraries. * kaffe/kaffevm/Makefile.am: Added dependencies for GNU Classpath's classpath utility library. Added Kaffe's gnu_java_nio_VMSelector.c implementation to the library. * libraries/clib/Makefile.am: (SUBDIRS) Removed nio. * libraries/clib/nio/Makefile.am, libraries/clib/nio/Makefile.in, libraries/clib/nio/gnu_java_nio_VMChannel.c, libraries/clib/nio/gnu_java_nio_VMPipe.c, libraries/clib/nio/gnu_java_nio_channels_FileChannelImpl.c, libraries/clib/nio/gnu_java_nio_charset_iconv_IconvDecoder.c, libraries/clib/nio/gnu_java_nio_charset_iconv_IconvEncoder.c, libraries/clib/nio/java_nio_MappedByteBufferImpl.c, libraries/clib/nio/java_nio_VMDirectByteBuffer.c: Removed. * libraries/javalib/external/classpath: Resynced with 0.92. Members: ChangeLog:1.4893->1.4894 Makefile.am:1.114->1.115 Makefile.in:1.265->1.266 configure:1.568->1.569 configure.ac:1.246->1.247 kaffe/kaffevm/Makefile.am:1.84->1.85 kaffe/kaffevm/Makefile.in:1.241->1.242 libraries/clib/Makefile.am:1.25->1.26 libraries/clib/Makefile.in:1.183->1.184 libraries/clib/nio/Makefile.am:1.23->1.24(DEAD) libraries/clib/nio/Makefile.in:1.114->1.115(DEAD) libraries/clib/nio/gnu_java_nio_VMChannel.c:1.1->1.2(DEAD) libraries/clib/nio/gnu_java_nio_VMPipe.c:1.1->1.2(DEAD) libraries/clib/nio/gnu_java_nio_channels_FileChannelImpl.c:1.6->1.7(DEAD) libraries/clib/nio/gnu_java_nio_charset_iconv_IconvDecoder.c:1.8->1.9(DEAD) libraries/clib/nio/gnu_java_nio_charset_iconv_IconvEncoder.c:1.7->1.8(DEAD) libraries/clib/nio/java_nio_MappedByteBufferImpl.c:1.2->1.3(DEAD) libraries/clib/nio/java_nio_VMDirectByteBuffer.c:1.13->1.14(DEAD) libraries/javalib/external/classpath/ChangeLog:1.34->1.35 libraries/javalib/external/classpath/INSTALL:1.5->1.6 libraries/javalib/external/classpath/Makefile.in:1.23->1.24 libraries/javalib/external/classpath/NEWS:1.15->1.16 libraries/javalib/external/classpath/README:1.2->1.3 libraries/javalib/external/classpath/configure:1.30->1.31 libraries/javalib/external/classpath/configure.ac:1.17->1.18 libraries/javalib/external/classpath/doc/Makefile.in:1.20->1.21 libraries/javalib/external/classpath/doc/hacking.info:1.8->1.9 libraries/javalib/external/classpath/doc/tools.info:1.6->1.7 libraries/javalib/external/classpath/doc/vmintegration.info:1.17->1.18 libraries/javalib/external/classpath/doc/vmintegration.texinfo:1.7->1.8 libraries/javalib/external/classpath/doc/api/Makefile.in:1.21->1.22 libraries/javalib/external/classpath/examples/Makefile.in:1.25->1.26 libraries/javalib/external/classpath/examples/gnu/classpath/examples/awt/Demo.java:1.4->1.5 libraries/javalib/external/classpath/examples/gnu/classpath/examples/management/TestBeans.java:INITIAL->1.1 libraries/javalib/external/classpath/examples/gnu/classpath/examples/swing/Demo.java:1.12->1.13 libraries/javalib/external/classpath/external/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/external/relaxngDatatype/Makefile.in:1.9->1.10 libraries/javalib/external/classpath/external/sax/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.34->1.35 libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.34->1.35 libraries/javalib/external/classpath/external/w3c_dom/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/gnu/classpath/jdwp/event/ExceptionEvent.java:1.1->1.2 libraries/javalib/external/classpath/gnu/classpath/jdwp/util/Location.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/awt/java2d/CubicSegment.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/awt/java2d/LineSegment.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/awt/java2d/QuadSegment.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/awt/java2d/Segment.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/CairoSurface.java:1.5->1.6 libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java:1.4->1.5 libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/GtkCanvasPeer.java:1.4->1.5 libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java:1.3->1.4 libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.9->1.10 libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java:1.7->1.8 libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java:1.7->1.8 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtCheckboxPeer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtComponentGraphics.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtComponentPeer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtContainerPeer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtDialogPeer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtFontMetrics.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtFontPeer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtGraphics.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtGraphicsEnvironment.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtImage.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtImageConsumer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtImageDirectGraphics.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtImageGraphics.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtMenuBarPeer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtMenuItemPeer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtPopupMenuPeer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtScrollPanePeer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtToolkit.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/awt/peer/qt/QtVolatileImage.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/x/XDialogPeer.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/java/awt/peer/x/XEventPump.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/x/XFontPeer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/x/XFramePeer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/awt/peer/x/XGraphics.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/awt/peer/x/XImage.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/awt/peer/x/XToolkit.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/awt/peer/x/XWindowPeer.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/lang/management/BeanImpl.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/lang/management/ClassLoadingMXBeanImpl.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/lang/management/CompilationMXBeanImpl.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/lang/management/GarbageCollectorMXBeanImpl.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/lang/management/MemoryMXBeanImpl.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/lang/management/MemoryManagerMXBeanImpl.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/lang/management/MemoryPoolMXBeanImpl.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/lang/management/OperatingSystemMXBeanImpl.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/lang/management/RuntimeMXBeanImpl.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/lang/management/ThreadMXBeanImpl.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/nio/SelectionKeyImpl.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/nio/SelectorImpl.java:1.3->1.4 libraries/javalib/external/classpath/gnu/java/security/Engine.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/security/key/dss/DSSKey.java:1.7->1.8 libraries/javalib/external/classpath/gnu/java/security/key/dss/DSSKeyPairX509Codec.java:1.2->1.3 libraries/javalib/external/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java:1.3->1.4 libraries/javalib/external/classpath/gnu/java/security/util/IntegerUtil.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/java/util/regex/RE.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/util/regex/RETokenEnd.java:1.1->1.2 libraries/javalib/external/classpath/gnu/java/util/regex/RETokenStart.java:1.1->1.2 libraries/javalib/external/classpath/gnu/javax/crypto/cipher/TripleDES.java:1.2->1.3 libraries/javalib/external/classpath/gnu/javax/imageio/IIOInputStream.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/gif/GIFImageReader.java:1.1->1.2 libraries/javalib/external/classpath/gnu/javax/imageio/gif/GIFImageReaderSpi.java:1.1->1.2 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGChunk.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGData.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGDecoder.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGEncoder.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGException.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGFile.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGFilter.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGGamma.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGHeader.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGICCProfile.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGImageReader.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGImageReaderSpi.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGPalette.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGPhys.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/javax/imageio/png/PNGTime.java:INITIAL->1.1 libraries/javalib/external/classpath/gnu/xml/dom/DomIterator.java:1.2->1.3 libraries/javalib/external/classpath/gnu/xml/transform/ApplyTemplatesNode.java:1.3->1.4 libraries/javalib/external/classpath/gnu/xml/transform/ForEachNode.java:1.2->1.3 libraries/javalib/external/classpath/include/Makefile.in:1.24->1.25 libraries/javalib/external/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h:1.4->1.5 libraries/javalib/external/classpath/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h:1.4->1.5 libraries/javalib/external/classpath/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h:1.3->1.4 libraries/javalib/external/classpath/include/java_lang_VMSystem.h:1.2->1.3 libraries/javalib/external/classpath/include/jvmti.h:1.1->1.2 libraries/javalib/external/classpath/java/awt/AWTEvent.java:1.2->1.3 libraries/javalib/external/classpath/java/awt/BasicStroke.java:1.5->1.6 libraries/javalib/external/classpath/java/awt/Component.java:1.13->1.14 libraries/javalib/external/classpath/java/awt/Container.java:1.13->1.14 libraries/javalib/external/classpath/java/awt/ContainerOrderFocusTraversalPolicy.java:1.2->1.3 libraries/javalib/external/classpath/java/awt/DefaultKeyboardFocusManager.java:1.3->1.4 libraries/javalib/external/classpath/java/awt/EventDispatchThread.java:1.2->1.3 libraries/javalib/external/classpath/java/awt/Font.java:1.3->1.4 libraries/javalib/external/classpath/java/awt/GridLayout.java:1.1->1.2 libraries/javalib/external/classpath/java/awt/KeyboardFocusManager.java:1.2->1.3 libraries/javalib/external/classpath/java/awt/LightweightDispatcher.java:1.5->1.6 libraries/javalib/external/classpath/java/awt/Window.java:1.8->1.9 libraries/javalib/external/classpath/java/awt/dnd/DragSource.java:1.4->1.5 libraries/javalib/external/classpath/java/awt/geom/GeneralPath.java:1.3->1.4 libraries/javalib/external/classpath/java/awt/image/BandedSampleModel.java:1.2->1.3 libraries/javalib/external/classpath/java/awt/image/ByteLookupTable.java:1.1->1.2 libraries/javalib/external/classpath/java/awt/image/ColorConvertOp.java:1.1->1.2 libraries/javalib/external/classpath/java/awt/image/ColorModel.java:1.3->1.4 libraries/javalib/external/classpath/java/awt/image/ComponentSampleModel.java:1.2->1.3 libraries/javalib/external/classpath/java/awt/image/ConvolveOp.java:1.2->1.3 libraries/javalib/external/classpath/java/awt/image/Kernel.java:1.1->1.2 libraries/javalib/external/classpath/java/awt/image/ShortLookupTable.java:1.1->1.2 libraries/javalib/external/classpath/java/awt/peer/ComponentPeer.java:1.2->1.3 libraries/javalib/external/classpath/java/lang/Iterable.java:1.1->1.2 libraries/javalib/external/classpath/java/lang/StrictMath.java:1.4->1.5 libraries/javalib/external/classpath/java/lang/management/ManagementFactory.java:1.2->1.3 libraries/javalib/external/classpath/java/lang/management/MemoryMXBean.java:1.1->1.2 libraries/javalib/external/classpath/java/lang/management/MemoryNotificationInfo.java:1.1->1.2 libraries/javalib/external/classpath/java/lang/management/MemoryPoolMXBean.java:1.1->1.2 libraries/javalib/external/classpath/java/math/BigDecimal.java:1.4->1.5 libraries/javalib/external/classpath/java/net/Inet6Address.java:1.2->1.3 libraries/javalib/external/classpath/java/net/URL.java:1.7->1.8 libraries/javalib/external/classpath/java/net/URLStreamHandler.java:1.2->1.3 libraries/javalib/external/classpath/java/nio/DirectByteBufferImpl.java:1.1->1.2 libraries/javalib/external/classpath/java/nio/channels/SelectionKey.java:1.1->1.2 libraries/javalib/external/classpath/java/nio/channels/spi/AbstractSelectionKey.java:1.1->1.2 libraries/javalib/external/classpath/java/security/Provider.java:1.1->1.2 libraries/javalib/external/classpath/java/security/SecureRandom.java:1.3->1.4 libraries/javalib/external/classpath/java/util/GregorianCalendar.java:1.2->1.3 libraries/javalib/external/classpath/java/util/Vector.java:1.1->1.2 libraries/javalib/external/classpath/java/util/regex/Pattern.java:1.5->1.6 libraries/javalib/external/classpath/javax/imageio/spi/IIORegistry.java:1.2->1.3 libraries/javalib/external/classpath/javax/management/IntrospectionException.java:INITIAL->1.1 libraries/javalib/external/classpath/javax/management/MBeanAttributeInfo.java:INITIAL->1.1 libraries/javalib/external/classpath/javax/management/MBeanConstructorInfo.java:INITIAL->1.1 libraries/javalib/external/classpath/javax/management/MBeanFeatureInfo.java:1.2->1.3 libraries/javalib/external/classpath/javax/management/MBeanInfo.java:1.2->1.3 libraries/javalib/external/classpath/javax/management/MBeanNotificationInfo.java:1.1->1.2 libraries/javalib/external/classpath/javax/management/MBeanOperationInfo.java:INITIAL->1.1 libraries/javalib/external/classpath/javax/management/MBeanParameterInfo.java:INITIAL->1.1 libraries/javalib/external/classpath/javax/management/NotCompliantMBeanException.java:INITIAL->1.1 libraries/javalib/external/classpath/javax/management/StandardMBean.java:INITIAL->1.1 libraries/javalib/external/classpath/javax/management/openmbean/CompositeData.java:1.1->1.2 libraries/javalib/external/classpath/javax/management/openmbean/CompositeDataSupport.java:INITIAL->1.1 libraries/javalib/external/classpath/javax/management/openmbean/InvalidKeyException.java:INITIAL->1.1 libraries/javalib/external/classpath/javax/security/auth/login/LoginContext.java:1.3->1.4 libraries/javalib/external/classpath/javax/swing/JComboBox.java:1.7->1.8 libraries/javalib/external/classpath/javax/swing/JComponent.java:1.15->1.16 libraries/javalib/external/classpath/javax/swing/JOptionPane.java:1.6->1.7 libraries/javalib/external/classpath/javax/swing/JPopupMenu.java:1.5->1.6 libraries/javalib/external/classpath/javax/swing/JTabbedPane.java:1.10->1.11 libraries/javalib/external/classpath/javax/swing/JTable.java:1.14->1.15 libraries/javalib/external/classpath/javax/swing/JTree.java:1.10->1.11 libraries/javalib/external/classpath/javax/swing/RepaintManager.java:1.11->1.12 libraries/javalib/external/classpath/javax/swing/SwingUtilities.java:1.8->1.9 libraries/javalib/external/classpath/javax/swing/UIManager.java:1.8->1.9 libraries/javalib/external/classpath/javax/swing/filechooser/FileSystemView.java:1.2->1.3 libraries/javalib/external/classpath/javax/swing/filechooser/UnixFileSystemView.java:1.3->1.4 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicButtonListener.java:1.5->1.6 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java:1.8->1.9 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java:1.3->1.4 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java:1.8->1.9 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java:1.10->1.11 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicListUI.java:1.11->1.12 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java:1.13->1.14 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicMenuBarUI.java:1.4->1.5 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java:1.5->1.6 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java:1.6->1.7 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java:1.9->1.10 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicTableUI.java:1.11->1.12 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicTextUI.java:1.14->1.15 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicToolBarUI.java:1.6->1.7 libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicTreeUI.java:1.11->1.12 libraries/javalib/external/classpath/javax/swing/plaf/metal/MetalComboBoxButton.java:1.5->1.6 libraries/javalib/external/classpath/javax/swing/plaf/metal/MetalFileChooserUI.java:1.10->1.11 libraries/javalib/external/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java:1.10->1.11 libraries/javalib/external/classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java:1.5->1.6 libraries/javalib/external/classpath/javax/swing/plaf/metal/MetalUtils.java:1.6->1.7 libraries/javalib/external/classpath/javax/swing/text/AbstractDocument.java:1.11->1.12 libraries/javalib/external/classpath/javax/swing/text/BoxView.java:1.4->1.5 libraries/javalib/external/classpath/javax/swing/text/CompositeView.java:1.5->1.6 libraries/javalib/external/classpath/javax/swing/text/DefaultCaret.java:1.11->1.12 libraries/javalib/external/classpath/javax/swing/text/EmptyAttributeSet.java:INITIAL->1.1 libraries/javalib/external/classpath/javax/swing/text/FlowView.java:1.5->1.6 libraries/javalib/external/classpath/javax/swing/text/GapContent.java:1.11->1.12 libraries/javalib/external/classpath/javax/swing/text/IconView.java:1.3->1.4 libraries/javalib/external/classpath/javax/swing/text/ParagraphView.java:1.3->1.4 libraries/javalib/external/classpath/javax/swing/text/Segment.java:1.6->1.7 libraries/javalib/external/classpath/javax/swing/text/SimpleAttributeSet.java:1.2->1.3 libraries/javalib/external/classpath/javax/swing/text/StringContent.java:1.3->1.4 libraries/javalib/external/classpath/javax/swing/text/TabSet.java:1.1->1.2 libraries/javalib/external/classpath/javax/swing/text/TabStop.java:1.1->1.2 libraries/javalib/external/classpath/javax/swing/text/View.java:1.5->1.6 libraries/javalib/external/classpath/javax/swing/tree/TreePath.java:1.5->1.6 libraries/javalib/external/classpath/lib/Makefile.am:1.14->1.15 libraries/javalib/external/classpath/lib/Makefile.in:1.27->1.28 libraries/javalib/external/classpath/lib/mkcollections.pl.in:1.2->1.3 libraries/javalib/external/classpath/native/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/native/fdlibm/Makefile.in:1.24->1.25 libraries/javalib/external/classpath/native/jawt/Makefile.am:1.4->1.5 libraries/javalib/external/classpath/native/jawt/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/native/jni/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/native/jni/classpath/Makefile.in:1.23->1.24 libraries/javalib/external/classpath/native/jni/gconf-peer/GConfNativePeer.c:1.2->1.3 libraries/javalib/external/classpath/native/jni/gconf-peer/Makefile.am:1.2->1.3 libraries/javalib/external/classpath/native/jni/gconf-peer/Makefile.in:1.2->1.3 libraries/javalib/external/classpath/native/jni/gtk-peer/Makefile.am:1.8->1.9 libraries/javalib/external/classpath/native/jni/gtk-peer/Makefile.in:1.25->1.26 libraries/javalib/external/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c:1.3->1.4 libraries/javalib/external/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c:1.4->1.5 libraries/javalib/external/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.5->1.6 libraries/javalib/external/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:1.3->1.4 libraries/javalib/external/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.5->1.6 libraries/javalib/external/classpath/native/jni/java-io/Makefile.in:1.23->1.24 libraries/javalib/external/classpath/native/jni/java-lang/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/native/jni/java-lang/java_lang_VMSystem.c:1.2->1.3 libraries/javalib/external/classpath/native/jni/java-net/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/native/jni/java-nio/Makefile.in:1.23->1.24 libraries/javalib/external/classpath/native/jni/java-nio/java_nio_VMDirectByteBuffer.c:1.2->1.3 libraries/javalib/external/classpath/native/jni/java-util/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.am:1.2->1.3 libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/native/jni/midi-dssi/Makefile.am:1.3->1.4 libraries/javalib/external/classpath/native/jni/midi-dssi/Makefile.in:1.23->1.24 libraries/javalib/external/classpath/native/jni/qt-peer/Makefile.am:1.2->1.3 libraries/javalib/external/classpath/native/jni/qt-peer/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/native/jni/xmlj/Makefile.in:1.23->1.24 libraries/javalib/external/classpath/native/plugin/Makefile.in:1.4->1.5 libraries/javalib/external/classpath/native/target/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/native/target/Linux/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/native/target/generic/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/resource/Makefile.in:1.23->1.24 libraries/javalib/external/classpath/resource/META-INF/services/java.util.prefs.PreferencesFactory:INITIAL->1.1 libraries/javalib/external/classpath/resource/gnu/classpath/tools/jarsigner/messages.properties:1.1->1.2 libraries/javalib/external/classpath/resource/gnu/java/awt/peer/x/fonts.properties:INITIAL->1.1 libraries/javalib/external/classpath/resource/gnu/java/util/regex/MessagesBundle.properties:INITIAL->1.1 libraries/javalib/external/classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties:INITIAL->1.1 libraries/javalib/external/classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties:INITIAL->1.1 libraries/javalib/external/classpath/resource/java/security/classpath.security:1.3->1.4 libraries/javalib/external/classpath/scripts/Makefile.am:1.1->1.2 libraries/javalib/external/classpath/scripts/Makefile.in:1.22->1.23 libraries/javalib/external/classpath/scripts/classpath.spec.in:1.34->1.35 libraries/javalib/external/classpath/scripts/import-cacerts.sh:INITIAL->1.1 libraries/javalib/external/classpath/tools/Makefile.in:1.11->1.12 libraries/javalib/external/classpath/tools/gnu/classpath/tools/jarsigner/SFHelper.java:1.3->1.4 libraries/javalib/external/classpath/vm/reference/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java:1.1->1.2 libraries/javalib/external/classpath/vm/reference/java/lang/VMSystem.java:1.3->1.4 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.4893 kaffe/ChangeLog:1.4894 --- kaffe/ChangeLog:1.4893 Mon Aug 21 22:04:49 2006 +++ kaffe/ChangeLog Tue Aug 22 12:24:34 2006 @@ -1,3 +1,33 @@ +2006-08-22 Dalibor Topic <[EMAIL PROTECTED]> + + Switched nio libraries to GNU Classpath's version. + + * Makefile.am (BUILD_ENVIRONMENT-make): Set KAFFELIBRARYPATH to GNU Classpath's + java-nio native library. + + * configure.ac (JAVA_LIBS) Removed kaffe's native nio library. + Dont disable core jni libraries when building GNU Classpath. Don't + output Makefile for Kaffe's native nio libraries. + + * kaffe/kaffevm/Makefile.am: Added dependencies for GNU Classpath's + classpath utility library. Added Kaffe's gnu_java_nio_VMSelector.c + implementation to the library. + + * libraries/clib/Makefile.am: (SUBDIRS) Removed nio. + + * libraries/clib/nio/Makefile.am, + libraries/clib/nio/Makefile.in, + libraries/clib/nio/gnu_java_nio_VMChannel.c, + libraries/clib/nio/gnu_java_nio_VMPipe.c, + libraries/clib/nio/gnu_java_nio_channels_FileChannelImpl.c, + libraries/clib/nio/gnu_java_nio_charset_iconv_IconvDecoder.c, + libraries/clib/nio/gnu_java_nio_charset_iconv_IconvEncoder.c, + libraries/clib/nio/java_nio_MappedByteBufferImpl.c, + libraries/clib/nio/java_nio_VMDirectByteBuffer.c: + Removed. + + * libraries/javalib/external/classpath: Resynced with 0.92. + 2006-08-21 Dalibor Topic <[EMAIL PROTECTED]> * libraries/clib/nio/gnu_java_nio_channels_FileChannelImpl.c, Index: kaffe/Makefile.am diff -u kaffe/Makefile.am:1.114 kaffe/Makefile.am:1.115 --- kaffe/Makefile.am:1.114 Sun Aug 20 22:27:32 2006 +++ kaffe/Makefile.am Tue Aug 22 12:24:38 2006 @@ -175,7 +175,7 @@ BUILD_ENVIRONMENT-make: Makefile echo BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(GLIBJ_ZIP)\''$(PATHSEP)'\'\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \ echo CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\; export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \ - echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \ + echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \ echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new; \ rm -f BUILD_ENVIRONMENT mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT Index: kaffe/Makefile.in diff -u kaffe/Makefile.in:1.265 kaffe/Makefile.in:1.266 --- kaffe/Makefile.in:1.265 Sun Aug 20 22:27:32 2006 +++ kaffe/Makefile.in Tue Aug 22 12:24:38 2006 @@ -985,7 +985,7 @@ BUILD_ENVIRONMENT-make: Makefile echo BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(GLIBJ_ZIP)\''$(PATHSEP)'\'\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \ echo CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\; export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \ - echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \ + echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \ echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new; \ rm -f BUILD_ENVIRONMENT mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT Index: kaffe/configure diff -u kaffe/configure:1.568 kaffe/configure:1.569 --- kaffe/configure:1.568 Sun Aug 20 22:27:32 2006 +++ kaffe/configure Tue Aug 22 12:24:38 2006 @@ -50057,7 +50057,6 @@ \$(top_builddir)/libraries/clib/native/libjavalang.la \ \$(top_builddir)/libraries/clib/net/libjavanet.la \ \$(top_builddir)/libraries/clib/io/libjavaio.la \ -\$(top_builddir)/libraries/clib/nio/libjavanio.la \ \$(top_builddir)/libraries/clib/management/libmanagement.la \ \$(top_builddir)/libraries/clib/security/libsecurity.la \ $JAVA_LIBS \ @@ -51034,7 +51033,7 @@ fi ac_configure_args="$ac_configure_args --with-vm=${prefix}/bin/kaffe" -ac_configure_args="$ac_configure_args --disable-core-jni" +#ac_configure_args="$ac_configure_args --disable-core-jni" ac_configure_args="$ac_configure_args --disable-examples" ac_configure_args="$ac_configure_args --with-glibj-dir=${jrelibdir}" ac_configure_args="$ac_configure_args --with-native-libdir=${nativedir}" @@ -51160,8 +51159,6 @@ ac_config_files="$ac_config_files libraries/clib/io/Makefile" - ac_config_files="$ac_config_files libraries/clib/nio/Makefile" - ac_config_files="$ac_config_files libraries/clib/net/Makefile" ac_config_files="$ac_config_files libraries/clib/zip/Makefile" @@ -52170,7 +52167,6 @@ "libraries/clib/target/Linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/target/Linux/Makefile" ;; "libraries/clib/native/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/native/Makefile" ;; "libraries/clib/io/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/io/Makefile" ;; - "libraries/clib/nio/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/nio/Makefile" ;; "libraries/clib/net/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/net/Makefile" ;; "libraries/clib/zip/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/zip/Makefile" ;; "libraries/clib/math/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/math/Makefile" ;; Index: kaffe/configure.ac diff -u kaffe/configure.ac:1.246 kaffe/configure.ac:1.247 --- kaffe/configure.ac:1.246 Sun Aug 20 22:27:40 2006 +++ kaffe/configure.ac Tue Aug 22 12:24:45 2006 @@ -2185,7 +2185,6 @@ \$(top_builddir)/libraries/clib/native/libjavalang.la \ \$(top_builddir)/libraries/clib/net/libjavanet.la \ \$(top_builddir)/libraries/clib/io/libjavaio.la \ -\$(top_builddir)/libraries/clib/nio/libjavanio.la \ \$(top_builddir)/libraries/clib/management/libmanagement.la \ \$(top_builddir)/libraries/clib/security/libsecurity.la \ $JAVA_LIBS \ @@ -2476,7 +2475,7 @@ fi ac_configure_args="$ac_configure_args --with-vm=${prefix}/bin/kaffe" -ac_configure_args="$ac_configure_args --disable-core-jni" +#ac_configure_args="$ac_configure_args --disable-core-jni" ac_configure_args="$ac_configure_args --disable-examples" ac_configure_args="$ac_configure_args --with-glibj-dir=${jrelibdir}" ac_configure_args="$ac_configure_args --with-native-libdir=${nativedir}" @@ -2543,7 +2542,6 @@ AC_CONFIG_FILES([libraries/clib/target/Linux/Makefile]) AC_CONFIG_FILES([libraries/clib/native/Makefile]) AC_CONFIG_FILES([libraries/clib/io/Makefile]) -AC_CONFIG_FILES([libraries/clib/nio/Makefile]) AC_CONFIG_FILES([libraries/clib/net/Makefile]) AC_CONFIG_FILES([libraries/clib/zip/Makefile]) AC_CONFIG_FILES([libraries/clib/math/Makefile]) Index: kaffe/kaffe/kaffevm/Makefile.am diff -u kaffe/kaffe/kaffevm/Makefile.am:1.84 kaffe/kaffe/kaffevm/Makefile.am:1.85 --- kaffe/kaffe/kaffevm/Makefile.am:1.84 Sat Jul 15 18:35:28 2006 +++ kaffe/kaffe/kaffevm/Makefile.am Tue Aug 22 12:24:47 2006 @@ -40,7 +40,8 @@ -I$(top_srcdir)/kaffe/kaffevm/jni \ -I$(top_srcdir)/config/$(Khost_cpu) \ -I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) \ - $(MAYBE_INTERNAL_ZIP_INCLUDES) + $(MAYBE_INTERNAL_ZIP_INCLUDES) \ + -I$(top_srcdir)/libraries/javalib/external/classpath/native/jni/classpath native_LTLIBRARIES = libkaffevm.la @@ -77,7 +78,8 @@ verifier/libkaffeverifier.la \ $(GC_NAME)/libkaffegc.la \ jni/libkaffejni.la \ - $(top_builddir)/replace/libreplace.la + $(top_builddir)/replace/libreplace.la \ + $(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la libkaffevm_la_LIBADD = \ $(libkaffevm_la_DEPENDENCIES) \ @@ -122,7 +124,8 @@ gcFuncs.c \ reflect.c \ reference.c \ - binreloc.c + binreloc.c \ + $(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c noinst_HEADERS = \ access.h \ Index: kaffe/kaffe/kaffevm/Makefile.in diff -u kaffe/kaffe/kaffevm/Makefile.in:1.241 kaffe/kaffe/kaffevm/Makefile.in:1.242 --- kaffe/kaffe/kaffevm/Makefile.in:1.241 Sun Aug 20 22:27:48 2006 +++ kaffe/kaffe/kaffevm/Makefile.in Tue Aug 22 12:24:47 2006 @@ -93,7 +93,8 @@ am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(ENGINE_NAME)/libengine.la \ $(am__DEPENDENCIES_2) systems/$(THREAD_SYSTEM)/libkthread.la \ verifier/libkaffeverifier.la $(GC_NAME)/libkaffegc.la \ - jni/libkaffejni.la $(top_builddir)/replace/libreplace.la + jni/libkaffejni.la $(top_builddir)/replace/libreplace.la \ + $(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la @[EMAIL PROTECTED] = \ @COND_SYSTEM_ZLIB_FALSE@ ../../external/gcc/zlib/libz.la @[EMAIL PROTECTED] = $(am__DEPENDENCIES_1) @@ -114,7 +115,8 @@ libkaffevm_la-javacall.lo libkaffevm_la-thread.lo \ libkaffevm_la-utf8const.lo libkaffevm_la-gcFuncs.lo \ libkaffevm_la-reflect.lo libkaffevm_la-reference.lo \ - libkaffevm_la-binreloc.lo + libkaffevm_la-binreloc.lo \ + libkaffevm_la-gnu_java_nio_VMSelector.lo nodist_libkaffevm_la_OBJECTS = libkaffevm_la-md.lo libkaffevm_la_OBJECTS = $(am_libkaffevm_la_OBJECTS) \ $(nodist_libkaffevm_la_OBJECTS) @@ -434,7 +436,8 @@ -I$(top_srcdir)/kaffe/kaffevm/jni \ -I$(top_srcdir)/config/$(Khost_cpu) \ -I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) \ - $(MAYBE_INTERNAL_ZIP_INCLUDES) + $(MAYBE_INTERNAL_ZIP_INCLUDES) \ + -I$(top_srcdir)/libraries/javalib/external/classpath/native/jni/classpath native_LTLIBRARIES = libkaffevm.la @[EMAIL PROTECTED] = # @@ -461,7 +464,8 @@ verifier/libkaffeverifier.la \ $(GC_NAME)/libkaffegc.la \ jni/libkaffejni.la \ - $(top_builddir)/replace/libreplace.la + $(top_builddir)/replace/libreplace.la \ + $(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la libkaffevm_la_LIBADD = \ $(libkaffevm_la_DEPENDENCIES) \ @@ -506,7 +510,8 @@ gcFuncs.c \ reflect.c \ reference.c \ - binreloc.c + binreloc.c \ + $(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c noinst_HEADERS = \ access.h \ @@ -632,6 +637,7 @@ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ [EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ @@ -910,6 +916,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='binreloc.c' object='libkaffevm_la-binreloc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-binreloc.lo `test -f 'binreloc.c' || echo '$(srcdir)/'`binreloc.c + +libkaffevm_la-gnu_java_nio_VMSelector.lo: $(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c [EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-gnu_java_nio_VMSelector.lo -MD -MP -MF "$(DEPDIR)/libkaffevm_la-gnu_java_nio_VMSelector.Tpo" -c -o libkaffevm_la-gnu_java_nio_VMSelector.lo `test -f '$(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/libkaffevm_la-gnu_java_nio_VMSelector.Tpo" "$(DEPDIR)/libkaffevm_la-gnu_java_nio_VMSelector.Plo"; else rm -f "$(DEPDIR)/libkaffevm_la-gnu_java_nio_VMSelector.Tpo"; exit 1; fi [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='$(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c' object='libkaffevm_la-gnu_java_nio_VMSelector.lo' libtool=yes @AMDEPBACKSLASH@ [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ [EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -c -o libkaffevm_la-gnu_java_nio_VMSelector.lo `test -f '$(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c' || echo '$(srcdir)/'`$(top_srcdir)/libraries/clib/nio/gnu_java_nio_VMSelector.c libkaffevm_la-md.lo: md.c @am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkaffevm_la_CFLAGS) $(CFLAGS) -MT libkaffevm_la-md.lo -MD -MP -MF "$(DEPDIR)/libkaffevm_la-md.Tpo" -c -o libkaffevm_la-md.lo `test -f 'md.c' || echo '$(srcdir)/'`md.c; \ Index: kaffe/libraries/clib/Makefile.am diff -u kaffe/libraries/clib/Makefile.am:1.25 kaffe/libraries/clib/Makefile.am:1.26 --- kaffe/libraries/clib/Makefile.am:1.25 Wed Aug 9 21:27:28 2006 +++ kaffe/libraries/clib/Makefile.am Tue Aug 22 12:24:48 2006 @@ -30,7 +30,6 @@ target \ native \ io \ - nio \ net \ security \ management \ Index: kaffe/libraries/clib/Makefile.in diff -u kaffe/libraries/clib/Makefile.in:1.183 kaffe/libraries/clib/Makefile.in:1.184 --- kaffe/libraries/clib/Makefile.in:1.183 Sun Aug 20 22:28:16 2006 +++ kaffe/libraries/clib/Makefile.in Tue Aug 22 12:24:48 2006 @@ -84,8 +84,8 @@ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = target native io nio net security management awt math \ - sound zip +DIST_SUBDIRS = target native io net security management awt math sound \ + zip DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALSA_CFLAGS = @ALSA_CFLAGS@ @@ -364,7 +364,6 @@ target \ native \ io \ - nio \ net \ security \ management \ =================================================================== Checking out kaffe/libraries/clib/nio/Makefile.am RCS: /home/cvs/kaffe/kaffe/libraries/clib/nio/Attic/Makefile.am,v VERS: 1.23 *************** --- kaffe/libraries/clib/nio/Makefile.am Tue Aug 22 12:35:28 2006 +++ /dev/null Sun Aug 4 19:57:58 2002 @@ -1,44 +0,0 @@ -# New IO subsystem (NIO) support for Java libraries -# -# Copyright (c) 2003 Kaffe's team -# -# See the file "license.terms" for information on usage and redistribution -# of this file. - -AM_CFLAGS= $(KAFFE_CFLAGS) - -AM_CPPFLAGS = \ - $(CLASSPATH_INCLUDES) \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/kaffe/kaffevm/jni \ - -I$(top_srcdir)/libraries/javalib/external/classpath/native/jni/classpath - -native_LTLIBRARIES = libjavanio.la - -libjavanio_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(CFLAGS_PG) - -libjavanio_la_LDFLAGS = \ - $(KLIBFLAGS) \ - -no-undefined \ - -module \ - -release $(PACKAGE_VERSION) \ - -export-symbols-regex "^([Jj]ava|kaffe|gnu)_" - -libjavanio_la_SOURCES = \ - java_nio_MappedByteBufferImpl.c \ - java_nio_VMDirectByteBuffer.c \ - gnu_java_nio_charset_iconv_IconvDecoder.c \ - gnu_java_nio_charset_iconv_IconvEncoder.c \ - gnu_java_nio_channels_FileChannelImpl.c \ - gnu_java_nio_VMChannel.c \ - gnu_java_nio_VMSelector.c \ - gnu_java_nio_VMPipe.c - -libjavanio_la_LIBADD = \ - $(LTLIBICONV) \ - $(top_builddir)/kaffe/kaffevm/libkaffevm.la \ - $(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la - -CLEANFILES = so_locations =================================================================== Checking out kaffe/libraries/clib/nio/Makefile.in RCS: /home/cvs/kaffe/kaffe/libraries/clib/nio/Attic/Makefile.in,v VERS: 1.114 *************** --- kaffe/libraries/clib/nio/Makefile.in Tue Aug 22 12:35:29 2006 +++ /dev/null Sun Aug 4 19:57:58 2002 @@ -1,754 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - [EMAIL PROTECTED]@ - -# New IO subsystem (NIO) support for Java libraries -# -# Copyright (c) 2003 Kaffe's team -# -# See the file "license.terms" for information on usage and redistribution -# of this file. - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = libraries/clib/nio -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ - $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ - $(top_srcdir)/m4/ax_create_stdint_h.m4 \ - $(top_srcdir)/m4/binreloc.m4 $(top_srcdir)/m4/compile_value.m4 \ - $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/gcc_attribute.m4 \ - $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibcver.m4 $(top_srcdir)/m4/gmp.m4 \ - $(top_srcdir)/m4/gwqt.m4 $(top_srcdir)/m4/herrno.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/in6addr.m4 \ - $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/semaphore.m4 $(top_srcdir)/m4/size_max.m4 \ - $(top_srcdir)/m4/sockaddrin6.m4 \ - $(top_srcdir)/m4/sockinttypes.m4 \ - $(top_srcdir)/m4/solarispthread.m4 $(top_srcdir)/m4/valist.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(nativedir)" -nativeLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(native_LTLIBRARIES) -am__DEPENDENCIES_1 = -libjavanio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/kaffe/kaffevm/libkaffevm.la \ - $(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la -am_libjavanio_la_OBJECTS = \ - libjavanio_la-java_nio_MappedByteBufferImpl.lo \ - libjavanio_la-java_nio_VMDirectByteBuffer.lo \ - libjavanio_la-gnu_java_nio_charset_iconv_IconvDecoder.lo \ - libjavanio_la-gnu_java_nio_charset_iconv_IconvEncoder.lo \ - libjavanio_la-gnu_java_nio_channels_FileChannelImpl.lo \ - libjavanio_la-gnu_java_nio_VMChannel.lo \ - libjavanio_la-gnu_java_nio_VMSelector.lo \ - libjavanio_la-gnu_java_nio_VMPipe.lo -libjavanio_la_OBJECTS = $(am_libjavanio_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config -depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libjavanio_la_SOURCES) -DIST_SOURCES = $(libjavanio_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -AWT_LIBS = @AWT_LIBS@ -BCEL_JAR = @BCEL_JAR@ -BINRELOC_CFLAGS = @BINRELOC_CFLAGS@ -BINRELOC_LIBS = @BINRELOC_LIBS@ -BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@ -CC = @CC@ -CCAS = @CCAS@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CCLD = @CCLD@ -CFLAGS = @CFLAGS@ -CFLAGS_PG = @CFLAGS_PG@ -CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@ -CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@ -COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@ -COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@ -COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@ -COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@ -COND_FASTJAR_FALSE = @COND_FASTJAR_FALSE@ -COND_FASTJAR_TRUE = @COND_FASTJAR_TRUE@ -COND_GJDOC_FALSE = @COND_GJDOC_FALSE@ -COND_GJDOC_TRUE = @COND_GJDOC_TRUE@ -COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@ -COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@ -COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@ -COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@ -COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@ -COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@ -COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@ -COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@ -COND_NATIVE_SOUND_FALSE = @COND_NATIVE_SOUND_FALSE@ -COND_NATIVE_SOUND_TRUE = @COND_NATIVE_SOUND_TRUE@ -COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@ -COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@ -COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@ -COND_SOUND_ALSA_TRUE = @COND_SOUND_ALSA_TRUE@ -COND_SOUND_ESD_FALSE = @COND_SOUND_ESD_FALSE@ -COND_SOUND_ESD_TRUE = @COND_SOUND_ESD_TRUE@ -COND_SYSTEM_ZLIB_FALSE = @COND_SYSTEM_ZLIB_FALSE@ -COND_SYSTEM_ZLIB_TRUE = @COND_SYSTEM_ZLIB_TRUE@ -COND_ZLIB_ZIP_FALSE = @COND_ZLIB_ZIP_FALSE@ -COND_ZLIB_ZIP_TRUE = @COND_ZLIB_ZIP_TRUE@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CREATE_ALSA_LIBRARIES_FALSE = @CREATE_ALSA_LIBRARIES_FALSE@ -CREATE_ALSA_LIBRARIES_TRUE = @CREATE_ALSA_LIBRARIES_TRUE@ -CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@ -CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@ -CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@ -CREATE_GTK_PEER_LIBRARIES_TRUE = @CREATE_GTK_PEER_LIBRARIES_TRUE@ -CREATE_PLUGIN_FALSE = @CREATE_PLUGIN_FALSE@ -CREATE_PLUGIN_TRUE = @CREATE_PLUGIN_TRUE@ -CREATE_XMLJ_LIBRARY_FALSE = @CREATE_XMLJ_LIBRARY_FALSE@ -CREATE_XMLJ_LIBRARY_TRUE = @CREATE_XMLJ_LIBRARY_TRUE@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DIRSEP = @DIRSEP@ -DLLTOOL = @DLLTOOL@ -DLOPEN_JAVA_LIBS = @DLOPEN_JAVA_LIBS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_JVMPI_FALSE = @ENABLE_JVMPI_FALSE@ -ENABLE_JVMPI_TRUE = @ENABLE_JVMPI_TRUE@ -ENABLE_XPROF_FALSE = @ENABLE_XPROF_FALSE@ -ENABLE_XPROF_TRUE = @ENABLE_XPROF_TRUE@ -ENGINE_NAME = @ENGINE_NAME@ -ESD_CFLAGS = @ESD_CFLAGS@ -ESD_CONFIG = @ESD_CONFIG@ -ESD_LIBS = @ESD_LIBS@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FASTJAR = @FASTJAR@ -FFLAGS = @FFLAGS@ -GC_NAME = @GC_NAME@ -GETOPT_H = @GETOPT_H@ -GLIBJ_ZIP = @GLIBJ_ZIP@ -GMSGFMT = @GMSGFMT@ -HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@ -HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@ -HAVE_GCJ_SUPPORT_FALSE = @HAVE_GCJ_SUPPORT_FALSE@ -HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@ -HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@ -HAVE_JASMIN_TRUE = @HAVE_JASMIN_TRUE@ -HAVE_JAVAC_FALSE = @HAVE_JAVAC_FALSE@ -HAVE_JAVAC_TRUE = @HAVE_JAVAC_TRUE@ -HAVE_MKTEMP_FALSE = @HAVE_MKTEMP_FALSE@ -HAVE_MKTEMP_TRUE = @HAVE_MKTEMP_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -JASMIN = @JASMIN@ -JAVAC_FLAGS = @JAVAC_FLAGS@ -JAVA_COMPILER = @JAVA_COMPILER@ -JAVA_LIBS = @JAVA_LIBS@ -JIKESPROG = @JIKESPROG@ -KAFFEH = @KAFFEH@ -KAFFE_ARCHOS = @KAFFE_ARCHOS@ -KAFFE_CCASFLAGS = @KAFFE_CCASFLAGS@ -KAFFE_CFLAGS = @KAFFE_CFLAGS@ -KAFFE_LIBS = @KAFFE_LIBS@ -KLIBFLAGS = @KLIBFLAGS@ -KPREFIX = @KPREFIX@ -KVMBINFLAGS = @KVMBINFLAGS@ -KVMLIBFLAGS = @KVMLIBFLAGS@ -Khost_cpu = @Khost_cpu@ -Khost_os = @Khost_os@ -LDFLAGS = @LDFLAGS@ -LIBADD_GMP = @LIBADD_GMP@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBLTDL = @LIBLTDL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MAKE_KAFFEH = @MAKE_KAFFEH@ -MATH_LIB = @MATH_LIB@ -MAY_RUN_PO_FALSE = @MAY_RUN_PO_FALSE@ -MAY_RUN_PO_TRUE = @MAY_RUN_PO_TRUE@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MKTEMP = @MKTEMP@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -M_LIBS = @M_LIBS@ -NANOX_CFLAGS = @NANOX_CFLAGS@ -NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@ -NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@ -NET_LIBS = @NET_LIBS@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPT_DLOPEN_JAVA_LIBS = @OPT_DLOPEN_JAVA_LIBS@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATHSEP = @PATHSEP@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -QASSISTANTCLIENT_LDADD = @QASSISTANTCLIENT_LDADD@ -QEMBED = @QEMBED@ -QT_CXXFLAGS = @QT_CXXFLAGS@ -QT_GUILINK = @QT_GUILINK@ -QT_LDADD = @QT_LDADD@ -RANLIB = @RANLIB@ -REPLACE_GETOPT_FALSE = @REPLACE_GETOPT_FALSE@ -REPLACE_GETOPT_TRUE = @REPLACE_GETOPT_TRUE@ -SECURITY_LIBS = @SECURITY_LIBS@ -SEMAPHORE_LIB = @SEMAPHORE_LIB@ -SET_MAKE = @SET_MAKE@ *** Patch too long, truncated *** _______________________________________________ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe