diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-02-02 01:28:25 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-02-02 01:28:25 +0000 |
| commit | 11c9e16113bddadab226df6eaaa4b90e1140beb0 (patch) | |
| tree | 809fa6cf22656222c78349cf4b02abb7699c4a02 /libjava | |
| parent | 3d4da704e7af99d07c27b934d5e89b659230b51f (diff) | |
| download | gcc-11c9e16113bddadab226df6eaaa4b90e1140beb0.zip gcc-11c9e16113bddadab226df6eaaa4b90e1140beb0.tar.gz gcc-11c9e16113bddadab226df6eaaa4b90e1140beb0.tar.bz2 | |
Makefile.in: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (BOOTCLASSPATH): Added sax and w3c_dom.
(.java.class): Use BOOTCLASSPATH.
From-SVN: r94579
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 4 | ||||
| -rw-r--r-- | libjava/Makefile.in | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c75db1b..83dcba4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,11 @@ 2005-02-01 Tom Tromey <tromey@redhat.com> + * Makefile.in: Rebuilt. + * Makefile.am (BOOTCLASSPATH): Added sax and w3c_dom. + (.java.class): Use BOOTCLASSPATH. + +2005-02-01 Tom Tromey <tromey@redhat.com> + * external/w3c_dom/Makefile.am: New file. * external/w3c_dom/Makefile.in: New file. * external/sax/Makefile.am: New file. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index db764eb..d7465d8a 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 7822ebf..ae0d981 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 |