diff options
| author | Mark Wielaard <mark@klomp.org> | 2005-01-05 23:01:02 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2005-01-05 23:01:02 +0000 |
| commit | 49660c06d78c7851acc55fe065d47215dfc99633 (patch) | |
| tree | 0ccda0d7d1c55ddf07ba0ab906440d59183ea3d0 /lib/Makefile.am | |
| parent | 0d289990d66c8e037f66e0b26050063ce977656e (diff) | |
| download | classpath-49660c06d78c7851acc55fe065d47215dfc99633.tar.gz | |
* 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.
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
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) |