diff options
| author | Mark Wielaard <mark@klomp.org> | 2006-07-22 20:30:47 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2006-07-22 20:30:47 +0000 |
| commit | 4fba73619d21bfb5afe2152a50057a674ea53294 (patch) | |
| tree | f12321ad071d1077fa44018fa248c481bd818b25 /lib | |
| parent | f4aada78b313b1148dfa018f3557d3030acc5efd (diff) | |
| download | classpath-4fba73619d21bfb5afe2152a50057a674ea53294.tar.gz | |
* java/lang/Iterable.java: Import all of java.util.
* lib/mkcollections.pl.in (javautilclasses): Add Iterable.
* lib/Makefile.am: Only search for .java files in COLLECTIONS_PREFIX.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 4 | ||||
| -rwxr-xr-x | lib/mkcollections.pl.in | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index c0f93e7a8..fc1081d03 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -44,9 +44,9 @@ COLLECTIONS = collections.jar collections.jar: mkcollections.pl ./mkcollections.pl $(top_srcdir) if FOUND_GCJ - $(GCJ) -C `$(FIND) $(COLLECTIONS_PREFIX) -name '*' -type f -print` + $(GCJ) -C `$(FIND) $(COLLECTIONS_PREFIX) -name '*.java' -type f -print` else - $(JAVAC) `$(FIND) $(COLLECTIONS_PREFIX) -name '*' -type f -print` + $(JAVAC) `$(FIND) $(COLLECTIONS_PREFIX) -name '*.java' -type f -print` endif if test "$(FASTJAR)" != ""; then \ $(FASTJAR) cf $@ $(COLLECTIONS_PREFIX); \ diff --git a/lib/mkcollections.pl.in b/lib/mkcollections.pl.in index bd00f01f2..3d2d3c78a 100755 --- a/lib/mkcollections.pl.in +++ b/lib/mkcollections.pl.in @@ -25,7 +25,8 @@ my $destpath=@COLLECTIONS_PREFIX@; my $classpath=pop; my @javalangclasses=qw(UnsupportedOperationException - Comparable); + Comparable + Iterable); my @javautilclasses=qw(AbstractCollection AbstractList AbstractMap |