diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-07-25 16:40:04 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-07-25 16:40:04 +0000 |
| commit | a9e83c1b1bf4fff7947c71e91cda457ae0972a65 (patch) | |
| tree | d9f3ff2dfc9f511a34f8e448946b1fd6e091ddb7 /libjava | |
| parent | 08ac397c043f41656afacca215910e4847d90429 (diff) | |
| download | gcc-a9e83c1b1bf4fff7947c71e91cda457ae0972a65.zip gcc-a9e83c1b1bf4fff7947c71e91cda457ae0972a65.tar.gz gcc-a9e83c1b1bf4fff7947c71e91cda457ae0972a65.tar.bz2 | |
Makefile.in: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (libgcj.jar): Correctly fail when bytecode
compilation fails.
From-SVN: r44359
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 4 | ||||
| -rw-r--r-- | libjava/Makefile.in | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index dc779d1..bc5f522 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2001-07-25 Tom Tromey <tromey@redhat.com> + + * Makefile.in: Rebuilt. + * Makefile.am (libgcj.jar): Correctly fail when bytecode + compilation fails. + 2001-07-24 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> * prims.cc (_JNI_OnLoad): New function. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index e7bf69e..98f9c58 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -180,12 +180,12 @@ libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_file @: $(shell echo Creating list of files to compile...) $(shell rm -f tmp-list || :) $(shell touch tmp-list) $(foreach source,$?,$(shell echo $(source) >> tmp-list)) @set fnord $(MAKEFLAGS); amf=$$2; fail=no; \ javac="$(JAVAC)"; \ - cat tmp-list | while read f; do \ + cat tmp-list | (while read f; do \ echo $$javac $(JCFLAGS) -classpath $(here):$(srcdir) -d $(here) $$f; \ $$javac $(JCFLAGS) -classpath $(here):$(srcdir) -d $(here) $$f \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \ done; \ - test "$$fail" = no + test "$$fail" = no) -@rm -f tmp-list libgcj.jar ## Note that we explicitly want to include directory information. find java gnu org -type d -o -type f -name '*.class' | \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index c33bf70..a0007af 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -2455,12 +2455,12 @@ libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_file @: $(shell echo Creating list of files to compile...) $(shell rm -f tmp-list || :) $(shell touch tmp-list) $(foreach source,$?,$(shell echo $(source) >> tmp-list)) @set fnord $(MAKEFLAGS); amf=$$2; fail=no; \ javac="$(JAVAC)"; \ - cat tmp-list | while read f; do \ + cat tmp-list | (while read f; do \ echo $$javac $(JCFLAGS) -classpath $(here):$(srcdir) -d $(here) $$f; \ $$javac $(JCFLAGS) -classpath $(here):$(srcdir) -d $(here) $$f \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \ done; \ - test "$$fail" = no + test "$$fail" = no) -@rm -f tmp-list libgcj.jar find java gnu org -type d -o -type f -name '*.class' | \ sed -e '/\/\./d' -e '/\/xlib/d' | \ |