Makefile.am (GCJCOMPILE): Use -fCLASSPATH not -fclasspath.

	* Makefile.am (GCJCOMPILE): Use -fCLASSPATH not -fclasspath. Fixes
	dependency tracking for .java files.
	* Makefile.in: Rebuilt.

From-SVN: r50024

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 29c0417c2ea12ff6804848d32140c52621b4e2c0..4701a7d8bb22ab2a2af74f3567af4f11a0f7d2ab 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-25  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
+
+       * Makefile.am (GCJCOMPILE): Use -fCLASSPATH not -fclasspath. Fixes
+       dependency tracking for .java files.
+       * Makefile.in: Rebuilt.
+
 2002-02-24  Adam Megacz  <adam@xwt.org>
 
        * java/net/natPlainDatagramSocketImpl.cc: whops; removed 'make'

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index e79471f80644cc847111a3fc3bc97fd6bbc4ec9d..3bbd943e5fad9828f3f4c0a869ea4e3054ad576e 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -69,7 +69,7 @@ endif # CANADIAN
 ## compiles.
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8
 
-GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c
+GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fCLASSPATH=$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c
 GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
 LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
 

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 45fdc1146c27f5aac8f4217f0402735335e55d51..fea2f5b625cac8d485897c6c89b201992a507280 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -119,7 +119,6 @@ ZINCS = @ZINCS@
 ZLIBS = @ZLIBS@
 ZLIBSPEC = @ZLIBSPEC@
 ZLIBTESTSPEC = @ZLIBTESTSPEC@
-glibcpp_CXX = @glibcpp_CXX@
 here = @here@
 libgcj_basedir = @libgcj_basedir@
 mkinstalldirs = @mkinstalldirs@
@@ -150,7 +149,7 @@ bin_SCRIPTS = addr2name.awk
 
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8
 
-GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c
+GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fCLASSPATH=$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c
 GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
 LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@