[cp-patches] Patch: FYI: speed up file splitting

[Tom Tromey]

I'm checking this in.

With this patch we will only run the split-for-gcj.sh script when the
file list changes.  This is preferable as this script is pretty slow.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        * lib/gen-classlist.sh.in (GCJ): New subst.
        Invoke split-for-gcj.sh if the results changed.
        * lib/Makefile.am (CLEANFILES): Removed old entries.
        (compile-classes): Don't run split-for-gcj.sh.

Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.97
diff -u -r1.97 Makefile.am
--- lib/Makefile.am 10 Aug 2005 18:53:25 -0000 1.97
+++ lib/Makefile.am 10 Aug 2005 22:35:16 -0000
@@ -124,7 +124,6 @@
 ## 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
@@ -135,7 +134,6 @@
 
 EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh
 CLEANFILES = compile-classes resources classes \
-       classes.standard classes.awt classes.standardx classes.xml \
        glibj.zip classes.1 \
        $(top_builddir)/java/util/LocaleData.java \
        $(JAVA_DEPEND)
Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.27
diff -u -r1.27 gen-classlist.sh.in
--- lib/gen-classlist.sh.in 6 Jul 2005 22:12:18 -0000 1.27
+++ lib/gen-classlist.sh.in 10 Aug 2005 22:35:16 -0000
@@ -5,6 +5,9 @@
 LC_ALL=C; export LC_ALL
 LANG=C; export LANG
 
+# We use this to decide whether we need to invoke the split script.
+GCJ="@GCJ@"
+
 echo "Adding java source files from srcdir '@top_srcdir@'."
 @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu \
        @top_srcdir@/org \
@@ -82,6 +85,10 @@
   for i in `cat ${top_builddir}/lib/classes` ; do
     echo $i "\\" >> ${top_builddir}/lib/java.dep
   done
+
+  if test -n "$GCJ"; then
+     ${top_srcdir}/lib/split-for-gcj.sh
+  fi
 fi
 
 exit 0