[cp-patches] Patch: FYI: fix PR classpath/22580

[Tom Tromey]

I'm checking this in.

This is another build fix.  With this fix, parallel builds will now
work without issuing a warning.

I chose to do things this way since I also plan to make it so that
split-for-gcj.sh is not run needlessly; having a separate
compile-classes rule seemed like it would make this simpler.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        For PR classpath/22580:
        * lib/Makefile.am (compile-classes): Made conditional on
        FOUND_GCJ.
        (JAVAC): Redefined when FOUND_GCJ.

Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.96
diff -u -r1.96 Makefile.am
--- lib/Makefile.am 10 Aug 2005 18:40:13 -0000 1.96
+++ lib/Makefile.am 10 Aug 2005 18:49:21 -0000
@@ -14,11 +14,9 @@
 
 # handling source to bytecode compiler programs like gcj, jikes  and kjc
 if FOUND_GCJ
-# Since we don't feed all classes at once gcj needs to know where to find
-# the generated classes (in top_builddir).
-JAVAC = $(SHELL) $(srcdir)/split-for-gcj.sh \
-    && $(MAKE) -f $(srcdir)/Makefile.gcj \
-         GCJ='$(GCJ)' compile_classpath='$(top_builddir):$(compile_classpath)'
+## This should never be used when gcj is the compiler.
+## See the compile-classes target.
+JAVAC = exit 1
 else
 if FOUND_JIKES
 JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +F $(JIKESENCODING) 
-bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) 
-d . @classes
@@ -120,9 +118,20 @@
 
 $(JAVA_DEPEND): genclasses
 
+if FOUND_GCJ
+## When building with gcj, we do a recursive make.  We split this rule
+## out specially, rather than simply defining JAVAC, so that GNU make
+## will see the recursive make invocation and still allow parallel
+## builds.
+compile-classes: classes $(JAVA_SRCS) Makefile
+       $(SHELL) $(srcdir)/split-for-gcj.sh
+       $(MAKE) -f $(srcdir)/Makefile.gcj \
+         GCJ='$(GCJ)' compile_classpath='$(top_builddir):$(compile_classpath)'
+else
 compile-classes: classes $(JAVA_SRCS) Makefile
        $(JAVAC)
        touch compile-classes
+endif
 
 EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh
 CLEANFILES = compile-classes resources classes \