X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libjava%2FMakefile.am;h=3b9b914649c51dcbb07cff31adfccb2751ac004c;hb=e4e3a8d4ffaad857d8ba1d3147b466a949594e01;hp=2f394ddd42e4c46e5f32107128d4b4ec24f6278c;hpb=6c6138d48eaedb67fabd9d1be7dc9b3d4b2ad13a;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 2f394ddd42e..3b9b914649c 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -10,6 +10,15 @@ else SUBDIRS = $(DIRLTDL) gcj include endif +# 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))) + ## ################################################################ ## @@ -35,11 +44,16 @@ toolexeclib_LTLIBRARIES = libgcj.la lib-org-xml-sax.la lib-org-w3c-dom.la \ $(cond_gtk_ltlibrary) $(cond_x_ltlibrary) toolexecmainlib_DATA = libgcj.spec +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libgcj.pc + jardir = $(datadir)/java jar_DATA = libgcj-@gcc_version@.jar ## FIXME: Using libdir violates GNU coding standards. secdir = $(libdir)/security +## Where to install default logging property file. +propdir = $(libdir) ## For now, only on native systems. FIXME. if NATIVE @@ -61,10 +75,11 @@ if NULL_TARGET ## In this case, gcj is found outside the build tree. However, zip is ## found in the build tree. ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar +GCJH = gcjh else ZIP = jar +GCJH = $(target_alias)-gcjh endif -GCJH = gcjh else # CANADIAN GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar @@ -91,13 +106,14 @@ GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@ WARNINGS = -W -Wall ## We need _GNU_SOURCE defined for some Linux builds. It doesn't hurt ## to always define it. -AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \ +AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \ ## Some systems don't allow `$' in identifiers by default, so we force it. -fdollars-in-identifiers \ ## Detect bugs in the verifier implementation, and maybe other places. -Wswitch-enum \ @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \ - -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" + -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" \ + -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" if USING_GCC AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS) else @@ -124,6 +140,7 @@ nat_files = $(nat_source_files:.cc=.lo) x_nat_files = $(x_nat_source_files:.cc=.lo) ## Objects from C sources in subdirs. c_files = $(c_source_files:.c=.lo) +extra_cc_files = $(extra_cc_source_files:.cc=.lo) ## Objects from gtk-related C sources in subdirs. gtk_c_files = $(gtk_c_source_files:.c=.lo) ## Objects from Java sources in subdirs. @@ -135,13 +152,13 @@ libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ resolve.cc defineclass.cc interpret.cc verify.cc \ $(nat_source_files) EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \ - win32-threads.cc posix.cc win32.cc \ - $(c_source_files) $(java_source_files) $(built_java_source_files) + win32-threads.cc posix.cc win32.cc $(c_source_files) \ + $(extra_cc_source_files) $(java_source_files) $(built_java_source_files) libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(javao_files) \ - $(c_files) $(GCOBJS) $(THREADOBJS) $(PLATFORMOBJS) $(LIBLTDL) \ - $(LIBFFI) $(ZLIBS) $(GCLIBS) + $(c_files) $(extra_cc_files) $(GCOBJS) $(THREADOBJS) \ + $(PLATFORMOBJS) $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) -libgcj_la_LIBADD = $(javao_files) $(c_files) $(GCOBJS) \ +libgcj_la_LIBADD = $(javao_files) $(c_files) $(extra_cc_files) $(GCOBJS) \ $(THREADOBJS) $(PLATFORMOBJS) # Include THREADLIBS here to ensure that the correct version of # certain linuxthread functions get linked: @@ -151,10 +168,23 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` libgcj_la_LINK = $(LIBLINK) +# Gtk/Cairo JNI sources. +if GTK_CAIRO +gtk_cairo_c_source_files = \ +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c \ +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c \ +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c \ +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c +else +gtk_cairo_c_source_files = +endif + ## Gtk JNI sources. gtk_c_source_files = \ +$(gtk_cairo_c_source_files) \ jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c \ +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c \ @@ -162,6 +192,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 \ @@ -188,8 +219,13 @@ jni/classpath/primlib.c ## Java sources for Gtk peers. gtk_awt_peer_sources = \ +gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java \ +gnu/java/awt/peer/gtk/GdkClasspathFontPeerMetrics.java \ gnu/java/awt/peer/gtk/GdkFontMetrics.java \ +gnu/java/awt/peer/gtk/GdkGlyphVector.java \ gnu/java/awt/peer/gtk/GdkGraphics.java \ +gnu/java/awt/peer/gtk/GdkGraphics2D.java \ +gnu/java/awt/peer/gtk/GdkPixbufDecoder.java \ gnu/java/awt/peer/gtk/GtkArg.java \ gnu/java/awt/peer/gtk/GtkArgList.java \ gnu/java/awt/peer/gtk/GtkButtonPeer.java \ @@ -202,6 +238,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 \ @@ -226,11 +263,9 @@ gnu/java/awt/peer/gtk/GtkTextFieldPeer.java \ gnu/java/awt/peer/gtk/GtkToolkit.java \ gnu/java/awt/peer/gtk/GtkWindowPeer.java -## FIXME: GNU make. gtk_c_headers = $(patsubst %.java,jniinclude/%.h,$(subst /,_,$(gtk_awt_peer_sources))) $(gtk_c_headers): $(gtk_awt_peer_sources) -## FIXME: GNU make. @input=`echo $@ | sed -e 's,jniinclude/,,' -e 's,_,.,g' -e 's,.h$$,,'`; \ echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \ $(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input @@ -245,7 +280,7 @@ jni/classpath/jnilink.h \ jni/classpath/native_state.h \ jni/classpath/primlib.h -lib_gnu_java_awt_peer_gtk_la_LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) +lib_gnu_java_awt_peer_gtk_la_LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \ org/w3c/dom/CDATASection.java \ @@ -325,9 +360,33 @@ all_java_source_files = \ all_java_class_files = $(all_java_source_files:.java=.class) +if ONESTEP + +# Compile all classfiles in one go. + +libgcj-@gcc_version@.jar: $(all_java_source_files) + -@rm -f libgcj-@gcc_version@.jar + @echo Compiling Java sourcefiles... + @: $(call write_entries_to_file,$?,libgcj.sourcelist) + $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) @libgcj.sourcelist +## Note that we explicitly want to include directory information. + find java gnu javax org -type d -o -type f -name '*.class' | \ + sed -e '/\/\./d' -e '/\/xlib/d' | \ + $(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. +$(all_java_class_files): libgcj-@gcc_version@.jar + +else # !ONESTEP + +# Compile each classfile individually. + .java.class: - $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) \ - -d $(here) $< + $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) $< libgcj-@gcc_version@.jar: $(all_java_class_files) -@rm -f libgcj-@gcc_version@.jar @@ -336,13 +395,26 @@ libgcj-@gcc_version@.jar: $(all_java_class_files) sed -e '/\/\./d' -e '/\/xlib/d' | \ $(ZIP) cfM0E@ $@ -MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers) +endif + +# 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 +mostlyclean-local: +## Use libtool rm to remove each libtool object + find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f + clean-local: -## We just remove every .class file that was created. +## Remove every .class file that was created. find . -name '*.class' -print | xargs rm -f +distclean-local: +## Remove every .d file that was created. + 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) @@ -355,28 +427,31 @@ SUFFIXES = .class .java .h .java.lo: $(GCJCOMPILE) -o $@ $< -## This is GNU make specific. For the .o files in subdirs, use a -## special rule. The standard automake rule can't be overridden (this -## is a bug in automake), and it also won't put the .o files into -## subdirs. FIXME. +## FIXME: For the .o files in subdirs, use a special rule. The +## standard automake rule can't be overridden (this is a bug in +## automake), and it also won't put the .o files into subdirs. $(nat_files) $(x_nat_files): %.lo: %.cc @echo '$(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $<'; \ $(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $< @-mv $(@:.lo=.pp) $(@:.lo=.d) -## FIXME: GNU make. +## FIXME: see above $(c_files): %.lo: %.c $(LTCOMPILE) -c -o $@ $< +$(extra_cc_files): %.lo: %.cc + $(LTCXXCOMPILE) -c -o $@ $< + $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h -## FIXME: GNU make. +## FIXME: see above $(gtk_c_files): %.lo: %.c - $(LTCOMPILE) -c -Ijniinclude -I$(srcdir)/jni/classpath -I$(srcdir)/jni/gtk-peer $(GTK_CFLAGS) $(LIBART_CFLAGS) -o $@ $< + $(LTCOMPILE) -c -Ijniinclude -I$(srcdir)/jni/classpath -I$(srcdir)/jni/gtk-peer \ + $(GTK_CFLAGS) $(LIBART_CFLAGS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) -o $@ $< $(gtk_c_files): $(gtk_c_headers) -## FIXME: GNU make. +## FIXME: see above. $(javao_files) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java $(GCJCOMPILE) -o $@ $< @@ -386,13 +461,15 @@ $(gtk_awt_peer_sources:.java=.lo): %.lo: %.java ## Pass the list of object files to libtool in a temporary file to ## avoid tripping platform command line length limits. 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) @@ -403,7 +480,6 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND ## .class.h: -## FIXME: GNU make specific. $(GCJH) -classpath '' -bootclasspath $(top_builddir) $(basename $<) ## Header files used when compiling some of the nat* files. @@ -413,9 +489,12 @@ ordinary_nat_headers = $(ordinary_java_source_files:.java=.h) \ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \ java/io/ObjectInputStream$$GetField.h \ java/lang/reflect/Proxy$$ProxyData.h \ - java/lang/reflect/Proxy$$ProxyType.h + java/lang/reflect/Proxy$$ProxyType.h \ + gnu/java/net/PlainSocketImpl$$SocketInputStream.h \ + gnu/java/net/PlainSocketImpl$$SocketOutputStream.h nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) +nat_headers_install = $(ordinary_nat_headers) x_nat_headers = $(x_java_source_files:.java=.h) @@ -498,6 +577,14 @@ java/io/ObjectOutputStream$$PutField.h: java/io/ObjectOutputStream.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ 'java/io/ObjectOutputStream$$PutField' +gnu/java/net/PlainSocketImpl$$SocketInputStream.h: gnu/java/net/PlainSocketImpl.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'gnu/java/net/PlainSocketImpl$$SocketInputStream' + +gnu/java/net/PlainSocketImpl$$SocketOutputStream.h: gnu/java/net/PlainSocketImpl.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'gnu/java/net/PlainSocketImpl$$SocketOutputStream' + ## Headers we maintain by hand and which we want to install. extra_headers = java/lang/Object.h java/lang/Class.h @@ -510,7 +597,8 @@ install-data-local: $(PRE_INSTALL) ## We use a GNU make trick here so that we don't go over the command ## length limit of some shells. - @: $(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_install) $(extra_headers),tmp-ilist) @cat tmp-ilist | while read f; do \ d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \ $(mkinstalldirs) $(DESTDIR)$(includedir)/$$d; \ @@ -526,6 +614,14 @@ install-data-local: echo " $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f"; \ $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f; \ done +## Install inner class headers. + $(INSTALL_DATA) 'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(includedir)/java/io/ + $(INSTALL_DATA) 'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(includedir)/java/io/ + $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(includedir)/java/lang/reflect/ + $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(includedir)/java/lang/reflect/ + $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(includedir)/gnu/java/net/ + $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(includedir)/gnu/java/net/ + $(INSTALL_DATA) $(srcdir)/java/util/logging/logging.properties $(DESTDIR)$(propdir)/logging.properties ## ################################################################ @@ -566,6 +662,11 @@ class-check: libgcj-@gcc_version@.jar :; else ok=1; fi; \ done; exit $$ok +## This rule checks whether write_entries_to_file works properly. +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) + ## ################################################################ ## @@ -748,10 +849,15 @@ gnu/awt/j2d/MappedRaster.java \ gnu/java/awt/BitMaskExtent.java \ gnu/java/awt/Buffers.java \ gnu/java/awt/ComponentDataBlitOp.java \ -gnu/java/awt/GLightweightPeer.java \ +gnu/java/awt/ClasspathToolkit.java \ +gnu/java/awt/EmbeddedWindow.java \ +gnu/java/awt/EmbeddedWindowSupport.java \ gnu/java/awt/EventModifier.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/awt/peer/ClasspathFontPeer.java \ gnu/java/beans/editors/ColorEditor.java \ gnu/java/beans/editors/FontEditor.java \ gnu/java/beans/editors/NativeBooleanEditor.java \ @@ -813,6 +919,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 \ @@ -1144,14 +1251,15 @@ javax/rmi/CORBA/UtilDelegate.java \ javax/rmi/CORBA/Util.java \ javax/rmi/CORBA/ValueHandler.java \ javax/swing/border/AbstractBorder.java \ +javax/swing/border/BevelBorder.java \ javax/swing/border/Border.java \ javax/swing/border/CompoundBorder.java \ javax/swing/border/EmptyBorder.java \ -javax/swing/border/MatteBorder.java \ -javax/swing/border/TitledBorder.java \ -javax/swing/border/BevelBorder.java \ javax/swing/border/EtchedBorder.java \ javax/swing/border/LineBorder.java \ +javax/swing/border/MatteBorder.java \ +javax/swing/border/SoftBevelBorder.java \ +javax/swing/border/TitledBorder.java \ javax/swing/GrayFilter.java \ javax/swing/AbstractAction.java \ javax/swing/AbstractButton.java \ @@ -1165,6 +1273,8 @@ javax/swing/plaf/basic/BasicOptionPaneUI.java \ javax/swing/plaf/basic/BasicPanelUI.java \ javax/swing/plaf/basic/BasicRadioButtonUI.java \ javax/swing/plaf/basic/BasicScrollPaneUI.java \ +javax/swing/plaf/basic/BasicSplitPaneDivider.java \ +javax/swing/plaf/basic/BasicSplitPaneUI.java \ javax/swing/plaf/basic/BasicTabbedPaneUI.java \ javax/swing/plaf/basic/BasicTextUI.java \ javax/swing/plaf/basic/BasicToggleButtonUI.java \ @@ -1209,6 +1319,7 @@ javax/swing/plaf/RootPaneUI.java \ javax/swing/plaf/ScrollBarUI.java \ javax/swing/plaf/SeparatorUI.java \ javax/swing/plaf/SliderUI.java \ +javax/swing/plaf/SpinnerUI.java \ javax/swing/plaf/SplitPaneUI.java \ javax/swing/plaf/TableHeaderUI.java \ javax/swing/plaf/TableUI.java \ @@ -1226,6 +1337,7 @@ javax/swing/filechooser/FileView.java \ javax/swing/table/AbstractTableModel.java \ javax/swing/table/DefaultTableColumnModel.java \ javax/swing/table/DefaultTableModel.java \ +javax/swing/table/JTableHeader.java \ javax/swing/table/TableCellEditor.java \ javax/swing/table/TableCellRenderer.java \ javax/swing/table/TableColumn.java \ @@ -1429,6 +1541,8 @@ javax/swing/JSplitPane.java \ javax/swing/JTextPane.java \ javax/swing/JToolBar.java \ javax/swing/OverlayLayout.java \ +javax/swing/Popup.java \ +javax/swing/PopupFactory.java \ javax/swing/ProgressMonitor.java \ javax/swing/ProgressMonitorInputStream.java \ javax/swing/RepaintManager.java \ @@ -1512,9 +1626,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 \ @@ -1522,6 +1639,7 @@ gnu/java/rmi/server/RMIDefaultSocketFactory.java \ gnu/java/rmi/server/RMIHashes.java \ gnu/java/rmi/server/RMIObjectInputStream.java \ gnu/java/rmi/server/RMIObjectOutputStream.java \ +gnu/java/rmi/server/RMIVoidValue.java \ gnu/java/rmi/server/UnicastConnection.java \ gnu/java/rmi/server/UnicastConnectionManager.java \ gnu/java/rmi/server/UnicastRef.java \ @@ -1644,7 +1762,48 @@ javax/naming/ldap/UnsolicitedNotificationListener.java \ javax/naming/OperationNotSupportedException.java \ javax/print/attribute/Attribute.java \ javax/print/attribute/AttributeSet.java \ +javax/print/attribute/AttributeSetUtilities.java \ +javax/print/attribute/DateTimeSyntax.java \ +javax/print/attribute/DocAttribute.java \ +javax/print/attribute/DocAttributeSet.java \ +javax/print/attribute/EnumSyntax.java \ +javax/print/attribute/HashAttributeSet.java \ +javax/print/attribute/HashDocAttributeSet.java \ +javax/print/attribute/HashPrintJobAttributeSet.java \ +javax/print/attribute/HashPrintRequestAttributeSet.java \ +javax/print/attribute/HashPrintServiceAttributeSet.java \ +javax/print/attribute/IntegerSyntax.java \ +javax/print/attribute/PrintJobAttribute.java \ +javax/print/attribute/PrintJobAttributeSet.java \ +javax/print/attribute/PrintRequestAttribute.java \ javax/print/attribute/PrintRequestAttributeSet.java \ +javax/print/attribute/PrintServiceAttribute.java \ +javax/print/attribute/PrintServiceAttributeSet.java \ +javax/print/attribute/ResolutionSyntax.java \ +javax/print/attribute/SetOfIntegerSyntax.java \ +javax/print/attribute/Size2DSyntax.java \ +javax/print/attribute/SupportedValuesAttribute.java \ +javax/print/attribute/TextSyntax.java \ +javax/print/attribute/UnmodifiableSetException.java \ +javax/print/attribute/URISyntax.java \ +javax/print/attribute/standard/Copies.java \ +javax/print/attribute/standard/DateTimeAtCompleted.java \ +javax/print/attribute/standard/DateTimeAtCreation.java \ +javax/print/attribute/standard/DateTimeAtProcessing.java \ +javax/print/attribute/standard/JobImpressions.java \ +javax/print/attribute/standard/JobImpressionsCompleted.java \ +javax/print/attribute/standard/JobKOctets.java \ +javax/print/attribute/standard/JobKOctetsProcessed.java \ +javax/print/attribute/standard/JobMediaSheets.java \ +javax/print/attribute/standard/JobMediaSheetsCompleted.java \ +javax/print/attribute/standard/JobPriority.java \ +javax/print/attribute/standard/JobPrioritySupported.java \ +javax/print/attribute/standard/NumberOfDocuments.java \ +javax/print/attribute/standard/NumberOfInterveningJobs.java \ +javax/print/attribute/standard/NumberUp.java \ +javax/print/attribute/standard/PagesPerMinute.java \ +javax/print/attribute/standard/PagesPerMinuteColor.java \ +javax/print/attribute/standard/QueuedJobCount.java \ javax/security/auth/x500/X500Principal.java \ javax/sql/ConnectionEvent.java \ javax/sql/ConnectionEventListener.java \ @@ -1857,6 +2016,7 @@ java/util/Collection.java \ java/util/Collections.java \ java/util/Comparator.java \ java/util/ConcurrentModificationException.java \ +java/util/Currency.java \ java/util/Date.java \ java/util/Dictionary.java \ java/util/EmptyStackException.java \ @@ -1903,6 +2063,22 @@ java/util/TreeSet.java \ java/util/TooManyListenersException.java \ java/util/Vector.java \ java/util/WeakHashMap.java \ +java/util/logging/ConsoleHandler.java \ +java/util/logging/ErrorManager.java \ +java/util/logging/FileHandler.java \ +java/util/logging/Filter.java \ +java/util/logging/Formatter.java \ +java/util/logging/Handler.java \ +java/util/logging/Level.java \ +java/util/logging/Logger.java \ +java/util/logging/LoggingPermission.java \ +java/util/logging/LogManager.java \ +java/util/logging/LogRecord.java \ +java/util/logging/MemoryHandler.java \ +java/util/logging/SimpleFormatter.java \ +java/util/logging/SocketHandler.java \ +java/util/logging/StreamHandler.java \ +java/util/logging/XMLFormatter.java \ java/util/prefs/NodeChangeListener.java \ java/util/prefs/Preferences.java \ java/util/prefs/PreferenceChangeListener.java \ @@ -1928,21 +2104,13 @@ gnu/gcj/RawData.java \ gnu/gcj/io/DefaultMimeTypes.java \ gnu/gcj/io/MimeTypes.java \ gnu/gcj/io/SimpleSHSStream.java \ -gnu/gcj/protocol/core/Connection.java \ -gnu/gcj/protocol/core/Handler.java \ -gnu/gcj/protocol/core/CoreInputStream.java \ -gnu/gcj/protocol/file/Connection.java \ -gnu/gcj/protocol/file/Handler.java \ -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/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 \ @@ -2096,29 +2264,40 @@ 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/nio/ByteBufferImpl.java \ -gnu/java/nio/CharBufferImpl.java \ -gnu/java/nio/CharViewBufferImpl.java \ +gnu/java/net/HeaderFieldHelper.java \ +gnu/java/net/PlainDatagramSocketImpl.java \ +gnu/java/net/PlainSocketImpl.java \ +gnu/java/net/URLParseError.java \ +gnu/java/net/protocol/core/Connection.java \ +gnu/java/net/protocol/core/Handler.java \ +gnu/java/net/protocol/core/CoreInputStream.java \ +gnu/java/net/protocol/file/Connection.java \ +gnu/java/net/protocol/file/Handler.java \ +gnu/java/net/protocol/http/Connection.java \ +gnu/java/net/protocol/http/Handler.java \ +gnu/java/net/protocol/jar/Connection.java \ +gnu/java/net/protocol/jar/Handler.java \ +gnu/java/net/protocol/gcjlib/Connection.java \ +gnu/java/net/protocol/gcjlib/Handler.java \ gnu/java/nio/DatagramChannelImpl.java \ -gnu/java/nio/DirectByteBufferImpl.java \ -gnu/java/nio/DoubleBufferImpl.java \ -gnu/java/nio/DoubleViewBufferImpl.java \ -gnu/java/nio/FileChannelImpl.java \ -gnu/java/nio/FloatBufferImpl.java \ -gnu/java/nio/FloatViewBufferImpl.java \ -gnu/java/nio/IntBufferImpl.java \ -gnu/java/nio/IntViewBufferImpl.java \ -gnu/java/nio/LongBufferImpl.java \ -gnu/java/nio/LongViewBufferImpl.java \ -gnu/java/nio/MappedByteFileBuffer.java \ +gnu/java/nio/DatagramChannelSelectionKey.java \ +gnu/java/nio/FileLockImpl.java \ +gnu/java/nio/NIOConstants.java \ +gnu/java/nio/NIODatagramSocket.java \ +gnu/java/nio/NIOServerSocket.java \ +gnu/java/nio/NIOSocket.java \ +gnu/java/nio/ChannelInputStream.java \ +gnu/java/nio/ChannelOutputStream.java \ +gnu/java/nio/InputStreamChannel.java \ +gnu/java/nio/OutputStreamChannel.java \ gnu/java/nio/PipeImpl.java \ gnu/java/nio/SelectionKeyImpl.java \ gnu/java/nio/SelectorImpl.java \ gnu/java/nio/SelectorProviderImpl.java \ gnu/java/nio/ServerSocketChannelImpl.java \ -gnu/java/nio/ShortBufferImpl.java \ -gnu/java/nio/ShortViewBufferImpl.java \ +gnu/java/nio/ServerSocketChannelSelectionKey.java \ gnu/java/nio/SocketChannelImpl.java \ +gnu/java/nio/SocketChannelSelectionKey.java \ gnu/java/nio/charset/ISO_8859_1.java \ gnu/java/nio/charset/Provider.java \ gnu/java/nio/charset/US_ASCII.java \ @@ -2207,8 +2386,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 \ @@ -2235,16 +2412,32 @@ java/nio/Buffer.java \ java/nio/BufferOverflowException.java \ java/nio/BufferUnderflowException.java \ java/nio/ByteBuffer.java \ +java/nio/ByteBufferHelper.java \ +java/nio/ByteBufferImpl.java \ java/nio/ByteOrder.java \ java/nio/CharBuffer.java \ +java/nio/CharBufferImpl.java \ +java/nio/CharViewBufferImpl.java \ +java/nio/DirectByteBufferImpl.java \ java/nio/DoubleBuffer.java \ +java/nio/DoubleBufferImpl.java \ +java/nio/DoubleViewBufferImpl.java \ java/nio/FloatBuffer.java \ +java/nio/FloatBufferImpl.java \ +java/nio/FloatViewBufferImpl.java \ java/nio/IntBuffer.java \ +java/nio/IntBufferImpl.java \ +java/nio/IntViewBufferImpl.java \ java/nio/InvalidMarkException.java \ java/nio/LongBuffer.java \ +java/nio/LongBufferImpl.java \ +java/nio/LongViewBufferImpl.java \ java/nio/MappedByteBuffer.java \ +java/nio/MappedByteBufferImpl.java \ java/nio/ReadOnlyBufferException.java \ java/nio/ShortBuffer.java \ +java/nio/ShortBufferImpl.java \ +java/nio/ShortViewBufferImpl.java \ java/nio/channels/AlreadyConnectedException.java \ java/nio/channels/AsynchronousCloseException.java \ java/nio/channels/ByteChannel.java \ @@ -2257,6 +2450,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 \ @@ -2483,6 +2677,7 @@ java/text/DecimalFormat.java \ java/text/DecimalFormatSymbols.java \ java/text/FieldPosition.java \ java/text/Format.java \ +java/text/FormatCharacterIterator.java \ java/text/MessageFormat.java \ java/text/NumberFormat.java \ java/text/ParseException.java \ @@ -2539,6 +2734,8 @@ c_source_files = \ java/lang/e_sqrt.c java/lang/s_scalbn.c java/lang/sf_rint.c \ java/lang/k_cos.c java/lang/s_sin.c java/lang/sf_fabs.c +extra_cc_source_files = $(EXTRA_CC_FILES) + #java/awt/natToolkit.cc ## This lists all the C++ source files in subdirectories. @@ -2554,7 +2751,6 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \ gnu/gcj/convert/natOutput_SJIS.cc \ gnu/gcj/io/natSimpleSHSStream.cc \ gnu/gcj/io/shs.cc \ -gnu/gcj/protocol/core/natCoreInputStream.cc \ gnu/gcj/runtime/natFinalizerThread.cc \ gnu/gcj/runtime/natFirstThread.cc \ gnu/gcj/runtime/natNameFinder.cc \ @@ -2562,11 +2758,14 @@ gnu/gcj/runtime/natSharedLibLoader.cc \ gnu/gcj/runtime/natStackTrace.cc \ gnu/gcj/runtime/natStringBuffer.cc \ gnu/gcj/runtime/natVMClassLoader.cc \ -gnu/java/nio/natDirectByteBufferImpl.cc \ -gnu/java/nio/natFileChannelImpl.cc \ -gnu/java/nio/natMappedByteFileBuffer.cc \ +gnu/java/awt/natEmbeddedWindow.cc \ +gnu/java/net/natPlainDatagramSocketImpl.cc \ +gnu/java/net/natPlainSocketImpl.cc \ +gnu/java/net/protocol/core/natCoreInputStream.cc \ +gnu/java/nio/natFileLockImpl.cc \ +gnu/java/nio/natPipeImpl.cc \ gnu/java/nio/natSelectorImpl.cc \ -gnu/java/nio/natSocketChannelImpl.cc \ +gnu/java/nio/natNIOServerSocket.cc \ java/io/natFile.cc \ java/io/natFileDescriptor.cc \ java/io/natObjectInputStream.cc \ @@ -2593,8 +2792,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 \ @@ -2632,6 +2831,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 @@ -2701,7 +2901,6 @@ texinfo: TexinfoDoclet.class ## Dependency tracking madness. ## -## FIXME: depends on GNU make. -include deps.mk ## This is an evil hack to work around an automake limitation. We @@ -2711,7 +2910,7 @@ texinfo: TexinfoDoclet.class ## the C++ code whenever any .java file is touched. ## Also force all the class files to build first. This makes them build in ## the right order to improve performance. -all-recursive: $(all_java_class_files) $(nat_headers) $(x_nat_headers) +all-recursive: libgcj-@gcc_version@.jar $(nat_headers) $(x_nat_headers) ## ################################################################ @@ -2727,6 +2926,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)" \