Skip to content

R
riscv-gcc-1
Commit 5e0c4d19 by Anthony Green Committed by Anthony Green
Options

Makefile.am: Move org.xml.sax and org.w3c.dom into their own libraries. 

2002-12-21  Anthony Green  <green@redhat.com>

	* Makefile.am: Move org.xml.sax and org.w3c.dom into their own
	libraries.
	* Makefile.in: Rebuilt.

From-SVN: r60410
parent 4f09be91
Showing with 178 additions and 116 deletions
libjava/ChangeLog
2002-12-21 Anthony Green <green@redhat.com>
* Makefile.am: Move org.xml.sax and org.w3c.dom into their own
libraries.
* Makefile.in: Rebuilt.
2002-12-19 Anthony Green <green@redhat.com>
* Makefile.am (ordinary_java_source_files): Add
......
libjava/Makefile.am
......@@ -29,7 +29,7 @@ else
cond_x_ltlibrary =
endif
toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
toolexeclib_LTLIBRARIES = libgcj.la lib-org-xml-sax.la lib-org-w3c-dom.la $(cond_x_ltlibrary)
toolexeclib_DATA = libgcj.spec
jardir = $(datadir)/java
......@@ -147,6 +147,63 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgcj_la_LINK = $(LIBLINK)
lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \
org/w3c/dom/CDATASection.java \
org/w3c/dom/CharacterData.java \
org/w3c/dom/Comment.java \
org/w3c/dom/DOMException.java \
org/w3c/dom/DOMImplementation.java \
org/w3c/dom/Document.java \
org/w3c/dom/DocumentFragment.java \
org/w3c/dom/DocumentType.java \
org/w3c/dom/Element.java \
org/w3c/dom/Entity.java \
org/w3c/dom/EntityReference.java \
org/w3c/dom/NamedNodeMap.java \
org/w3c/dom/Node.java \
org/w3c/dom/NodeList.java \
org/w3c/dom/Notation.java \
org/w3c/dom/ProcessingInstruction.java \
org/w3c/dom/Text.java \
org/w3c/dom/ranges/DocumentRange.java \
org/w3c/dom/ranges/Range.java \
org/w3c/dom/ranges/RangeException.java \
org/w3c/dom/traversal/DocumentTraversal.java \
org/w3c/dom/traversal/NodeFilter.java \
org/w3c/dom/traversal/NodeIterator.java \
org/w3c/dom/traversal/TreeWalker.java
lib_org_xml_sax_la_SOURCES = org/xml/sax/ext/DeclHandler.java \
org/xml/sax/ext/LexicalHandler.java \
org/xml/sax/helpers/AttributeListImpl.java \
org/xml/sax/helpers/AttributesImpl.java \
org/xml/sax/helpers/DefaultHandler.java \
org/xml/sax/helpers/LocatorImpl.java \
org/xml/sax/helpers/NamespaceSupport.java \
org/xml/sax/helpers/NewInstance.java \
org/xml/sax/helpers/ParserAdapter.java \
org/xml/sax/helpers/ParserFactory.java \
org/xml/sax/helpers/XMLFilterImpl.java \
org/xml/sax/helpers/XMLReaderAdapter.java \
org/xml/sax/helpers/XMLReaderFactory.java \
org/xml/sax/AttributeList.java \
org/xml/sax/Attributes.java \
org/xml/sax/ContentHandler.java \
org/xml/sax/DTDHandler.java \
org/xml/sax/DocumentHandler.java \
org/xml/sax/EntityResolver.java \
org/xml/sax/ErrorHandler.java \
org/xml/sax/HandlerBase.java \
org/xml/sax/InputSource.java \
org/xml/sax/Locator.java \
org/xml/sax/Parser.java \
org/xml/sax/SAXException.java \
org/xml/sax/SAXNotRecognizedException.java \
org/xml/sax/SAXNotSupportedException.java \
org/xml/sax/SAXParseException.java \
org/xml/sax/XMLFilter.java \
org/xml/sax/XMLReader.java
libgcjx_la_SOURCES = $(x_nat_source_files)
EXTRA_libgcjx_la_SOURCES = $(x_java_source_files)
libgcjx_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files)
......@@ -168,6 +225,8 @@ install-exec-hook:
all_java_source_files = \
$(java_source_files) \
$(built_java_source_files) \
$(lib_org_xml_sax_la_SOURCES) \
$(lib_org_w3c_dom_la_SOURCES) \
$(x_java_source_files)
all_java_class_files = $(all_java_source_files:.java=.class)
......@@ -218,7 +277,7 @@ $(c_files): %.lo: %.c
$(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h
## FIXME: GNU make.
$(javao_files) $(x_javao_files): %.lo: %.java
$(javao_files) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java
$(GCJCOMPILE) -o $@ $<
## Pass the list of object files to libtool in a temporary file to
......@@ -2220,61 +2279,6 @@ java/util/zip/ZipException.java \
java/util/zip/ZipFile.java \
java/util/zip/ZipInputStream.java \
java/util/zip/ZipOutputStream.java \
org/w3c/dom/Attr.java \
org/w3c/dom/CDATASection.java \
org/w3c/dom/CharacterData.java \
org/w3c/dom/Comment.java \
org/w3c/dom/DOMException.java \
org/w3c/dom/DOMImplementation.java \
org/w3c/dom/Document.java \
org/w3c/dom/DocumentFragment.java \
org/w3c/dom/DocumentType.java \
org/w3c/dom/Element.java \
org/w3c/dom/Entity.java \
org/w3c/dom/EntityReference.java \
org/w3c/dom/NamedNodeMap.java \
org/w3c/dom/Node.java \
org/w3c/dom/NodeList.java \
org/w3c/dom/Notation.java \
org/w3c/dom/ProcessingInstruction.java \
org/w3c/dom/Text.java \
org/w3c/dom/ranges/DocumentRange.java \
org/w3c/dom/ranges/Range.java \
org/w3c/dom/ranges/RangeException.java \
org/w3c/dom/traversal/DocumentTraversal.java \
org/w3c/dom/traversal/NodeFilter.java \
org/w3c/dom/traversal/NodeIterator.java \
org/w3c/dom/traversal/TreeWalker.java \
org/xml/sax/ext/DeclHandler.java \
org/xml/sax/ext/LexicalHandler.java \
org/xml/sax/helpers/AttributeListImpl.java \
org/xml/sax/helpers/AttributesImpl.java \
org/xml/sax/helpers/DefaultHandler.java \
org/xml/sax/helpers/LocatorImpl.java \
org/xml/sax/helpers/NamespaceSupport.java \
org/xml/sax/helpers/NewInstance.java \
org/xml/sax/helpers/ParserAdapter.java \
org/xml/sax/helpers/ParserFactory.java \
org/xml/sax/helpers/XMLFilterImpl.java \
org/xml/sax/helpers/XMLReaderAdapter.java \
org/xml/sax/helpers/XMLReaderFactory.java \
org/xml/sax/AttributeList.java \
org/xml/sax/Attributes.java \
org/xml/sax/ContentHandler.java \
org/xml/sax/DTDHandler.java \
org/xml/sax/DocumentHandler.java \
org/xml/sax/EntityResolver.java \
org/xml/sax/ErrorHandler.java \
org/xml/sax/HandlerBase.java \
org/xml/sax/InputSource.java \
org/xml/sax/Locator.java \
org/xml/sax/Parser.java \
org/xml/sax/SAXException.java \
org/xml/sax/SAXNotRecognizedException.java \
org/xml/sax/SAXNotSupportedException.java \
org/xml/sax/SAXParseException.java \
org/xml/sax/XMLFilter.java \
org/xml/sax/XMLReader.java \
$(rmi_java_source_files) \
$(awt_java_source_files) \
$(convert_source_files) \
......
libjava/Makefile.in
......@@ -137,7 +137,7 @@ AUTOMAKE_OPTIONS = foreign
@XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@libgcjx.la
@XLIB_AWT_FALSE@cond_x_ltlibrary =
toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
toolexeclib_LTLIBRARIES = libgcj.la lib-org-xml-sax.la lib-org-w3c-dom.la $(cond_x_ltlibrary)
toolexeclib_DATA = libgcj.spec
jardir = $(datadir)/java
......@@ -218,6 +218,65 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
libgcj_la_LINK = $(LIBLINK)
lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \
org/w3c/dom/CDATASection.java \
org/w3c/dom/CharacterData.java \
org/w3c/dom/Comment.java \
org/w3c/dom/DOMException.java \
org/w3c/dom/DOMImplementation.java \
org/w3c/dom/Document.java \
org/w3c/dom/DocumentFragment.java \
org/w3c/dom/DocumentType.java \
org/w3c/dom/Element.java \
org/w3c/dom/Entity.java \
org/w3c/dom/EntityReference.java \
org/w3c/dom/NamedNodeMap.java \
org/w3c/dom/Node.java \
org/w3c/dom/NodeList.java \
org/w3c/dom/Notation.java \
org/w3c/dom/ProcessingInstruction.java \
org/w3c/dom/Text.java \
org/w3c/dom/ranges/DocumentRange.java \
org/w3c/dom/ranges/Range.java \
org/w3c/dom/ranges/RangeException.java \
org/w3c/dom/traversal/DocumentTraversal.java \
org/w3c/dom/traversal/NodeFilter.java \
org/w3c/dom/traversal/NodeIterator.java \
org/w3c/dom/traversal/TreeWalker.java
lib_org_xml_sax_la_SOURCES = org/xml/sax/ext/DeclHandler.java \
org/xml/sax/ext/LexicalHandler.java \
org/xml/sax/helpers/AttributeListImpl.java \
org/xml/sax/helpers/AttributesImpl.java \
org/xml/sax/helpers/DefaultHandler.java \
org/xml/sax/helpers/LocatorImpl.java \
org/xml/sax/helpers/NamespaceSupport.java \
org/xml/sax/helpers/NewInstance.java \
org/xml/sax/helpers/ParserAdapter.java \
org/xml/sax/helpers/ParserFactory.java \
org/xml/sax/helpers/XMLFilterImpl.java \
org/xml/sax/helpers/XMLReaderAdapter.java \
org/xml/sax/helpers/XMLReaderFactory.java \
org/xml/sax/AttributeList.java \
org/xml/sax/Attributes.java \
org/xml/sax/ContentHandler.java \
org/xml/sax/DTDHandler.java \
org/xml/sax/DocumentHandler.java \
org/xml/sax/EntityResolver.java \
org/xml/sax/ErrorHandler.java \
org/xml/sax/HandlerBase.java \
org/xml/sax/InputSource.java \
org/xml/sax/Locator.java \
org/xml/sax/Parser.java \
org/xml/sax/SAXException.java \
org/xml/sax/SAXNotRecognizedException.java \
org/xml/sax/SAXNotSupportedException.java \
org/xml/sax/SAXParseException.java \
org/xml/sax/XMLFilter.java \
org/xml/sax/XMLReader.java
libgcjx_la_SOURCES = $(x_nat_source_files)
EXTRA_libgcjx_la_SOURCES = $(x_java_source_files)
libgcjx_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files)
......@@ -231,6 +290,8 @@ libgcjx_la_LINK = $(LIBLINK)
all_java_source_files = \
$(java_source_files) \
$(built_java_source_files) \
$(lib_org_xml_sax_la_SOURCES) \
$(lib_org_w3c_dom_la_SOURCES) \
$(x_java_source_files)
......@@ -1970,61 +2031,6 @@ java/util/zip/ZipException.java \
java/util/zip/ZipFile.java \
java/util/zip/ZipInputStream.java \
java/util/zip/ZipOutputStream.java \
org/w3c/dom/Attr.java \
org/w3c/dom/CDATASection.java \
org/w3c/dom/CharacterData.java \
org/w3c/dom/Comment.java \
org/w3c/dom/DOMException.java \
org/w3c/dom/DOMImplementation.java \
org/w3c/dom/Document.java \
org/w3c/dom/DocumentFragment.java \
org/w3c/dom/DocumentType.java \
org/w3c/dom/Element.java \
org/w3c/dom/Entity.java \
org/w3c/dom/EntityReference.java \
org/w3c/dom/NamedNodeMap.java \
org/w3c/dom/Node.java \
org/w3c/dom/NodeList.java \
org/w3c/dom/Notation.java \
org/w3c/dom/ProcessingInstruction.java \
org/w3c/dom/Text.java \
org/w3c/dom/ranges/DocumentRange.java \
org/w3c/dom/ranges/Range.java \
org/w3c/dom/ranges/RangeException.java \
org/w3c/dom/traversal/DocumentTraversal.java \
org/w3c/dom/traversal/NodeFilter.java \
org/w3c/dom/traversal/NodeIterator.java \
org/w3c/dom/traversal/TreeWalker.java \
org/xml/sax/ext/DeclHandler.java \
org/xml/sax/ext/LexicalHandler.java \
org/xml/sax/helpers/AttributeListImpl.java \
org/xml/sax/helpers/AttributesImpl.java \
org/xml/sax/helpers/DefaultHandler.java \
org/xml/sax/helpers/LocatorImpl.java \
org/xml/sax/helpers/NamespaceSupport.java \
org/xml/sax/helpers/NewInstance.java \
org/xml/sax/helpers/ParserAdapter.java \
org/xml/sax/helpers/ParserFactory.java \
org/xml/sax/helpers/XMLFilterImpl.java \
org/xml/sax/helpers/XMLReaderAdapter.java \
org/xml/sax/helpers/XMLReaderFactory.java \
org/xml/sax/AttributeList.java \
org/xml/sax/Attributes.java \
org/xml/sax/ContentHandler.java \
org/xml/sax/DTDHandler.java \
org/xml/sax/DocumentHandler.java \
org/xml/sax/EntityResolver.java \
org/xml/sax/ErrorHandler.java \
org/xml/sax/HandlerBase.java \
org/xml/sax/InputSource.java \
org/xml/sax/Locator.java \
org/xml/sax/Parser.java \
org/xml/sax/SAXException.java \
org/xml/sax/SAXNotRecognizedException.java \
org/xml/sax/SAXNotSupportedException.java \
org/xml/sax/SAXParseException.java \
org/xml/sax/XMLFilter.java \
org/xml/sax/XMLReader.java \
$(rmi_java_source_files) \
$(awt_java_source_files) \
$(convert_source_files) \
......@@ -2258,6 +2264,46 @@ java/net/natPlainDatagramSocketImpl.lo java/net/natPlainSocketImpl.lo \
java/text/natCollator.lo java/util/natResourceBundle.lo \
java/util/natTimeZone.lo java/util/zip/natDeflater.lo \
java/util/zip/natInflater.lo
lib_org_xml_sax_la_LDFLAGS =
lib_org_xml_sax_la_LIBADD =
lib_org_xml_sax_la_OBJECTS = org/xml/sax/ext/DeclHandler.lo \
org/xml/sax/ext/LexicalHandler.lo \
org/xml/sax/helpers/AttributeListImpl.lo \
org/xml/sax/helpers/AttributesImpl.lo \
org/xml/sax/helpers/DefaultHandler.lo \
org/xml/sax/helpers/LocatorImpl.lo \
org/xml/sax/helpers/NamespaceSupport.lo \
org/xml/sax/helpers/NewInstance.lo org/xml/sax/helpers/ParserAdapter.lo \
org/xml/sax/helpers/ParserFactory.lo \
org/xml/sax/helpers/XMLFilterImpl.lo \
org/xml/sax/helpers/XMLReaderAdapter.lo \
org/xml/sax/helpers/XMLReaderFactory.lo org/xml/sax/AttributeList.lo \
org/xml/sax/Attributes.lo org/xml/sax/ContentHandler.lo \
org/xml/sax/DTDHandler.lo org/xml/sax/DocumentHandler.lo \
org/xml/sax/EntityResolver.lo org/xml/sax/ErrorHandler.lo \
org/xml/sax/HandlerBase.lo org/xml/sax/InputSource.lo \
org/xml/sax/Locator.lo org/xml/sax/Parser.lo \
org/xml/sax/SAXException.lo org/xml/sax/SAXNotRecognizedException.lo \
org/xml/sax/SAXNotSupportedException.lo \
org/xml/sax/SAXParseException.lo org/xml/sax/XMLFilter.lo \
org/xml/sax/XMLReader.lo
lib_org_w3c_dom_la_LDFLAGS =
lib_org_w3c_dom_la_LIBADD =
lib_org_w3c_dom_la_OBJECTS = org/w3c/dom/Attr.lo \
org/w3c/dom/CDATASection.lo org/w3c/dom/CharacterData.lo \
org/w3c/dom/Comment.lo org/w3c/dom/DOMException.lo \
org/w3c/dom/DOMImplementation.lo org/w3c/dom/Document.lo \
org/w3c/dom/DocumentFragment.lo org/w3c/dom/DocumentType.lo \
org/w3c/dom/Element.lo org/w3c/dom/Entity.lo \
org/w3c/dom/EntityReference.lo org/w3c/dom/NamedNodeMap.lo \
org/w3c/dom/Node.lo org/w3c/dom/NodeList.lo org/w3c/dom/Notation.lo \
org/w3c/dom/ProcessingInstruction.lo org/w3c/dom/Text.lo \
org/w3c/dom/ranges/DocumentRange.lo org/w3c/dom/ranges/Range.lo \
org/w3c/dom/ranges/RangeException.lo \
org/w3c/dom/traversal/DocumentTraversal.lo \
org/w3c/dom/traversal/NodeFilter.lo \
org/w3c/dom/traversal/NodeIterator.lo \
org/w3c/dom/traversal/TreeWalker.lo
libgcjx_la_OBJECTS = gnu/gcj/xlib/natClip.lo \
gnu/gcj/xlib/natColormap.lo gnu/gcj/xlib/natDisplay.lo \
gnu/gcj/xlib/natDrawable.lo gnu/gcj/xlib/natFont.lo \
......@@ -3710,8 +3756,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/org/xml/sax/helpers/XMLReaderFactory.P .deps/posix-threads.P \
.deps/posix.P .deps/prims.P .deps/resolve.P .deps/verify.P \
.deps/win32-threads.P .deps/win32.P
SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(libgcjx_la_SOURCES) $(EXTRA_libgcjx_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(rmic_SOURCES) $(EXTRA_rmic_SOURCES) $(rmiregistry_SOURCES) $(EXTRA_rmiregistry_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES)
OBJECTS = $(libgcj_la_OBJECTS) $(libgcjx_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(rmic_OBJECTS) $(rmiregistry_OBJECTS) $(gen_from_JIS_OBJECTS)
SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(lib_org_xml_sax_la_SOURCES) $(lib_org_w3c_dom_la_SOURCES) $(libgcjx_la_SOURCES) $(EXTRA_libgcjx_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(rmic_SOURCES) $(EXTRA_rmic_SOURCES) $(rmiregistry_SOURCES) $(EXTRA_rmiregistry_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES)
OBJECTS = $(libgcj_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_w3c_dom_la_OBJECTS) $(libgcjx_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(rmic_OBJECTS) $(rmiregistry_OBJECTS) $(gen_from_JIS_OBJECTS)
all: all-redirect
.SUFFIXES:
......@@ -3798,6 +3844,12 @@ distclean-libtool:
maintainer-clean-libtool:
lib-org-xml-sax.la: $(lib_org_xml_sax_la_OBJECTS) $(lib_org_xml_sax_la_DEPENDENCIES)
$(LINK) -rpath $(toolexeclibdir) $(lib_org_xml_sax_la_LDFLAGS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_xml_sax_la_LIBADD) $(LIBS)
lib-org-w3c-dom.la: $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_w3c_dom_la_DEPENDENCIES)
$(LINK) -rpath $(toolexeclibdir) $(lib_org_w3c_dom_la_LDFLAGS) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_w3c_dom_la_LIBADD) $(LIBS)
mostlyclean-binPROGRAMS:
clean-binPROGRAMS:
......@@ -4266,7 +4318,7 @@ $(c_files): %.lo: %.c
$(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h
$(javao_files) $(x_javao_files): %.lo: %.java
$(javao_files) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java
$(GCJCOMPILE) -o $@ $<
libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment