diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-24 19:42:40 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-24 19:42:40 +0000 |
| commit | c958ef6c7a82dd9835e5813c4c99c4796d901665 (patch) | |
| tree | d33ee2c15c782dbb00cc57cf0c4cb83393c64d12 /libjava/Makefile.am | |
| parent | c38bb1162d77849fc43f7c20815b6a42a0c0f5e2 (diff) | |
| download | gcc-c958ef6c7a82dd9835e5813c4c99c4796d901665.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@97004 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
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) |