diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-25 09:58:13 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-25 09:58:13 +0000 |
| commit | 8d4084540ca1f6ef948b3d7e076419f632954726 (patch) | |
| tree | 260029cc40b3978211fe691864b4dcea1ce78b31 /libjava | |
| parent | f8c79468b67a824a019df60f1a6af59cbed4fe54 (diff) | |
| download | gcc-8d4084540ca1f6ef948b3d7e076419f632954726.tar.gz | |
* Makefile.am (GCJCOMPILE): Use -fCLASSPATH not -fclasspath. Fixes
dependency tracking for .java files.
* Makefile.in: Rebuilt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50024 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 2 | ||||
| -rw-r--r-- | 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 <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 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 $@ |