From 2127637945ea6b763966398130e0770fa993c860 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 17 Jan 2006 18:09:40 +0000 Subject: Imported GNU Classpath 0.20 Imported GNU Classpath 0.20 * Makefile.am (AM_CPPFLAGS): Add classpath/include. * java/nio/charset/spi/CharsetProvider.java: New override file. * java/security/Security.java: Likewise. * sources.am: Regenerated. * Makefile.in: Likewise. From-SVN: r109831 --- libjava/Makefile.in | 132 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 105 insertions(+), 27 deletions(-) (limited to 'libjava/Makefile.in') diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 2a7add5..118b492 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -192,24 +192,25 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \ java/util/jar.lo java/util/logging.lo java/util/prefs.lo \ java/util/regex.lo java/util/zip.lo javax/accessibility.lo \ javax/crypto.lo javax/crypto/interfaces.lo \ - javax/crypto/spec.lo javax/naming.lo javax/naming/directory.lo \ - javax/naming/event.lo javax/naming/ldap.lo javax/naming/spi.lo \ - javax/net.lo javax/net/ssl.lo javax/print.lo \ - javax/print/attribute.lo javax/print/attribute/standard.lo \ - javax/print/event.lo javax/security/auth.lo \ - javax/security/auth/callback.lo javax/security/auth/login.lo \ - javax/security/auth/spi.lo javax/security/auth/x500.lo \ - javax/security/cert.lo javax/security/sasl.lo \ - javax/sound/midi.lo javax/sound/midi/spi.lo \ - javax/sound/sampled.lo javax/sound/sampled/spi.lo javax/sql.lo \ - javax/swing.lo javax/swing/border.lo \ - javax/swing/colorchooser.lo javax/swing/event.lo \ - javax/swing/filechooser.lo javax/swing/plaf.lo \ - javax/swing/plaf/basic.lo javax/swing/plaf/metal.lo \ - javax/swing/plaf/multi.lo javax/swing/table.lo \ - javax/swing/text.lo javax/swing/text/html.lo \ - javax/swing/text/html/parser.lo javax/swing/text/rtf.lo \ - javax/swing/tree.lo javax/swing/undo.lo javax/transaction.lo \ + javax/crypto/spec.lo javax/management.lo javax/naming.lo \ + javax/naming/directory.lo javax/naming/event.lo \ + javax/naming/ldap.lo javax/naming/spi.lo javax/net.lo \ + javax/net/ssl.lo javax/print.lo javax/print/attribute.lo \ + javax/print/attribute/standard.lo javax/print/event.lo \ + javax/security/auth.lo javax/security/auth/callback.lo \ + javax/security/auth/login.lo javax/security/auth/spi.lo \ + javax/security/auth/x500.lo javax/security/cert.lo \ + javax/security/sasl.lo javax/sound/midi.lo \ + javax/sound/midi/spi.lo javax/sound/sampled.lo \ + javax/sound/sampled/spi.lo javax/sql.lo javax/swing.lo \ + javax/swing/border.lo javax/swing/colorchooser.lo \ + javax/swing/event.lo javax/swing/filechooser.lo \ + javax/swing/plaf.lo javax/swing/plaf/basic.lo \ + javax/swing/plaf/metal.lo javax/swing/plaf/multi.lo \ + javax/swing/table.lo javax/swing/text.lo \ + javax/swing/text/html.lo javax/swing/text/html/parser.lo \ + javax/swing/text/rtf.lo javax/swing/tree.lo \ + javax/swing/undo.lo javax/transaction.lo \ javax/transaction/xa.lo org/ietf/jgss.lo am__DEPENDENCIES_3 = gnu-CORBA.lo gnu-java-beans.lo gnu-javax-rmi.lo \ gnu-javax-sound-midi.lo gnu-xml.lo javax-imageio.lo \ @@ -582,6 +583,7 @@ build_os = @build_os@ build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ +dbexecdir = @dbexecdir@ exec_prefix = @exec_prefix@ extra_ldflags_libjava = @extra_ldflags_libjava@ gxx_include_dir = @gxx_include_dir@ @@ -622,7 +624,6 @@ target_vendor = @target_vendor@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ toolexecmainlibdir = @toolexecmainlibdir@ -dbexecdir = @dbexecdir@ AUTOMAKE_OPTIONS = foreign subdir-objects ACLOCAL_AMFLAGS = -I . -I .. -I ../config @@ -697,6 +698,7 @@ JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) AM_CPPFLAGS = -I$(top_srcdir) \ -Iinclude -I$(top_srcdir)/include \ -I$(top_srcdir)/classpath/include \ + -Iclasspath/include \ -I$(top_srcdir)/classpath/native/fdlibm \ $(GCINCS) $(THREADINCS) $(INCLTDL) \ $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS) @@ -1395,7 +1397,37 @@ classpath/gnu/java/beans/editors/NativeFloatEditor.java \ classpath/gnu/java/beans/editors/NativeIntEditor.java \ classpath/gnu/java/beans/editors/NativeLongEditor.java \ classpath/gnu/java/beans/editors/NativeShortEditor.java \ -classpath/gnu/java/beans/editors/StringEditor.java +classpath/gnu/java/beans/editors/StringEditor.java \ +classpath/gnu/java/beans/encoder/ArrayPersistenceDelegate.java \ +classpath/gnu/java/beans/encoder/ClassPersistenceDelegate.java \ +classpath/gnu/java/beans/encoder/CollectionPersistenceDelegate.java \ +classpath/gnu/java/beans/encoder/Context.java \ +classpath/gnu/java/beans/encoder/GenericScannerState.java \ +classpath/gnu/java/beans/encoder/IgnoringScannerState.java \ +classpath/gnu/java/beans/encoder/MapPersistenceDelegate.java \ +classpath/gnu/java/beans/encoder/ObjectId.java \ +classpath/gnu/java/beans/encoder/PrimitivePersistenceDelegate.java \ +classpath/gnu/java/beans/encoder/ReportingScannerState.java \ +classpath/gnu/java/beans/encoder/Root.java \ +classpath/gnu/java/beans/encoder/ScanEngine.java \ +classpath/gnu/java/beans/encoder/ScannerState.java \ +classpath/gnu/java/beans/encoder/StAXWriter.java \ +classpath/gnu/java/beans/encoder/Writer.java \ +classpath/gnu/java/beans/encoder/elements/ArrayInstantiation.java \ +classpath/gnu/java/beans/encoder/elements/Array_Get.java \ +classpath/gnu/java/beans/encoder/elements/Array_Set.java \ +classpath/gnu/java/beans/encoder/elements/ClassResolution.java \ +classpath/gnu/java/beans/encoder/elements/Element.java \ +classpath/gnu/java/beans/encoder/elements/List_Get.java \ +classpath/gnu/java/beans/encoder/elements/List_Set.java \ +classpath/gnu/java/beans/encoder/elements/MethodInvocation.java \ +classpath/gnu/java/beans/encoder/elements/NullObject.java \ +classpath/gnu/java/beans/encoder/elements/ObjectInstantiation.java \ +classpath/gnu/java/beans/encoder/elements/ObjectReference.java \ +classpath/gnu/java/beans/encoder/elements/PrimitiveInstantiation.java \ +classpath/gnu/java/beans/encoder/elements/StaticFieldAccess.java \ +classpath/gnu/java/beans/encoder/elements/StaticMethodInvocation.java \ +classpath/gnu/java/beans/encoder/elements/StringReference.java gnu_java_io_source_files = \ classpath/gnu/java/io/ASN1ParsingException.java \ @@ -1885,7 +1917,8 @@ classpath/gnu/java/text/WordBreakIterator.java gnu_java_text_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_text_source_files))) gnu_java_util_source_files = \ classpath/gnu/java/util/DoubleEnumeration.java \ -classpath/gnu/java/util/EmptyEnumeration.java +classpath/gnu/java/util/EmptyEnumeration.java \ +classpath/gnu/java/util/WeakIdentityHashMap.java gnu_java_util_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_source_files))) gnu_java_util_prefs_source_files = \ @@ -2005,7 +2038,6 @@ classpath/gnu/regexp/UncheckedRE.java gnu_regexp_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_regexp_source_files))) gnu_xml_source_files = \ -classpath/gnu/xml/aelfred2/ContentHandler2.java \ classpath/gnu/xml/aelfred2/JAXPFactory.java \ classpath/gnu/xml/aelfred2/SAXDriver.java \ classpath/gnu/xml/aelfred2/XmlParser.java \ @@ -2166,6 +2198,8 @@ classpath/gnu/xml/pipeline/WellFormednessFilter.java \ classpath/gnu/xml/pipeline/XIncludeFilter.java \ classpath/gnu/xml/pipeline/XsltFilter.java \ classpath/gnu/xml/stream/AttributeImpl.java \ +classpath/gnu/xml/stream/BufferedReader.java \ +classpath/gnu/xml/stream/CRLFReader.java \ classpath/gnu/xml/stream/CharactersImpl.java \ classpath/gnu/xml/stream/CommentImpl.java \ classpath/gnu/xml/stream/DTDImpl.java \ @@ -2180,9 +2214,13 @@ classpath/gnu/xml/stream/LocationImpl.java \ classpath/gnu/xml/stream/NamespaceImpl.java \ classpath/gnu/xml/stream/NotationDeclarationImpl.java \ classpath/gnu/xml/stream/ProcessingInstructionImpl.java \ +classpath/gnu/xml/stream/SAXParser.java \ +classpath/gnu/xml/stream/SAXParserFactory.java \ classpath/gnu/xml/stream/StartDocumentImpl.java \ classpath/gnu/xml/stream/StartElementImpl.java \ classpath/gnu/xml/stream/StartEntityImpl.java \ +classpath/gnu/xml/stream/UnicodeReader.java \ +classpath/gnu/xml/stream/XIncludeFilter.java \ classpath/gnu/xml/stream/XMLEventAllocatorImpl.java \ classpath/gnu/xml/stream/XMLEventFactoryImpl.java \ classpath/gnu/xml/stream/XMLEventImpl.java \ @@ -2190,6 +2228,7 @@ classpath/gnu/xml/stream/XMLEventReaderImpl.java \ classpath/gnu/xml/stream/XMLEventWriterImpl.java \ classpath/gnu/xml/stream/XMLInputFactoryImpl.java \ classpath/gnu/xml/stream/XMLOutputFactoryImpl.java \ +classpath/gnu/xml/stream/XMLParser.java \ classpath/gnu/xml/stream/XMLStreamReaderImpl.java \ classpath/gnu/xml/stream/XMLStreamWriterImpl.java \ classpath/gnu/xml/transform/AbstractNumberNode.java \ @@ -2218,6 +2257,7 @@ classpath/gnu/xml/transform/Key.java \ classpath/gnu/xml/transform/KeyFunction.java \ classpath/gnu/xml/transform/LiteralNode.java \ classpath/gnu/xml/transform/MessageNode.java \ +classpath/gnu/xml/transform/NamespaceProxy.java \ classpath/gnu/xml/transform/NodeNumberNode.java \ classpath/gnu/xml/transform/NumberNode.java \ classpath/gnu/xml/transform/OtherwiseNode.java \ @@ -2226,6 +2266,7 @@ classpath/gnu/xml/transform/ProcessingInstructionNode.java \ classpath/gnu/xml/transform/SAXSerializer.java \ classpath/gnu/xml/transform/SortKey.java \ classpath/gnu/xml/transform/StreamSerializer.java \ +classpath/gnu/xml/transform/StrippingInstruction.java \ classpath/gnu/xml/transform/Stylesheet.java \ classpath/gnu/xml/transform/SystemPropertyFunction.java \ classpath/gnu/xml/transform/Template.java \ @@ -2686,17 +2727,21 @@ classpath/java/beans/BeanDescriptor.java \ classpath/java/beans/BeanInfo.java \ classpath/java/beans/Beans.java \ classpath/java/beans/Customizer.java \ +classpath/java/beans/DefaultPersistenceDelegate.java \ classpath/java/beans/DesignMode.java \ +classpath/java/beans/Encoder.java \ classpath/java/beans/EventHandler.java \ classpath/java/beans/EventSetDescriptor.java \ classpath/java/beans/ExceptionListener.java \ classpath/java/beans/Expression.java \ classpath/java/beans/FeatureDescriptor.java \ +classpath/java/beans/IndexedPropertyChangeEvent.java \ classpath/java/beans/IndexedPropertyDescriptor.java \ classpath/java/beans/IntrospectionException.java \ classpath/java/beans/Introspector.java \ classpath/java/beans/MethodDescriptor.java \ classpath/java/beans/ParameterDescriptor.java \ +classpath/java/beans/PersistenceDelegate.java \ classpath/java/beans/PropertyChangeEvent.java \ classpath/java/beans/PropertyChangeListener.java \ classpath/java/beans/PropertyChangeListenerProxy.java \ @@ -2712,7 +2757,8 @@ classpath/java/beans/VetoableChangeListener.java \ classpath/java/beans/VetoableChangeListenerProxy.java \ classpath/java/beans/VetoableChangeSupport.java \ classpath/java/beans/Visibility.java \ -classpath/java/beans/XMLDecoder.java +classpath/java/beans/XMLDecoder.java \ +classpath/java/beans/XMLEncoder.java java_beans_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_beans_source_files))) java_beans_beancontext_source_files = \ @@ -3091,9 +3137,9 @@ classpath/java/nio/charset/UnsupportedCharsetException.java java_nio_charset_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_charset_source_files))) java_nio_charset_spi_source_files = \ -classpath/java/nio/charset/spi/CharsetProvider.java +java/nio/charset/spi/CharsetProvider.java -java_nio_charset_spi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_charset_spi_source_files))) +java_nio_charset_spi_header_files = $(patsubst %.java,%.h,$(java_nio_charset_spi_source_files)) java_rmi_source_files = \ classpath/java/rmi/AccessException.java \ classpath/java/rmi/AlreadyBoundException.java \ @@ -3235,7 +3281,7 @@ classpath/java/security/PublicKey.java \ classpath/java/security/SecureClassLoader.java \ classpath/java/security/SecureRandom.java \ classpath/java/security/SecureRandomSpi.java \ -classpath/java/security/Security.java \ +java/security/Security.java \ classpath/java/security/SecurityPermission.java \ classpath/java/security/Signature.java \ classpath/java/security/SignatureException.java \ @@ -3372,6 +3418,7 @@ classpath/java/text/Annotation.java \ classpath/java/text/AttributedCharacterIterator.java \ classpath/java/text/AttributedString.java \ classpath/java/text/AttributedStringIterator.java \ +classpath/java/text/Bidi.java \ classpath/java/text/BreakIterator.java \ classpath/java/text/CharacterIterator.java \ classpath/java/text/ChoiceFormat.java \ @@ -3647,6 +3694,10 @@ classpath/javax/imageio/stream/ImageOutputStreamImpl.java \ classpath/javax/imageio/stream/MemoryCacheImageInputStream.java \ classpath/javax/imageio/stream/MemoryCacheImageOutputStream.java +javax_management_source_files = \ +classpath/javax/management/Attribute.java + +javax_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_management_source_files))) javax_naming_source_files = \ classpath/javax/naming/AuthenticationException.java \ classpath/javax/naming/AuthenticationNotSupportedException.java \ @@ -3870,9 +3921,11 @@ classpath/javax/print/attribute/standard/JobState.java \ classpath/javax/print/attribute/standard/JobStateReason.java \ classpath/javax/print/attribute/standard/JobStateReasons.java \ classpath/javax/print/attribute/standard/Media.java \ +classpath/javax/print/attribute/standard/MediaName.java \ classpath/javax/print/attribute/standard/MediaPrintableArea.java \ classpath/javax/print/attribute/standard/MediaSize.java \ classpath/javax/print/attribute/standard/MediaSizeName.java \ +classpath/javax/print/attribute/standard/MediaTray.java \ classpath/javax/print/attribute/standard/MultipleDocumentHandling.java \ classpath/javax/print/attribute/standard/NumberOfDocuments.java \ classpath/javax/print/attribute/standard/NumberOfInterveningJobs.java \ @@ -3956,10 +4009,15 @@ classpath/javax/security/auth/callback/UnsupportedCallbackException.java javax_security_auth_callback_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_security_auth_callback_source_files))) javax_security_auth_login_source_files = \ +classpath/javax/security/auth/login/AccountException.java \ classpath/javax/security/auth/login/AccountExpiredException.java \ +classpath/javax/security/auth/login/AccountLockedException.java \ +classpath/javax/security/auth/login/AccountNotFoundException.java \ classpath/javax/security/auth/login/AppConfigurationEntry.java \ classpath/javax/security/auth/login/Configuration.java \ +classpath/javax/security/auth/login/CredentialException.java \ classpath/javax/security/auth/login/CredentialExpiredException.java \ +classpath/javax/security/auth/login/CredentialNotFoundException.java \ classpath/javax/security/auth/login/FailedLoginException.java \ classpath/javax/security/auth/login/LoginContext.java \ classpath/javax/security/auth/login/LoginException.java \ @@ -4348,6 +4406,7 @@ classpath/javax/swing/plaf/basic/BasicEditorPaneUI.java \ classpath/javax/swing/plaf/basic/BasicFileChooserUI.java \ classpath/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java \ classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java \ +classpath/javax/swing/plaf/basic/BasicHTML.java \ classpath/javax/swing/plaf/basic/BasicIconFactory.java \ classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java \ classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java \ @@ -4492,6 +4551,7 @@ classpath/javax/swing/text/DateFormatter.java \ classpath/javax/swing/text/DefaultCaret.java \ classpath/javax/swing/text/DefaultEditorKit.java \ classpath/javax/swing/text/DefaultFormatter.java \ +classpath/javax/swing/text/DefaultFormatterFactory.java \ classpath/javax/swing/text/DefaultHighlighter.java \ classpath/javax/swing/text/DefaultStyledDocument.java \ classpath/javax/swing/text/DefaultTextUI.java \ @@ -4512,8 +4572,10 @@ classpath/javax/swing/text/Keymap.java \ classpath/javax/swing/text/LabelView.java \ classpath/javax/swing/text/LayeredHighlighter.java \ classpath/javax/swing/text/LayoutQueue.java \ +classpath/javax/swing/text/MaskFormatter.java \ classpath/javax/swing/text/MutableAttributeSet.java \ classpath/javax/swing/text/NavigationFilter.java \ +classpath/javax/swing/text/NumberFormatter.java \ classpath/javax/swing/text/ParagraphView.java \ classpath/javax/swing/text/PasswordView.java \ classpath/javax/swing/text/PlainDocument.java \ @@ -4531,6 +4593,7 @@ classpath/javax/swing/text/TabExpander.java \ classpath/javax/swing/text/TabSet.java \ classpath/javax/swing/text/TabStop.java \ classpath/javax/swing/text/TabableView.java \ +classpath/javax/swing/text/TableView.java \ classpath/javax/swing/text/TextAction.java \ classpath/javax/swing/text/Utilities.java \ classpath/javax/swing/text/View.java \ @@ -4539,11 +4602,14 @@ classpath/javax/swing/text/WrappedPlainView.java javax_swing_text_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_text_source_files))) javax_swing_text_html_source_files = \ +classpath/javax/swing/text/html/BlockView.java \ classpath/javax/swing/text/html/CSS.java \ +classpath/javax/swing/text/html/CSSParser.java \ classpath/javax/swing/text/html/HTML.java \ classpath/javax/swing/text/html/HTMLDocument.java \ classpath/javax/swing/text/html/HTMLEditorKit.java \ -classpath/javax/swing/text/html/HTMLFrameHyperlinkEvent.java +classpath/javax/swing/text/html/HTMLFrameHyperlinkEvent.java \ +classpath/javax/swing/text/html/StyleSheet.java javax_swing_text_html_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_swing_text_html_source_files))) javax_swing_text_html_parser_source_files = \ @@ -5558,6 +5624,7 @@ all_packages_source_files = \ javax/crypto.list \ javax/crypto/interfaces.list \ javax/crypto/spec.list \ + javax/management.list \ javax/naming.list \ javax/naming/directory.list \ javax/naming/event.list \ @@ -5711,6 +5778,7 @@ ordinary_header_files = \ $(javax_crypto_header_files) \ $(javax_crypto_interfaces_header_files) \ $(javax_crypto_spec_header_files) \ + $(javax_management_header_files) \ $(javax_naming_header_files) \ $(javax_naming_directory_header_files) \ $(javax_naming_event_header_files) \ @@ -8705,6 +8773,16 @@ javax-imageio.lo: $(javax_imageio_source_files) $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o javax-imageio.lo @javax-imageio.list @rm -f javax-imageio.list +javax/management.list: $(javax_management_source_files) + @$(mkinstalldirs) $(dir $@) + @for file in $(javax_management_source_files); do \ + if test -f $(srcdir)/$$file; then \ + echo $(srcdir)/$$file; \ + else echo $$file; fi; \ + done > javax/management.list + +-include javax/management.deps + javax/naming.list: $(javax_naming_source_files) @$(mkinstalldirs) $(dir $@) @for file in $(javax_naming_source_files); do \ -- cgit v1.1