From: Mohan Embar <gnustuff@thisiscool.com>
Date: Fri, 29 Aug 2003 03:11:02 +0000 (+0000)
Subject: Makefile.am: Fixed problems with parallel makes.
X-Git-Tag: releases/gcc-3.4.0~4005
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=165d9b9c812021bf8ccead41ca6d41790d44a932;p=thirdparty%2Fgcc.git

Makefile.am: Fixed problems with parallel makes.

	* Makefile.am: Fixed problems with parallel makes.
	(all_java_class_files): Readded definition.
	(all_java_class_files): New target which depends on
	libgcj-@gcc_version@.jar
	* Makefile.in: Rebuilt

From-SVN: r70900
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 178a2aa1291d..aa3efab1eeaf 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-28  Mohan Embar  <gnustuff@thisiscool.com>
+
+	* Makefile.am: Fixed problems with parallel makes.
+	(all_java_class_files): Readded definition.
+	(all_java_class_files): New target which depends on
+	libgcj-@gcc_version@.jar
+	* Makefile.in: Rebuilt
+
 2003-08-28  Tom Tromey  <tromey@redhat.com>
 
 	* Makefile.in: Rebuilt.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 4329340972d1..f95e5fc02a0a 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -337,6 +337,8 @@ all_java_source_files = \
     $(gtk_awt_peer_sources) \
     $(x_java_source_files)
 
+all_java_class_files = $(all_java_source_files:.java=.class)
+
 libgcj-@gcc_version@.jar: $(all_java_source_files)
 	-@rm -f libgcj-@gcc_version@.jar
 	@echo Compiling Java sourcefiles...
@@ -347,6 +349,13 @@ libgcj-@gcc_version@.jar: $(all_java_source_files)
 	  sed -e '/\/\./d' -e '/\/xlib/d' | \
 	  $(ZIP) cfM0E@ $@
 
+# This next rule seems backward, but reflects the fact
+# that 1) all classfiles are compiled in one go when the
+# libgcj jarfile is built and 2) anything which depends
+# on a particular .class file must wait until the jarfile
+# is built.
+$(all_java_class_files): libgcj-@gcc_version@.jar
+
 MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers)
 CLEANFILES = libgcj-@gcc_version@.jar
 
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index df65652ee21f..4f00d8b1f090 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -427,6 +427,8 @@ all_java_source_files = \
     $(x_java_source_files)
 
 
+all_java_class_files = $(all_java_source_files:.java=.class)
+
 MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers)
 CLEANFILES = libgcj-@gcc_version@.jar
 
@@ -4873,6 +4875,13 @@ libgcj-@gcc_version@.jar: $(all_java_source_files)
 	  sed -e '/\/\./d' -e '/\/xlib/d' | \
 	  $(ZIP) cfM0E@ $@
 
+# This next rule seems backward, but reflects the fact
+# that 1) all classfiles are compiled in one go when the
+# libgcj jarfile is built and 2) anything which depends
+# on a particular .class file must wait until the jarfile
+# is built.
+$(all_java_class_files): libgcj-@gcc_version@.jar
+
 clean-local:
 	find . -name '*.class' -print | xargs rm -f