diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/Makefile.am | 5 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 3 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,11 @@ +2005-01-05 Mark Wielaard <mark@klomp.org> + + * lib/gen-classlist.sh.in: Don't split locales in classes.locale1 + and classes.locale2. + * lib/Makefile.am (JAVAC): Compile only classes.locale. + (CLEANFILES): Remove classes.locale1 and classes.locale2, + add classes.locale. + 2005-01-05 Tom Tromey <tromey@redhat.com> * java/util/zip/ZipEntry.java (setCompressedSize): Allow any diff --git a/lib/Makefile.am b/lib/Makefile.am index 014f2b103..2a950c16a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -14,8 +14,7 @@ compile_classpath = $(top_srcdir):$(top_srcdir)/vm/reference:$(top_srcdir)/exter if FOUND_GCJ JAVAC = $(GCJ) --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.standard \ && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.awt \ -&& $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.locale1 \ -&& $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.locale2 \ +&& $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.locale \ && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.xml \ && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.standardx else @@ -110,7 +109,7 @@ compile-classes: classes $(JAVA_SRCS) Makefile EXTRA_DIST = standard.omit mkcollections.pl.in CLEANFILES = compile-classes resources classes \ classes.standard classes.awt classes.standardx classes.xml \ - classes.locale1 classes.locale2 glibj.zip classes.1 \ + classes.locale glibj.zip classes.1 \ $(top_builddir)/java/util/LocaleData.java \ $(JAVA_DEPEND) diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in index ce2bb5830..486d979ee 100755 --- a/lib/gen-classlist.sh.in +++ b/lib/gen-classlist.sh.in @@ -42,7 +42,6 @@ grep -v /javax/ classes | grep -v /awt/ \ | grep -v /xml/ > classes.standard grep /awt/ classes > classes.awt grep /beans/ classes >> classes.awt -grep /locale/ classes | grep _[j-z][a-z].java > classes.locale1 -grep /locale/ classes | grep -v _[j-z][a-z].java > classes.locale2 +grep /locale/ classes > classes.locale grep /xml/ classes > classes.xml grep /javax/ classes | grep -v /xml/ > classes.standardx |