Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (GCJCOMPILE): Use -fclasspath, not the CLASSPATH
	environment variable.

From-SVN: r36126

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a8a8b007a395a81d0eb962be766cd9f53d24270b..1b8932fb01f6aa4dea9adc6af4dbfa6685a6508c 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-02  Tom Tromey  <tromey@cygnus.com>
+
+       * Makefile.in: Rebuilt.
+       * Makefile.am (GCJCOMPILE): Use -fclasspath, not the CLASSPATH
+       environment variable.
+
 2000-09-01  Andrew Haley  <aph@redhat.com>
 
         * java/io/StreamTokenizer.java: Don't throw a

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index beecd8c1fa1169195fcc3046313b06519b837991..b29636842e9987fb172b8d604b96c4072c0b7cdd 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -69,7 +69,7 @@ GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
 ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/zip/zip$(EXEEXT)
 endif # CANADIAN
 
-GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -L$(here) $(JC1FLAGS) -c
+GCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -c
 GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
 LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
 

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 630bb27659a057fdbca48913572df085ab5b84f4..5da8d91c5e7d8f50a58b1902dae9bbcdbe2b883c 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -158,7 +158,7 @@ bin_SCRIPTS = addr2name.awk
 @CANADIAN_FALSE@expanded = \
 @CANADIAN_FALSE@`cd $(MULTIBUILDTOP)../$(COMPPATH)/gcc && pwd`
 
-GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -L$(here) $(JC1FLAGS) -c
+GCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -c
 GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
 LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@