diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-01-20 22:25:27 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2004-01-20 22:25:27 +0100 |
| commit | d5d2603ff4d6b25ac7d2e804a3d00fb648e08832 (patch) | |
| tree | 8a3c19de884889da4adabddabf4ce4bbb263f8c1 | |
| parent | c01c143789ef36be55a16b399775a6d84dffb992 (diff) | |
| download | gcc-d5d2603ff4d6b25ac7d2e804a3d00fb648e08832.zip gcc-d5d2603ff4d6b25ac7d2e804a3d00fb648e08832.tar.gz gcc-d5d2603ff4d6b25ac7d2e804a3d00fb648e08832.tar.bz2 | |
Makefile.am (lib_org_w3c_dom_la_LIBADD, [...]): New.
* Makefile.am (lib_org_w3c_dom_la_LIBADD,
lib_org_w3c_dom_la_LDFLAGS): New.
(lib_org_xml_sax_la_LIBADD, lib_org_xml_sax_la_LDFLAGS): New.
* Makefile.in: Rebuilt.
From-SVN: r76231
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/Makefile.am | 10 | ||||
| -rw-r--r-- | libjava/Makefile.in | 14 |
3 files changed, 27 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 95f86ef..889e520 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2004-01-20 Jakub Jelinek <jakub@redhat.com> + + * Makefile.am (lib_org_w3c_dom_la_LIBADD, + lib_org_w3c_dom_la_LDFLAGS): New. + (lib_org_xml_sax_la_LIBADD, lib_org_xml_sax_la_LDFLAGS): New. + * Makefile.in: Rebuilt. + 2004-01-20 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (setBounds): diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 8043a0a..5d89aef 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -307,6 +307,11 @@ org/w3c/dom/traversal/DocumentTraversal.java \ org/w3c/dom/traversal/NodeFilter.java \ org/w3c/dom/traversal/NodeIterator.java \ org/w3c/dom/traversal/TreeWalker.java +## See jv_convert_LDADD. +lib_org_w3c_dom_la_LIBADD = -L$(here)/.libs libgcj.la +lib_org_w3c_dom_la_LDFLAGS = -rpath $(toolexeclibdir) \ +## The mysterious backslash is consumed by make. + -version-info `grep -v '^\#' $(srcdir)/libtool-version` lib_org_xml_sax_la_SOURCES = org/xml/sax/ext/DeclHandler.java \ org/xml/sax/ext/LexicalHandler.java \ @@ -338,6 +343,11 @@ org/xml/sax/SAXNotSupportedException.java \ org/xml/sax/SAXParseException.java \ org/xml/sax/XMLFilter.java \ org/xml/sax/XMLReader.java +## See jv_convert_LDADD. +lib_org_xml_sax_la_LIBADD = -L$(here)/.libs libgcj.la +lib_org_xml_sax_la_LDFLAGS = -rpath $(toolexeclibdir) \ +## The mysterious backslash is consumed by make. + -version-info `grep -v '^\#' $(srcdir)/libtool-version` lib_gnu_awt_xlib_la_SOURCES = $(x_nat_source_files) EXTRA_lib_gnu_awt_xlib_la_SOURCES = $(x_java_source_files) diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 3e02fef..e0fc800 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -397,6 +397,10 @@ org/w3c/dom/traversal/NodeFilter.java \ org/w3c/dom/traversal/NodeIterator.java \ org/w3c/dom/traversal/TreeWalker.java +lib_org_w3c_dom_la_LIBADD = -L$(here)/.libs libgcj.la +lib_org_w3c_dom_la_LDFLAGS = -rpath $(toolexeclibdir) \ + -version-info `grep -v '^\#' $(srcdir)/libtool-version` + lib_org_xml_sax_la_SOURCES = org/xml/sax/ext/DeclHandler.java \ org/xml/sax/ext/LexicalHandler.java \ @@ -429,6 +433,10 @@ org/xml/sax/SAXParseException.java \ org/xml/sax/XMLFilter.java \ org/xml/sax/XMLReader.java +lib_org_xml_sax_la_LIBADD = -L$(here)/.libs libgcj.la +lib_org_xml_sax_la_LDFLAGS = -rpath $(toolexeclibdir) \ + -version-info `grep -v '^\#' $(srcdir)/libtool-version` + lib_gnu_awt_xlib_la_SOURCES = $(x_nat_source_files) EXTRA_lib_gnu_awt_xlib_la_SOURCES = $(x_java_source_files) @@ -2682,8 +2690,7 @@ java/net/natInetAddress.lo java/nio/natDirectByteBufferImpl.lo \ java/nio/channels/natFileChannelImpl.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_DEPENDENCIES = libgcj.la lib_org_xml_sax_la_OBJECTS = org/xml/sax/ext/DeclHandler.lo \ org/xml/sax/ext/LexicalHandler.lo \ org/xml/sax/helpers/AttributeListImpl.lo \ @@ -2705,8 +2712,7 @@ 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_DEPENDENCIES = libgcj.la 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 \ |