diff options
Diffstat (limited to 'libjava/Makefile.in')
| -rw-r--r-- | libjava/Makefile.in | 194 |
1 files changed, 139 insertions, 55 deletions
diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 6b6d21b274c..b4ff7aca48e 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -123,6 +123,7 @@ STRIP = @STRIP@ SYSDEP_SOURCES = @SYSDEP_SOURCES@ SYSTEMSPEC = @SYSTEMSPEC@ SYS_ZLIBS = @SYS_ZLIBS@ +THREADCXXFLAGS = @THREADCXXFLAGS@ THREADDEPS = @THREADDEPS@ THREADINCS = @THREADINCS@ THREADLDFLAGS = @THREADLDFLAGS@ @@ -150,6 +151,15 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I . @TESTSUBDIR_TRUE@SUBDIRS = @TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include @TESTSUBDIR_FALSE@SUBDIRS = @TESTSUBDIR_FALSE@$(DIRLTDL) gcj include + +# write_entries_to_file - writes each entry in a list +# to the specified file. Each entry is written individually +# to accomodate systems with severe command-line-length +# limitations. +# Parameters: +# $(1): variable containing entries to iterate over +# $(2): output file +write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach object,$(1),$(shell echo $(object) >> $(2))) @XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@lib-gnu-awt-xlib.la @XLIB_AWT_FALSE@cond_x_ltlibrary = @XLIB_AWT_TRUE@xlib_includes = @XLIB_AWT_TRUE@-I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_alias) -I$(srcdir)/../libstdc++-v3/libsupc++ @@ -176,7 +186,8 @@ bin_SCRIPTS = addr2name.awk @CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar @CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar @CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar -@CANADIAN_TRUE@GCJH = @CANADIAN_TRUE@gcjh +@CANADIAN_TRUE@@NULL_TARGET_TRUE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_TRUE@gcjh +@CANADIAN_TRUE@@NULL_TARGET_FALSE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(target_alias)-gcjh @CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated @@ -192,11 +203,12 @@ JAVAC = $(GCJ_WITH_FLAGS) -C GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@ WARNINGS = -W -Wall -AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \ +AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \ -fdollars-in-identifiers \ -Wswitch-enum \ @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \ - -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" + -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" \ + -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" @USING_GCC_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS) @USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@ @@ -254,6 +266,7 @@ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c \ +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c \ @@ -294,6 +307,7 @@ gnu/java/awt/peer/gtk/GtkClipboard.java \ gnu/java/awt/peer/gtk/GtkComponentPeer.java \ gnu/java/awt/peer/gtk/GtkContainerPeer.java \ gnu/java/awt/peer/gtk/GtkDialogPeer.java \ +gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java \ gnu/java/awt/peer/gtk/GtkFileDialogPeer.java \ gnu/java/awt/peer/gtk/GtkFontPeer.java \ gnu/java/awt/peer/gtk/GtkFramePeer.java \ @@ -415,7 +429,10 @@ all_java_source_files = \ all_java_class_files = $(all_java_source_files:.java=.class) -MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers) +# Note: The libtool objects are removed by mostlyclean-local +# because of command-line-length issues. +MOSTLYCLEANFILES = $(nat_headers) $(x_nat_headers) + CLEANFILES = libgcj-@gcc_version@.jar SUFFIXES = .class .java .h @@ -522,10 +539,13 @@ gnu/awt/j2d/MappedRaster.java \ gnu/java/awt/BitMaskExtent.java \ gnu/java/awt/Buffers.java \ gnu/java/awt/ComponentDataBlitOp.java \ +gnu/java/awt/EmbeddedWindow.java \ +gnu/java/awt/EmbeddedWindowSupport.java \ gnu/java/awt/EventModifier.java \ -gnu/java/awt/GLightweightPeer.java \ gnu/java/awt/image/ImageDecoder.java \ gnu/java/awt/image/XBMDecoder.java \ +gnu/java/awt/peer/EmbeddedWindowPeer.java \ +gnu/java/awt/peer/GLightweightPeer.java \ gnu/java/beans/editors/ColorEditor.java \ gnu/java/beans/editors/FontEditor.java \ gnu/java/beans/editors/NativeBooleanEditor.java \ @@ -587,6 +607,7 @@ java/awt/Graphics2D.java \ java/awt/GraphicsConfiguration.java \ java/awt/GridBagConstraints.java \ java/awt/GridBagLayout.java \ +java/awt/GridBagLayoutInfo.java \ java/awt/GridLayout.java \ java/awt/IllegalComponentStateException.java \ java/awt/Image.java \ @@ -1294,9 +1315,12 @@ gnu/java/rmi/registry/RegistryImpl.java \ gnu/java/rmi/registry/RegistryImpl_Skel.java \ gnu/java/rmi/registry/RegistryImpl_Stub.java \ gnu/java/rmi/rmic/Compile_gcj.java \ +gnu/java/rmi/rmic/Compile_jikes.java \ +gnu/java/rmi/rmic/Compile_kjc.java \ gnu/java/rmi/rmic/Compiler.java \ gnu/java/rmi/rmic/CompilerProcess.java \ gnu/java/rmi/rmic/RMIC.java \ +gnu/java/rmi/rmic/RMICException.java \ gnu/java/rmi/rmic/TabbedWriter.java \ gnu/java/rmi/server/ConnectionRunnerPool.java \ gnu/java/rmi/server/ProtocolConstants.java \ @@ -1711,12 +1735,15 @@ gnu/gcj/protocol/http/Connection.java \ gnu/gcj/protocol/http/Handler.java \ gnu/gcj/protocol/jar/Connection.java \ gnu/gcj/protocol/jar/Handler.java \ +gnu/gcj/protocol/gcjlib/Connection.java \ +gnu/gcj/protocol/gcjlib/Handler.java \ gnu/gcj/runtime/FileDeleter.java \ gnu/gcj/runtime/FinalizerThread.java \ gnu/gcj/runtime/FirstThread.java \ gnu/gcj/runtime/JNIWeakRef.java \ gnu/gcj/runtime/MethodRef.java \ gnu/gcj/runtime/NameFinder.java \ +gnu/gcj/runtime/SharedLibHelper.java \ gnu/gcj/runtime/SharedLibLoader.java \ gnu/gcj/runtime/StackTrace.java \ gnu/gcj/runtime/StringBuffer.java \ @@ -1870,9 +1897,12 @@ gnu/java/locale/LocaleInformation_zh_HK.java \ gnu/java/locale/LocaleInformation_zh_SG.java \ gnu/java/locale/LocaleInformation_zh_TW.java \ gnu/java/math/MPN.java \ +gnu/java/net/PlainDatagramSocketImpl.java \ +gnu/java/net/PlainSocketImpl.java \ gnu/java/nio/DatagramChannelImpl.java \ -gnu/java/nio/FileChannelImpl.java \ gnu/java/nio/FileLockImpl.java \ +gnu/java/nio/NIODatagramSocket.java \ +gnu/java/nio/NIOSocket.java \ gnu/java/nio/PipeImpl.java \ gnu/java/nio/SelectionKeyImpl.java \ gnu/java/nio/SelectorImpl.java \ @@ -1967,8 +1997,6 @@ java/net/NetPermission.java \ java/net/NetworkInterface.java \ java/net/NoRouteToHostException.java \ java/net/PasswordAuthentication.java \ -java/net/PlainDatagramSocketImpl.java \ -java/net/PlainSocketImpl.java \ java/net/PortUnreachableException.java \ java/net/ProtocolException.java \ java/net/ServerSocket.java \ @@ -2032,6 +2060,7 @@ java/nio/channels/ClosedSelectorException.java \ java/nio/channels/ConnectionPendingException.java \ java/nio/channels/DatagramChannel.java \ java/nio/channels/FileChannel.java \ +java/nio/channels/FileChannelImpl.java \ java/nio/channels/FileLock.java \ java/nio/channels/FileLockInterruptionException.java \ java/nio/channels/GatheringByteChannel.java \ @@ -2336,7 +2365,9 @@ gnu/gcj/runtime/natSharedLibLoader.cc \ gnu/gcj/runtime/natStackTrace.cc \ gnu/gcj/runtime/natStringBuffer.cc \ gnu/gcj/runtime/natVMClassLoader.cc \ -gnu/java/nio/natFileChannelImpl.cc \ +gnu/java/awt/natEmbeddedWindow.cc \ +gnu/java/net/natPlainDatagramSocketImpl.cc \ +gnu/java/net/natPlainSocketImpl.cc \ gnu/java/nio/natFileLockImpl.cc \ gnu/java/nio/natSelectorImpl.cc \ java/io/natFile.cc \ @@ -2365,9 +2396,8 @@ java/lang/reflect/natMethod.cc \ java/lang/reflect/natProxy.cc \ java/net/natNetworkInterface.cc \ java/net/natInetAddress.cc \ -java/net/natPlainDatagramSocketImpl.cc \ -java/net/natPlainSocketImpl.cc \ java/nio/natDirectByteBufferImpl.cc \ +java/nio/channels/natFileChannelImpl.cc \ java/text/natCollator.cc \ java/util/natResourceBundle.cc \ java/util/natTimeZone.cc \ @@ -2406,6 +2436,7 @@ gnu/awt/xlib/XFontMetrics.java \ gnu/awt/xlib/XFramePeer.java \ gnu/awt/xlib/XGraphics.java \ gnu/awt/xlib/XGraphicsConfiguration.java \ +gnu/awt/xlib/XOffScreenImage.java \ gnu/awt/xlib/XPanelPeer.java \ gnu/awt/xlib/XToolkit.java @@ -2441,6 +2472,7 @@ AM_MAKEFLAGS = \ "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ "CFLAGS=$(CFLAGS)" \ "CXXFLAGS=$(CXXFLAGS)" \ + "CPPFLAGS=$(CPPFLAGS)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ "INSTALL=$(INSTALL)" \ @@ -2510,22 +2542,24 @@ gnu/gcj/io/shs.lo gnu/gcj/protocol/core/natCoreInputStream.lo \ gnu/gcj/runtime/natFinalizerThread.lo gnu/gcj/runtime/natFirstThread.lo \ gnu/gcj/runtime/natNameFinder.lo gnu/gcj/runtime/natSharedLibLoader.lo \ gnu/gcj/runtime/natStackTrace.lo gnu/gcj/runtime/natStringBuffer.lo \ -gnu/gcj/runtime/natVMClassLoader.lo gnu/java/nio/natFileChannelImpl.lo \ -gnu/java/nio/natFileLockImpl.lo gnu/java/nio/natSelectorImpl.lo \ -java/io/natFile.lo java/io/natFileDescriptor.lo \ -java/io/natObjectInputStream.lo java/io/natVMObjectStreamClass.lo \ -java/lang/natCharacter.lo java/lang/natClass.lo \ -java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \ -java/lang/natDouble.lo java/lang/natFloat.lo java/lang/natMath.lo \ -java/lang/natObject.lo java/lang/natRuntime.lo java/lang/natString.lo \ +gnu/gcj/runtime/natVMClassLoader.lo gnu/java/awt/natEmbeddedWindow.lo \ +gnu/java/net/natPlainDatagramSocketImpl.lo \ +gnu/java/net/natPlainSocketImpl.lo gnu/java/nio/natFileLockImpl.lo \ +gnu/java/nio/natSelectorImpl.lo java/io/natFile.lo \ +java/io/natFileDescriptor.lo java/io/natObjectInputStream.lo \ +java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \ +java/lang/natClass.lo java/lang/natClassLoader.lo \ +java/lang/natConcreteProcess.lo java/lang/natDouble.lo \ +java/lang/natFloat.lo java/lang/natMath.lo java/lang/natObject.lo \ +java/lang/natRuntime.lo java/lang/natString.lo \ java/lang/natStringBuffer.lo java/lang/natSystem.lo \ java/lang/natThread.lo java/lang/natVMSecurityManager.lo \ java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \ java/lang/reflect/natConstructor.lo java/lang/reflect/natField.lo \ java/lang/reflect/natMethod.lo java/lang/reflect/natProxy.lo \ java/net/natNetworkInterface.lo java/net/natInetAddress.lo \ -java/net/natPlainDatagramSocketImpl.lo java/net/natPlainSocketImpl.lo \ -java/nio/natDirectByteBufferImpl.lo java/text/natCollator.lo \ +java/nio/natDirectByteBufferImpl.lo \ +java/nio/channels/natFileChannelImpl.lo java/text/natCollator.lo \ java/util/natResourceBundle.lo java/util/natTimeZone.lo \ java/util/zip/natDeflater.lo java/util/zip/natInflater.lo lib_org_xml_sax_la_LDFLAGS = @@ -2584,6 +2618,7 @@ gnu/java/awt/peer/gtk/GtkClipboard.lo \ gnu/java/awt/peer/gtk/GtkComponentPeer.lo \ gnu/java/awt/peer/gtk/GtkContainerPeer.lo \ gnu/java/awt/peer/gtk/GtkDialogPeer.lo \ +gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.lo \ gnu/java/awt/peer/gtk/GtkFileDialogPeer.lo \ gnu/java/awt/peer/gtk/GtkFontPeer.lo \ gnu/java/awt/peer/gtk/GtkFramePeer.lo \ @@ -2616,6 +2651,7 @@ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.lo \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.lo \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.lo \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.lo \ +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.lo \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.lo \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.lo \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.lo \ @@ -2674,13 +2710,14 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DATA = $(jar_DATA) $(pkgconfig_DATA) $(toolexecmainlib_DATA) DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \ -THANKS acinclude.m4 aclocal.m4 configure configure.in \ -libgcj-test.spec.in libgcj.pc.in libgcj.spec.in +THANKS acinclude.m4 aclocal.m4 config.guess config.sub configure \ +configure.in install-sh libgcj-test.spec.in libgcj.pc.in libgcj.spec.in \ +ltmain.sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ @@ -2696,10 +2733,11 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/awt/xlib/XFontMetrics.P .deps/gnu/awt/xlib/XFramePeer.P \ .deps/gnu/awt/xlib/XGraphics.P \ .deps/gnu/awt/xlib/XGraphicsConfiguration.P \ -.deps/gnu/awt/xlib/XPanelPeer.P .deps/gnu/awt/xlib/XToolkit.P \ -.deps/gnu/classpath/Configuration.P .deps/gnu/gcj/Core.P \ -.deps/gnu/gcj/RawData.P .deps/gnu/gcj/convert/BytesToUnicode.P \ -.deps/gnu/gcj/convert/Convert.P .deps/gnu/gcj/convert/IOConverter.P \ +.deps/gnu/awt/xlib/XOffScreenImage.P .deps/gnu/awt/xlib/XPanelPeer.P \ +.deps/gnu/awt/xlib/XToolkit.P .deps/gnu/classpath/Configuration.P \ +.deps/gnu/gcj/Core.P .deps/gnu/gcj/RawData.P \ +.deps/gnu/gcj/convert/BytesToUnicode.P .deps/gnu/gcj/convert/Convert.P \ +.deps/gnu/gcj/convert/IOConverter.P \ .deps/gnu/gcj/convert/Input_8859_1.P \ .deps/gnu/gcj/convert/Input_ASCII.P \ .deps/gnu/gcj/convert/Input_EUCJIS.P \ @@ -2729,6 +2767,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/gcj/protocol/core/natCoreInputStream.P \ .deps/gnu/gcj/protocol/file/Connection.P \ .deps/gnu/gcj/protocol/file/Handler.P \ +.deps/gnu/gcj/protocol/gcjlib/Connection.P \ +.deps/gnu/gcj/protocol/gcjlib/Handler.P \ .deps/gnu/gcj/protocol/http/Connection.P \ .deps/gnu/gcj/protocol/http/Handler.P \ .deps/gnu/gcj/protocol/jar/Connection.P \ @@ -2737,6 +2777,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/gcj/runtime/FinalizerThread.P \ .deps/gnu/gcj/runtime/FirstThread.P .deps/gnu/gcj/runtime/JNIWeakRef.P \ .deps/gnu/gcj/runtime/MethodRef.P .deps/gnu/gcj/runtime/NameFinder.P \ +.deps/gnu/gcj/runtime/SharedLibHelper.P \ .deps/gnu/gcj/runtime/SharedLibLoader.P \ .deps/gnu/gcj/runtime/StackTrace.P .deps/gnu/gcj/runtime/StringBuffer.P \ .deps/gnu/gcj/runtime/VMClassLoader.P \ @@ -2774,9 +2815,11 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/java/awt/EmbeddedWindow.P \ .deps/gnu/java/awt/EmbeddedWindowSupport.P \ .deps/gnu/java/awt/EventModifier.P \ -.deps/gnu/java/awt/GLightweightPeer.P \ .deps/gnu/java/awt/image/ImageDecoder.P \ .deps/gnu/java/awt/image/XBMDecoder.P \ +.deps/gnu/java/awt/natEmbeddedWindow.P \ +.deps/gnu/java/awt/peer/EmbeddedWindowPeer.P \ +.deps/gnu/java/awt/peer/GLightweightPeer.P \ .deps/gnu/java/awt/peer/gtk/GdkFontMetrics.P \ .deps/gnu/java/awt/peer/gtk/GdkGraphics.P \ .deps/gnu/java/awt/peer/gtk/GtkArg.P \ @@ -2791,6 +2834,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/java/awt/peer/gtk/GtkComponentPeer.P \ .deps/gnu/java/awt/peer/gtk/GtkContainerPeer.P \ .deps/gnu/java/awt/peer/gtk/GtkDialogPeer.P \ +.deps/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.P \ .deps/gnu/java/awt/peer/gtk/GtkFileDialogPeer.P \ .deps/gnu/java/awt/peer/gtk/GtkFontPeer.P \ .deps/gnu/java/awt/peer/gtk/GtkFramePeer.P \ @@ -2974,8 +3018,13 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/java/locale/LocaleInformation_zh_HK.P \ .deps/gnu/java/locale/LocaleInformation_zh_SG.P \ .deps/gnu/java/locale/LocaleInformation_zh_TW.P \ -.deps/gnu/java/math/MPN.P .deps/gnu/java/nio/DatagramChannelImpl.P \ -.deps/gnu/java/nio/FileChannelImpl.P .deps/gnu/java/nio/FileLockImpl.P \ +.deps/gnu/java/math/MPN.P .deps/gnu/java/net/PlainDatagramSocketImpl.P \ +.deps/gnu/java/net/PlainSocketImpl.P \ +.deps/gnu/java/net/natPlainDatagramSocketImpl.P \ +.deps/gnu/java/net/natPlainSocketImpl.P \ +.deps/gnu/java/nio/DatagramChannelImpl.P \ +.deps/gnu/java/nio/FileLockImpl.P \ +.deps/gnu/java/nio/NIODatagramSocket.P .deps/gnu/java/nio/NIOSocket.P \ .deps/gnu/java/nio/PipeImpl.P .deps/gnu/java/nio/SelectionKeyImpl.P \ .deps/gnu/java/nio/SelectorImpl.P \ .deps/gnu/java/nio/SelectorProviderImpl.P \ @@ -2989,9 +3038,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/java/nio/charset/UTF_16Decoder.P \ .deps/gnu/java/nio/charset/UTF_16Encoder.P \ .deps/gnu/java/nio/charset/UTF_16LE.P \ -.deps/gnu/java/nio/charset/UTF_8.P \ -.deps/gnu/java/nio/natFileChannelImpl.P \ -.deps/gnu/java/nio/natFileLockImpl.P \ +.deps/gnu/java/nio/charset/UTF_8.P .deps/gnu/java/nio/natFileLockImpl.P \ .deps/gnu/java/nio/natSelectorImpl.P \ .deps/gnu/java/rmi/RMIMarshalledObjectInputStream.P \ .deps/gnu/java/rmi/RMIMarshalledObjectOutputStream.P \ @@ -3001,9 +3048,12 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/java/rmi/registry/RegistryImpl_Skel.P \ .deps/gnu/java/rmi/registry/RegistryImpl_Stub.P \ .deps/gnu/java/rmi/rmic/Compile_gcj.P \ +.deps/gnu/java/rmi/rmic/Compile_jikes.P \ +.deps/gnu/java/rmi/rmic/Compile_kjc.P \ .deps/gnu/java/rmi/rmic/Compiler.P \ .deps/gnu/java/rmi/rmic/CompilerProcess.P \ -.deps/gnu/java/rmi/rmic/RMIC.P .deps/gnu/java/rmi/rmic/TabbedWriter.P \ +.deps/gnu/java/rmi/rmic/RMIC.P .deps/gnu/java/rmi/rmic/RMICException.P \ +.deps/gnu/java/rmi/rmic/TabbedWriter.P \ .deps/gnu/java/rmi/server/ConnectionRunnerPool.P \ .deps/gnu/java/rmi/server/ProtocolConstants.P \ .deps/gnu/java/rmi/server/RMIDefaultSocketFactory.P \ @@ -3091,7 +3141,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/awt/GraphicsConfiguration.P .deps/java/awt/GraphicsDevice.P \ .deps/java/awt/GraphicsEnvironment.P \ .deps/java/awt/GridBagConstraints.P .deps/java/awt/GridBagLayout.P \ -.deps/java/awt/GridLayout.P .deps/java/awt/HeadlessException.P \ +.deps/java/awt/GridBagLayoutInfo.P .deps/java/awt/GridLayout.P \ +.deps/java/awt/HeadlessException.P \ .deps/java/awt/IllegalComponentStateException.P .deps/java/awt/Image.P \ .deps/java/awt/ImageCapabilities.P .deps/java/awt/Insets.P \ .deps/java/awt/ItemSelectable.P .deps/java/awt/JobAttributes.P \ @@ -3476,8 +3527,6 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/net/NetPermission.P .deps/java/net/NetworkInterface.P \ .deps/java/net/NoRouteToHostException.P \ .deps/java/net/PasswordAuthentication.P \ -.deps/java/net/PlainDatagramSocketImpl.P \ -.deps/java/net/PlainSocketImpl.P \ .deps/java/net/PortUnreachableException.P \ .deps/java/net/ProtocolException.P .deps/java/net/ServerSocket.P \ .deps/java/net/Socket.P .deps/java/net/SocketAddress.P \ @@ -3493,9 +3542,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/net/UnknownHostException.P \ .deps/java/net/UnknownServiceException.P \ .deps/java/net/natInetAddress.P .deps/java/net/natNetworkInterface.P \ -.deps/java/net/natPlainDatagramSocketImpl.P \ -.deps/java/net/natPlainSocketImpl.P .deps/java/nio/Buffer.P \ -.deps/java/nio/BufferOverflowException.P \ +.deps/java/nio/Buffer.P .deps/java/nio/BufferOverflowException.P \ .deps/java/nio/BufferUnderflowException.P .deps/java/nio/ByteBuffer.P \ .deps/java/nio/ByteBufferImpl.P .deps/java/nio/ByteOrder.P \ .deps/java/nio/CharBuffer.P .deps/java/nio/CharBufferImpl.P \ @@ -3521,6 +3568,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/nio/channels/ConnectionPendingException.P \ .deps/java/nio/channels/DatagramChannel.P \ .deps/java/nio/channels/FileChannel.P \ +.deps/java/nio/channels/FileChannelImpl.P \ .deps/java/nio/channels/FileLock.P \ .deps/java/nio/channels/FileLockInterruptionException.P \ .deps/java/nio/channels/GatheringByteChannel.P \ @@ -3544,6 +3592,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/nio/channels/UnresolvedAddressException.P \ .deps/java/nio/channels/UnsupportedAddressTypeException.P \ .deps/java/nio/channels/WritableByteChannel.P \ +.deps/java/nio/channels/natFileChannelImpl.P \ .deps/java/nio/channels/spi/AbstractInterruptibleChannel.P \ .deps/java/nio/channels/spi/AbstractSelectableChannel.P \ .deps/java/nio/channels/spi/AbstractSelectionKey.P \ @@ -4218,6 +4267,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.P \ .deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.P \ .deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.P \ +.deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.P \ .deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.P \ .deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.P \ .deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.P \ @@ -4766,7 +4816,8 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \ mostlyclean-libtool mostlyclean-binPROGRAMS \ mostlyclean-noinstPROGRAMS mostlyclean-tags \ - mostlyclean-depend mostlyclean-generic + mostlyclean-depend mostlyclean-generic \ + mostlyclean-local mostlyclean: mostlyclean-recursive @@ -4779,7 +4830,8 @@ clean: clean-recursive distclean-am: distclean-toolexeclibLTLIBRARIES distclean-compile \ distclean-libtool distclean-binPROGRAMS \ distclean-noinstPROGRAMS distclean-tags \ - distclean-depend distclean-generic clean-am + distclean-depend distclean-generic clean-am \ + distclean-local -rm -f libtool distclean: distclean-recursive @@ -4831,19 +4883,44 @@ $(gtk_c_headers): $(gtk_awt_peer_sources) echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \ $(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input -.java.class: - $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) \ - -d $(here) $< +# Compile all classfiles in one go. + +@ONESTEP_TRUE@libgcj-@gcc_version@.jar: $(all_java_source_files) +@ONESTEP_TRUE@ -@rm -f libgcj-@gcc_version@.jar +@ONESTEP_TRUE@ @echo Compiling Java sourcefiles... +@ONESTEP_TRUE@ @: $(call write_entries_to_file,$?,libgcj.sourcelist) +@ONESTEP_TRUE@ $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) @libgcj.sourcelist +@ONESTEP_TRUE@ find java gnu javax org -type d -o -type f -name '*.class' | \ +@ONESTEP_TRUE@ sed -e '/\/\./d' -e '/\/xlib/d' | \ +@ONESTEP_TRUE@ $(ZIP) cfM0E@ $@ + +# This next rule seems backward, but reflects the fact +# that 1) all classfiles are compiled in one go when the +# libgcj jarfile is built and 2) anything which depends +# on a particular .class file must wait until the jarfile +# is built. +@ONESTEP_TRUE@$(all_java_class_files): libgcj-@gcc_version@.jar + +# Compile each classfile individually. -libgcj-@gcc_version@.jar: $(all_java_class_files) - -@rm -f libgcj-@gcc_version@.jar - find java gnu javax org -type d -o -type f -name '*.class' | \ - sed -e '/\/\./d' -e '/\/xlib/d' | \ - $(ZIP) cfM0E@ $@ +@ONESTEP_FALSE@.java.class: +@ONESTEP_FALSE@ $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) $< + +@ONESTEP_FALSE@libgcj-@gcc_version@.jar: $(all_java_class_files) +@ONESTEP_FALSE@ -@rm -f libgcj-@gcc_version@.jar +@ONESTEP_FALSE@ find java gnu javax org -type d -o -type f -name '*.class' | \ +@ONESTEP_FALSE@ sed -e '/\/\./d' -e '/\/xlib/d' | \ +@ONESTEP_FALSE@ $(ZIP) cfM0E@ $@ + +mostlyclean-local: + find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f clean-local: find . -name '*.class' -print | xargs rm -f +distclean-local: + find . -name '*.d' -print | xargs rm -f + # Just remove the objects from C++ sources, for testing the C++ compiler. clean-nat: rm -f $(nat_files) $(x_nat_files) @@ -4876,13 +4953,15 @@ $(gtk_awt_peer_sources:.java=.lo): %.lo: %.java $(GCJCOMPILE) -fjni -o $@ $< libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) - @: $(shell echo Creating list of files to link...) $(shell rm -f libgcj.objectlist || :) $(shell touch libgcj.objectlist) $(foreach object,$(libgcj_la_OBJECTS) $(libgcj_la_LIBADD),$(shell echo $(object) >> libgcj.objectlist)) + @echo Creating list of files to link... + @: $(call write_entries_to_file,$(libgcj_la_OBJECTS) $(libgcj_la_LIBADD),libgcj.objectlist) $(libgcj_la_LINK) -objectlist libgcj.objectlist \ @GCLIBS@ @LIBFFI@ @ZLIBS@ \ -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS) lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPENDENCIES) - @: $(shell echo Creating list of files to link...) $(shell rm -f lib_gnu_awt_xlib.objectlist || :) $(shell touch lib_gnu_awt_xlib.objectlist) $(foreach object,$(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_LIBADD),$(shell echo $(object) >> lib_gnu_awt_xlib.objectlist)) + @echo Creating list of files to link... + @: $(call write_entries_to_file,$(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_LIBADD),lib_gnu_awt_xlib.objectlist) $(lib_gnu_awt_xlib_la_LINK) -objectlist lib_gnu_awt_xlib.objectlist \ -rpath $(toolexeclibdir) $(lib_gnu_awt_xlib_la_LDFLAGS) $(LIBS) @@ -4973,7 +5052,8 @@ $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h: install-data-local: $(PRE_INSTALL) - @: $(shell echo Creating list of headers to install...) $(shell rm -f tmp-ilist || :) $(shell touch tmp-ilist) $(foreach hdr,$(nat_headers) $(extra_headers),$(shell echo $(hdr) >> tmp-ilist)) + @echo Creating list of headers to install... + @: $(call write_entries_to_file,$(nat_headers) $(extra_headers),tmp-ilist) @cat tmp-ilist | while read f; do \ d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \ $(mkinstalldirs) $(DESTDIR)$(includedir)/$$d; \ @@ -5009,6 +5089,10 @@ class-check: libgcj-@gcc_version@.jar :; else ok=1; fi; \ done; exit $$ok +write-entries-to-file-check: + @echo Creating list of files to link... + @: $(call write_entries_to_file,$(libgcj_la_OBJECTS) $(libgcj_la_LIBADD),libgcj.objectlist) + # The Unicode consortium does not permit re-distributing the file JIS0201.TXT. # You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/. @@ -5093,7 +5177,7 @@ texinfo: TexinfoDoclet.class -include deps.mk -all-recursive: $(all_java_class_files) $(nat_headers) $(x_nat_headers) +all-recursive: libgcj-@gcc_version@.jar $(nat_headers) $(x_nat_headers) # Multilib support. .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ |