* Makefile.in: Rebuilt.

	* Makefile.am (libgcj-$(gcc_version).jar): Rewrote.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121363 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5cd30df..123edd3 100644 (file)
--- 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 ccff51b..6a7e119 100644 (file)
--- 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 f6e5b41..ff6b942 100644 (file)
--- 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 $< $@