2005-07-18 Tom Tromey <tromey@redhat.com>
+ PR libgj/21058:
+ * sources.am, Makefile.in: Rebuilt.
+ * scripts/makemake.tcl (emit_bc_rule): Create a temporary list
+ file.
+ (emit_source_var): Don't emit patsubst with './'.
+
+2005-07-18 Tom Tromey <tromey@redhat.com>
+
* Makefile.in: Rebuilt.
* Makefile.am ($(libgij_la_OBJECTS)): Depend on headers.stamp.
gnu_awt_source_files = \
gnu/awt/LightweightRedirector.java
-gnu_awt_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_awt_source_files)))
+gnu_awt_header_files = $(patsubst %.java,%.h,$(gnu_awt_source_files))
gnu_awt_j2d_source_files = \
gnu/awt/j2d/AbstractGraphicsState.java \
gnu/awt/j2d/DirectRasterGraphics.java \
gnu/awt/j2d/IntegerGraphicsState.java \
gnu/awt/j2d/MappedRaster.java
-gnu_awt_j2d_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_awt_j2d_source_files)))
+gnu_awt_j2d_header_files = $(patsubst %.java,%.h,$(gnu_awt_j2d_source_files))
gnu_classpath_source_files = \
classpath/gnu/classpath/Configuration.java \
classpath/gnu/classpath/RawData.java \
classpath/gnu/classpath/ServiceProviderLoadingAction.java \
gnu/classpath/SystemProperties.java
-gnu_classpath_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_classpath_source_files))))
+gnu_classpath_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_source_files)))
gnu_classpath_debug_source_files = \
classpath/gnu/classpath/debug/Component.java \
classpath/gnu/classpath/debug/PreciseFilter.java \
gnu/gcj/RawData.java \
gnu/gcj/RawDataManaged.java
-gnu_gcj_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_gcj_source_files)))
+gnu_gcj_header_files = $(patsubst %.java,%.h,$(gnu_gcj_source_files))
gnu_gcj_convert_source_files = \
gnu/gcj/convert/BytesToUnicode.java \
gnu/gcj/convert/Convert.java \
gnu/gcj/convert/Output_iconv.java \
gnu/gcj/convert/UnicodeToBytes.java
-gnu_gcj_convert_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_gcj_convert_source_files)))
+gnu_gcj_convert_header_files = $(patsubst %.java,%.h,$(gnu_gcj_convert_source_files))
gnu_gcj_io_source_files = \
gnu/gcj/io/DefaultMimeTypes.java \
gnu/gcj/io/MimeTypes.java \
gnu/gcj/io/SimpleSHSStream.java
-gnu_gcj_io_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_gcj_io_source_files)))
+gnu_gcj_io_header_files = $(patsubst %.java,%.h,$(gnu_gcj_io_source_files))
gnu_gcj_runtime_source_files = \
gnu/gcj/runtime/BootClassLoader.java \
gnu/gcj/runtime/ExtensionClassLoader.java \
gnu/gcj/runtime/StringBuffer.java \
gnu/gcj/runtime/SystemClassLoader.java
-gnu_gcj_runtime_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_gcj_runtime_source_files)))
+gnu_gcj_runtime_header_files = $(patsubst %.java,%.h,$(gnu_gcj_runtime_source_files))
gnu_gcj_util_source_files = \
gnu/gcj/util/Debug.java
-gnu_gcj_util_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_gcj_util_source_files)))
+gnu_gcj_util_header_files = $(patsubst %.java,%.h,$(gnu_gcj_util_source_files))
gnu_java_awt_source_files = \
classpath/gnu/java/awt/AWTUtilities.java \
classpath/gnu/java/awt/BitMaskExtent.java \
classpath/gnu/java/lang/ClassHelper.java \
gnu/java/lang/MainThread.java
-gnu_java_lang_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_lang_source_files))))
+gnu_java_lang_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_source_files)))
gnu_java_lang_reflect_source_files = \
classpath/gnu/java/lang/reflect/TypeSignature.java
gnu/java/locale/LocaleInformation_zh_SG.java \
gnu/java/locale/LocaleInformation_zh_TW.java
-gnu_java_locale_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_locale_source_files))))
+gnu_java_locale_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_locale_source_files)))
gnu_java_math_source_files = \
classpath/gnu/java/math/MPN.java
gnu/java/net/protocol/gcjlib/Connection.java \
gnu/java/net/protocol/gcjlib/Handler.java
-gnu_java_net_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_net_source_files))))
+gnu_java_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_source_files)))
gnu_java_net_protocol_file_source_files = \
gnu/java/net/protocol/file/Connection.java \
gnu/java/net/protocol/file/Handler.java
-gnu_java_net_protocol_file_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_file_source_files)))
+gnu_java_net_protocol_file_header_files = $(patsubst %.java,%.h,$(gnu_java_net_protocol_file_source_files))
gnu_java_net_protocol_ftp_source_files = \
classpath/gnu/java/net/protocol/ftp/ActiveModeDTP.java \
classpath/gnu/java/net/protocol/ftp/BlockInputStream.java \
gnu/java/net/protocol/jar/Connection.java \
classpath/gnu/java/net/protocol/jar/Handler.java
-gnu_java_net_protocol_jar_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_jar_source_files))))
+gnu_java_net_protocol_jar_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_jar_source_files)))
gnu_java_nio_source_files = \
classpath/gnu/java/nio/ChannelInputStream.java \
classpath/gnu/java/nio/ChannelOutputStream.java \
gnu/java/nio/VMPipe.java \
gnu/java/nio/VMSelector.java
-gnu_java_nio_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_nio_source_files))))
+gnu_java_nio_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_nio_source_files)))
gnu_java_nio_channels_source_files = \
gnu/java/nio/channels/FileChannelImpl.java
-gnu_java_nio_channels_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_nio_channels_source_files)))
+gnu_java_nio_channels_header_files = $(patsubst %.java,%.h,$(gnu_java_nio_channels_source_files))
gnu_java_nio_charset_source_files = \
classpath/gnu/java/nio/charset/ByteCharset.java \
classpath/gnu/java/nio/charset/Cp424.java \
classpath/gnu/java/nio/charset/Windows1257.java \
classpath/gnu/java/nio/charset/Windows1258.java
-gnu_java_nio_charset_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_nio_charset_source_files))))
+gnu_java_nio_charset_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_nio_charset_source_files)))
gnu_java_rmi_source_files = \
classpath/gnu/java/rmi/RMIMarshalledObjectInputStream.java \
classpath/gnu/java/rmi/RMIMarshalledObjectOutputStream.java \
gnu/java/rmi/rmic/RMICException.java \
gnu/java/rmi/rmic/TabbedWriter.java
-gnu_java_rmi_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_source_files))))
+gnu_java_rmi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_source_files)))
gnu_java_rmi_dgc_source_files = \
classpath/gnu/java/rmi/dgc/DGCImpl.java \
classpath/gnu/java/rmi/dgc/DGCImpl_Skel.java \
classpath/java/io/WriteAbortedException.java \
classpath/java/io/Writer.java
-java_io_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_io_source_files))))
+java_io_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_io_source_files)))
java_lang_source_files = \
classpath/java/lang/AbstractMethodError.java \
classpath/java/lang/Appendable.java \
classpath/java/lang/VirtualMachineError.java \
classpath/java/lang/Void.java
-java_lang_header_files = $(filter-out java/lang/Object.h java/lang/Class.h,$(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_lang_source_files)))))
+java_lang_header_files = $(filter-out java/lang/Object.h java/lang/Class.h,$(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_source_files))))
java_lang_annotation_source_files = \
classpath/java/lang/annotation/AnnotationFormatError.java \
classpath/java/lang/annotation/AnnotationTypeMismatchException.java
classpath/java/lang/ref/SoftReference.java \
classpath/java/lang/ref/WeakReference.java
-java_lang_ref_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_lang_ref_source_files))))
+java_lang_ref_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_ref_source_files)))
java_lang_reflect_source_files = \
classpath/java/lang/reflect/AccessibleObject.java \
java/lang/reflect/Array.java \
classpath/java/lang/reflect/UndeclaredThrowableException.java \
classpath/java/lang/reflect/WildcardType.java
-java_lang_reflect_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_lang_reflect_source_files))))
+java_lang_reflect_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_reflect_source_files)))
java_math_source_files = \
classpath/java/math/BigDecimal.java \
classpath/java/math/BigInteger.java
classpath/java/net/UnknownServiceException.java \
java/net/VMNetworkInterface.java
-java_net_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_net_source_files))))
+java_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_net_source_files)))
java_nio_source_files = \
java/nio/Buffer.java \
classpath/java/nio/BufferOverflowException.java \
classpath/java/nio/ShortViewBufferImpl.java \
java/nio/VMDirectByteBuffer.java
-java_nio_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_nio_source_files))))
+java_nio_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_source_files)))
java_nio_channels_source_files = \
classpath/java/nio/channels/AlreadyConnectedException.java \
classpath/java/nio/channels/AsynchronousCloseException.java \
classpath/java/nio/channels/UnsupportedAddressTypeException.java \
classpath/java/nio/channels/WritableByteChannel.java
-java_nio_channels_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_nio_channels_source_files))))
+java_nio_channels_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_channels_source_files)))
java_nio_channels_spi_source_files = \
classpath/java/nio/channels/spi/AbstractInterruptibleChannel.java \
classpath/java/nio/channels/spi/AbstractSelectableChannel.java \
classpath/java/nio/charset/UnmappableCharacterException.java \
classpath/java/nio/charset/UnsupportedCharsetException.java
-java_nio_charset_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_nio_charset_source_files))))
+java_nio_charset_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_charset_source_files)))
java_nio_charset_spi_source_files = \
classpath/java/nio/charset/spi/CharsetProvider.java
classpath/java/security/UnrecoverableKeyException.java \
classpath/java/security/UnresolvedPermission.java
-java_security_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_security_source_files))))
+java_security_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_security_source_files)))
java_security_acl_source_files = \
classpath/java/security/acl/Acl.java \
classpath/java/security/acl/AclEntry.java \
java/text/SimpleDateFormat.java \
classpath/java/text/StringCharacterIterator.java
-java_text_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_text_source_files))))
+java_text_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_text_source_files)))
java_util_source_files = \
classpath/java/util/AbstractCollection.java \
classpath/java/util/AbstractList.java \
classpath/java/util/Vector.java \
classpath/java/util/WeakHashMap.java
-java_util_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_util_source_files))))
+java_util_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_util_source_files)))
java_util_jar_source_files = \
classpath/java/util/jar/Attributes.java \
classpath/java/util/jar/JarEntry.java \
classpath/java/util/logging/StreamHandler.java \
classpath/java/util/logging/XMLFormatter.java
-java_util_logging_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_util_logging_source_files))))
+java_util_logging_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_util_logging_source_files)))
java_util_prefs_source_files = \
classpath/java/util/prefs/AbstractPreferences.java \
classpath/java/util/prefs/BackingStoreException.java \
classpath/java/util/zip/ZipInputStream.java \
classpath/java/util/zip/ZipOutputStream.java
-java_util_zip_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_util_zip_source_files))))
+java_util_zip_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_util_zip_source_files)))
javax_accessibility_source_files = \
classpath/javax/accessibility/Accessible.java \
classpath/javax/accessibility/AccessibleAction.java \
-include gnu/java/awt/peer.deps
gnu-java-awt-peer-gtk.lo: $(gnu_java_awt_peer_gtk_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-java-awt-peer-gtk.lo \
- `find classpath/lib/gnu/java/awt/peer/gtk -name '*.class' | sort -r`
+ @find classpath/lib/gnu/java/awt/peer/gtk -name '*.class' > gnu-java-awt-peer-gtk.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-java-awt-peer-gtk.lo @gnu-java-awt-peer-gtk.list
+ @rm -f gnu-java-awt-peer-gtk.list
gnu-java-beans.lo: $(gnu_java_beans_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-java-beans.lo \
- `find classpath/lib/gnu/java/beans -name '*.class' | sort -r`
+ @find classpath/lib/gnu/java/beans -name '*.class' > gnu-java-beans.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-java-beans.lo @gnu-java-beans.list
+ @rm -f gnu-java-beans.list
gnu/java/io.list: $(gnu_java_io_source_files)
@$(mkinstalldirs) $(dir $@)
-include gnu/regexp.deps
gnu-xml.lo: $(gnu_xml_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-xml.lo \
- `find classpath/lib/gnu/xml -name '*.class' | sort -r`
+ @find classpath/lib/gnu/xml -name '*.class' > gnu-xml.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-xml.lo @gnu-xml.list
+ @rm -f gnu-xml.list
java/applet.list: $(java_applet_source_files)
@$(mkinstalldirs) $(dir $@)
-include javax/crypto/spec.deps
javax-imageio.lo: $(javax_imageio_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o javax-imageio.lo \
- `find classpath/lib/javax/imageio -name '*.class' | sort -r`
+ @find classpath/lib/javax/imageio -name '*.class' > javax-imageio.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o javax-imageio.lo @javax-imageio.list
+ @rm -f javax-imageio.list
javax/naming.list: $(javax_naming_source_files)
@$(mkinstalldirs) $(dir $@)
-include javax/transaction/xa.deps
javax-xml.lo: $(javax_xml_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o javax-xml.lo \
- `find classpath/lib/javax/xml -name '*.class' | sort -r`
+ @find classpath/lib/javax/xml -name '*.class' > javax-xml.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o javax-xml.lo @javax-xml.list
+ @rm -f javax-xml.list
org/ietf/jgss.list: $(org_ietf_jgss_source_files)
@$(mkinstalldirs) $(dir $@)
-include org/ietf/jgss.deps
org-w3c.lo: $(org_w3c_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-w3c.lo \
- `find classpath/lib/org/w3c -name '*.class' | sort -r`
+ @find classpath/lib/org/w3c -name '*.class' > org-w3c.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-w3c.lo @org-w3c.list
+ @rm -f org-w3c.list
org-xml.lo: $(org_xml_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-xml.lo \
- `find classpath/lib/org/xml -name '*.class' | sort -r`
+ @find classpath/lib/org/xml -name '*.class' > org-xml.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-xml.lo @org-xml.list
+ @rm -f org-xml.list
$(generic_header_files): %.h: classpath/lib/%.class
name=`echo $< | sed -e 's/\.class$$//' -e 's,classpath/lib/,,'`; \
}
set varname [join [split $pkgname /] _]_source_files
set loname [join [split $pkgname /] -].lo
+ set tname [join [split $pkgname /] -].list
puts "$loname: \$($varname)"
- puts "\t\$(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o $loname \\"
+ # Create a temporary list file and then compile it. This works
+ # around the libtool problem mentioned in PR 21058. classpath was
+ # built first, so the class files are to be found there.
set omit ""
if {[info exists exclusion_map($package)]} {
set omit "| grep -v $exclusion_map($package)"
}
- # classpath was built first, so the class files are to be found
- # there.
- puts "\t\t`find classpath/lib/$package -name '*.class' | sort -r$omit`"
+ puts "\t@find classpath/lib/$package -name '*.class'${omit} > $tname"
+ puts "\t\$(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o $loname @$tname"
+ puts "\t@rm -f $tname"
puts ""
# We skip this one because it is built into its own library and is
# Ugly code to build up the appropriate patsubst.
set result "\$(patsubst %.java,%.h,\$($varname))"
foreach dir [lsort [array names dirs]] {
- set result "\$(patsubst $dir/%,%,$result)"
+ if {$dir != "."} {
+ set result "\$(patsubst $dir/%,%,$result)"
+ }
}
if {$package == "." || $package == "java/lang"} {
gnu_awt_source_files = \
gnu/awt/LightweightRedirector.java
-gnu_awt_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_awt_source_files)))
+gnu_awt_header_files = $(patsubst %.java,%.h,$(gnu_awt_source_files))
gnu/awt.list: $(gnu_awt_source_files)
@$(mkinstalldirs) $(dir $@)
gnu/awt/j2d/IntegerGraphicsState.java \
gnu/awt/j2d/MappedRaster.java
-gnu_awt_j2d_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_awt_j2d_source_files)))
+gnu_awt_j2d_header_files = $(patsubst %.java,%.h,$(gnu_awt_j2d_source_files))
gnu/awt/j2d.list: $(gnu_awt_j2d_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/gnu/classpath/ServiceProviderLoadingAction.java \
gnu/classpath/SystemProperties.java
-gnu_classpath_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_classpath_source_files))))
+gnu_classpath_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_classpath_source_files)))
gnu/classpath.list: $(gnu_classpath_source_files)
@$(mkinstalldirs) $(dir $@)
gnu/gcj/RawData.java \
gnu/gcj/RawDataManaged.java
-gnu_gcj_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_gcj_source_files)))
+gnu_gcj_header_files = $(patsubst %.java,%.h,$(gnu_gcj_source_files))
gnu/gcj.list: $(gnu_gcj_source_files)
@$(mkinstalldirs) $(dir $@)
gnu/gcj/convert/Output_iconv.java \
gnu/gcj/convert/UnicodeToBytes.java
-gnu_gcj_convert_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_gcj_convert_source_files)))
+gnu_gcj_convert_header_files = $(patsubst %.java,%.h,$(gnu_gcj_convert_source_files))
gnu/gcj/convert.list: $(gnu_gcj_convert_source_files)
@$(mkinstalldirs) $(dir $@)
gnu/gcj/io/MimeTypes.java \
gnu/gcj/io/SimpleSHSStream.java
-gnu_gcj_io_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_gcj_io_source_files)))
+gnu_gcj_io_header_files = $(patsubst %.java,%.h,$(gnu_gcj_io_source_files))
gnu/gcj/io.list: $(gnu_gcj_io_source_files)
@$(mkinstalldirs) $(dir $@)
gnu/gcj/runtime/StringBuffer.java \
gnu/gcj/runtime/SystemClassLoader.java
-gnu_gcj_runtime_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_gcj_runtime_source_files)))
+gnu_gcj_runtime_header_files = $(patsubst %.java,%.h,$(gnu_gcj_runtime_source_files))
gnu/gcj/runtime.list: $(gnu_gcj_runtime_source_files)
@$(mkinstalldirs) $(dir $@)
gnu_gcj_util_source_files = \
gnu/gcj/util/Debug.java
-gnu_gcj_util_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_gcj_util_source_files)))
+gnu_gcj_util_header_files = $(patsubst %.java,%.h,$(gnu_gcj_util_source_files))
gnu/gcj/util.list: $(gnu_gcj_util_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java
gnu-java-awt-peer-gtk.lo: $(gnu_java_awt_peer_gtk_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-java-awt-peer-gtk.lo \
- `find classpath/lib/gnu/java/awt/peer/gtk -name '*.class' | sort -r`
+ @find classpath/lib/gnu/java/awt/peer/gtk -name '*.class' > gnu-java-awt-peer-gtk.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-java-awt-peer-gtk.lo @gnu-java-awt-peer-gtk.list
+ @rm -f gnu-java-awt-peer-gtk.list
gnu_java_beans_source_files = \
classpath/gnu/java/beans/BeanInfoEmbryo.java \
classpath/gnu/java/beans/editors/StringEditor.java
gnu-java-beans.lo: $(gnu_java_beans_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-java-beans.lo \
- `find classpath/lib/gnu/java/beans -name '*.class' | sort -r`
+ @find classpath/lib/gnu/java/beans -name '*.class' > gnu-java-beans.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-java-beans.lo @gnu-java-beans.list
+ @rm -f gnu-java-beans.list
gnu_java_io_source_files = \
classpath/gnu/java/io/ASN1ParsingException.java \
classpath/gnu/java/lang/ClassHelper.java \
gnu/java/lang/MainThread.java
-gnu_java_lang_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_lang_source_files))))
+gnu_java_lang_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_source_files)))
gnu/java/lang.list: $(gnu_java_lang_source_files)
@$(mkinstalldirs) $(dir $@)
gnu/java/locale/LocaleInformation_zh_SG.java \
gnu/java/locale/LocaleInformation_zh_TW.java
-gnu_java_locale_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_locale_source_files))))
+gnu_java_locale_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_locale_source_files)))
gnu/java/locale.list: $(gnu_java_locale_source_files)
@$(mkinstalldirs) $(dir $@)
gnu/java/net/protocol/gcjlib/Connection.java \
gnu/java/net/protocol/gcjlib/Handler.java
-gnu_java_net_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_net_source_files))))
+gnu_java_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_source_files)))
gnu/java/net.list: $(gnu_java_net_source_files)
@$(mkinstalldirs) $(dir $@)
gnu/java/net/protocol/file/Connection.java \
gnu/java/net/protocol/file/Handler.java
-gnu_java_net_protocol_file_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_file_source_files)))
+gnu_java_net_protocol_file_header_files = $(patsubst %.java,%.h,$(gnu_java_net_protocol_file_source_files))
gnu/java/net/protocol/file.list: $(gnu_java_net_protocol_file_source_files)
@$(mkinstalldirs) $(dir $@)
gnu/java/net/protocol/jar/Connection.java \
classpath/gnu/java/net/protocol/jar/Handler.java
-gnu_java_net_protocol_jar_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_jar_source_files))))
+gnu_java_net_protocol_jar_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_protocol_jar_source_files)))
gnu/java/net/protocol/jar.list: $(gnu_java_net_protocol_jar_source_files)
@$(mkinstalldirs) $(dir $@)
gnu/java/nio/VMPipe.java \
gnu/java/nio/VMSelector.java
-gnu_java_nio_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_nio_source_files))))
+gnu_java_nio_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_nio_source_files)))
gnu/java/nio.list: $(gnu_java_nio_source_files)
@$(mkinstalldirs) $(dir $@)
gnu_java_nio_channels_source_files = \
gnu/java/nio/channels/FileChannelImpl.java
-gnu_java_nio_channels_header_files = $(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_nio_channels_source_files)))
+gnu_java_nio_channels_header_files = $(patsubst %.java,%.h,$(gnu_java_nio_channels_source_files))
gnu/java/nio/channels.list: $(gnu_java_nio_channels_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/gnu/java/nio/charset/Windows1257.java \
classpath/gnu/java/nio/charset/Windows1258.java
-gnu_java_nio_charset_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_nio_charset_source_files))))
+gnu_java_nio_charset_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_nio_charset_source_files)))
gnu/java/nio/charset.list: $(gnu_java_nio_charset_source_files)
@$(mkinstalldirs) $(dir $@)
gnu/java/rmi/rmic/RMICException.java \
gnu/java/rmi/rmic/TabbedWriter.java
-gnu_java_rmi_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_source_files))))
+gnu_java_rmi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_source_files)))
gnu/java/rmi.list: $(gnu_java_rmi_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/gnu/xml/xpath/XPathTokenizer.java
gnu-xml.lo: $(gnu_xml_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-xml.lo \
- `find classpath/lib/gnu/xml -name '*.class' | sort -r`
+ @find classpath/lib/gnu/xml -name '*.class' > gnu-xml.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-xml.lo @gnu-xml.list
+ @rm -f gnu-xml.list
java_applet_source_files = \
classpath/java/applet/Applet.java \
classpath/java/io/WriteAbortedException.java \
classpath/java/io/Writer.java
-java_io_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_io_source_files))))
+java_io_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_io_source_files)))
java/io.list: $(java_io_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/java/lang/VirtualMachineError.java \
classpath/java/lang/Void.java
-java_lang_header_files = $(filter-out java/lang/Object.h java/lang/Class.h,$(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_lang_source_files)))))
+java_lang_header_files = $(filter-out java/lang/Object.h java/lang/Class.h,$(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_source_files))))
java/lang.list: $(java_lang_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/java/lang/ref/SoftReference.java \
classpath/java/lang/ref/WeakReference.java
-java_lang_ref_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_lang_ref_source_files))))
+java_lang_ref_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_ref_source_files)))
java/lang/ref.list: $(java_lang_ref_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/java/lang/reflect/UndeclaredThrowableException.java \
classpath/java/lang/reflect/WildcardType.java
-java_lang_reflect_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_lang_reflect_source_files))))
+java_lang_reflect_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_reflect_source_files)))
java/lang/reflect.list: $(java_lang_reflect_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/java/net/UnknownServiceException.java \
java/net/VMNetworkInterface.java
-java_net_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_net_source_files))))
+java_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_net_source_files)))
java/net.list: $(java_net_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/java/nio/ShortViewBufferImpl.java \
java/nio/VMDirectByteBuffer.java
-java_nio_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_nio_source_files))))
+java_nio_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_source_files)))
java/nio.list: $(java_nio_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/java/nio/channels/UnsupportedAddressTypeException.java \
classpath/java/nio/channels/WritableByteChannel.java
-java_nio_channels_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_nio_channels_source_files))))
+java_nio_channels_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_channels_source_files)))
java/nio/channels.list: $(java_nio_channels_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/java/nio/charset/UnmappableCharacterException.java \
classpath/java/nio/charset/UnsupportedCharsetException.java
-java_nio_charset_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_nio_charset_source_files))))
+java_nio_charset_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_charset_source_files)))
java/nio/charset.list: $(java_nio_charset_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/java/security/UnrecoverableKeyException.java \
classpath/java/security/UnresolvedPermission.java
-java_security_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_security_source_files))))
+java_security_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_security_source_files)))
java/security.list: $(java_security_source_files)
@$(mkinstalldirs) $(dir $@)
java/text/SimpleDateFormat.java \
classpath/java/text/StringCharacterIterator.java
-java_text_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_text_source_files))))
+java_text_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_text_source_files)))
java/text.list: $(java_text_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/java/util/Vector.java \
classpath/java/util/WeakHashMap.java
-java_util_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_util_source_files))))
+java_util_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_util_source_files)))
java/util.list: $(java_util_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/java/util/logging/StreamHandler.java \
classpath/java/util/logging/XMLFormatter.java
-java_util_logging_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_util_logging_source_files))))
+java_util_logging_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_util_logging_source_files)))
java/util/logging.list: $(java_util_logging_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/java/util/zip/ZipInputStream.java \
classpath/java/util/zip/ZipOutputStream.java
-java_util_zip_header_files = $(patsubst classpath/%,%,$(patsubst ./%,%,$(patsubst %.java,%.h,$(java_util_zip_source_files))))
+java_util_zip_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_util_zip_source_files)))
java/util/zip.list: $(java_util_zip_source_files)
@$(mkinstalldirs) $(dir $@)
classpath/javax/imageio/stream/MemoryCacheImageOutputStream.java
javax-imageio.lo: $(javax_imageio_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o javax-imageio.lo \
- `find classpath/lib/javax/imageio -name '*.class' | sort -r`
+ @find classpath/lib/javax/imageio -name '*.class' > javax-imageio.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o javax-imageio.lo @javax-imageio.list
+ @rm -f javax-imageio.list
javax_naming_source_files = \
classpath/javax/naming/AuthenticationException.java \
classpath/javax/xml/xpath/XPathVariableResolver.java
javax-xml.lo: $(javax_xml_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o javax-xml.lo \
- `find classpath/lib/javax/xml -name '*.class' | sort -r`
+ @find classpath/lib/javax/xml -name '*.class' > javax-xml.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o javax-xml.lo @javax-xml.list
+ @rm -f javax-xml.list
org_ietf_jgss_source_files = \
classpath/org/ietf/jgss/ChannelBinding.java \
classpath/external/w3c_dom/org/w3c/dom/xpath/XPathResult.java
org-w3c.lo: $(org_w3c_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-w3c.lo \
- `find classpath/lib/org/w3c -name '*.class' | sort -r`
+ @find classpath/lib/org/w3c -name '*.class' > org-w3c.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-w3c.lo @org-w3c.list
+ @rm -f org-w3c.list
org_xml_source_files = \
classpath/external/sax/org/xml/sax/AttributeList.java \
classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java
org-xml.lo: $(org_xml_source_files)
- $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-xml.lo \
- `find classpath/lib/org/xml -name '*.class' | sort -r`
+ @find classpath/lib/org/xml -name '*.class' > org-xml.list
+ $(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o org-xml.lo @org-xml.list
+ @rm -f org-xml.list
all_packages_source_files = \