* 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 dc779d1..bc5f522 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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' | \