diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/Makefile.am | 6 | ||||
| -rw-r--r-- | libjava/Makefile.in | 6 |
3 files changed, 13 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 5cd30dfe07b..123edd3b338 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2007-01-30 Tom Tromey <tromey@redhat.com> + + * Makefile.in: Rebuilt. + * Makefile.am (libgcj-$(gcc_version).jar): Rewrote. + 2007-01-30 Andreas Tobler <a.tobler@schweiz.org> * testsuite/libjava.jvmti/natevents.cc (FieldModificationCB): Use a diff --git a/libjava/Makefile.am b/libjava/Makefile.am index ccff51ba90a..6a7e1198907 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -332,8 +332,10 @@ $(propertyo_files): %.lo: classpath/resource/% libgcj-$(gcc_version).jar: classpath/lib/compile-classes ## Note that this now omits the property files. ## It doesn't matter since we don't use the jar at runtime. - here=`pwd`; cd $(srcdir)/classpath/lib; $(JAR) -cfM \ - $$here/libgcj-$(gcc_version).jar gnu java javax org sun + here=`pwd`; cd $(srcdir)/classpath/lib; \ + find gnu java javax org sun -name '*.class' -print | \ + fgrep -v .svn | \ + $(JAR) -cfM@ $$here/libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar: classpath/tools/tools.zip cp $< $@ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index f6e5b41116c..ff6b9429f55 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -9901,8 +9901,10 @@ $(propertyo_files): %.lo: classpath/resource/% $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,$(@:.lo=) libgcj-$(gcc_version).jar: classpath/lib/compile-classes - here=`pwd`; cd $(srcdir)/classpath/lib; $(JAR) -cfM \ - $$here/libgcj-$(gcc_version).jar gnu java javax org sun + here=`pwd`; cd $(srcdir)/classpath/lib; \ + find gnu java javax org sun -name '*.class' -print | \ + fgrep -v .svn | \ + $(JAR) -cfM@ $$here/libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar: classpath/tools/tools.zip cp $< $@ |