Makefile.in: Rebuilt.

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

From-SVN: r121363

libjava/ChangeLog

+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

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 $< $@

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 $< $@