From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 25 Jul 2001 16:40:04 +0000 (+0000)
Subject: 	* Makefile.in: Rebuilt.
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=eec1cf71ab01f7a1c4f7ca7754301b8aeb9ed71b

	* Makefile.in: Rebuilt.
	* Makefile.am (libgcj.jar): Correctly fail when bytecode
	compilation fails.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44359 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index dc779d13d32..bc5f52207e7 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 e7bf69e9022..98f9c58b200 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 c33bf706b2a..a0007af4dd5 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' | \