diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-08-30 23:08:52 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-08-30 23:08:52 +0000 |
| commit | 1782d0c6a6b3df85b0d5ff85b29d55c18b5d0d58 (patch) | |
| tree | c5338289bca4dca5ba761d12d37378b090d9f0af /libjava | |
| parent | d462fee0a038c63766af2cdf22a6dacf6d74a5b7 (diff) | |
| download | gcc-1782d0c6a6b3df85b0d5ff85b29d55c18b5d0d58.tar.gz | |
2002-08-30 Jeff Sturm <jsturm@one-point.com>
* Makefile.in: Rebuilt.
* Makefile.am (ZIP, GCJH): Remove $(EXEEXT).
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@56690 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/Makefile.am | 6 | ||||
| -rw-r--r-- | libjava/Makefile.in | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 33c9bb40fc0..c64f9ea3034 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-08-30 Jeff Sturm <jsturm@one-point.com> + + * Makefile.in: Rebuilt. + * Makefile.am (ZIP, GCJH): Remove $(EXEEXT). + 2002-08-29 Tom Tromey <tromey@redhat.com> * java/net/JarURLConnection.java (getCertificates): New method diff --git a/libjava/Makefile.am b/libjava/Makefile.am index ef10fe91c0d..e3cfaeab727 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -57,14 +57,14 @@ if CANADIAN if NULL_TARGET ## In this case, gcj is found outside the build tree. However, zip is ## found in the build tree. -ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT) +ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar else ZIP = jar endif GCJH = gcjh else # CANADIAN -GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT) -ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT) +GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh +ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar endif # CANADIAN ## The compiler with whatever flags we want for both -c and -C diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 2de61223dc6..91edd98e2f5 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -148,11 +148,11 @@ secdir = $(libdir)/security @NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry bin_SCRIPTS = addr2name.awk -@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT) +@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar @CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar -@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT) +@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar @CANADIAN_TRUE@GCJH = @CANADIAN_TRUE@gcjh -@CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT) +@CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 |