X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libjava%2FMakefile.am;h=9ce95a0d0b0f14ed26b6c9adf9d1aaa08ab18352;hb=2f59f8b223b249352a6e3e740bda3d289f42e6c5;hp=23dd92c80a7b0949cb26203e5598afedcf2ae4f3;hpb=913f3d59ec972e7369887eef4e196cb5cefa2e2c;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 23dd92c80a7..9ce95a0d0b0 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -1,15 +1,81 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign subdir-objects -ACLOCAL_AMFLAGS = -I . +ACLOCAL_AMFLAGS = -I . -I ../config +## Garbage collector conditionals. +if USING_BOEHMGC +BOEHMGC_SRC = boehm.cc +else +BOEHMGC_SRC = +endif + +if USING_NOGC +NOGC_SRC = nogc.cc +else +NOGC_SRC = +endif + +## Broken backtrace conditional. +if SUPPLY_BACKTRACE +BACKTRACE_SRC = sysdep/dwarf2-backtrace.cc +else +BACKTRACE_SRC = +endif + +## Conditionals for platform-specific helper functions. +if USING_POSIX_PLATFORM +POSIX_PLATFORM_SRC = posix.cc +else +POSIX_PLATFORM_SRC = +endif + +if USING_WIN32_PLATFORM +WIN32_PLATFORM_SRC = win32.cc +else +WIN32_PLATFORM_SRC = +endif + +if USING_ECOS_PLATFORM +ECOS_PLATFORM_SRC = posix.cc +else +ECOS_PLATFORM_SRC = +endif + +## Conditionals for platform-specific thread support. +if USING_POSIX_THREADS +POSIX_THREAD_SRC = posix-threads.cc +else +POSIX_THREAD_SRC = +endif + +if USING_WIN32_THREADS +WIN32_THREAD_SRC = win32-threads.cc +else +WIN32_THREAD_SRC = +endif + +if USING_NO_THREADS +NO_THREAD_SRC = no-threads.cc +else +NO_THREAD_SRC = +endif + +## Testsuite conditional. if TESTSUBDIR SUBDIRS = $(DIRLTDL) testsuite gcj include else SUBDIRS = $(DIRLTDL) gcj include endif +## Darwin uses the jcr section, but doesn't use crtstuff. +if USING_DARWIN_CRT +DARWIN_CRT_SRC = darwin.cc +else +DARWIN_CRT_SRC = +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 @@ -21,17 +87,17 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach o ## ################################################################ +# autoconf2.13's target_alias +target_noncanonical = @target_noncanonical@ + ## ## What gets installed, and where. ## if XLIB_AWT -cond_x_ltlibrary = lib-gnu-awt-xlib.la -## We require libstdc++-v3 to be in the same build tree. -xlib_includes = -I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_alias) -I$(srcdir)/../libstdc++-v3/libsupc++ +cond_xlib_ltlibrary = lib-gnu-awt-xlib.la else -cond_x_ltlibrary = -xlib_includes = +cond_xlib_ltlibrary = endif if GTK_AWT @@ -40,8 +106,9 @@ else cond_gtk_ltlibrary = endif -toolexeclib_LTLIBRARIES = libgcj.la lib-org-xml-sax.la lib-org-w3c-dom.la \ - $(cond_gtk_ltlibrary) $(cond_x_ltlibrary) +toolexeclib_LTLIBRARIES = libgcj.la libgij.la lib-org-xml-sax.la \ + lib-org-w3c-dom.la lib-org-ietf-jgss.la \ + $(cond_gtk_ltlibrary) $(cond_xlib_ltlibrary) toolexecmainlib_DATA = libgcj.spec pkgconfigdir = $(libdir)/pkgconfig @@ -57,7 +124,7 @@ propdir = $(libdir) ## For now, only on native systems. FIXME. if NATIVE -bin_PROGRAMS = jv-convert gij rmic rmiregistry +bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool endif bin_SCRIPTS = addr2name.awk @@ -68,65 +135,65 @@ bin_SCRIPTS = addr2name.awk ## Compilers and compilation flags. ## -## CANADIAN is a misnomer. Really we check to see if we must pick up -## the tools from the path. -if CANADIAN -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 -else # CANADIAN -GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh -ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar -endif # CANADIAN +GCJH = @GCJH@ +ZIP = @ZIP@ ## The compiler with whatever flags we want for both -c and -C ## compiles. GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fclasspath= -fbootclasspath=$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ -## We define this because otherwise libtool can be run with different -## values of `CXX' and will then get confused and fail to work. So, -## we use --tag explicitly. Someday automake will be changed to do -## this automatically. -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - JAVAC = $(GCJ_WITH_FLAGS) -C 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 $(THREADCXXFLAGS) \ -## Some systems don't allow `$' in identifiers by default, so we force it. +WARNINGS = -Wextra -Wall +## Some systems don't allow `$' in identifiers by default, so we force +## it with -fdollars-in-identifiers. -Wswitch-enum detects bugs in +## the verifier implementation, and maybe other places. We need +## _GNU_SOURCE defined for some Linux builds. It doesn't hurt to +## always define it. Some systems, including Linux, need +## -D_FILE_OFFSET_BITS=64 to enable > 2GB file support. +AM_CXXFLAGS = \ + -fno-rtti \ + -fnon-call-exceptions \ + $(THREADCXXFLAGS) \ -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)\"" \ - -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" + -D_FILE_OFFSET_BITS=64 \ + @LIBGCJ_CXXFLAGS@ \ + @X_CFLAGS@ \ + $(WARNINGS) \ + -D_GNU_SOURCE \ + -DPREFIX="\"$(prefix)\"" \ + -DLIBDIR="\"$(libdir)\"" \ + -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \ + -DJAVA_EXT_DIRS="\"$(jardir)/ext\"" + +AM_GCJFLAGS = \ + @LIBGCJ_JAVAFLAGS@ \ + -fclasspath= -fbootclasspath=$(here) \ + --encoding=UTF-8 \ + -Wno-deprecated + if USING_GCC AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS) else AM_CFLAGS = @LIBGCJ_CFLAGS@ endif +## Extra CFLAGS used for JNI C sources shared with GNU Classpath. +PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long + JCFLAGS = -g JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) LIBFFIINCS = @LIBFFIINCS@ -INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ - $(GCINCS) $(THREADINCS) $(INCLTDL) $(xlib_includes) \ +AM_CPPFLAGS = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ + $(GCINCS) $(THREADINCS) $(INCLTDL) \ $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS) ## ################################################################ @@ -135,46 +202,57 @@ INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ ## How to build libgcj.a and libgcj.jar ## +libgij_la_SOURCES = gij.cc +libgij_la_LIBADD = libgcj.la +libgij_la_DEPENDENCIES = libgcj.la libgcj.spec + +libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ + link.cc defineclass.cc interpret.cc verify.cc \ + $(nat_source_files) $(math_c_source_files) $(java_source_files) \ + $(built_java_source_files) \ + $(BOEHMGC_SRC) $(NOGC_SRC) \ + $(BACKTRACE_SRC) \ + $(POSIX_PLATFORM_SRC) $(WIN32_PLATFORM_SRC) $(ECOS_PLATFORM_SRC) \ + $(DARWIN_CRT_SRC) \ + $(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC) +libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar \ + java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \ + $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files) + ## Objects from C++ sources in subdirs. 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. -javao_files = $(java_source_files:.java=.lo) \ - $(built_java_source_files:.java=.lo) -x_javao_files = $(x_java_source_files:.java=.lo) +xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) -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) \ - $(extra_cc_source_files) $(java_source_files) $(built_java_source_files) -libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(javao_files) \ - $(c_files) $(extra_cc_files) $(GCOBJS) $(THREADOBJS) \ - $(PLATFORMOBJS) $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) - -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: +## The mysterious backslash in the grep pattern is consumed by make. libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \ $(LIBLTDL) $(SYS_ZLIBS) \ -## The mysterious backslash is consumed by make. -version-info `grep -v '^\#' $(srcdir)/libtool-version` +libgcj_la_LIBADD = $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files) libgcj_la_LINK = $(LIBLINK) +# Gtk/Cairo JNI sources. +if GTK_CAIRO +gtk_cairo_c_source_files = \ +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_GdkTextLayout.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c \ +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c \ +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c \ +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.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_GtkCheckboxGroupPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c \ @@ -183,11 +261,14 @@ 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_GtkFramePeer.c \ +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c \ +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c \ @@ -199,6 +280,7 @@ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c \ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c \ +jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c \ jni/gtk-peer/gthread-jni.c \ jni/classpath/jcl.c \ jni/classpath/jnilink.c \ @@ -207,11 +289,14 @@ jni/classpath/primlib.c ## Java sources for Gtk peers. gtk_awt_peer_sources = \ +gnu/java/awt/peer/gtk/GdkTextLayout.java \ gnu/java/awt/peer/gtk/GdkFontMetrics.java \ +gnu/java/awt/peer/gtk/GdkFontPeer.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/GdkGraphicsEnvironment.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 \ gnu/java/awt/peer/gtk/GtkCanvasPeer.java \ gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java \ @@ -224,7 +309,6 @@ 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 \ gnu/java/awt/peer/gtk/GtkGenericPeer.java \ gnu/java/awt/peer/gtk/GtkImage.java \ @@ -245,15 +329,107 @@ gnu/java/awt/peer/gtk/GtkTextAreaPeer.java \ gnu/java/awt/peer/gtk/GtkTextComponentPeer.java \ gnu/java/awt/peer/gtk/GtkTextFieldPeer.java \ gnu/java/awt/peer/gtk/GtkToolkit.java \ -gnu/java/awt/peer/gtk/GtkWindowPeer.java - -gtk_c_headers = $(patsubst %.java,jniinclude/%.h,$(subst /,_,$(gtk_awt_peer_sources))) - -$(gtk_c_headers): $(gtk_awt_peer_sources) +gnu/java/awt/peer/gtk/GtkWindowPeer.java \ +gnu/java/awt/peer/gtk/GThreadMutex.java \ +gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java + + +gtk_jni_headers = $(patsubst %.java,jniinclude/%.h,$(subst /,_,$(gtk_awt_peer_sources))) + +jniinclude/gnu_java_awt_peer_gtk_GdkFontMetrics.h: gnu/java/awt/peer/gtk/GdkFontMetrics.java +jniinclude/gnu_java_awt_peer_gtk_GdkGlyphVector.h: gnu/java/awt/peer/gtk/GdkGlyphVector.java +jniinclude/gnu_java_awt_peer_gtk_GdkGraphics.h: gnu/java/awt/peer/gtk/GdkGraphics.java +jniinclude/gnu_java_awt_peer_gtk_GdkGraphics2D.h: gnu/java/awt/peer/gtk/GdkGraphics2D.java +jniinclude/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h: gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java +jniinclude/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h: gnu/java/awt/peer/gtk/GdkPixbufDecoder.java +jniinclude/gnu_java_awt_peer_gtk_GtkButtonPeer.h: gnu/java/awt/peer/gtk/GtkButtonPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkCanvasPeer.h: gnu/java/awt/peer/gtk/GtkCanvasPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h: gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h: gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h: gnu/java/awt/peer/gtk/GtkCheckboxPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkChoicePeer.h: gnu/java/awt/peer/gtk/GtkChoicePeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkClipboard.h: gnu/java/awt/peer/gtk/GtkClipboard.java +jniinclude/gnu_java_awt_peer_gtk_GtkComponentPeer.h: gnu/java/awt/peer/gtk/GtkComponentPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkContainerPeer.h: gnu/java/awt/peer/gtk/GtkContainerPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkDialogPeer.h: gnu/java/awt/peer/gtk/GtkDialogPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h: gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h: gnu/java/awt/peer/gtk/GtkFileDialogPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkFontPeer.h: gnu/java/awt/peer/gtk/GtkFontPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkFramePeer.h: gnu/java/awt/peer/gtk/GtkFramePeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkGenericPeer.h: gnu/java/awt/peer/gtk/GtkGenericPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkImage.h: gnu/java/awt/peer/gtk/GtkImage.java +jniinclude/gnu_java_awt_peer_gtk_GtkImagePainter.h: gnu/java/awt/peer/gtk/GtkImagePainter.java +jniinclude/gnu_java_awt_peer_gtk_GtkLabelPeer.h: gnu/java/awt/peer/gtk/GtkLabelPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkListPeer.h: gnu/java/awt/peer/gtk/GtkListPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkMainThread.h: gnu/java/awt/peer/gtk/GtkMainThread.java +jniinclude/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h: gnu/java/awt/peer/gtk/GtkMenuBarPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h: gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h: gnu/java/awt/peer/gtk/GtkMenuItemPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkMenuPeer.h: gnu/java/awt/peer/gtk/GtkMenuPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkOffScreenImage.h: gnu/java/awt/peer/gtk/GtkOffScreenImage.java +jniinclude/gnu_java_awt_peer_gtk_GtkPanelPeer.h: gnu/java/awt/peer/gtk/GtkPanelPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h: gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h: gnu/java/awt/peer/gtk/GtkScrollPanePeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h: gnu/java/awt/peer/gtk/GtkScrollbarPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h: gnu/java/awt/peer/gtk/GtkTextAreaPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h: gnu/java/awt/peer/gtk/GtkTextComponentPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h: gnu/java/awt/peer/gtk/GtkTextFieldPeer.java +jniinclude/gnu_java_awt_peer_gtk_GtkToolkit.h: gnu/java/awt/peer/gtk/GtkToolkit.java +jniinclude/gnu_java_awt_peer_gtk_GtkWindowPeer.h: gnu/java/awt/peer/gtk/GtkWindowPeer.java +jniinclude/gnu_java_awt_peer_gtk_GThreadMutex.h: gnu/java/awt/peer/gtk/GThreadMutex.java +jniinclude/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h: gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java +jniinclude/gnu_java_awt_peer_gtk_GdkTextLayout.h: gnu/java/awt/peer/gtk/GdkTextLayout.java +jniinclude/gnu_java_awt_peer_gtk_GdkFontPeer.h: gnu/java/awt/peer/gtk/GdkFontPeer.java + +$(gtk_jni_headers): %.h: @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 +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkFontMetrics.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkFontPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkGlyphVector.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkGraphics2D.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkGraphics.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GdkTextLayout.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkButtonPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkCanvasPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkComponentPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkChoicePeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkClipboard.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkComponentPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkFramePeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkGenericPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkImagePainter.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkLabelPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkListPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkMainThread.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkMenuPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkPanelPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkToolkit.h +jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.lo: $(top_builddir)/jniinclude/gnu_java_awt_peer_gtk_GtkWindowPeer.h + + +## For the peer library, DEPENDENCIES need to come before OBJECTS so +## that JNI headers are built before JNI C files. +$(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES) + lib_gnu_java_awt_peer_gtk_la_SOURCES = \ $(gtk_awt_peer_sources) \ $(gtk_c_source_files) \ @@ -264,7 +440,37 @@ 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_CFLAGS = \ + -Ijniinclude -I$(srcdir)/jni/classpath \ + -I$(srcdir)/jni/gtk-peer $(PEDANTIC_CFLAGS) $(GTK_CFLAGS) $(LIBART_CFLAGS) \ + $(CAIRO_CFLAGS) $(PANGOFT2_CFLAGS) +lib_gnu_java_awt_peer_gtk_la_GCJFLAGS = $(AM_GCJFLAGS) -fjni +lib_gnu_java_awt_peer_gtk_la_LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) +lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = $(gtk_jni_headers) libgcj-@gcc_version@.jar libgcj.la libgcj.spec +## The mysterious backslash in the grep pattern is consumed by make. +lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \ + -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) +lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK) + +lib_org_ietf_jgss_la_SOURCES = \ +org/ietf/jgss/ChannelBinding.java \ +org/ietf/jgss/GSSContext.java \ +org/ietf/jgss/GSSCredential.java \ +org/ietf/jgss/GSSException.java \ +org/ietf/jgss/GSSManager.java \ +org/ietf/jgss/GSSName.java \ +org/ietf/jgss/MessageProp.java \ +org/ietf/jgss/Oid.java + +lib_org_ietf_jgss_la_DEPENDENCIES= $(jgss_propertyo_files) \ + libgcj-@gcc_version@.jar libgcj.la libgcj.spec +## See jv_convert_LDADD. +lib_org_ietf_jgss_la_LIBADD = -L$(here)/.libs $(jgss_propertyo_files) \ + libgcj.la + +## The mysterious backslash in the grep pattern is consumed by make. +lib_org_ietf_jgss_la_LDFLAGS = -rpath $(toolexeclibdir) \ + -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \ org/w3c/dom/CDATASection.java \ @@ -291,6 +497,11 @@ org/w3c/dom/traversal/DocumentTraversal.java \ org/w3c/dom/traversal/NodeFilter.java \ org/w3c/dom/traversal/NodeIterator.java \ org/w3c/dom/traversal/TreeWalker.java +## See jv_convert_LDADD. +lib_org_w3c_dom_la_LIBADD = -L$(here)/.libs libgcj.la +## The mysterious backslash in the grep pattern is consumed by make. +lib_org_w3c_dom_la_LDFLAGS = -rpath $(toolexeclibdir) \ + -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) lib_org_xml_sax_la_SOURCES = org/xml/sax/ext/DeclHandler.java \ org/xml/sax/ext/LexicalHandler.java \ @@ -322,28 +533,62 @@ org/xml/sax/SAXNotSupportedException.java \ org/xml/sax/SAXParseException.java \ org/xml/sax/XMLFilter.java \ org/xml/sax/XMLReader.java - -lib_gnu_awt_xlib_la_SOURCES = $(x_nat_source_files) -EXTRA_lib_gnu_awt_xlib_la_SOURCES = $(x_java_source_files) -lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files) -lib_gnu_awt_xlib_la_LIBADD = $(x_javao_files) +## See jv_convert_LDADD. +lib_org_xml_sax_la_LIBADD = -L$(here)/.libs libgcj.la +## The mysterious backslash in the grep pattern is consumed by make. +lib_org_xml_sax_la_LDFLAGS = -rpath $(toolexeclibdir) \ + -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) + +lib_gnu_awt_xlib_la_SOURCES = \ + $(xlib_java_source_files) \ + $(xlib_nat_source_files) +lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-@gcc_version@.jar libgcj.la libgcj.spec +lib_gnu_awt_xlib_la_LIBADD = $(xlib_javao_files) +## We require libstdc++-v3 to be in the same build tree. +lib_gnu_awt_xlib_la_CPPFLAGS = \ + -I../libstdc++-v3/include \ + -I../libstdc++-v3/include/$(target_noncanonical) \ + -I$(srcdir)/../libstdc++-v3/libsupc++ +## The mysterious backslash in the grep pattern is consumed by make. lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \ @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ -rpath $(toolexeclibdir) \ -## The mysterious backslash is consumed by make. - -version-info `grep -v '^\#' $(srcdir)/libtool-version` + -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) lib_gnu_awt_xlib_la_LINK = $(LIBLINK) all_java_source_files = \ $(java_source_files) \ $(built_java_source_files) \ + $(lib_org_ietf_jgss_la_SOURCES) \ $(lib_org_xml_sax_la_SOURCES) \ $(lib_org_w3c_dom_la_SOURCES) \ $(gtk_awt_peer_sources) \ - $(x_java_source_files) + $(xlib_java_source_files) all_java_class_files = $(all_java_source_files:.java=.class) +all_property_files = $(property_files) $(jgss_property_files) \ + java/util/logging/logging.properties + +## Build property files into the library. +property_files = \ +gnu/regexp/MessagesBundle.properties \ +gnu/regexp/MessagesBundle_fr.properties + +propertyo_files = $(property_files:.properties=.properties.lo) + +%.properties.lo: %.properties + $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"` + +## Build property files into the lib-org-ietf-jgss library. +jgss_property_files = \ +org/ietf/jgss/MessagesBundle.properties + +jgss_propertyo_files = $(jgss_property_files:.properties=.properties.lo) + +%.properties.lo: %.properties + $(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"` + if ONESTEP # Compile all classfiles in one go. @@ -352,11 +597,18 @@ 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 + $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here)'$(CLASSPATH_SEPARATOR)'$(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@ $@ + (find java gnu javax org -type d -o -type f -name '*.class'; \ +## Ugly code to avoid "echo -C". Must separate each entry by a newline +## Gross but easy. + for file in $(all_property_files); do \ + echo "x-C" | sed -e 's/^.//'; \ + echo $(srcdir); \ + echo $$file; \ + done) | \ + sed -e '/\/xlib/d' -e '/\/\.libs/d' -e '/\/\.deps/d' | \ + $(ZIP) -cfM0E@ $@ # This next rule seems backward, but reflects the fact # that 1) all classfiles are compiled in one go when the @@ -370,26 +622,32 @@ else # !ONESTEP # Compile each classfile individually. .java.class: - $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) $< + $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir) -d $(here) $< -libgcj-@gcc_version@.jar: $(all_java_class_files) +libgcj-@gcc_version@.jar: $(all_java_class_files) $(all_property_files) -@rm -f libgcj-@gcc_version@.jar ## 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@ $@ + (find java gnu javax org -type d -o -type f -name '*.class'; \ +## Ugly code to avoid "echo -C". Must separate each entry by a newline +## Gross but easy. + for file in $(all_property_files); do \ + echo "x-C" | sed -e 's/^.//'; \ + echo $(srcdir); \ + echo $$file; \ + done) | \ + sed -e '/\/xlib/d' -e '/\/\.libs/d' -e '/\/\.deps/d' | \ + $(ZIP) -cfM0E@ $@ 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 +## Remove headers. We use GNU make trickery because otherwise +## the command line is too long. + @: $(foreach header,$(nat_headers) $(xlib_nat_headers) $(gtk_jni_headers),$(shell rm -f '$(header)')) clean-local: ## Remove every .class file that was created. @@ -401,53 +659,31 @@ distclean-local: # Just remove the objects from C++ sources, for testing the C++ compiler. clean-nat: - rm -f $(nat_files) $(x_nat_files) - -SUFFIXES = .class .java .h - -.class.lo: - $(GCJCOMPILE) -o $@ $< + rm -f $(nat_files) $(xlib_nat_files) -.java.lo: - $(GCJCOMPILE) -o $@ $< +SUFFIXES = .class .java .h .properties -## 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: 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: see above -$(gtk_c_files): %.lo: %.c - $(LTCOMPILE) -c -Ijniinclude -I$(srcdir)/jni/classpath -I$(srcdir)/jni/gtk-peer $(GTK_CFLAGS) $(LIBART_CFLAGS) -o $@ $< - -$(gtk_c_files): $(gtk_c_headers) - -## FIXME: see above. -$(javao_files) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java - $(GCJCOMPILE) -o $@ $< +## Note: we omit StackTrace here, since it has an explicit rule a bit +## later, and GNU make will warn in this case. +$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(xlib_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_ietf_jgss_la_OBJECTS): %.lo: %.java + $(LTGCJCOMPILE) -o $@ -c $< $(gtk_awt_peer_sources:.java=.lo): %.lo: %.java - $(GCJCOMPILE) -fjni -o $@ $< + $(LTGCJCOMPILE) -fjni -o $@ -c $< -## Pass the list of object files to libtool in a temporary file to +## A special case. The sibcall optimization can change the number of +## frames on the stack, and StackTrace makes assumptions about this +## number. +gnu/gcj/runtime/StackTrace.lo: gnu/gcj/runtime/StackTrace.java + $(LTGCJCOMPILE) -fno-optimize-sibling-calls -o $@ -c $< + +## 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) @echo Creating list of files to link... - @: $(call write_entries_to_file,$(libgcj_la_OBJECTS) $(libgcj_la_LIBADD),libgcj.objectlist) + @: $(call write_entries_to_file,$(libgcj_la_OBJECTS),libgcj.objectlist) $(libgcj_la_LINK) -objectlist libgcj.objectlist \ - @GCLIBS@ @LIBFFI@ @ZLIBS@ \ + $(libgcj_la_LIBADD) \ -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS) lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPENDENCIES) @@ -471,22 +707,30 @@ ordinary_nat_headers = $(ordinary_java_source_files:.java=.h) \ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \ java/io/ObjectInputStream$$GetField.h \ + java/nio/DirectByteBufferImpl$$ReadWrite.h \ + java/nio/channels/Pipe$$SinkChannel.h \ + java/nio/channels/Pipe$$SourceChannel.h \ java/lang/reflect/Proxy$$ProxyData.h \ java/lang/reflect/Proxy$$ProxyType.h \ gnu/java/net/PlainSocketImpl$$SocketInputStream.h \ - gnu/java/net/PlainSocketImpl$$SocketOutputStream.h + gnu/java/net/PlainSocketImpl$$SocketOutputStream.h \ + gnu/java/nio/PipeImpl$$SinkChannelImpl.h \ + gnu/java/nio/PipeImpl$$SourceChannelImpl.h \ + $(PLATFORM_INNER_NAT_HDRS) nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) nat_headers_install = $(ordinary_nat_headers) -x_nat_headers = $(x_java_source_files:.java=.h) +xlib_nat_headers = $(xlib_java_source_files:.java=.h) -$(ordinary_nat_headers) $(x_nat_headers): %.h: %.class +$(ordinary_nat_headers) $(xlib_nat_headers): %.h: %.class java/lang/ClassLoader.h: java/lang/ClassLoader.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ - -friend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \ - -friend 'void _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \ + -prepend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \ + -prepend 'void _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \ + -friend 'jclass (::_Jv_FindClass) (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \ + -friend 'void ::_Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \ $(basename $<) java/lang/Thread.h: java/lang/Thread.class @@ -494,45 +738,64 @@ java/lang/Thread.h: java/lang/Thread.class -prepend 'class _Jv_JNIEnv;' \ -prepend '#define _JV_NOT_OWNER 1' \ -prepend '#define _JV_INTERRUPTED 2' \ - -friend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \ - -friend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \ - -friend 'void _Jv_ThreadRun (java::lang::Thread* thread);' \ - -friend 'jint _Jv_AttachCurrentThread(java::lang::Thread* thread);' \ - -friend 'java::lang::Thread* _Jv_AttachCurrentThread(jstring name, java::lang::ThreadGroup* group);' \ - -friend 'java::lang::Thread* _Jv_AttachCurrentThreadAsDaemon(jstring name, java::lang::ThreadGroup* group);' \ - -friend 'jint _Jv_DetachCurrentThread ();' \ + -prepend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \ + -prepend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \ + -prepend 'void _Jv_ThreadRun (java::lang::Thread* thread);' \ + -prepend 'jint _Jv_AttachCurrentThread(java::lang::Thread* thread);' \ + -prepend 'java::lang::Thread* _Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \ + -prepend 'java::lang::Thread* _Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \ + -prepend 'jint _Jv_DetachCurrentThread ();' \ + -friend '_Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();' \ + -friend 'void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \ + -friend 'void ::_Jv_ThreadRun (java::lang::Thread* thread);' \ + -friend 'jint (::_Jv_AttachCurrentThread) (java::lang::Thread* thread);' \ + -friend 'java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \ + -friend 'java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \ + -friend 'jint (::_Jv_DetachCurrentThread) ();' \ $(basename $<) java/lang/String.h: java/lang/String.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ - -friend 'jchar* _Jv_GetStringChars (jstring str);' \ - -friend 'jstring* _Jv_StringFindSlot (jchar*, jint, jint);' \ - -friend 'jstring* _Jv_StringGetSlot (jstring);' \ - -friend 'jstring _Jv_NewStringUtf8Const (_Jv_Utf8Const* str);' \ - -friend 'jstring _Jv_NewStringLatin1 (const char*, jsize);' \ - -friend 'jstring _Jv_AllocString (jsize);' \ + -prepend 'jchar* _Jv_GetStringChars (jstring str);' \ + -prepend 'jstring* _Jv_StringFindSlot (jchar*, jint, jint);' \ + -prepend 'jstring* _Jv_StringGetSlot (jstring);' \ + -prepend 'jstring _Jv_NewStringUtf8Const (_Jv_Utf8Const* str);' \ + -prepend 'jstring _Jv_NewStringLatin1 (const char*, jsize);' \ + -prepend 'jstring _Jv_AllocString (jsize);' \ + -friend 'jchar* ::_Jv_GetStringChars (jstring str);' \ + -friend 'jstring* ::_Jv_StringFindSlot (jchar*, jint, jint);' \ + -friend 'jstring* ::_Jv_StringGetSlot (jstring);' \ + -friend 'jstring (::_Jv_NewStringUtf8Const) (_Jv_Utf8Const* str);' \ + -friend 'jstring (::_Jv_NewStringLatin1) (const char*, jsize);' \ + -friend 'jstring (::_Jv_AllocString) (jsize);' \ $(basename $<) java/lang/reflect/Constructor.h: java/lang/reflect/Constructor.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ - -friend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \ + -prepend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \ + -prepend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \ + -friend 'jmethodID (::_Jv_FromReflectedConstructor) (java::lang::reflect::Constructor *);' \ + -friend 'jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \ -friend 'class java::lang::Class;' \ - -friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \ $(basename $<) java/lang/reflect/Field.h: java/lang/reflect/Field.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ - -friend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \ - -friend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \ + -prepend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \ + -prepend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \ + -friend 'jfieldID (::_Jv_FromReflectedField) (java::lang::reflect::Field *);' \ + -friend 'jobject (::_Jv_JNI_ToReflectedField) (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \ -friend 'class java::lang::Class;' \ $(basename $<) java/lang/reflect/Method.h: java/lang/reflect/Method.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ - -friend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \ + -prepend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \ + -prepend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \ + -friend 'jmethodID (::_Jv_FromReflectedMethod) (java::lang::reflect::Method *);' \ + -friend 'jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \ -friend 'class java::lang::Class;' \ -friend 'class java::io::ObjectInputStream;' \ - -friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \ $(basename $<) java/lang/reflect/Proxy.h: java/lang/reflect/Proxy.class @@ -560,6 +823,18 @@ java/io/ObjectOutputStream$$PutField.h: java/io/ObjectOutputStream.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ 'java/io/ObjectOutputStream$$PutField' +java/nio/DirectByteBufferImpl$$ReadWrite.h: java/nio/DirectByteBufferImpl.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'java/nio/DirectByteBufferImpl$$ReadWrite' + +java/nio/channels/Pipe$$SinkChannel.h: java/nio/channels/Pipe.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'java/nio/channels/Pipe$$SinkChannel' + +java/nio/channels/Pipe$$SourceChannel.h: java/nio/channels/Pipe.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'java/nio/channels/Pipe$$SourceChannel' + gnu/java/net/PlainSocketImpl$$SocketInputStream.h: gnu/java/net/PlainSocketImpl.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ 'gnu/java/net/PlainSocketImpl$$SocketInputStream' @@ -568,6 +843,19 @@ gnu/java/net/PlainSocketImpl$$SocketOutputStream.h: gnu/java/net/PlainSocketImpl $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ 'gnu/java/net/PlainSocketImpl$$SocketOutputStream' +gnu/java/nio/PipeImpl$$SinkChannelImpl.h: gnu/java/nio/PipeImpl.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'gnu/java/nio/PipeImpl$$SinkChannelImpl' + +gnu/java/nio/PipeImpl$$SourceChannelImpl.h: gnu/java/nio/PipeImpl.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'gnu/java/nio/PipeImpl$$SourceChannelImpl' + +## Only used by PosixProcess.java +java/lang/ConcreteProcess$$ProcessManager.h: java/lang/ConcreteProcess.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'java/lang/ConcreteProcess$$ProcessManager' + ## Headers we maintain by hand and which we want to install. extra_headers = java/lang/Object.h java/lang/Class.h @@ -584,10 +872,10 @@ install-data-local: @: $(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; \ + $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/$$d; \ if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f; \ done -@rm -f tmp-ilist ## FIXME: the obvious approach using lib_DATA doesn't work with @@ -597,15 +885,20 @@ 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 +## Install inner class headers. + $(INSTALL_DATA) 'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(gxx_include_dir)/java/io/ + $(INSTALL_DATA) 'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(gxx_include_dir)/java/io/ + $(INSTALL_DATA) 'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/ + $(INSTALL_DATA) 'java/nio/channels/Pipe$$SourceChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/ + $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/ + $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/ + $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/ + $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/ + $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/ + $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/ +## Don't install java/nio/DirectByteBufferImpl$$ReadWrite.h here. It's for internal use only. + ## ################################################################ @@ -663,13 +956,63 @@ write-entries-to-file-check: if NATIVE if MAINTAINER_MODE noinst_PROGRAMS = gen-from-JIS + +gen_from_JIS_SOURCES = \ + gnu/gcj/convert/gen-from-JIS.c \ + gnu/gcj/convert/make-trie.c + +gen_from_JIS_DEPENDENCIES = \ + gnu/gcj/convert/JIS0201.h \ + gnu/gcj/convert/JIS0208.h \ + gnu/gcj/convert/JIS0212.h + +$(srcdir)/gnu/gcj/convert/JIS0208_to_Unicode.cc: ./gen-from-JIS$(EXEEXT) + ./gen-from-JIS JIS0208 >$(srcdir)/gnu/gcj/convert/JIS0208_to_Unicode.cc + +$(srcdir)/gnu/gcj/convert/JIS0212_to_Unicode.cc: ./gen-from-JIS$(EXEEXT) + ./gen-from-JIS JIS0212 >$(srcdir)/gnu/gcj/convert/JIS0212_to_Unicode.cc + +$(srcdir)/gnu/gcj/convert/Unicode_to_JIS.cc: ./gen-from-JIS$(EXEEXT) + ./gen-from-JIS toJIS >$(srcdir)/gnu/gcj/convert/Unicode_to_JIS.cc + +# The Unicode consortium does not permit re-distributing the file JIS0201.TXT. +# You can get it from +# ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/ + +$(srcdir)/gnu/gcj/convert/JIS0201.h: # gnu/gcj/convert/JIS0201.TXT + echo '/* This file is automatically generated from Unicode tables */' > tmp-0201; \ + tr -d '\r' <$(srcdir)/gnu/gcj/convert/JIS0201.TXT \ + | sed -n -e 's|\(0x..\).*\(0x....\).*#\(.*\)$$|MAP(0x00, \1, \2) /*\3 */|p' \ + >> tmp-0201; \ + mv tmp-0201 $(srcdir)/gnu/gcj/convert/JIS0201.h + +# The Unicode consortium does not permit re-distributing the file JIS0208.TXT. +# You can get it from +# ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/ + +$(srcdir)/gnu/gcj/convert/JIS0208.h: # gnu/gcj/convert/JIS0208.TXT + echo '/* This file is automatically generated from Unicode tables */' > tmp-0208; \ + tr -d '\r' <$(srcdir)/gnu/gcj/convert/JIS0208.TXT \ + | sed -n -e 's|\(0x....\).*0x\(..\)\(..\).*\(0x....\).*#\(.*\)$$|MAP(0x\2, 0x\3, \4) /*\5 */|p' \ + >> tmp-0208; \ + mv tmp-0208 $(srcdir)/gnu/gcj/convert/JIS0208.h + +# The Unicode consortium does not permit re-distributing the file JIS0212.TXT. +# You can get it from +# ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/ + +$(srcdir)/gnu/gcj/convert/JIS0212.h: # gnu/gcj/convert/JIS0212.TXT + echo '/* This file is automatically generated from Unicode tables */' > tmp-0212; \ + tr -d '\r' <$(srcdir)/gnu/gcj/convert/JIS0212.TXT \ + | sed -n -e 's|0x\(..\)\(..\).*\(0x....\).*#\(.*\)$$|MAP(0x\1, 0x\2, \3) /*\4 */|p' \ + >> tmp-0212; \ + mv tmp-0212 $(srcdir)/gnu/gcj/convert/JIS0212.h + endif endif -CONVERT_DIR = gnu/gcj/convert jv_convert_SOURCES = -EXTRA_jv_convert_SOURCES = $(convert_source_files) ## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We ## need this because we are explicitly using libtool to link using the ## `.la' file. @@ -686,112 +1029,60 @@ jv_convert_LINK = $(GCJLINK) jv_convert_LDADD = -L$(here)/.libs libgcj.la ## Depend on the spec file to make sure it is up to date before ## linking this program. -jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \ - libgcj.la libgcj.spec +jv_convert_DEPENDENCIES = libgcj.la libgcj.spec -gij_SOURCES = gij.cc +gcj_dbtool_SOURCES = gnu/gcj/tools/gcj_dbtool/Main.java +## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We +## need this because we are explicitly using libtool to link using the +## `.la' file. +gcj_dbtool_LDFLAGS = --main=gnu.gcj.tools.gcj_dbtool.Main \ + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) +gcj_dbtool_LINK = $(GCJLINK) +## We don't explicitly link in the libraries we need; libgcj.la brings +## in all dependencies. We need the -L so that gcj can find libgcj +## with `-lgcj', but it must come first, otherwise the -L flags +## brought in from libgcj.la would cause the install directories to be +## searched before the build-tree ones, and we'd get errors because of +## different libraries with the same SONAME from picky linkers such as +## Solaris'. FIXME: should be _libs on some systems. +gcj_dbtool_LDADD = -L$(here)/.libs libgcj.la +## Depend on the spec file to make sure it is up to date before +## linking this program. +gcj_dbtool_DEPENDENCIES = libgcj.la libgcj.spec + +gij_SOURCES = ## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We ## need this because we are explicitly using libtool to link using the ## `.la' file. gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) gij_LINK = $(GCJLINK) ## See jv_convert_LDADD. -gij_LDADD = -L$(here)/.libs libgcj.la +gij_LDADD = -L$(here)/.libs libgij.la ## Depend on the spec file to make sure it is up to date before ## linking this program. -gij_DEPENDENCIES = libgcj.la libgcj.spec +gij_DEPENDENCIES = libgij.la -rmic_SOURCES = ## This is a dummy definition. -EXTRA_rmic_SOURCES = $(rmi_java_source_files) -rmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \ +grmic_SOURCES = +grmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \ -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) -rmic_LINK = $(GCJLINK) +grmic_LINK = $(GCJLINK) ## See jv_convert_LDADD. -rmic_LDADD = -L$(here)/.libs libgcj.la +grmic_LDADD = -L$(here)/.libs libgcj.la ## Depend on the spec file to make sure it is up to date before ## linking this program. -rmic_DEPENDENCIES = libgcj.la libgcj.spec +grmic_DEPENDENCIES = libgcj.la libgcj.spec -rmiregistry_SOURCES = ## This is a dummy definition. -EXTRA_rmiregistry_SOURCES = $(rmi_java_source_files) -rmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \ +grmiregistry_SOURCES = +grmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \ -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) -rmiregistry_LINK = $(GCJLINK) +grmiregistry_LINK = $(GCJLINK) ## See jv_convert_LDADD. -rmiregistry_LDADD = -L$(here)/.libs libgcj.la +grmiregistry_LDADD = -L$(here)/.libs libgcj.la ## Depend on the spec file to make sure it is up to date before ## linking this program. -rmiregistry_DEPENDENCIES = libgcj.la libgcj.spec - -# 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/. - -$(srcdir)/$(CONVERT_DIR)/JIS0201.h: # $(CONVERT_DIR)/JIS0201.TXT - echo '/* This file is automatically generated from Unicode tables */' > tmp-0201; \ - tr -d '\r' <$(CONVERT_DIR)/JIS0201.TXT \ - | sed -n -e 's|\(0x..\).*\(0x....\).*#\(.*\)$$|MAP(0x00, \1, \2) /*\3 */|p' \ - >> tmp-0201; \ - mv tmp-0201 $(srcdir)/$(CONVERT_DIR)/JIS0201.h - -# The Unicode consortium does not permit re-distributing the file JIS0208.TXT. -# You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/. - -$(srcdir)/$(CONVERT_DIR)/JIS0208.h: # $(CONVERT_DIR)/JIS0208.TXT - echo '/* This file is automatically generated from Unicode tables */' > tmp-0208; \ - tr -d '\r' <$(CONVERT_DIR)/JIS0208.TXT \ - | sed -n -e 's|\(0x....\).*0x\(..\)\(..\).*\(0x....\).*#\(.*\)$$|MAP(0x\2, 0x\3, \4) /*\5 */|p' \ - >> tmp-0208; \ - mv tmp-0208 $(srcdir)/$(CONVERT_DIR)/JIS0208.h - -# The Unicode consortium does not permit re-distributing the file JIS0212.TXT. -# You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/. - -$(srcdir)/$(CONVERT_DIR)/JIS0212.h: # $(CONVERT_DIR)/JIS0212.TXT - echo '/* This file is automatically generated from Unicode tables */' > tmp-0212; \ - tr -d '\r' <$(CONVERT_DIR)/JIS0212.TXT \ - | sed -n -e 's|0x\(..\)\(..\).*\(0x....\).*#\(.*\)$$|MAP(0x\1, 0x\2, \3) /*\4 */|p' \ - >> tmp-0212; \ - mv tmp-0212 $(srcdir)/$(CONVERT_DIR)/JIS0212.h - - -gen_from_JIS_SOURCES = -EXTRA_gen_from_JIS_SOURCES = $(srcdir)/$(CONVERT_DIR)/gen-from-JIS.c \ - $(srcdir)/$(CONVERT_DIR)/make-trie.c \ - $(srcdir)/$(CONVERT_DIR)/JIS0201.h \ - $(srcdir)/$(CONVERT_DIR)/JIS0208.h \ - $(srcdir)/$(CONVERT_DIR)/JIS0212.h -gen_from_JIS_LDADD = $(CONVERT_DIR)/gen-from-JIS.o $(CONVERT_DIR)/make-trie.o -gen_from_JIS_DEPENDENCIES = $(CONVERT_DIR)/gen-from-JIS.o \ - $(CONVERT_DIR)/make-trie.o - -$(CONVERT_DIR)/gen-from-JIS.o: $(srcdir)/$(CONVERT_DIR)/gen-from-JIS.c \ - $(srcdir)/$(CONVERT_DIR)/JIS0201.h \ - $(srcdir)/$(CONVERT_DIR)/JIS0208.h \ - $(srcdir)/$(CONVERT_DIR)/JIS0212.h - $(COMPILE) -c -o $(CONVERT_DIR)/gen-from-JIS.o \ - $(srcdir)/$(CONVERT_DIR)/gen-from-JIS.c - -$(CONVERT_DIR)/make-trie.o: $(srcdir)/$(CONVERT_DIR)/make-trie.c - $(COMPILE) -c -o $(CONVERT_DIR)/make-trie.o \ - $(srcdir)/$(CONVERT_DIR)/make-trie.c - -if NATIVE -if MAINTAINER_MODE - -$(srcdir)/$(CONVERT_DIR)/JIS0208_to_Unicode.cc: ./gen-from-JIS$(EXEEXT) - ./gen-from-JIS JIS0208>$(srcdir)/$(CONVERT_DIR)/JIS0208_to_Unicode.cc - -$(srcdir)/$(CONVERT_DIR)/JIS0212_to_Unicode.cc: ./gen-from-JIS$(EXEEXT) - ./gen-from-JIS JIS0212>$(srcdir)/$(CONVERT_DIR)/JIS0212_to_Unicode.cc - -$(srcdir)/$(CONVERT_DIR)/Unicode_to_JIS.cc: ./gen-from-JIS$(EXEEXT) - ./gen-from-JIS toJIS>$(srcdir)/$(CONVERT_DIR)/Unicode_to_JIS.cc - -endif # MAINTAINER_MODE -endif # NATIVE - +grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec ## ################################################################ @@ -807,6 +1098,8 @@ gnu/gcj/convert/Input_ASCII.java \ gnu/gcj/convert/Input_EUCJIS.java \ gnu/gcj/convert/Input_JavaSrc.java \ gnu/gcj/convert/Input_SJIS.java \ +gnu/gcj/convert/Input_UnicodeBig.java \ +gnu/gcj/convert/Input_UnicodeLittle.java \ gnu/gcj/convert/Input_UTF8.java \ gnu/gcj/convert/Input_iconv.java \ gnu/gcj/convert/IOConverter.java \ @@ -815,6 +1108,7 @@ gnu/gcj/convert/Output_ASCII.java \ gnu/gcj/convert/Output_EUCJIS.java \ gnu/gcj/convert/Output_JavaSrc.java \ gnu/gcj/convert/Output_SJIS.java \ +gnu/gcj/convert/Output_UnicodeLittleUnmarked.java \ gnu/gcj/convert/Output_UTF8.java \ gnu/gcj/convert/Output_iconv.java \ gnu/gcj/convert/UnicodeToBytes.java @@ -832,14 +1126,31 @@ gnu/awt/j2d/IntegerGraphicsState.java \ gnu/awt/j2d/MappedRaster.java \ gnu/java/awt/BitMaskExtent.java \ gnu/java/awt/Buffers.java \ +gnu/java/awt/BitwiseXORComposite.java \ gnu/java/awt/ComponentDataBlitOp.java \ +gnu/java/awt/ClasspathToolkit.java \ gnu/java/awt/EmbeddedWindow.java \ gnu/java/awt/EmbeddedWindowSupport.java \ gnu/java/awt/EventModifier.java \ +gnu/java/awt/color/CieXyzConverter.java \ +gnu/java/awt/color/ClutProfileConverter.java \ +gnu/java/awt/color/ColorLookUpTable.java \ +gnu/java/awt/color/ColorSpaceConverter.java \ +gnu/java/awt/color/GrayProfileConverter.java \ +gnu/java/awt/color/GrayScaleConverter.java \ +gnu/java/awt/color/LinearRGBConverter.java \ +gnu/java/awt/color/ProfileHeader.java \ +gnu/java/awt/color/PyccConverter.java \ +gnu/java/awt/color/RgbProfileConverter.java \ +gnu/java/awt/color/SrgbConverter.java \ +gnu/java/awt/color/TagEntry.java \ +gnu/java/awt/color/ToneReproductionCurve.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/awt/peer/ClasspathTextLayoutPeer.java \ gnu/java/beans/editors/ColorEditor.java \ gnu/java/beans/editors/FontEditor.java \ gnu/java/beans/editors/NativeBooleanEditor.java \ @@ -855,13 +1166,6 @@ gnu/java/beans/BeanInfoEmbryo.java \ gnu/java/beans/EmptyBeanInfo.java \ gnu/java/beans/ExplicitBeanInfo.java \ gnu/java/beans/IntrospectionIncubator.java \ -gnu/javax/rmi/CORBA/DelegateFactory.java \ -gnu/javax/rmi/CORBA/GetDelegateInstanceException.java \ -gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java \ -gnu/javax/rmi/CORBA/StubDelegateImpl.java \ -gnu/javax/rmi/CORBA/UtilDelegateImpl.java \ -gnu/javax/rmi/CORBA/ValueHandlerImpl.java \ -gnu/javax/rmi/PortableServer.java \ java/applet/Applet.java \ java/applet/AppletStub.java \ java/applet/AppletContext.java \ @@ -1026,23 +1330,40 @@ java/awt/geom/CubicCurve2D.java \ java/awt/geom/FlatteningPathIterator.java \ java/awt/geom/GeneralPath.java \ java/awt/geom/QuadCurve2D.java \ +java/awt/image/BandCombineOp.java \ +java/awt/image/BandedSampleModel.java \ +java/awt/image/AffineTransformOp.java \ java/awt/image/BufferedImage.java \ +java/awt/image/BufferedImageFilter.java \ +java/awt/image/ByteLookupTable.java \ +java/awt/image/ColorConvertOp.java \ java/awt/image/ColorModel.java \ java/awt/image/ComponentColorModel.java \ java/awt/image/ComponentSampleModel.java \ +java/awt/image/ConvolveOp.java \ java/awt/image/DataBuffer.java \ java/awt/image/DataBufferByte.java \ +java/awt/image/DataBufferDouble.java \ +java/awt/image/DataBufferFloat.java \ java/awt/image/DataBufferInt.java \ +java/awt/image/DataBufferShort.java \ java/awt/image/DataBufferUShort.java \ java/awt/image/DirectColorModel.java \ java/awt/image/ImageConsumer.java \ java/awt/image/ImageObserver.java \ java/awt/image/ImageProducer.java \ java/awt/image/IndexColorModel.java \ +java/awt/image/Kernel.java \ +java/awt/image/LookupOp.java \ +java/awt/image/LookupTable.java \ +java/awt/image/MultiPixelPackedSampleModel.java \ java/awt/image/PackedColorModel.java \ +java/awt/image/PixelInterleavedSampleModel.java \ java/awt/image/Raster.java \ java/awt/image/RasterOp.java \ +java/awt/image/RescaleOp.java \ java/awt/image/SampleModel.java \ +java/awt/image/ShortLookupTable.java \ java/awt/image/SinglePixelPackedSampleModel.java \ java/awt/image/WritableRaster.java \ java/awt/image/AreaAveragingScaleFilter.java \ @@ -1196,8 +1517,10 @@ java/beans/BeanInfo.java \ java/beans/Beans.java \ java/beans/Customizer.java \ java/beans/DesignMode.java \ +java/beans/EventHandler.java \ java/beans/EventSetDescriptor.java \ java/beans/ExceptionListener.java \ +java/beans/Expression.java \ java/beans/FeatureDescriptor.java \ java/beans/IndexedPropertyDescriptor.java \ java/beans/IntrospectionException.java \ @@ -1213,25 +1536,13 @@ java/beans/PropertyEditor.java \ java/beans/PropertyEditorManager.java \ java/beans/PropertyEditorSupport.java \ java/beans/PropertyVetoException.java \ +java/beans/Statement.java \ java/beans/SimpleBeanInfo.java \ java/beans/VetoableChangeListener.java \ java/beans/VetoableChangeListenerProxy.java \ java/beans/VetoableChangeSupport.java \ java/beans/Visibility.java \ java/beans/AppletInitializer.java \ -javax/rmi/BAD_OPERATION.java \ -javax/rmi/ORB.java \ -javax/rmi/PortableRemoteObject.java \ -javax/rmi/CORBA/ClassDesc.java \ -javax/rmi/CORBA/ObjectImpl.java \ -javax/rmi/CORBA/PortableRemoteObjectDelegate.java \ -javax/rmi/CORBA/StubDelegate.java \ -javax/rmi/CORBA/Stub.java \ -javax/rmi/CORBA/SystemException.java \ -javax/rmi/CORBA/Tie.java \ -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 \ @@ -1245,26 +1556,61 @@ javax/swing/border/TitledBorder.java \ javax/swing/GrayFilter.java \ javax/swing/AbstractAction.java \ javax/swing/AbstractButton.java \ +javax/swing/AbstractSpinnerModel.java \ +javax/swing/plaf/basic/BasicArrowButton.java \ +javax/swing/plaf/basic/BasicButtonListener.java \ javax/swing/plaf/basic/BasicButtonUI.java \ javax/swing/plaf/basic/BasicCheckBoxUI.java \ -javax/swing/plaf/basic/BasicDefaults.java \ +javax/swing/plaf/basic/BasicColorChooserUI.java \ +javax/swing/plaf/basic/BasicComboBoxUI.java \ +javax/swing/plaf/basic/BasicComboBoxEditor.java \ +javax/swing/plaf/basic/BasicComboBoxRenderer.java \ +javax/swing/plaf/basic/BasicComboPopup.java \ +javax/swing/plaf/basic/BasicDesktopIconUI.java \ +javax/swing/plaf/basic/BasicDesktopPaneUI.java \ +javax/swing/plaf/basic/BasicFormattedTextFieldUI.java \ javax/swing/plaf/basic/BasicGraphicsUtils.java \ +javax/swing/plaf/basic/BasicInternalFrameTitlePane.java \ +javax/swing/plaf/basic/BasicInternalFrameUI.java \ javax/swing/plaf/basic/BasicLabelUI.java \ javax/swing/plaf/basic/BasicListUI.java \ +javax/swing/plaf/basic/BasicMenuUI.java \ +javax/swing/plaf/basic/BasicMenuBarUI.java \ +javax/swing/plaf/basic/BasicMenuItemUI.java \ javax/swing/plaf/basic/BasicOptionPaneUI.java \ javax/swing/plaf/basic/BasicPanelUI.java \ +javax/swing/plaf/basic/BasicPasswordFieldUI.java \ +javax/swing/plaf/basic/BasicPopupMenuUI.java \ +javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java \ +javax/swing/plaf/basic/BasicProgressBarUI.java \ +javax/swing/plaf/basic/BasicRootPaneUI.java \ javax/swing/plaf/basic/BasicRadioButtonUI.java \ +javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java \ +javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java \ +javax/swing/plaf/basic/BasicScrollBarUI.java \ javax/swing/plaf/basic/BasicScrollPaneUI.java \ +javax/swing/plaf/basic/BasicSeparatorUI.java \ +javax/swing/plaf/basic/BasicSliderUI.java \ +javax/swing/plaf/basic/BasicSpinnerUI.java \ javax/swing/plaf/basic/BasicSplitPaneDivider.java \ javax/swing/plaf/basic/BasicSplitPaneUI.java \ javax/swing/plaf/basic/BasicTabbedPaneUI.java \ +javax/swing/plaf/basic/BasicTableUI.java \ +javax/swing/plaf/basic/BasicTableHeaderUI.java \ +javax/swing/plaf/basic/BasicTextAreaUI.java \ +javax/swing/plaf/basic/BasicTextFieldUI.java \ +javax/swing/plaf/basic/BasicTextPaneUI.java \ javax/swing/plaf/basic/BasicTextUI.java \ javax/swing/plaf/basic/BasicToggleButtonUI.java \ +javax/swing/plaf/basic/BasicToolBarSeparatorUI.java \ +javax/swing/plaf/basic/BasicToolBarUI.java \ +javax/swing/plaf/basic/BasicToolTipUI.java \ javax/swing/plaf/basic/BasicTreeUI.java \ javax/swing/plaf/basic/BasicViewportUI.java \ javax/swing/plaf/basic/BasicLookAndFeel.java \ javax/swing/plaf/basic/BasicBorders.java \ javax/swing/plaf/basic/BasicIconFactory.java \ +javax/swing/plaf/basic/ComboPopup.java \ javax/swing/plaf/BorderUIResource.java \ javax/swing/plaf/UIResource.java \ javax/swing/plaf/ButtonUI.java \ @@ -1313,6 +1659,10 @@ javax/swing/colorchooser/AbstractColorChooserPanel.java \ javax/swing/colorchooser/ColorChooserComponentFactory.java \ javax/swing/colorchooser/ColorSelectionModel.java \ javax/swing/colorchooser/DefaultColorSelectionModel.java \ +javax/swing/colorchooser/DefaultPreviewPanel.java \ +javax/swing/colorchooser/DefaultSwatchChooserPanel.java \ +javax/swing/colorchooser/DefaultHSBChooserPanel.java \ +javax/swing/colorchooser/DefaultRGBChooserPanel.java \ javax/swing/filechooser/FileFilter.java \ javax/swing/filechooser/FileSystemView.java \ javax/swing/filechooser/FileView.java \ @@ -1358,7 +1708,9 @@ javax/swing/JRadioButton.java \ javax/swing/JRootPane.java \ javax/swing/JScrollBar.java \ javax/swing/JScrollPane.java \ +javax/swing/JSpinner.java \ javax/swing/JTabbedPane.java \ +javax/swing/JTextArea.java \ javax/swing/JTextField.java \ javax/swing/JToggleButton.java \ javax/swing/JToolTip.java \ @@ -1371,10 +1723,16 @@ javax/swing/ListModel.java \ javax/swing/ListSelectionModel.java \ javax/swing/LookAndFeel.java \ javax/swing/Scrollable.java \ +javax/swing/SpinnerListModel.java \ +javax/swing/SpinnerModel.java \ +javax/swing/SpinnerNumberModel.java \ +javax/swing/Spring.java \ +javax/swing/SpringLayout.java \ javax/swing/SwingConstants.java \ javax/swing/SwingUtilities.java \ javax/swing/Timer.java \ -javax/swing/ToggleButtonModel.java \ +javax/swing/ToolTipManager.java \ +javax/swing/TransferHandler.java \ javax/swing/UIDefaults.java \ javax/swing/UIManager.java \ javax/swing/UnsupportedLookAndFeelException.java \ @@ -1426,29 +1784,41 @@ javax/swing/text/AbstractDocument.java \ javax/swing/text/AttributeSet.java \ javax/swing/text/BadLocationException.java \ javax/swing/text/Caret.java \ -javax/swing/text/CharacterIterator.java \ javax/swing/text/ComponentView.java \ javax/swing/text/DefaultCaret.java \ javax/swing/text/DefaultEditorKit.java \ +javax/swing/text/DefaultHighlighter.java \ javax/swing/text/Document.java \ javax/swing/text/DocumentFilter.java \ javax/swing/text/EditorKit.java \ javax/swing/text/Element.java \ +javax/swing/text/FieldView.java \ javax/swing/text/GapContent.java \ +javax/swing/text/Highlighter.java \ javax/swing/text/JTextComponent.java \ javax/swing/text/Keymap.java \ +javax/swing/text/LayeredHighlighter.java \ +javax/swing/text/MutableAttributeSet.java \ +javax/swing/text/NavigationFilter.java \ +javax/swing/text/PasswordView.java \ javax/swing/text/PlainDocument.java \ -javax/swing/text/PlainEditorKit.java \ +javax/swing/text/PlainView.java \ javax/swing/text/Position.java \ javax/swing/text/Segment.java \ +javax/swing/text/SimpleAttributeSet.java \ javax/swing/text/Style.java \ -javax/swing/text/View.java \ -javax/swing/text/ViewFactory.java \ -javax/swing/text/MutableAttributeSet.java \ -javax/swing/text/NavigationFilter.java \ +javax/swing/text/StyleConstants.java \ +javax/swing/text/StyleContext.java \ javax/swing/text/StyledDocument.java \ javax/swing/text/StyledEditorKit.java \ +javax/swing/text/TabableView.java \ +javax/swing/text/TabExpander.java \ +javax/swing/text/TabSet.java \ +javax/swing/text/TabStop.java \ javax/swing/text/TextAction.java \ +javax/swing/text/Utilities.java \ +javax/swing/text/View.java \ +javax/swing/text/ViewFactory.java \ javax/swing/text/html/HTML.java \ javax/swing/text/html/parser/ParserDelegator.java \ javax/swing/tree/TreeNode.java \ @@ -1529,7 +1899,6 @@ javax/swing/ProgressMonitor.java \ javax/swing/ProgressMonitorInputStream.java \ javax/swing/RepaintManager.java \ javax/swing/ScrollPaneLayout.java \ -javax/swing/ToolTipManager.java \ javax/swing/ViewportLayout.java rmi_java_source_files = \ @@ -1619,8 +1988,10 @@ gnu/java/rmi/server/ConnectionRunnerPool.java \ gnu/java/rmi/server/ProtocolConstants.java \ gnu/java/rmi/server/RMIDefaultSocketFactory.java \ gnu/java/rmi/server/RMIHashes.java \ +gnu/java/rmi/server/RMIIncomingThread.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 \ @@ -1653,6 +2024,89 @@ javax/accessibility/AccessibleTable.java \ javax/accessibility/AccessibleTableModelChange.java \ javax/accessibility/AccessibleText.java \ javax/accessibility/AccessibleValue.java \ +javax/crypto/BadPaddingException.java \ +javax/crypto/Cipher.java \ +javax/crypto/CipherInputStream.java \ +javax/crypto/CipherOutputStream.java \ +javax/crypto/CipherSpi.java \ +javax/crypto/EncryptedPrivateKeyInfo.java \ +javax/crypto/KeyGeneratorSpi.java \ +javax/crypto/ExemptionMechanism.java \ +javax/crypto/ExemptionMechanismException.java \ +javax/crypto/ExemptionMechanismSpi.java \ +javax/crypto/IllegalBlockSizeException.java \ +javax/crypto/KeyAgreement.java \ +javax/crypto/KeyAgreementSpi.java \ +javax/crypto/KeyGenerator.java \ +javax/crypto/Mac.java \ +javax/crypto/MacSpi.java \ +javax/crypto/NoSuchPaddingException.java \ +javax/crypto/NullCipher.java \ +javax/crypto/NullCipherImpl.java \ +javax/crypto/SealedObject.java \ +javax/crypto/SecretKey.java \ +javax/crypto/SecretKeyFactory.java \ +javax/crypto/SecretKeyFactorySpi.java \ +javax/crypto/ShortBufferException.java \ +javax/crypto/interfaces/DHKey.java \ +javax/crypto/interfaces/DHPrivateKey.java \ +javax/crypto/interfaces/DHPublicKey.java \ +javax/crypto/interfaces/PBEKey.java \ +javax/crypto/spec/DESKeySpec.java \ +javax/crypto/spec/DESedeKeySpec.java \ +javax/crypto/spec/DHGenParameterSpec.java \ +javax/crypto/spec/DHParameterSpec.java \ +javax/crypto/spec/DHPrivateKeySpec.java \ +javax/crypto/spec/DHPublicKeySpec.java \ +javax/crypto/spec/IvParameterSpec.java \ +javax/crypto/spec/PBEKeySpec.java \ +javax/crypto/spec/PBEParameterSpec.java \ +javax/crypto/spec/RC2ParameterSpec.java \ +javax/crypto/spec/RC5ParameterSpec.java \ +javax/crypto/spec/SecretKeySpec.java \ +javax/imageio/IIOException.java \ +javax/imageio/IIOImage.java \ +javax/imageio/IIOParam.java \ +javax/imageio/IIOParamController.java \ +javax/imageio/ImageIO.java \ +javax/imageio/ImageReadParam.java \ +javax/imageio/ImageReader.java \ +javax/imageio/ImageTranscoder.java \ +javax/imageio/ImageTypeSpecifier.java \ +javax/imageio/ImageWriteParam.java \ +javax/imageio/ImageWriter.java \ +javax/imageio/event/IIOReadProgressListener.java \ +javax/imageio/event/IIOReadUpdateListener.java \ +javax/imageio/event/IIOReadWarningListener.java \ +javax/imageio/event/IIOWriteProgressListener.java \ +javax/imageio/event/IIOWriteWarningListener.java \ +javax/imageio/metadata/IIOInvalidTreeException.java \ +javax/imageio/metadata/IIOMetadata.java \ +javax/imageio/metadata/IIOMetadataController.java \ +javax/imageio/metadata/IIOMetadataFormat.java \ +javax/imageio/metadata/IIOMetadataFormatImpl.java \ +javax/imageio/metadata/IIOMetadataNode.java \ +javax/imageio/spi/IIOServiceProvider.java \ +javax/imageio/spi/IIORegistry.java \ +javax/imageio/spi/ImageInputStreamSpi.java \ +javax/imageio/spi/ImageOutputStreamSpi.java \ +javax/imageio/spi/ImageReaderSpi.java \ +javax/imageio/spi/ImageReaderWriterSpi.java \ +javax/imageio/spi/ImageTranscoderSpi.java \ +javax/imageio/spi/RegisterableService.java \ +javax/imageio/spi/ServiceRegistry.java \ +javax/imageio/spi/ImageWriterSpi.java \ +javax/imageio/stream/FileCacheImageInputStream.java \ +javax/imageio/stream/FileCacheImageOutputStream.java \ +javax/imageio/stream/FileImageInputStream.java \ +javax/imageio/stream/FileImageOutputStream.java \ +javax/imageio/stream/IIOByteBuffer.java \ +javax/imageio/stream/ImageInputStream.java \ +javax/imageio/stream/ImageInputStreamImpl.java \ +javax/imageio/stream/ImageOutputStream.java \ +javax/imageio/stream/ImageOutputStreamImpl.java \ +javax/imageio/stream/MemoryCacheImageInputStream.java \ +javax/imageio/stream/MemoryCacheImageOutputStream.java \ javax/naming/directory/Attribute.java \ javax/naming/directory/AttributeInUseException.java \ javax/naming/directory/AttributeModificationException.java \ @@ -1741,10 +2195,200 @@ javax/naming/ldap/UnsolicitedNotification.java \ javax/naming/ldap/UnsolicitedNotificationEvent.java \ javax/naming/ldap/UnsolicitedNotificationListener.java \ javax/naming/OperationNotSupportedException.java \ +javax/net/ServerSocketFactory.java \ +javax/net/SocketFactory.java \ +javax/net/ssl/HandshakeCompletedEvent.java \ +javax/net/ssl/HandshakeCompletedListener.java \ +javax/net/ssl/HostnameVerifier.java \ +javax/net/ssl/HttpsURLConnection.java \ +javax/net/ssl/KeyManager.java \ +javax/net/ssl/KeyManagerFactory.java \ +javax/net/ssl/KeyManagerFactorySpi.java \ +javax/net/ssl/ManagerFactoryParameters.java \ +javax/net/ssl/SSLProtocolException.java \ +javax/net/ssl/SSLContext.java \ +javax/net/ssl/SSLContextSpi.java \ +javax/net/ssl/SSLException.java \ +javax/net/ssl/SSLHandshakeException.java \ +javax/net/ssl/SSLKeyException.java \ +javax/net/ssl/SSLPeerUnverifiedException.java \ +javax/net/ssl/SSLPermission.java \ +javax/net/ssl/SSLServerSocket.java \ +javax/net/ssl/SSLServerSocketFactory.java \ +javax/net/ssl/SSLSession.java \ +javax/net/ssl/SSLSessionBindingEvent.java \ +javax/net/ssl/SSLSessionBindingListener.java \ +javax/net/ssl/SSLSessionContext.java \ +javax/net/ssl/SSLSocket.java \ +javax/net/ssl/SSLSocketFactory.java \ +javax/net/ssl/TrivialHostnameVerifier.java \ +javax/net/ssl/TrustManager.java \ +javax/net/ssl/TrustManagerFactory.java \ +javax/net/ssl/TrustManagerFactorySpi.java \ +javax/net/ssl/X509KeyManager.java \ +javax/net/ssl/X509TrustManager.java \ +javax/net/VanillaSocketFactory.java \ +javax/net/VanillaServerSocketFactory.java \ +javax/print/AttributeException.java \ +javax/print/CancelablePrintJob.java \ +javax/print/Doc.java \ +javax/print/DocFlavor.java \ +javax/print/DocPrintJob.java \ +javax/print/FlavorException.java \ +javax/print/MultiDoc.java \ +javax/print/MultiDocPrintJob.java \ +javax/print/MultiDocPrintService.java \ +javax/print/PrintException.java \ +javax/print/PrintService.java \ +javax/print/PrintServiceLookup.java \ +javax/print/ServiceUIFactory.java \ +javax/print/StreamPrintService.java \ +javax/print/URIException.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/ColorSupported.java \ +javax/print/attribute/standard/Compression.java \ +javax/print/attribute/standard/Copies.java \ +javax/print/attribute/standard/CopiesSupported.java \ +javax/print/attribute/standard/DateTimeAtCompleted.java \ +javax/print/attribute/standard/DateTimeAtCreation.java \ +javax/print/attribute/standard/DateTimeAtProcessing.java \ +javax/print/attribute/standard/DocumentName.java \ +javax/print/attribute/standard/Fidelity.java \ +javax/print/attribute/standard/Finishings.java \ +javax/print/attribute/standard/JobHoldUntil.java \ +javax/print/attribute/standard/JobImpressions.java \ +javax/print/attribute/standard/JobImpressionsCompleted.java \ +javax/print/attribute/standard/JobImpressionsSupported.java \ +javax/print/attribute/standard/JobKOctets.java \ +javax/print/attribute/standard/JobKOctetsProcessed.java \ +javax/print/attribute/standard/JobKOctetsSupported.java \ +javax/print/attribute/standard/JobMediaSheets.java \ +javax/print/attribute/standard/JobMediaSheetsCompleted.java \ +javax/print/attribute/standard/JobMediaSheetsSupported.java \ +javax/print/attribute/standard/JobMessageFromOperator.java \ +javax/print/attribute/standard/JobName.java \ +javax/print/attribute/standard/JobOriginatingUserName.java \ +javax/print/attribute/standard/JobPriority.java \ +javax/print/attribute/standard/JobPrioritySupported.java \ +javax/print/attribute/standard/JobSheets.java \ +javax/print/attribute/standard/JobState.java \ +javax/print/attribute/standard/JobStateReason.java \ +javax/print/attribute/standard/JobStateReasons.java \ +javax/print/attribute/standard/Media.java \ +javax/print/attribute/standard/MediaSizeName.java \ +javax/print/attribute/standard/MultipleDocumentHandling.java \ +javax/print/attribute/standard/NumberOfDocuments.java \ +javax/print/attribute/standard/NumberOfInterveningJobs.java \ +javax/print/attribute/standard/NumberUp.java \ +javax/print/attribute/standard/NumberUpSupported.java \ +javax/print/attribute/standard/OrientationRequested.java \ +javax/print/attribute/standard/OutputDeviceAssigned.java \ +javax/print/attribute/standard/PDLOverrideSupported.java \ +javax/print/attribute/standard/PageRanges.java \ +javax/print/attribute/standard/PagesPerMinute.java \ +javax/print/attribute/standard/PagesPerMinuteColor.java \ +javax/print/attribute/standard/PresentationDirection.java \ +javax/print/attribute/standard/PrintQuality.java \ +javax/print/attribute/standard/PrinterInfo.java \ +javax/print/attribute/standard/PrinterIsAcceptingJobs.java \ +javax/print/attribute/standard/PrinterLocation.java \ +javax/print/attribute/standard/PrinterMakeAndModel.java \ +javax/print/attribute/standard/PrinterMessageFromOperator.java \ +javax/print/attribute/standard/PrinterMoreInfo.java \ +javax/print/attribute/standard/PrinterMoreInfoManufacturer.java \ +javax/print/attribute/standard/PrinterName.java \ +javax/print/attribute/standard/PrinterResolution.java \ +javax/print/attribute/standard/PrinterState.java \ +javax/print/attribute/standard/PrinterStateReason.java \ +javax/print/attribute/standard/PrinterStateReasons.java \ +javax/print/attribute/standard/PrinterURI.java \ +javax/print/attribute/standard/QueuedJobCount.java \ +javax/print/attribute/standard/ReferenceUriSchemesSupported.java \ +javax/print/attribute/standard/RequestingUserName.java \ +javax/print/attribute/standard/Severity.java \ +javax/print/attribute/standard/SheetCollate.java \ +javax/print/attribute/standard/Sides.java \ +javax/print/event/PrintEvent.java \ +javax/print/event/PrintJobAdapter.java \ +javax/print/event/PrintJobAttributeEvent.java \ +javax/print/event/PrintJobAttributeListener.java \ +javax/print/event/PrintJobEvent.java \ +javax/print/event/PrintJobListener.java \ +javax/print/event/PrintServiceAttributeEvent.java \ +javax/print/event/PrintServiceAttributeListener.java \ +javax/security/auth/AuthPermission.java \ +javax/security/auth/Destroyable.java \ +javax/security/auth/DestroyFailedException.java \ +javax/security/auth/login/AccountExpiredException.java \ +javax/security/auth/login/AppConfigurationEntry.java \ +javax/security/auth/login/Configuration.java \ +javax/security/auth/login/CredentialExpiredException.java \ +javax/security/auth/login/FailedLoginException.java \ +javax/security/auth/login/LoginContext.java \ +javax/security/auth/login/LoginException.java \ +javax/security/auth/login/NullConfiguration.java \ +javax/security/auth/spi/LoginModule.java \ +javax/security/auth/Policy.java \ +javax/security/auth/PrivateCredentialPermission.java \ +javax/security/auth/Refreshable.java \ +javax/security/auth/RefreshFailedException.java \ +javax/security/auth/Subject.java \ +javax/security/auth/SubjectDomainCombiner.java \ javax/security/auth/x500/X500Principal.java \ +javax/security/auth/x500/X500PrivateCredential.java \ +javax/security/auth/callback/Callback.java \ +javax/security/auth/callback/CallbackHandler.java \ +javax/security/auth/callback/ChoiceCallback.java \ +javax/security/auth/callback/ConfirmationCallback.java \ +javax/security/auth/callback/LanguageCallback.java \ +javax/security/auth/callback/NameCallback.java \ +javax/security/auth/callback/PasswordCallback.java \ +javax/security/auth/callback/TextInputCallback.java \ +javax/security/auth/callback/TextOutputCallback.java \ +javax/security/auth/callback/UnsupportedCallbackException.java \ +javax/security/cert/Certificate.java \ +javax/security/cert/CertificateEncodingException.java \ +javax/security/cert/CertificateException.java \ +javax/security/cert/CertificateExpiredException.java \ +javax/security/cert/CertificateNotYetValidException.java \ +javax/security/cert/CertificateParsingException.java \ +javax/security/cert/X509CertBridge.java \ +javax/security/cert/X509Certificate.java \ +javax/security/sasl/AuthenticationException.java \ +javax/security/sasl/AuthorizeCallback.java \ +javax/security/sasl/RealmCallback.java \ +javax/security/sasl/RealmChoiceCallback.java \ +javax/security/sasl/Sasl.java \ +javax/security/sasl/SaslClient.java \ +javax/security/sasl/SaslClientFactory.java \ +javax/security/sasl/SaslException.java \ +javax/security/sasl/SaslServer.java \ +javax/security/sasl/SaslServerFactory.java \ javax/sql/ConnectionEvent.java \ javax/sql/ConnectionEventListener.java \ javax/sql/ConnectionPoolDataSource.java \ @@ -1865,6 +2509,7 @@ java/lang/UnsupportedOperationException.java \ java/lang/VerifyError.java \ java/lang/VirtualMachineError.java \ java/lang/VMClassLoader.java \ +java/lang/VMCompiler.java \ java/lang/VMSecurityManager.java \ java/lang/VMThrowable.java \ java/lang/Void.java \ @@ -2002,6 +2647,7 @@ java/util/TreeMap.java \ java/util/TreeSet.java \ java/util/TooManyListenersException.java \ java/util/Vector.java \ +java/util/VMTimeZone.java \ java/util/WeakHashMap.java \ java/util/logging/ConsoleHandler.java \ java/util/logging/ErrorManager.java \ @@ -2034,27 +2680,31 @@ java/util/regex/PatternSyntaxException.java ## List of all .java files to be compiled. Please keep this list ## alphabetical. Please put files from java/lang, java/io, and java/util -## into core_java_source_files. Please put files from gnu/gcj/convert +## into core_java_source_files. Please put files from gnu/gcj/convert ## into convert_source_files and files from java/awt into ## awt_java_source_files. If the .java file has a hand-maintained ## header, please list it in special_java_source_files. ordinary_java_source_files = $(core_java_source_files) \ +gnu/classpath/ServiceFactory.java \ +gnu/classpath/ServiceProviderLoadingAction.java \ gnu/gcj/Core.java \ gnu/gcj/RawData.java \ +gnu/gcj/RawDataManaged.java \ gnu/gcj/io/DefaultMimeTypes.java \ gnu/gcj/io/MimeTypes.java \ gnu/gcj/io/SimpleSHSStream.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/PersistentByteMap.java \ gnu/gcj/runtime/SharedLibHelper.java \ gnu/gcj/runtime/SharedLibLoader.java \ gnu/gcj/runtime/StackTrace.java \ gnu/gcj/runtime/StringBuffer.java \ gnu/gcj/runtime/VMClassLoader.java \ +gnu/gcj/util/Debug.java \ gnu/java/io/ASN1ParsingException.java \ gnu/java/io/Base64InputStream.java \ gnu/java/io/ClassLoaderObjectInputStream.java \ @@ -2062,7 +2712,7 @@ gnu/java/io/NullOutputStream.java \ gnu/java/io/ObjectIdentityWrapper.java \ gnu/java/lang/ArrayHelper.java \ gnu/java/lang/ClassHelper.java \ -gnu/java/lang/CharData.java \ +gnu/java/lang/MainThread.java \ gnu/java/lang/reflect/TypeSignature.java \ gnu/java/locale/Calendar.java \ gnu/java/locale/Calendar_de.java \ @@ -2204,26 +2854,33 @@ 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/DefaultContentHandlerFactory.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/core/Handler.java \ gnu/java/net/protocol/file/Connection.java \ gnu/java/net/protocol/file/Handler.java \ +gnu/java/net/protocol/gcjlib/Connection.java \ +gnu/java/net/protocol/gcjlib/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/ChannelInputStream.java \ +gnu/java/nio/ChannelOutputStream.java \ gnu/java/nio/DatagramChannelImpl.java \ gnu/java/nio/DatagramChannelSelectionKey.java \ gnu/java/nio/FileLockImpl.java \ +gnu/java/nio/InputStreamChannel.java \ gnu/java/nio/NIOConstants.java \ gnu/java/nio/NIODatagramSocket.java \ gnu/java/nio/NIOServerSocket.java \ gnu/java/nio/NIOSocket.java \ +gnu/java/nio/OutputStreamChannel.java \ gnu/java/nio/PipeImpl.java \ gnu/java/nio/SelectionKeyImpl.java \ gnu/java/nio/SelectorImpl.java \ @@ -2232,6 +2889,9 @@ gnu/java/nio/ServerSocketChannelImpl.java \ gnu/java/nio/ServerSocketChannelSelectionKey.java \ gnu/java/nio/SocketChannelImpl.java \ gnu/java/nio/SocketChannelSelectionKey.java \ +gnu/java/nio/VMPipe.java \ +gnu/java/nio/VMSelector.java \ +gnu/java/nio/channels/FileChannelImpl.java \ gnu/java/nio/charset/ISO_8859_1.java \ gnu/java/nio/charset/Provider.java \ gnu/java/nio/charset/US_ASCII.java \ @@ -2243,42 +2903,108 @@ gnu/java/nio/charset/UTF_16LE.java \ gnu/java/nio/charset/UTF_8.java \ gnu/java/security/Engine.java \ gnu/java/security/OID.java \ +gnu/java/security/PolicyFile.java \ +gnu/java/security/action/GetPropertyAction.java \ +gnu/java/security/action/GetSecurityPropertyAction.java \ +gnu/java/security/action/SetAccessibleAction.java \ gnu/java/security/der/BitString.java \ gnu/java/security/der/DER.java \ gnu/java/security/der/DEREncodingException.java \ gnu/java/security/der/DERReader.java \ gnu/java/security/der/DERValue.java \ gnu/java/security/der/DERWriter.java \ -gnu/java/security/provider/DefaultPolicy.java \ +gnu/java/security/provider/CollectionCertStoreImpl.java \ gnu/java/security/provider/DSAKeyFactory.java \ gnu/java/security/provider/DSAKeyPairGenerator.java \ gnu/java/security/provider/DSAParameterGenerator.java \ gnu/java/security/provider/DSAParameters.java \ gnu/java/security/provider/DSASignature.java \ +gnu/java/security/provider/DefaultPolicy.java \ +gnu/java/security/provider/EncodedKeyFactory.java \ gnu/java/security/provider/Gnu.java \ +gnu/java/security/provider/GnuDHPublicKey.java \ gnu/java/security/provider/GnuDSAPrivateKey.java \ gnu/java/security/provider/GnuDSAPublicKey.java \ +gnu/java/security/provider/GnuRSAPrivateKey.java \ +gnu/java/security/provider/GnuRSAPublicKey.java \ +gnu/java/security/provider/MD2withRSA.java \ +gnu/java/security/provider/MD4withRSA.java \ gnu/java/security/provider/MD5.java \ +gnu/java/security/provider/MD5withRSA.java \ +gnu/java/security/provider/PKIXCertPathValidatorImpl.java \ +gnu/java/security/provider/RSA.java \ +gnu/java/security/provider/RSAKeyFactory.java \ gnu/java/security/provider/SHA.java \ gnu/java/security/provider/SHA1PRNG.java \ +gnu/java/security/provider/SHA1withRSA.java \ gnu/java/security/provider/X509CertificateFactory.java \ gnu/java/security/util/Prime.java \ +gnu/java/security/x509/GnuPKIExtension.java \ +gnu/java/security/x509/PolicyNodeImpl.java \ +gnu/java/security/x509/Util.java \ gnu/java/security/x509/X500DistinguishedName.java \ -gnu/java/security/x509/X509Certificate.java \ -gnu/java/security/x509/X509CRLEntry.java \ gnu/java/security/x509/X509CRL.java \ +gnu/java/security/x509/X509CRLEntry.java \ +gnu/java/security/x509/X509CRLSelectorImpl.java \ +gnu/java/security/x509/X509Certificate.java \ +gnu/java/security/x509/X509CertPath.java \ +gnu/java/security/x509/X509CertSelectorImpl.java \ +gnu/java/security/x509/ext/AuthorityKeyIdentifier.java \ +gnu/java/security/x509/ext/BasicConstraints.java \ +gnu/java/security/x509/ext/CRLNumber.java \ +gnu/java/security/x509/ext/CertificatePolicies.java \ +gnu/java/security/x509/ext/ExtendedKeyUsage.java \ +gnu/java/security/x509/ext/Extension.java \ +gnu/java/security/x509/ext/GeneralNames.java \ +gnu/java/security/x509/ext/IssuerAlternativeNames.java \ +gnu/java/security/x509/ext/KeyUsage.java \ +gnu/java/security/x509/ext/PolicyConstraint.java \ +gnu/java/security/x509/ext/PolicyMappings.java \ +gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java \ +gnu/java/security/x509/ext/ReasonCode.java \ +gnu/java/security/x509/ext/SubjectAlternativeNames.java \ +gnu/java/security/x509/ext/SubjectKeyIdentifier.java \ +gnu/java/text/AttributedFormatBuffer.java \ gnu/java/text/BaseBreakIterator.java \ gnu/java/text/CharacterBreakIterator.java \ +gnu/java/text/FormatBuffer.java \ +gnu/java/text/FormatCharacterIterator.java \ gnu/java/text/LineBreakIterator.java \ gnu/java/text/SentenceBreakIterator.java \ +gnu/java/text/StringFormatBuffer.java \ gnu/java/text/WordBreakIterator.java \ gnu/java/util/DoubleEnumeration.java \ gnu/java/util/EmptyEnumeration.java \ +gnu/java/util/prefs/FileBasedFactory.java \ gnu/java/util/prefs/MemoryBasedFactory.java \ -gnu/java/util/prefs/NodeReader.java \ gnu/java/util/prefs/MemoryBasedPreferences.java \ -gnu/java/util/prefs/FileBasedFactory.java \ +gnu/java/util/prefs/NodeReader.java \ gnu/java/util/prefs/NodeWriter.java \ +gnu/regexp/CharIndexed.java \ +gnu/regexp/CharIndexedCharArray.java \ +gnu/regexp/CharIndexedInputStream.java \ +gnu/regexp/CharIndexedString.java \ +gnu/regexp/CharIndexedStringBuffer.java \ +gnu/regexp/RE.java \ +gnu/regexp/REException.java \ +gnu/regexp/REFilterInputStream.java \ +gnu/regexp/REMatch.java \ +gnu/regexp/REMatchEnumeration.java \ +gnu/regexp/RESyntax.java \ +gnu/regexp/REToken.java \ +gnu/regexp/RETokenAny.java \ +gnu/regexp/RETokenBackRef.java \ +gnu/regexp/RETokenChar.java \ +gnu/regexp/RETokenEnd.java \ +gnu/regexp/RETokenEndSub.java \ +gnu/regexp/RETokenLookAhead.java \ +gnu/regexp/RETokenOneOf.java \ +gnu/regexp/RETokenPOSIX.java \ +gnu/regexp/RETokenRange.java \ +gnu/regexp/RETokenRepeated.java \ +gnu/regexp/RETokenStart.java \ +gnu/regexp/RETokenWordBoundary.java \ +gnu/regexp/UncheckedRE.java \ java/lang/ref/PhantomReference.java \ java/lang/ref/Reference.java \ java/lang/ref/ReferenceQueue.java \ @@ -2309,9 +3035,9 @@ java/net/DatagramSocketImpl.java \ java/net/DatagramSocketImplFactory.java \ java/net/FileNameMap.java \ java/net/HttpURLConnection.java \ -java/net/InetAddress.java \ java/net/Inet4Address.java \ java/net/Inet6Address.java \ +java/net/InetAddress.java \ java/net/InetSocketAddress.java \ java/net/JarURLConnection.java \ java/net/MalformedURLException.java \ @@ -2372,6 +3098,7 @@ java/nio/ReadOnlyBufferException.java \ java/nio/ShortBuffer.java \ java/nio/ShortBufferImpl.java \ java/nio/ShortViewBufferImpl.java \ +java/nio/VMDirectByteBuffer.java \ java/nio/channels/AlreadyConnectedException.java \ java/nio/channels/AsynchronousCloseException.java \ java/nio/channels/ByteChannel.java \ @@ -2384,7 +3111,6 @@ 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 \ @@ -2408,13 +3134,13 @@ java/nio/channels/SocketChannel.java \ java/nio/channels/UnresolvedAddressException.java \ java/nio/channels/UnsupportedAddressTypeException.java \ java/nio/channels/WritableByteChannel.java \ -java/nio/channels/spi/AbstractSelectableChannel.java \ java/nio/channels/spi/AbstractInterruptibleChannel.java \ +java/nio/channels/spi/AbstractSelectableChannel.java \ java/nio/channels/spi/AbstractSelectionKey.java \ java/nio/channels/spi/AbstractSelector.java \ java/nio/channels/spi/SelectorProvider.java \ -java/nio/charset/Charset.java \ java/nio/charset/CharacterCodingException.java \ +java/nio/charset/Charset.java \ java/nio/charset/CharsetDecoder.java \ java/nio/charset/CharsetEncoder.java \ java/nio/charset/CoderMalfunctionError.java \ @@ -2429,20 +3155,20 @@ java/security/AccessControlContext.java \ java/security/AccessControlException.java \ java/security/AccessController.java \ java/security/AlgorithmParameterGenerator.java \ -java/security/AlgorithmParameters.java \ java/security/AlgorithmParameterGeneratorSpi.java \ +java/security/AlgorithmParameters.java \ java/security/AlgorithmParametersSpi.java \ java/security/AllPermission.java \ java/security/BasicPermission.java \ java/security/Certificate.java \ java/security/CodeSource.java \ java/security/DigestException.java \ -java/security/DigestOutputStream.java \ -java/security/DummyKeyPairGenerator.java \ -java/security/DummySignature.java \ java/security/DigestInputStream.java \ +java/security/DigestOutputStream.java \ java/security/DomainCombiner.java \ +java/security/DummyKeyPairGenerator.java \ java/security/DummyMessageDigest.java \ +java/security/DummySignature.java \ java/security/GeneralSecurityException.java \ java/security/Guard.java \ java/security/GuardedObject.java \ @@ -2452,64 +3178,56 @@ java/security/InvalidAlgorithmParameterException.java \ java/security/InvalidKeyException.java \ java/security/InvalidParameterException.java \ java/security/Key.java \ -java/security/KeyFactorySpi.java \ -java/security/KeyPairGenerator.java \ -java/security/KeyStoreException.java \ java/security/KeyException.java \ -java/security/KeyManagementException.java \ -java/security/KeyPairGeneratorSpi.java \ -java/security/KeyStoreSpi.java \ java/security/KeyFactory.java \ +java/security/KeyFactorySpi.java \ +java/security/KeyManagementException.java \ java/security/KeyPair.java \ +java/security/KeyPairGenerator.java \ +java/security/KeyPairGeneratorSpi.java \ java/security/KeyStore.java \ +java/security/KeyStoreException.java \ +java/security/KeyStoreSpi.java \ java/security/MessageDigest.java \ java/security/MessageDigestSpi.java \ java/security/NoSuchAlgorithmException.java \ java/security/NoSuchProviderException.java \ java/security/Permission.java \ -java/security/Principal.java \ -java/security/PrivilegedExceptionAction.java \ -java/security/PublicKey.java \ java/security/PermissionCollection.java \ -java/security/PrivateKey.java \ -java/security/ProtectionDomain.java \ java/security/Permissions.java \ -java/security/PrivilegedAction.java \ -java/security/Provider.java \ java/security/Policy.java \ +java/security/Principal.java \ +java/security/PrivateKey.java \ +java/security/PrivilegedAction.java \ java/security/PrivilegedActionException.java \ +java/security/PrivilegedExceptionAction.java \ +java/security/ProtectionDomain.java \ +java/security/Provider.java \ java/security/ProviderException.java \ +java/security/PublicKey.java \ java/security/SecureClassLoader.java \ -java/security/SecureRandomSpi.java \ -java/security/SecurityPermission.java \ -java/security/SignatureException.java \ -java/security/SignedObject.java \ java/security/SecureRandom.java \ +java/security/SecureRandomSpi.java \ java/security/Security.java \ +java/security/SecurityPermission.java \ java/security/Signature.java \ +java/security/SignatureException.java \ java/security/SignatureSpi.java \ +java/security/SignedObject.java \ java/security/Signer.java \ java/security/UnrecoverableKeyException.java \ java/security/UnresolvedPermission.java \ java/security/acl/Acl.java \ -java/security/acl/AclNotFoundException.java \ -java/security/acl/LastOwnerException.java \ -java/security/acl/Owner.java \ java/security/acl/AclEntry.java \ +java/security/acl/AclNotFoundException.java \ java/security/acl/Group.java \ +java/security/acl/LastOwnerException.java \ java/security/acl/NotOwnerException.java \ +java/security/acl/Owner.java \ java/security/acl/Permission.java \ java/security/cert/CRL.java \ java/security/cert/CRLException.java \ java/security/cert/CRLSelector.java \ -java/security/cert/Certificate.java \ -java/security/cert/CertificateEncodingException.java \ -java/security/cert/CertificateException.java \ -java/security/cert/CertificateExpiredException.java \ -java/security/cert/CertificateFactory.java \ -java/security/cert/CertificateFactorySpi.java \ -java/security/cert/CertificateNotYetValidException.java \ -java/security/cert/CertificateParsingException.java \ java/security/cert/CertPath.java \ java/security/cert/CertPathBuilder.java \ java/security/cert/CertPathBuilderException.java \ @@ -2525,6 +3243,14 @@ java/security/cert/CertStore.java \ java/security/cert/CertStoreException.java \ java/security/cert/CertStoreParameters.java \ java/security/cert/CertStoreSpi.java \ +java/security/cert/Certificate.java \ +java/security/cert/CertificateEncodingException.java \ +java/security/cert/CertificateException.java \ +java/security/cert/CertificateExpiredException.java \ +java/security/cert/CertificateFactory.java \ +java/security/cert/CertificateFactorySpi.java \ +java/security/cert/CertificateNotYetValidException.java \ +java/security/cert/CertificateParsingException.java \ java/security/cert/CollectionCertStoreParameters.java \ java/security/cert/LDAPCertStoreParameters.java \ java/security/cert/PKIXBuilderParameters.java \ @@ -2537,6 +3263,8 @@ java/security/cert/PolicyQualifierInfo.java \ java/security/cert/TrustAnchor.java \ java/security/cert/X509CRL.java \ java/security/cert/X509CRLEntry.java \ +java/security/cert/X509CRLSelector.java \ +java/security/cert/X509CertSelector.java \ java/security/cert/X509Certificate.java \ java/security/cert/X509Extension.java \ java/security/interfaces/DSAKey.java \ @@ -2583,13 +3311,13 @@ java/sql/PreparedStatement.java \ java/sql/Ref.java \ java/sql/ResultSet.java \ java/sql/ResultSetMetaData.java \ -java/sql/Savepoint.java \ java/sql/SQLData.java \ java/sql/SQLException.java \ java/sql/SQLInput.java \ java/sql/SQLOutput.java \ java/sql/SQLPermission.java \ java/sql/SQLWarning.java \ +java/sql/Savepoint.java \ java/sql/Statement.java \ java/sql/Struct.java \ java/sql/Time.java \ @@ -2611,7 +3339,6 @@ 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 \ @@ -2653,7 +3380,7 @@ $(javax_source_files) java_source_files = $(special_java_source_files) $(ordinary_java_source_files) ## Math library: C, not C++ -c_source_files = \ +math_c_source_files = \ java/lang/dtoa.c java/lang/k_rem_pio2.c java/lang/s_tan.c \ java/lang/e_acos.c java/lang/k_sin.c java/lang/strtod.c \ java/lang/e_asin.c java/lang/k_tan.c java/lang/w_acos.c \ @@ -2668,9 +3395,6 @@ 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. nat_source_files = \ @@ -2686,22 +3410,21 @@ gnu/gcj/convert/natOutput_SJIS.cc \ gnu/gcj/io/natSimpleSHSStream.cc \ gnu/gcj/io/shs.cc \ gnu/gcj/runtime/natFinalizerThread.cc \ -gnu/gcj/runtime/natFirstThread.cc \ gnu/gcj/runtime/natNameFinder.cc \ gnu/gcj/runtime/natSharedLibLoader.cc \ gnu/gcj/runtime/natStackTrace.cc \ gnu/gcj/runtime/natStringBuffer.cc \ gnu/gcj/runtime/natVMClassLoader.cc \ -gnu/java/awt/natEmbeddedWindow.cc \ +gnu/gcj/util/natDebug.cc \ +gnu/java/lang/natMainThread.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/natNIOServerSocket.cc \ +gnu/java/nio/channels/natFileChannelImpl.cc \ java/io/natFile.cc \ -java/io/natFileDescriptor.cc \ java/io/natObjectInputStream.cc \ java/io/natVMObjectStreamClass.cc \ java/lang/natCharacter.cc \ @@ -2717,6 +3440,7 @@ java/lang/natString.cc \ java/lang/natStringBuffer.cc \ java/lang/natSystem.cc \ java/lang/natThread.cc \ +java/lang/natVMClassLoader.cc \ java/lang/natVMSecurityManager.cc \ java/lang/ref/natReference.cc \ java/lang/reflect/natArray.cc \ @@ -2726,15 +3450,15 @@ java/lang/reflect/natMethod.cc \ java/lang/reflect/natProxy.cc \ java/net/natNetworkInterface.cc \ java/net/natInetAddress.cc \ +java/nio/channels/natChannels.cc \ java/nio/natDirectByteBufferImpl.cc \ -java/nio/channels/natFileChannelImpl.cc \ java/text/natCollator.cc \ java/util/natResourceBundle.cc \ -java/util/natTimeZone.cc \ +java/util/natVMTimeZone.cc \ java/util/zip/natDeflater.cc \ java/util/zip/natInflater.cc -x_java_source_files = \ +xlib_java_source_files = \ gnu/gcj/xlib/Clip.java \ gnu/gcj/xlib/Colormap.java \ gnu/gcj/xlib/Display.java \ @@ -2767,9 +3491,10 @@ gnu/awt/xlib/XGraphics.java \ gnu/awt/xlib/XGraphicsConfiguration.java \ gnu/awt/xlib/XOffScreenImage.java \ gnu/awt/xlib/XPanelPeer.java \ +gnu/awt/xlib/XFontPeer.java \ gnu/awt/xlib/XToolkit.java -x_nat_source_files = \ +xlib_nat_source_files = \ gnu/gcj/xlib/natClip.cc \ gnu/gcj/xlib/natColormap.cc \ gnu/gcj/xlib/natDisplay.cc \ @@ -2803,31 +3528,31 @@ TexinfoDoclet.class: $(srcdir)/scripts/TexinfoDoclet.java texinfo: TexinfoDoclet.class langsource=`ls $(srcdir)/java/lang/*.java`; \ lang=`echo $$langsource | sed -e 's/[^ ].*EcosProcess.java//g' | sed -e 's/[^ ].*PosixProcess.java//g'`; \ - javadoc -outfile $(srcdir)/doc/java-lang.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $$lang - javadoc -outfile $(srcdir)/doc/java-lang-ref.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/lang/ref/*.java - javadoc -outfile $(srcdir)/doc/java-lang-reflect.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/lang/reflect/*.java - javadoc -outfile $(srcdir)/doc/java-applet.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/applet/*.java - javadoc -outfile $(srcdir)/doc/java-awt.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/*.java - javadoc -outfile $(srcdir)/doc/java-awt-color.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/color/*.java - javadoc -outfile $(srcdir)/doc/java-awt-datatransfer.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/datatransfer/*.java - javadoc -outfile $(srcdir)/doc/java-awt-event.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/event/*.java - javadoc -outfile $(srcdir)/doc/java-awt-geom.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/geom/*.java - javadoc -outfile $(srcdir)/doc/java-awt-image.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/image/*.java - javadoc -outfile $(srcdir)/doc/java-awt-peer.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/awt/peer/*.java - javadoc -outfile $(srcdir)/doc/java-beans.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/beans/*.java - javadoc -outfile $(srcdir)/doc/java-beans-beancontext.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/beans/beancontext/*.java - javadoc -outfile $(srcdir)/doc/java-io.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/io/*.java - javadoc -outfile $(srcdir)/doc/java-math.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/math/*.java - javadoc -outfile $(srcdir)/doc/java-net.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/net/*.java - javadoc -outfile $(srcdir)/doc/java-security.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/security/*.java - javadoc -outfile $(srcdir)/doc/java-security-cert.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/security-cert/*.java - javadoc -outfile $(srcdir)/doc/java-security-spec.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/security/spec/*.java - javadoc -outfile $(srcdir)/doc/java-security-interfaces.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/security/spec/interfaces/*.java - javadoc -outfile $(srcdir)/doc/java-sql.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/sql/*.java - javadoc -outfile $(srcdir)/doc/java-text.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/text/*.java - javadoc -outfile $(srcdir)/doc/java-util.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/util/*.java - javadoc -outfile $(srcdir)/doc/java-util-jar.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/util/jar/*.java - javadoc -outfile $(srcdir)/doc/java-util-zip.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/util/zip/*.java + javadoc -outfile $(srcdir)/doc/java-lang.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $$lang + javadoc -outfile $(srcdir)/doc/java-lang-ref.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/lang/ref/*.java + javadoc -outfile $(srcdir)/doc/java-lang-reflect.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/lang/reflect/*.java + javadoc -outfile $(srcdir)/doc/java-applet.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/applet/*.java + javadoc -outfile $(srcdir)/doc/java-awt.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/*.java + javadoc -outfile $(srcdir)/doc/java-awt-color.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/color/*.java + javadoc -outfile $(srcdir)/doc/java-awt-datatransfer.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/datatransfer/*.java + javadoc -outfile $(srcdir)/doc/java-awt-event.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/event/*.java + javadoc -outfile $(srcdir)/doc/java-awt-geom.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/geom/*.java + javadoc -outfile $(srcdir)/doc/java-awt-image.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/image/*.java + javadoc -outfile $(srcdir)/doc/java-awt-peer.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/peer/*.java + javadoc -outfile $(srcdir)/doc/java-beans.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/beans/*.java + javadoc -outfile $(srcdir)/doc/java-beans-beancontext.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/beans/beancontext/*.java + javadoc -outfile $(srcdir)/doc/java-io.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/io/*.java + javadoc -outfile $(srcdir)/doc/java-math.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/math/*.java + javadoc -outfile $(srcdir)/doc/java-net.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/net/*.java + javadoc -outfile $(srcdir)/doc/java-security.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security/*.java + javadoc -outfile $(srcdir)/doc/java-security-cert.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security-cert/*.java + javadoc -outfile $(srcdir)/doc/java-security-spec.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security/spec/*.java + javadoc -outfile $(srcdir)/doc/java-security-interfaces.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security/spec/interfaces/*.java + javadoc -outfile $(srcdir)/doc/java-sql.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/sql/*.java + javadoc -outfile $(srcdir)/doc/java-text.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/text/*.java + javadoc -outfile $(srcdir)/doc/java-util.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/*.java + javadoc -outfile $(srcdir)/doc/java-util-jar.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/jar/*.java + javadoc -outfile $(srcdir)/doc/java-util-zip.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/zip/*.java ## ################################################################ @@ -2835,8 +3560,6 @@ texinfo: TexinfoDoclet.class ## Dependency tracking madness. ## --include deps.mk - ## This is an evil hack to work around an automake limitation. We ## need to ensure that all CNI headers are built, not just the ones used ## internally by libgcj. We can't make the .o files depend on nat_headers, @@ -2844,7 +3567,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: libgcj-@gcc_version@.jar $(nat_headers) $(x_nat_headers) +all-recursive: libgcj-@gcc_version@.jar $(nat_headers) $(xlib_nat_headers) ## ################################################################ @@ -2881,6 +3604,7 @@ AM_MAKEFLAGS = \ "infodir=$(infodir)" \ "libdir=$(libdir)" \ "prefix=$(prefix)" \ + "gxx_include_dir=$(gxx_include_dir)" \ "AR=$(AR)" \ "AS=$(AS)" \ "LD=$(LD)" \