From f36bcb2d6bfa52ba2db71bfdff8f247086945fc2 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Mon, 25 Feb 2002 09:58:13 +0000 Subject: [PATCH] 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 --- libjava/ChangeLog | 6 ++++++ libjava/Makefile.am | 2 +- libjava/Makefile.in | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 29c0417c2ea..4701a7d8bb2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2002-02-25 Bryce McKinlay + + * Makefile.am (GCJCOMPILE): Use -fCLASSPATH not -fclasspath. Fixes + dependency tracking for .java files. + * Makefile.in: Rebuilt. + 2002-02-24 Adam Megacz * java/net/natPlainDatagramSocketImpl.cc: whops; removed 'make' diff --git a/libjava/Makefile.am b/libjava/Makefile.am index e79471f8064..3bbd943e5fa 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 45fdc1146c2..fea2f5b625c 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 $@ -- 2.30.2