diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-04-04 00:30:05 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-04-04 00:30:05 +0000 |
| commit | 76c6ea0c8be95f0f31cf63bb55e647c4539e7b12 (patch) | |
| tree | e7eff1dfe7f6d953e9d4f452f6d946837a9a4d07 /libjava/Makefile.in | |
| parent | 46bdbc0012b7ac304f1810c23611d8c6f1f81186 (diff) | |
| download | gcc-76c6ea0c8be95f0f31cf63bb55e647c4539e7b12.zip gcc-76c6ea0c8be95f0f31cf63bb55e647c4539e7b12.tar.gz gcc-76c6ea0c8be95f0f31cf63bb55e647c4539e7b12.tar.bz2 | |
Makefile.in: Rebuilt.
fastjar
Removed
libjava
* Makefile.in: Rebuilt.
* Makefile.am (ZIP): Removed.
(libgcj-$(gcc_version).jar): Use $(JAR).
(src.zip): Likewise.
* configure: Rebuilt.
* configure.ac: Check for jar. Removed code to set ZIP.
From-SVN: r112654
Diffstat (limited to 'libjava/Makefile.in')
| -rw-r--r-- | libjava/Makefile.in | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 74e55e1..9851dd1 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -488,6 +488,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERPRETER = @INTERPRETER@ +JAR = @JAR@ JAVA_HOME = @JAVA_HOME@ JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@ JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@ @@ -579,7 +580,6 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZINCS = @ZINCS@ -ZIP = @ZIP@ ZLIBS = @ZLIBS@ ZLIBSPEC = @ZLIBSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ @@ -8423,10 +8423,7 @@ $(propertyo_files): %.lo: classpath/resource/% $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,$(@:.lo=) libgcj-$(gcc_version).jar: - jardir=`dirname $(ZIP)`; \ - jardir=`cd $$jardir && pwd`; \ - jarname=`basename $(ZIP)`; \ - cd classpath/lib; $$jardir/$$jarname -cfM \ + cd classpath/lib; $(JAR) -cfM \ ../../libgcj-$(gcc_version).jar gnu java javax org mostlyclean-local: @@ -10726,7 +10723,7 @@ src.zip: echo $$file; \ done ); \ ) | \ - $(ZIP) -cfM@ $$here/src.zip + $(JAR) -cfM@ $$here/src.zip here=`pwd`; \ ( \ ( cd $(srcdir); \ @@ -10737,7 +10734,7 @@ src.zip: echo $$file; \ done ); \ ) | \ - $(ZIP) -ufM@ $$here/src.zip + $(JAR) -ufM@ $$here/src.zip install-src.zip: src.zip $(INSTALL_DATA) src.zip $(DESTDIR)$(sourcesdir)/src-$(gcc_version).zip |