From 11c9e16113bddadab226df6eaaa4b90e1140beb0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 2 Feb 2005 01:28:25 +0000 Subject: [PATCH] Makefile.in: Rebuilt. * Makefile.in: Rebuilt. * Makefile.am (BOOTCLASSPATH): Added sax and w3c_dom. (.java.class): Use BOOTCLASSPATH. From-SVN: r94579 --- libjava/ChangeLog | 6 ++++++ libjava/Makefile.am | 4 ++-- libjava/Makefile.in | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c75db1bd970..83dcba4323d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-02-01 Tom Tromey + + * Makefile.in: Rebuilt. + * Makefile.am (BOOTCLASSPATH): Added sax and w3c_dom. + (.java.class): Use BOOTCLASSPATH. + 2005-02-01 Tom Tromey * external/w3c_dom/Makefile.am: New file. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index db764eb1d54..d7465d8a95c 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -195,7 +195,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ $(GCINCS) $(THREADINCS) $(INCLTDL) \ $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS) -BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir) +BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(srcdir)/external/w3c_dom'$(CLASSPATH_SEPARATOR)'$(srcdir)/external/sax ## ################################################################ @@ -543,7 +543,7 @@ else # !ONESTEP # Compile each classfile individually. .java.class: - $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir) -d $(here) $< + $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(BOOTCLASSPATH) -d $(here) $< libgcj-@gcc_version@.jar: $(all_java_class_files) $(all_property_files) -@rm -f libgcj-@gcc_version@.jar diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 7822ebf8cb1..ae0d981fd4c 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -4972,7 +4972,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ $(GCINCS) $(THREADINCS) $(INCLTDL) \ $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS) -BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir) +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 @@ -25853,7 +25853,7 @@ $(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDEN # Compile each classfile individually. @ONESTEP_FALSE@.java.class: -@ONESTEP_FALSE@ $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir) -d $(here) $< +@ONESTEP_FALSE@ $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(BOOTCLASSPATH) -d $(here) $< @ONESTEP_FALSE@libgcj-@gcc_version@.jar: $(all_java_class_files) $(all_property_files) @ONESTEP_FALSE@ -@rm -f libgcj-@gcc_version@.jar -- 2.30.2