From b0966710baefa76efb6090f4dfd0d7c39ac92d8d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 24 Mar 2005 19:42:40 +0000 Subject: BootClassLoader.java (BootClassLoader): Don't add sax and w3c libraries. * gnu/gcj/runtime/BootClassLoader.java (BootClassLoader): Don't add sax and w3c libraries. * Makefile.am (libgij_la_LIBADD): Added libsax-gcj.la and libw3c-gcj.la. * external/w3c_dom/Makefile.in: Rebuilt. * external/w3c_dom/Makefile.am (libw3c_gcj_la_GCJFLAGS): Include AM_GCJFLAGS. (libw3c_gcj_la_LDFLAGS): New variable. (noinst_LTLIBRARIES): Renamed. * external/sax/Makefile.in: Rebuilt. * external/sax/Makefile.am (libsax_gcj_la_GCJFLAGS): Include AM_GCJFLAGS. (libsax_gcj_la_LDFLAGS): New variable. (noinst_LTLIBRARIES): Renamed. From-SVN: r97004 --- libjava/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libjava/Makefile.am') diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 5ca18446539..933926824ce 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -222,7 +222,9 @@ BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)' libgij_la_SOURCES = gij.cc libgij_la_DEPENDENCIES = libgcj.la libgcj.spec ## See jv_convert_LDADD. -libgij_la_LIBADD = -L$(here)/.libs libgcj.la +libgij_la_LIBADD = -L$(here)/.libs libgcj.la \ + external/sax/libsax-gcj.la \ + external/w3c_dom/libw3c-gcj.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) -- cgit v1.2.3