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 | |
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')
-rw-r--r-- | libjava/ChangeLog | 17 | ||||
-rw-r--r-- | libjava/Makefile.am | 4 | ||||
-rw-r--r-- | libjava/Makefile.in | 5 | ||||
-rw-r--r-- | libjava/external/sax/Makefile.am | 4 | ||||
-rw-r--r-- | libjava/external/sax/Makefile.in | 62 | ||||
-rw-r--r-- | libjava/external/w3c_dom/Makefile.am | 4 | ||||
-rw-r--r-- | libjava/external/w3c_dom/Makefile.in | 62 | ||||
-rw-r--r-- | libjava/gnu/gcj/runtime/BootClassLoader.java | 7 |
8 files changed, 60 insertions, 105 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b2d500214f1..1ab2473eb64 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,20 @@ +2005-03-24 Tom Tromey <tromey@redhat.com> + + * 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. + 2005-03-23 Tom Tromey <tromey@redhat.com> * Makefile.in: Rebuilt. 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) diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 79f4ee9d7fb..508c4d56183 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -4587,7 +4587,10 @@ AM_CPPFLAGS = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(srcdir)/external/w3c_dom'$(CLASSPATH_SEPARATOR)'$(srcdir)/external/sax libgij_la_SOURCES = gij.cc libgij_la_DEPENDENCIES = libgcj.la libgcj.spec -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 + libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) diff --git a/libjava/external/sax/Makefile.am b/libjava/external/sax/Makefile.am index d4bdf5900d1..65c3a28b4c2 100644 --- a/libjava/external/sax/Makefile.am +++ b/libjava/external/sax/Makefile.am @@ -35,10 +35,10 @@ mostlyclean-local: -find . -name '*.class' | xargs rm -rm classes.stamp sax.jar -toolexeclib_LTLIBRARIES = libsax-gcj.la +noinst_LTLIBRARIES = libsax-gcj.la libsax_gcj_la_SOURCES = sax.jar -libsax_gcj_la_GCJFLAGS = -findirect-dispatch +libsax_gcj_la_GCJFLAGS = -findirect-dispatch $(AM_GCJFLAGS) source_files = \ org/xml/sax/SAXNotSupportedException.java \ diff --git a/libjava/external/sax/Makefile.in b/libjava/external/sax/Makefile.in index 6ca3c6249c5..6834616dac0 100644 --- a/libjava/external/sax/Makefile.in +++ b/libjava/external/sax/Makefile.in @@ -58,15 +58,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ CONFIG_HEADER = $(top_builddir)/include/config.h \ $(top_builddir)/gcj/libgcj-config.h CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(toolexeclibdir)" -toolexeclibLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(toolexeclib_LTLIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) libsax_gcj_la_LIBADD = am_libsax_gcj_la_OBJECTS = libsax_gcj_la-sax.lo libsax_gcj_la_OBJECTS = $(am_libsax_gcj_la_OBJECTS) @@ -318,9 +310,9 @@ AM_GCJFLAGS = \ -Wno-deprecated BUILT_SOURCES = classes.stamp -toolexeclib_LTLIBRARIES = libsax-gcj.la +noinst_LTLIBRARIES = libsax-gcj.la libsax_gcj_la_SOURCES = sax.jar -libsax_gcj_la_GCJFLAGS = -findirect-dispatch +libsax_gcj_la_GCJFLAGS = -findirect-dispatch $(AM_GCJFLAGS) source_files = \ org/xml/sax/SAXNotSupportedException.java \ org/xml/sax/helpers/NamespaceSupport.java \ @@ -393,35 +385,17 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(toolexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexeclibdir)" - @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(toolexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(toolexeclibdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(toolexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(toolexeclibdir)/$$f"; \ - else :; fi; \ - done - -uninstall-toolexeclibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @set -x; list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(toolexeclibdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(toolexeclibdir)/$$p"; \ - done -clean-toolexeclibLTLIBRARIES: - -test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES) - @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done libsax-gcj.la: $(libsax_gcj_la_OBJECTS) $(libsax_gcj_la_DEPENDENCIES) - $(GCJLINK) -rpath $(toolexeclibdir) $(libsax_gcj_la_LDFLAGS) $(libsax_gcj_la_OBJECTS) $(libsax_gcj_la_LIBADD) $(LIBS) + $(GCJLINK) $(libsax_gcj_la_LDFLAGS) $(libsax_gcj_la_OBJECTS) $(libsax_gcj_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -552,9 +526,6 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) installdirs: - for dir in "$(DESTDIR)$(toolexeclibdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am @@ -583,7 +554,7 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-generic clean-libtool clean-toolexeclibLTLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -604,7 +575,7 @@ info-am: install-data-am: -install-exec-am: install-toolexeclibLTLIBRARIES +install-exec-am: install-info: install-info-am @@ -630,20 +601,19 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES +uninstall-am: uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-toolexeclibLTLIBRARIES ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ - install-strip install-toolexeclibLTLIBRARIES installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ - pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ - uninstall-toolexeclibLTLIBRARIES + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + mostlyclean-local pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-info-am sax.jar: classes.stamp diff --git a/libjava/external/w3c_dom/Makefile.am b/libjava/external/w3c_dom/Makefile.am index f94e5626445..2c563dea56e 100644 --- a/libjava/external/w3c_dom/Makefile.am +++ b/libjava/external/w3c_dom/Makefile.am @@ -35,10 +35,10 @@ mostlyclean-local: -find . -name '*.class' | xargs rm -rm classes.stamp w3c.jar -toolexeclib_LTLIBRARIES = libw3c-gcj.la +noinst_LTLIBRARIES = libw3c-gcj.la libw3c_gcj_la_SOURCES = w3c.jar -libw3c_gcj_la_GCJFLAGS = -findirect-dispatch +libw3c_gcj_la_GCJFLAGS = -findirect-dispatch $(AM_GCJFLAGS) source_files = \ org/w3c/dom/xpath/XPathNamespace.java \ diff --git a/libjava/external/w3c_dom/Makefile.in b/libjava/external/w3c_dom/Makefile.in index 6aef501e357..5718e0b8fe0 100644 --- a/libjava/external/w3c_dom/Makefile.in +++ b/libjava/external/w3c_dom/Makefile.in @@ -58,15 +58,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ CONFIG_HEADER = $(top_builddir)/include/config.h \ $(top_builddir)/gcj/libgcj-config.h CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(toolexeclibdir)" -toolexeclibLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(toolexeclib_LTLIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) libw3c_gcj_la_LIBADD = am_libw3c_gcj_la_OBJECTS = libw3c_gcj_la-w3c.lo libw3c_gcj_la_OBJECTS = $(am_libw3c_gcj_la_OBJECTS) @@ -318,9 +310,9 @@ AM_GCJFLAGS = \ -Wno-deprecated BUILT_SOURCES = classes.stamp -toolexeclib_LTLIBRARIES = libw3c-gcj.la +noinst_LTLIBRARIES = libw3c-gcj.la libw3c_gcj_la_SOURCES = w3c.jar -libw3c_gcj_la_GCJFLAGS = -findirect-dispatch +libw3c_gcj_la_GCJFLAGS = -findirect-dispatch $(AM_GCJFLAGS) source_files = \ org/w3c/dom/xpath/XPathNamespace.java \ org/w3c/dom/xpath/XPathResult.java \ @@ -503,35 +495,17 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(toolexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexeclibdir)" - @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(toolexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(toolexeclibdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(toolexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(toolexeclibdir)/$$f"; \ - else :; fi; \ - done - -uninstall-toolexeclibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @set -x; list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(toolexeclibdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(toolexeclibdir)/$$p"; \ - done -clean-toolexeclibLTLIBRARIES: - -test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES) - @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done libw3c-gcj.la: $(libw3c_gcj_la_OBJECTS) $(libw3c_gcj_la_DEPENDENCIES) - $(GCJLINK) -rpath $(toolexeclibdir) $(libw3c_gcj_la_LDFLAGS) $(libw3c_gcj_la_OBJECTS) $(libw3c_gcj_la_LIBADD) $(LIBS) + $(GCJLINK) $(libw3c_gcj_la_LDFLAGS) $(libw3c_gcj_la_OBJECTS) $(libw3c_gcj_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -662,9 +636,6 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) installdirs: - for dir in "$(DESTDIR)$(toolexeclibdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am @@ -693,7 +664,7 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-generic clean-libtool clean-toolexeclibLTLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -714,7 +685,7 @@ info-am: install-data-am: -install-exec-am: install-toolexeclibLTLIBRARIES +install-exec-am: install-info: install-info-am @@ -740,20 +711,19 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES +uninstall-am: uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-toolexeclibLTLIBRARIES ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ - install-strip install-toolexeclibLTLIBRARIES installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ - pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ - uninstall-toolexeclibLTLIBRARIES + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + mostlyclean-local pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-info-am w3c.jar: classes.stamp diff --git a/libjava/gnu/gcj/runtime/BootClassLoader.java b/libjava/gnu/gcj/runtime/BootClassLoader.java index 6223c733b9f..e25f21f8841 100644 --- a/libjava/gnu/gcj/runtime/BootClassLoader.java +++ b/libjava/gnu/gcj/runtime/BootClassLoader.java @@ -55,13 +55,6 @@ public final class BootClassLoader extends URLClassLoader addURL(new URL("file", "", -1, dirname + files[i])); } } - - String w3clib = (libdir + File.separator - + System.mapLibraryName ("w3c-gcj")); - addURL(new URL("gcjlib", "", -1, w3clib)); - String saxlib = (libdir + File.separator - + System.mapLibraryName ("sax-gcj")); - addURL(new URL("gcjlib", "", -1, saxlib)); } catch (java.net.MalformedURLException x) { |