This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
4.0 Patch: Makefile fixlet
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Cc: Mark Mitchell <mitchell at codesourcery dot com>
- Date: 15 Apr 2005 12:42:28 -0600
- Subject: 4.0 Patch: Makefile fixlet
- Reply-to: tromey at redhat dot com
Per noticed that the DOM classes weren't appearing in libgcj.so.
Apparently testing programs that use this functionality didn't
discover the problem because the classes *were* linked into gij.
This patch fixes the problem.
Tested on x86 FC2, including Eclipse and Jonas smoke tests.
I'm checking this in on the trunk now.
Mark, I would like to check this in to 4.0. Ok?
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (libgij_la_LIBADD): Moved SAX and DOM...
(libgcj0_convenience_la_LIBADD): ... here.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.455.2.10
diff -u -r1.455.2.10 Makefile.am
--- Makefile.am 6 Apr 2005 21:38:10 -0000 1.455.2.10
+++ Makefile.am 15 Apr 2005 16:17:07 -0000
@@ -232,9 +232,7 @@
libgij_la_SOURCES = gij.cc
libgij_la_DEPENDENCIES = libgcj.la libgcj.spec
## See jv_convert_LDADD.
-libgij_la_LIBADD = -L$(here)/.libs libgcj.la \
- external/sax/libsax-gcj.la \
- external/w3c_dom/libw3c-gcj.la
+libgij_la_LIBADD = -L$(here)/.libs libgcj.la
## The mysterious backslash in the grep pattern is consumed by make.
libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
@@ -254,7 +252,9 @@
$(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC)
libgcj0_convenience_la_LIBADD = \
gnu-xml.lo javax-imageio.lo \
- javax-xml.lo gnu-java-beans.lo
+ javax-xml.lo gnu-java-beans.lo \
+ external/sax/libsax-gcj.la \
+ external/w3c_dom/libw3c-gcj.la
noinst_LTLIBRARIES = libgcj0_convenience.la