Makefile.in: Rebuilt.

* Makefile.in: Rebuilt.
	* Makefile.am (AM_CXXFLAGS): Define TOOLEXECLIBDIR.
	(libgcj0_convenience_la_SOURCES): Don't include
	gnu_xml_source_files.
	(libgcj0_convenience_la_LIBADD): New variable.
	(libgcj_la_LIBADD): Don't include sax or w3c_dom.
	(all_java_source_files): javax_imageio_source_files,
	javax_xml_source_files, and gnu_java_beans_source_files.
	($(gnu_xml_source_files:.java=.lo)): Removed target.
	(gnu-xml.lo): New target.
	(javax-imageio.lo): Likewise.
	(javax-xml.lo): Likewise.
	(gnu-java-beans.lo): Likewise.
	(gnu_java_beans_source_files): New variable.
	(javax_imageio_source_files): Likewise.
	(javax_xml_source_files): Likewise.
	(javax_source_files): Moved files to other variable.
	(awt_java_source_files): Likewise.
	(ordinary_java_source_files): Added BootClassLoader.java.
	* java/lang/natVMClassLoader.cc (defineClass): Use boot loader,
	not system class loader.
	(initBootLoader): New method.
	(loadClass): Search bootLoader.
	* java/lang/natClassLoader.cc (_Jv_RegisterInitiatingLoader): Use
	boot loader, not system class loader.
	(_Jv_UnregisterInitiatingLoader): Likewise.
	(_Jv_FindClass): Likewise.  Ensure entries in
	bootstrap_class_list are unique.
	* java/lang/natClass.cc (getClassLoader): Don't special case
	system class loader.
	* java/lang/VMClassLoader.java (bootLoader): New field.
	(getResource): Use bootLoader.
	(getResources): Likewise.
	(initBootLoader): Declare.
	* gnu/gcj/runtime/BootClassLoader.java: New file.
	* external/sax/org/xml/sax/helpers/NamespaceSupport.java
	(EMPTY_ENUMERATION): Now package-private.
	* external/w3c_com/Makefile.in: Rebuilt.
	* external/w3c_com/Makefile.am (MULTIBUILDTOP): New variable.
	(w3c.jar): New target.
	(classes.stamp): Updated.
	(toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES.
	Changed name of library.
	(libw3c_gcj_la_SOURCES): New variable.
	(libw3c_gcj_la_GCJFLAGS): Likewise.
	(source_files): Renamed from lib3c_convenience_la_SOURCES.
	* external/sax/Makefile.in: Rebuilt.
	* external/sax/Makefile.am (MULTIBUILDTOP): New variable.
	(sax.jar): New target.
	(classes.stamp): Updated.
	(toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES.
	Changed name of library.
	(libsax_gcj_la_SOURCES): New variable.
	(libsax_gcj_la_GCJFLAGS): Likewise.
	(source_files): Renamed from libsax_convenience_la_SOURCES.
	* stacktrace.cc (non_system_trace_fn): Don't look at system class
	loader.
	* prims.cc (_Jv_CreateJavaVM): Initialize the bootstrap class
	loader.
	(_Jv_RunMain): Handle case where 'runtime' is NULL at exit.

From-SVN: r96960
This commit is contained in:
Tom Tromey
2005-03-24 00:04:22 +00:00
committed by Tom Tromey
parent 85624ffd34
commit aa893047e8
24 changed files with 8517 additions and 10715 deletions
+6 -18
View File
@@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.5 from Makefile.am.
# Makefile.in generated by automake 1.9.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -382,13 +382,7 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
@set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -400,7 +394,7 @@ $(RECURSIVE_TARGETS):
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -408,13 +402,7 @@ $(RECURSIVE_TARGETS):
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
@set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -435,7 +423,7 @@ maintainer-clean-recursive:
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+14 -5
View File
@@ -5,6 +5,9 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
## Needed because $(ZIP) is a relative path.
MULTIBUILDTOP = ../../
## The compiler with whatever flags we want for both -c and -C
## compiles.
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
@@ -20,18 +23,24 @@ AM_GCJFLAGS = \
BUILT_SOURCES = classes.stamp
classes.stamp: $(libsax_convenience_la_SOURCES)
sax.jar: classes.stamp
find org -name '*.class' -print | $(ZIP) -cfME@ $@
classes.stamp: $(source_files)
here=`pwd`; cd $(srcdir); \
$(GCJ_WITH_FLAGS) -C -d $$here $(libsax_convenience_la_SOURCES)
$(GCJ_WITH_FLAGS) -C -d $$here $(source_files)
echo > classes.stamp
mostlyclean-local:
-find . -name '*.class' | xargs rm
-rm classes.stamp
-rm classes.stamp sax.jar
noinst_LTLIBRARIES = libsax_convenience.la
toolexeclib_LTLIBRARIES = libsax-gcj.la
libsax_convenience_la_SOURCES = \
libsax_gcj_la_SOURCES = sax.jar
libsax_gcj_la_GCJFLAGS = -findirect-dispatch
source_files = \
org/xml/sax/SAXNotSupportedException.java \
org/xml/sax/helpers/NamespaceSupport.java \
org/xml/sax/helpers/AttributesImpl.java \
+78 -280
View File
@@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.5 from Makefile.am.
# Makefile.in generated by automake 1.9.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
@SET_MAKE@
SOURCES = $(libsax_convenience_la_SOURCES)
SOURCES = $(libsax_gcj_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -58,38 +58,18 @@ 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 =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsax_convenience_la_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
am_libsax_convenience_la_OBJECTS = \
org/xml/sax/SAXNotSupportedException.lo \
org/xml/sax/helpers/NamespaceSupport.lo \
org/xml/sax/helpers/AttributesImpl.lo \
org/xml/sax/helpers/LocatorImpl.lo \
org/xml/sax/helpers/DefaultHandler.lo \
org/xml/sax/helpers/AttributeListImpl.lo \
org/xml/sax/helpers/ParserFactory.lo \
org/xml/sax/helpers/NewInstance.lo \
org/xml/sax/helpers/XMLFilterImpl.lo \
org/xml/sax/helpers/ParserAdapter.lo \
org/xml/sax/helpers/XMLReaderAdapter.lo \
org/xml/sax/helpers/XMLReaderFactory.lo \
org/xml/sax/HandlerBase.lo org/xml/sax/SAXException.lo \
org/xml/sax/ContentHandler.lo \
org/xml/sax/SAXNotRecognizedException.lo \
org/xml/sax/ErrorHandler.lo org/xml/sax/AttributeList.lo \
org/xml/sax/Locator.lo org/xml/sax/Attributes.lo \
org/xml/sax/SAXParseException.lo org/xml/sax/XMLFilter.lo \
org/xml/sax/EntityResolver.lo org/xml/sax/XMLReader.lo \
org/xml/sax/ext/Locator2.lo org/xml/sax/ext/LexicalHandler.lo \
org/xml/sax/ext/Attributes2Impl.lo \
org/xml/sax/ext/DeclHandler.lo org/xml/sax/ext/Attributes2.lo \
org/xml/sax/ext/EntityResolver2.lo \
org/xml/sax/ext/Locator2Impl.lo \
org/xml/sax/ext/DefaultHandler2.lo org/xml/sax/InputSource.lo \
org/xml/sax/DocumentHandler.lo org/xml/sax/DTDHandler.lo \
org/xml/sax/Parser.lo
libsax_convenience_la_OBJECTS = $(am_libsax_convenience_la_OBJECTS)
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)
libsax_gcj_la_LIBADD =
am_libsax_gcj_la_OBJECTS = libsax_gcj_la-sax.lo
libsax_gcj_la_OBJECTS = $(am_libsax_gcj_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/gcj
depcomp = $(SHELL) $(top_srcdir)/../depcomp
am__depfiles_maybe = depfiles
@@ -99,8 +79,8 @@ LTGCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) $(AM_GCJFLAGS) \
GCJLD = $(GCJ)
GCJLINK = $(LIBTOOL) --mode=link $(GCJLD) $(AM_GCJFLAGS) $(GCJFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libsax_convenience_la_SOURCES)
DIST_SOURCES = $(libsax_convenience_la_SOURCES)
SOURCES = $(libsax_gcj_la_SOURCES)
DIST_SOURCES = $(libsax_gcj_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -327,6 +307,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MULTIBUILDTOP = ../../
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir)
AM_GCJFLAGS = \
@@ -337,8 +318,10 @@ AM_GCJFLAGS = \
-Wno-deprecated
BUILT_SOURCES = classes.stamp
noinst_LTLIBRARIES = libsax_convenience.la
libsax_convenience_la_SOURCES = \
toolexeclib_LTLIBRARIES = libsax-gcj.la
libsax_gcj_la_SOURCES = sax.jar
libsax_gcj_la_GCJFLAGS = -findirect-dispatch
source_files = \
org/xml/sax/SAXNotSupportedException.java \
org/xml/sax/helpers/NamespaceSupport.java \
org/xml/sax/helpers/AttributesImpl.java \
@@ -380,7 +363,7 @@ all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .java .lo .o .obj
.SUFFIXES: .jar .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -410,235 +393,45 @@ $(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
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
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 \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
org/xml/sax/$(am__dirstamp):
@$(mkdir_p) org/xml/sax
@: > org/xml/sax/$(am__dirstamp)
org/xml/sax/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) org/xml/sax/$(DEPDIR)
@: > org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/SAXNotSupportedException.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/$(am__dirstamp):
@$(mkdir_p) org/xml/sax/helpers
@: > org/xml/sax/helpers/$(am__dirstamp)
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) org/xml/sax/helpers/$(DEPDIR)
@: > org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/NamespaceSupport.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/AttributesImpl.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/LocatorImpl.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/DefaultHandler.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/AttributeListImpl.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/ParserFactory.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/NewInstance.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/XMLFilterImpl.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/ParserAdapter.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/XMLReaderAdapter.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/XMLReaderFactory.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/HandlerBase.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/SAXException.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ContentHandler.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/SAXNotRecognizedException.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ErrorHandler.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/AttributeList.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/Locator.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/Attributes.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/SAXParseException.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/XMLFilter.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/EntityResolver.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/XMLReader.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/$(am__dirstamp):
@$(mkdir_p) org/xml/sax/ext
@: > org/xml/sax/ext/$(am__dirstamp)
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) org/xml/sax/ext/$(DEPDIR)
@: > org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/Locator2.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/LexicalHandler.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/Attributes2Impl.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/DeclHandler.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/Attributes2.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/EntityResolver2.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/Locator2Impl.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/DefaultHandler2.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/InputSource.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/DocumentHandler.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/DTDHandler.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/Parser.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
libsax_convenience.la: $(libsax_convenience_la_OBJECTS) $(libsax_convenience_la_DEPENDENCIES)
$(GCJLINK) $(libsax_convenience_la_LDFLAGS) $(libsax_convenience_la_OBJECTS) $(libsax_convenience_la_LIBADD) $(LIBS)
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)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-rm -f org/xml/sax/AttributeList.$(OBJEXT)
-rm -f org/xml/sax/AttributeList.lo
-rm -f org/xml/sax/Attributes.$(OBJEXT)
-rm -f org/xml/sax/Attributes.lo
-rm -f org/xml/sax/ContentHandler.$(OBJEXT)
-rm -f org/xml/sax/ContentHandler.lo
-rm -f org/xml/sax/DTDHandler.$(OBJEXT)
-rm -f org/xml/sax/DTDHandler.lo
-rm -f org/xml/sax/DocumentHandler.$(OBJEXT)
-rm -f org/xml/sax/DocumentHandler.lo
-rm -f org/xml/sax/EntityResolver.$(OBJEXT)
-rm -f org/xml/sax/EntityResolver.lo
-rm -f org/xml/sax/ErrorHandler.$(OBJEXT)
-rm -f org/xml/sax/ErrorHandler.lo
-rm -f org/xml/sax/HandlerBase.$(OBJEXT)
-rm -f org/xml/sax/HandlerBase.lo
-rm -f org/xml/sax/InputSource.$(OBJEXT)
-rm -f org/xml/sax/InputSource.lo
-rm -f org/xml/sax/Locator.$(OBJEXT)
-rm -f org/xml/sax/Locator.lo
-rm -f org/xml/sax/Parser.$(OBJEXT)
-rm -f org/xml/sax/Parser.lo
-rm -f org/xml/sax/SAXException.$(OBJEXT)
-rm -f org/xml/sax/SAXException.lo
-rm -f org/xml/sax/SAXNotRecognizedException.$(OBJEXT)
-rm -f org/xml/sax/SAXNotRecognizedException.lo
-rm -f org/xml/sax/SAXNotSupportedException.$(OBJEXT)
-rm -f org/xml/sax/SAXNotSupportedException.lo
-rm -f org/xml/sax/SAXParseException.$(OBJEXT)
-rm -f org/xml/sax/SAXParseException.lo
-rm -f org/xml/sax/XMLFilter.$(OBJEXT)
-rm -f org/xml/sax/XMLFilter.lo
-rm -f org/xml/sax/XMLReader.$(OBJEXT)
-rm -f org/xml/sax/XMLReader.lo
-rm -f org/xml/sax/ext/Attributes2.$(OBJEXT)
-rm -f org/xml/sax/ext/Attributes2.lo
-rm -f org/xml/sax/ext/Attributes2Impl.$(OBJEXT)
-rm -f org/xml/sax/ext/Attributes2Impl.lo
-rm -f org/xml/sax/ext/DeclHandler.$(OBJEXT)
-rm -f org/xml/sax/ext/DeclHandler.lo
-rm -f org/xml/sax/ext/DefaultHandler2.$(OBJEXT)
-rm -f org/xml/sax/ext/DefaultHandler2.lo
-rm -f org/xml/sax/ext/EntityResolver2.$(OBJEXT)
-rm -f org/xml/sax/ext/EntityResolver2.lo
-rm -f org/xml/sax/ext/LexicalHandler.$(OBJEXT)
-rm -f org/xml/sax/ext/LexicalHandler.lo
-rm -f org/xml/sax/ext/Locator2.$(OBJEXT)
-rm -f org/xml/sax/ext/Locator2.lo
-rm -f org/xml/sax/ext/Locator2Impl.$(OBJEXT)
-rm -f org/xml/sax/ext/Locator2Impl.lo
-rm -f org/xml/sax/helpers/AttributeListImpl.$(OBJEXT)
-rm -f org/xml/sax/helpers/AttributeListImpl.lo
-rm -f org/xml/sax/helpers/AttributesImpl.$(OBJEXT)
-rm -f org/xml/sax/helpers/AttributesImpl.lo
-rm -f org/xml/sax/helpers/DefaultHandler.$(OBJEXT)
-rm -f org/xml/sax/helpers/DefaultHandler.lo
-rm -f org/xml/sax/helpers/LocatorImpl.$(OBJEXT)
-rm -f org/xml/sax/helpers/LocatorImpl.lo
-rm -f org/xml/sax/helpers/NamespaceSupport.$(OBJEXT)
-rm -f org/xml/sax/helpers/NamespaceSupport.lo
-rm -f org/xml/sax/helpers/NewInstance.$(OBJEXT)
-rm -f org/xml/sax/helpers/NewInstance.lo
-rm -f org/xml/sax/helpers/ParserAdapter.$(OBJEXT)
-rm -f org/xml/sax/helpers/ParserAdapter.lo
-rm -f org/xml/sax/helpers/ParserFactory.$(OBJEXT)
-rm -f org/xml/sax/helpers/ParserFactory.lo
-rm -f org/xml/sax/helpers/XMLFilterImpl.$(OBJEXT)
-rm -f org/xml/sax/helpers/XMLFilterImpl.lo
-rm -f org/xml/sax/helpers/XMLReaderAdapter.$(OBJEXT)
-rm -f org/xml/sax/helpers/XMLReaderAdapter.lo
-rm -f org/xml/sax/helpers/XMLReaderFactory.$(OBJEXT)
-rm -f org/xml/sax/helpers/XMLReaderFactory.lo
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/AttributeList.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Attributes.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/ContentHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/DTDHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/DocumentHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/EntityResolver.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/ErrorHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/HandlerBase.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/InputSource.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Locator.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Parser.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXNotRecognizedException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXNotSupportedException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXParseException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/XMLFilter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/XMLReader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Attributes2.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Attributes2Impl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/DeclHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/DefaultHandler2.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/EntityResolver2.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/LexicalHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Locator2.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Locator2Impl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/AttributeListImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/AttributesImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/DefaultHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/LocatorImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/NamespaceSupport.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/NewInstance.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/ParserAdapter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/ParserFactory.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLFilterImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLReaderAdapter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLReaderFactory.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsax_gcj_la-sax.Plo@am__quote@
.java.o:
.jar.o:
@am__fastdepGCJ_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@am__fastdepGCJ_TRUE@ if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
@am__fastdepGCJ_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
@@ -646,7 +439,7 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ $<
.java.obj:
.jar.obj:
@am__fastdepGCJ_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
@am__fastdepGCJ_TRUE@ if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepGCJ_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
@@ -654,7 +447,7 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.java.lo:
.jar.lo:
@am__fastdepGCJ_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
@am__fastdepGCJ_TRUE@ if $(LTGCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
@am__fastdepGCJ_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
@@ -662,14 +455,18 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepGCJ_FALSE@ $(LTGCJCOMPILE) -c -o $@ $<
libsax_gcj_la-sax.lo: sax.jar
@am__fastdepGCJ_TRUE@ if $(LIBTOOL) --mode=compile $(GCJ) $(libsax_gcj_la_GCJFLAGS) $(GCJFLAGS) -MT libsax_gcj_la-sax.lo -MD -MP -MF "$(DEPDIR)/libsax_gcj_la-sax.Tpo" -c -o libsax_gcj_la-sax.lo `test -f 'sax.jar' || echo '$(srcdir)/'`sax.jar; \
@am__fastdepGCJ_TRUE@ then mv -f "$(DEPDIR)/libsax_gcj_la-sax.Tpo" "$(DEPDIR)/libsax_gcj_la-sax.Plo"; else rm -f "$(DEPDIR)/libsax_gcj_la-sax.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ source='sax.jar' object='libsax_gcj_la-sax.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepGCJ_FALSE@ $(LIBTOOL) --mode=compile $(GCJ) $(libsax_gcj_la_GCJFLAGS) $(GCJFLAGS) -c -o libsax_gcj_la-sax.lo `test -f 'sax.jar' || echo '$(srcdir)/'`sax.jar
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
-rm -rf org/xml/sax/.libs org/xml/sax/_libs
-rm -rf org/xml/sax/ext/.libs org/xml/sax/ext/_libs
-rm -rf org/xml/sax/helpers/.libs org/xml/sax/helpers/_libs
distclean-libtool:
-rm -f libtool
@@ -755,6 +552,9 @@ 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
@@ -776,12 +576,6 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-rm -f org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-rm -f org/xml/sax/$(am__dirstamp)
-rm -f org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-rm -f org/xml/sax/ext/$(am__dirstamp)
-rm -f org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-rm -f org/xml/sax/helpers/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -789,11 +583,11 @@ maintainer-clean-generic:
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
clean-am: clean-generic clean-libtool clean-toolexeclibLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
-rm -rf org/xml/sax/$(DEPDIR) org/xml/sax/ext/$(DEPDIR) org/xml/sax/helpers/$(DEPDIR)
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
@@ -810,7 +604,7 @@ info-am:
install-data-am:
install-exec-am:
install-exec-am: install-toolexeclibLTLIBRARIES
install-info: install-info-am
@@ -819,7 +613,7 @@ install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -rf org/xml/sax/$(DEPDIR) org/xml/sax/ext/$(DEPDIR) org/xml/sax/helpers/$(DEPDIR)
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -836,29 +630,33 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-info-am
uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
clean-libtool clean-toolexeclibLTLIBRARIES 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 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
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
classes.stamp: $(libsax_convenience_la_SOURCES)
sax.jar: classes.stamp
find org -name '*.class' -print | $(ZIP) -cfME@ $@
classes.stamp: $(source_files)
here=`pwd`; cd $(srcdir); \
$(GCJ_WITH_FLAGS) -C -d $$here $(libsax_convenience_la_SOURCES)
$(GCJ_WITH_FLAGS) -C -d $$here $(source_files)
echo > classes.stamp
mostlyclean-local:
-find . -name '*.class' | xargs rm
-rm classes.stamp
-rm classes.stamp sax.jar
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
@@ -2,7 +2,7 @@
// http://www.saxproject.org
// Written by David Megginson
// This class is in the Public Domain. NO WARRANTY!
// $Id: NamespaceSupport.java,v 1.1 2004/12/23 22:38:42 mark Exp $
// $Id: NamespaceSupport.java,v 1.1 2005/02/02 00:41:54 tromey Exp $
package org.xml.sax.helpers;
@@ -113,7 +113,8 @@ public class NamespaceSupport
/**
* An empty enumeration.
*/
private final static Enumeration EMPTY_ENUMERATION =
// GCJ LOCAL: work around gcj bug by making this package-private
final static Enumeration EMPTY_ENUMERATION =
new Vector().elements();
+14 -5
View File
@@ -5,6 +5,9 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
## Needed because $(ZIP) is a relative path.
MULTIBUILDTOP = ../../
## The compiler with whatever flags we want for both -c and -C
## compiles.
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
@@ -20,18 +23,24 @@ AM_GCJFLAGS = \
BUILT_SOURCES = classes.stamp
classes.stamp: $(libw3c_convenience_la_SOURCES)
w3c.jar: classes.stamp
find org -name '*.class' -print | $(ZIP) -cfME@ $@
classes.stamp: $(source_files)
here=`pwd`; cd $(srcdir); \
$(GCJ_WITH_FLAGS) -C -d $$here $(libw3c_convenience_la_SOURCES)
$(GCJ_WITH_FLAGS) -C -d $$here $(source_files)
echo > classes.stamp
mostlyclean-local:
-find . -name '*.class' | xargs rm
-rm classes.stamp
-rm classes.stamp w3c.jar
noinst_LTLIBRARIES = libw3c_convenience.la
toolexeclib_LTLIBRARIES = libw3c-gcj.la
libw3c_convenience_la_SOURCES = \
libw3c_gcj_la_SOURCES = w3c.jar
libw3c_gcj_la_GCJFLAGS = -findirect-dispatch
source_files = \
org/w3c/dom/xpath/XPathNamespace.java \
org/w3c/dom/xpath/XPathResult.java \
org/w3c/dom/xpath/XPathException.java \
+78 -1060
View File
File diff suppressed because it is too large Load Diff