aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce McKinlay <bryce@waitaki.otago.ac.nz>2002-02-25 09:58:13 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2002-02-25 09:58:13 +0000
commitf36bcb2d6bfa52ba2db71bfdff8f247086945fc2 (patch)
tree260029cc40b3978211fe691864b4dcea1ce78b31
parentb73a391b6f7c2156fc3bf7478ccdcb2d960cb918 (diff)
downloadgcc-f36bcb2d6bfa52ba2db71bfdff8f247086945fc2.zip
gcc-f36bcb2d6bfa52ba2db71bfdff8f247086945fc2.tar.gz
gcc-f36bcb2d6bfa52ba2db71bfdff8f247086945fc2.tar.bz2
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
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/Makefile.am2
-rw-r--r--libjava/Makefile.in3
3 files changed, 8 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 29c0417..4701a7d 100644
--- 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 e79471f..3bbd943 100644
--- 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 45fdc11..fea2f5b 100644
--- 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 $@