X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libjava%2FMakefile.am;h=da50e04f140b2d401d74bb45caa81f347b446edb;hb=40000b13d53cd26333206c29a058da6227a6df03;hp=e852807a6f0ebfccd54d53a794ae3cf6adf5cceb;hpb=b152bc6646ee0d6a4fdcff97684eadf64f0fe28d;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libjava/Makefile.am b/libjava/Makefile.am index e852807a6f0..da50e04f140 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -3,7 +3,9 @@ AUTOMAKE_OPTIONS = foreign no-installinfo if TESTSUBDIR -SUBDIRS = testsuite +SUBDIRS = $(DIRLTDL) testsuite gcj include +else +SUBDIRS = $(DIRLTDL) gcj include endif ## ################################################################ @@ -12,18 +14,37 @@ endif ## What gets installed, and where. ## +## Install a library built with a cross compiler in tooldir, not +## libdir. +if USE_LIBDIR +toolexeclibdir = $(libdir)$(MULTISUBDIR) +else toolexecdir = $(exec_prefix)/$(target_alias) toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) +endif + +if NO_X +cond_x_ltlibrary = +else +cond_x_ltlibrary = libgcjx.la +endif -toolexeclib_LTLIBRARIES = libgcj.la +toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary) toolexeclib_DATA = libgcj.spec data_DATA = libgcj.zip -## For now, only on native systems. +if NEEDS_DATA_START +toolexeclib_LIBRARIES = libgcjdata.a +libgcjdata_a_SOURCES = libgcjdata.c +endif + +## For now, only on native systems. FIXME. if NATIVE -bin_PROGRAMS = jv-convert +bin_PROGRAMS = jv-convert gij endif +bin_SCRIPTS = addr2name.awk + ## ################################################################ ## @@ -36,10 +57,8 @@ if CANADIAN if NULL_TARGET ## In this case, gcj is found outside the build tree. However, zip is ## found in the build tree. -GCJ = gcj ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/zip/zip$(EXEEXT) else -GCJ = $(target_alias)-gcj ZIP = zip endif GCJH = gcjh @@ -48,20 +67,28 @@ else # CANADIAN ## (due to problems running it in builddir). In this case the obvious ## definition of GCJ won't work; instead we resort to this ugly ## definition that gives us absolute paths. -expanded = `cd $(MULTIBUILDTOP)../$(COMPPATH)/gcc && pwd` -GCJ = $(expanded)/gcj$(EXEEXT) -B$(expanded)/ GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT) ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/zip/zip$(EXEEXT) endif # CANADIAN -GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled $(JC1FLAGS) -c +GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c +GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ +LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ JAVAC = $(GCJ) -C EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@ WARNINGS = -W -Wall -AM_CXXFLAGS = -fno-rtti -fvtable-thunks @LIBGCJ_CXXFLAGS@ $(WARNINGS) +## We need _GNU_SOURCE defined for some Linux builds. It doesn't hurt +## to always define it. +## Note that we need -fasynchronous-exceptions because gcc is +## currently broken with respect to exception handling in leaf +## functions. +AM_CXXFLAGS = -fno-rtti -fvtable-thunks -fasynchronous-exceptions \ +## Some systems don't allow `$' in identifiers by default, so we force it. + -fdollars-in-identifiers \ + @LIBGCJ_CXXFLAGS@ @EXCEPTIONSPEC@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE if USING_GCC AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS) else @@ -71,7 +98,11 @@ endif JCFLAGS = -g JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@ -INCLUDES = -Iinclude -I$(top_srcdir)/include $(GCINCS) $(THREADINCS) $(EH_COMMON_INCLUDE) +LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include + +INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ + $(GCINCS) $(THREADINCS) $(INCLTDL) \ + $(EH_COMMON_INCLUDE) $(ZINCS) $(LIBFFIINCS) ## ################################################################ @@ -82,21 +113,48 @@ INCLUDES = -Iinclude -I$(top_srcdir)/include $(GCINCS) $(THREADINCS) $(EH_COMMON ## 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) ## Objects from Java sources in subdirs. -javao_files = $(java_source_files:.java=.lo) +javao_files = $(java_source_files:.java=.lo) \ + $(built_java_source_files:.java=.lo) +x_javao_files = $(x_java_source_files:.java=.lo) -libgcj_la_SOURCES = prims.cc jni.cc exception.cc +## Extract the libffi object file names. +libffi_files = `$(AR) t ../libffi/.libs/libffi.a 2>/dev/null | sed 's/\.o/\.lo/g' | sed 's/^/..\/libffi\//g'` + +libgcj_la_SOURCES = prims.cc posix.cc jni.cc exception.cc \ + resolve.cc defineclass.cc interpret.cc name-finder.cc \ + $(nat_source_files) EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \ - $(c_source_files) $(java_source_files) -libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) $(nat_files) \ - $(c_files) $(GCOBJS) $(THREADOBJS) -libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \ - $(THREADOBJS) -libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \ + $(c_source_files) $(java_source_files) $(built_java_source_files) +libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) \ + $(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL) +libgcj_la_LIBADD = $(javao_files) $(c_files) $(GCOBJS) \ + $(THREADOBJS) $(libffi_files) $(LIBLTDL) +libgcj_la_LDFLAGS = -lsupc++ -rpath $(toolexeclibdir) \ ## The mysterious backslash is consumed by make. -version-info `grep -v '^\#' $(srcdir)/libtool-version` +libgcj_la_LINK = $(LIBLINK) + +libgcjx_la_SOURCES = $(x_nat_source_files) +EXTRA_libgcjx_la_SOURCES = $(x_java_source_files) +libgcjx_la_DEPENDENCIES = libgcj.zip $(x_javao_files) +libgcjx_la_LIBADD = $(x_javao_files) +libgcjx_la_LDFLAGS = @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ + -lsupc++ -rpath $(toolexeclibdir) \ +## The mysterious backslash is consumed by make. + -version-info `grep -v '^\#' $(srcdir)/libtool-version` +libgcjx_la_LINK = $(LIBLINK) + +## Make a symlink for each `libgcjx' file that was installed. +install-exec-hook: + cd $(DESTDIR)$(libdir) && \ + if test -f libgcjx.la; then \ + rm -f gnu-awt-xlib.la; \ + $(LN_S) libgcjx.la gnu-awt-xlib.la; \ + fi ## Make the .class files depend on the .zip file. This seems ## backwards, but is right. This doesn't catch all the .class files, @@ -106,24 +164,52 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \ ## hand-maintained headers. $(java_source_files:.java=.class): libgcj.zip +## The .class files for X will not be included in libgcj.zip, but the +## rule for libgcj.zip will cause all out-of-date .class files to be +## built. We need this to generate headers for the nat-files. +$(x_java_source_files:.java=.class): libgcj.zip + +## FIXME: this isn't really correct. +$(built_java_source_files:.java=.class): $(built_java_source_files) +## This little nastiness is here so that the backquoted stuff in the +## GCJ definition can be correctly expanded, if required. + @javac="$(JAVAC)"; \ + for f in $?; do \ + echo $$javac -L$(here) $(JCFLAGS) -classpath $(here):`cd $(srcdir) && /bin/pwd` -d $(here) $$f; \ + $$javac -L$(here) $(JCFLAGS) -classpath $(here):`cd $(srcdir) && /bin/pwd` \ + -d $(here) $$f; \ + done + ## We have the zip file depend on the java sources and not the class ## files, because we don't know the names of all the class files. ## FIXME: this method fails in a peculiar case: if libgcj.zip is ## up-to-date, and foo.class is removed, and bar.java is touched, then ## `make libgcj.zip' will not rebuilt foo.class. That's because ## libgcj.zip is not out-of-date with respect to foo.java. -libgcj.zip: $(java_source_files) +libgcj.zip: $(java_source_files) $(x_java_source_files) +## Create a list of all Java sources, without exceeding any shell limits. + @: $(shell echo Creating list of files to compile...) $(shell rm -f tmp-list || :) $(shell touch tmp-list) $(foreach source,$(subst $(srcdir)/,,$?),$(shell echo $(source) >> tmp-list)) +## FIXME: this ought to depend on built_java_source_files, but right +## now it can't. Ugly. + $(MAKE) $(built_java_source_files:.java=.class) ## This little nastiness is here so that the backquoted stuff in the ## GCJ definition can be correctly expanded, if required. - javac="$(JAVAC)"; cd $(srcdir); \ - $$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \ - $(subst $(srcdir)/,,$?) - -@rm -f libgcj.zip + @set fnord $(MAKEFLAGS); amf=$$2; fail=no; \ + javac="$(JAVAC)"; dir=`/bin/pwd`; cd $(srcdir); \ + for f in `cat $$dir/tmp-list`; do \ + echo $$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) $$f; \ + $$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) $$f \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \ + done; \ + test "$$fail" = no + -@rm -f tmp-list libgcj.zip ## Note that we explicitly want to include directory information. - $(ZIP) -r libgcj java gnu -n .class -i '*.class' -i '*/' + find java gnu -type d -o -type f -name '*.class' | \ + sed -e '/\/\./d' -e '/\/xlib/d' | \ + $(ZIP) libgcj -@ -n .class -MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) -CLEANFILES = libgcj.zip +MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers) +CLEANFILES = tmp-list libgcj.zip clean-local: ## We just remove every .class file that was created. @@ -141,11 +227,15 @@ SUFFIXES = .class .java .h ## special rule. The standard automake rule can't be overridden (this ## is a bug in automake), and it also won't put the .o files into ## subdirs. FIXME. -$(nat_files): %.lo: %.cc - $(LTCXXCOMPILE) -c -o $@ $< - -$(nat_files) $(GCOBJS) $(THREADOBJS) $(libgcj_la_OBJECTS): \ - include/config.h include/java-signal.h $(nat_headers) +$(nat_files) $(x_nat_files): %.lo: %.cc + @echo '$(LTCXXCOMPILE) -c -o $@ $<'; \ + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c -o $@ $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp ## FIXME: GNU make. $(c_files): %.lo: %.c @@ -154,7 +244,7 @@ $(c_files): %.lo: %.c $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h ## FIXME: GNU make. -$(javao_files): %.lo: %.java +$(javao_files) $(x_javao_files): %.lo: %.java $(GCJCOMPILE) -o $@ $< ## ################################################################ @@ -168,21 +258,35 @@ $(javao_files): %.lo: %.java $(GCJH) -classpath $(top_builddir) $(basename $<) ## Header files used when compiling some of the nat* files. -nat_headers = $(ordinary_java_source_files:.java=.h) +nat_headers = $(ordinary_java_source_files:.java=.h) \ + $(built_java_source_files:.java=.h) \ + java/io/ObjectOutputStream$$PutField.h \ + java/io/ObjectInputStream$$GetField.h + +x_nat_headers = $(x_java_source_files:.java=.h) -$(nat_headers): libgcj.zip +java/lang/ClassLoader.h: java/lang/ClassLoader.class libgcj.zip + $(GCJH) -classpath $(top_builddir) \ + -friend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \ + -friend 'void _Jv_RunMain (const char *name, int argc, const char **argv, bool is_jar);' \ + $(basename $<) ## Our internal main program needs to be able to create a FirstThread. -FTFRIEND = void JvRunMain (jclass klass, int argc, const char **argv) -java/lang/FirstThread.h: java/lang/FirstThread.class libgcj.zip - $(GCJH) -classpath $(top_builddir) -friend '$(FTFRIEND);' \ +gnu/gcj/runtime/FirstThread.h: gnu/gcj/runtime/FirstThread.class libgcj.zip + $(GCJH) -classpath $(top_builddir) \ + -friend 'void JvRunMain (jclass, int, const char **);' \ + -friend 'void _Jv_RunMain (const char*, int, const char **);' \ $(basename $<) -## ThreadGroup has a special constructor that is used when creating -## the first ThreadGroup. We need to expose this to the main program. -TGFRIEND = void JvRunMain (jclass klass, int argc, const char **argv) -java/lang/ThreadGroup.h: java/lang/ThreadGroup.class libgcj.zip - $(GCJH) -classpath $(top_builddir) -friend '$(TGFRIEND);' \ +java/lang/Thread.h: java/lang/Thread.class libgcj.zip + $(GCJH) -classpath $(top_builddir) \ + -prepend 'class _Jv_JNIEnv;' \ + -prepend 'extern "Java" { namespace gnu { namespace gcj { namespace jni { class NativeThread; } } } };' \ + -prepend '#define _JV_NOT_OWNER 1' \ + -prepend '#define _JV_INTERRUPTED 2' \ + -friend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \ + -friend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \ + -friend 'class gnu::gcj::jni::NativeThread;' \ $(basename $<) java/lang/String.h: java/lang/String.class libgcj.zip @@ -195,19 +299,54 @@ java/lang/String.h: java/lang/String.class libgcj.zip -friend 'jstring _Jv_AllocString (jsize);' \ $(basename $<) +java/lang/reflect/Constructor.h: java/lang/reflect/Constructor.class libgcj.zip + $(GCJH) -classpath $(top_builddir) \ + -friend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \ + -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 libgcj.zip $(GCJH) -classpath $(top_builddir) \ -friend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \ - -friend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID);' \ - -friend 'java::lang::Class;' \ + -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 libgcj.zip $(GCJH) -classpath $(top_builddir) \ -friend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \ - -friend 'java::lang::Class;' \ + -friend 'class java::lang::Class;' \ + -friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \ + $(basename $<) + +gnu/gcj/runtime/VMClassLoader.h: gnu/gcj/runtime/VMClassLoader.class libgcj.zip + $(GCJH) -classpath $(top_builddir) \ + -friend 'class java::lang::ClassLoader;' \ $(basename $<) +java/io/ObjectInputStream$$GetField.h: libgcj.zip + $(GCJH) -classpath $(top_builddir) \ + 'java/io/ObjectInputStream$$GetField' + +java/io/ObjectOutputStream$$PutField.h: libgcj.zip + $(GCJH) -classpath $(top_builddir) \ + 'java/io/ObjectOutputStream$$PutField' + +## Headers we maintain by hand and which we want to install. +extra_headers = java/lang/Object.h java/lang/Class.h + +## Install the headers. It is fairly ugly that we have to do this by +## hand. +install-data-local: + $(PRE_INSTALL) + @for f in $(nat_headers) $(extra_headers); do \ + d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \ + $(mkinstalldirs) $(DESTDIR)$(includedir)/$$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; \ + done ## ################################################################ @@ -263,16 +402,34 @@ EXTRA_jv_convert_SOURCES = $(convert_source_files) ## `.la' file. jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \ -rpath $(toolexeclibdir) -jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) \ - -o jv-convert +jv_convert_LINK = $(GCJLINK) ## We explicitly link in the libraries we need. This way we don't ## need -nodefaultlibs, so we can still rely on gcj picking up the -## system libraries we need (via the specs file). The -L. finds the -## specs file for us. +## system libraries we need (via the specs file). +## We need the -L so that gcj can find libgcj with `-lgcj'. +## FIXME: should be _libs on some systems. jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \ - $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L. + $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs +## 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) \ - $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la + $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec + +gij_SOURCES = gij.cc +## 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) +gij_LINK = $(GCJLINK) +## We explicitly link in the libraries we need. This way we don't +## need -nodefaultlibs, so we can still rely on gcj picking up the +## system libraries we need (via the specs file). +## We need the -L so that gcj can find libgcj with `-lgcj'. +## FIXME: should be _libs on some systems. +gij_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs +## Depend on the spec file to make sure it is up to date before +## linking this program. +gij_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) 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/. @@ -352,136 +509,262 @@ convert_source_files = \ gnu/gcj/convert/BytesToUnicode.java \ gnu/gcj/convert/Convert.java \ gnu/gcj/convert/Input_8859_1.java \ +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_UTF8.java \ +gnu/gcj/convert/Input_iconv.java \ +gnu/gcj/convert/IOConverter.java \ gnu/gcj/convert/Output_8859_1.java \ +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_UTF8.java \ +gnu/gcj/convert/Output_iconv.java \ gnu/gcj/convert/UnicodeToBytes.java ## List of all .java files for which the .h file is maintained by ## hand. special_java_source_files = java/lang/Class.java java/lang/Object.java -awt_java_source_files = \ +awt_java_source_files = \ +gnu/awt/LightweightRedirector.java \ +gnu/awt/j2d/AbstractGraphicsState.java \ +gnu/awt/j2d/DirectRasterGraphics.java \ +gnu/awt/j2d/Graphics2DImpl.java \ +gnu/awt/j2d/IntegerGraphicsState.java \ +gnu/awt/j2d/MappedRaster.java \ +gnu/gcj/awt/BitMaskExtent.java \ +gnu/gcj/awt/Buffers.java \ +gnu/gcj/awt/ComponentDataBlitOp.java \ +gnu/gcj/awt/GLightweightPeer.java \ +gnu/java/beans/editors/ColorEditor.java \ +gnu/java/beans/editors/FontEditor.java \ +gnu/java/beans/editors/NativeBooleanEditor.java \ +gnu/java/beans/editors/NativeByteEditor.java \ +gnu/java/beans/editors/NativeDoubleEditor.java \ +gnu/java/beans/editors/NativeFloatEditor.java \ +gnu/java/beans/editors/NativeIntEditor.java \ +gnu/java/beans/editors/NativeLongEditor.java \ +gnu/java/beans/editors/NativeShortEditor.java \ +gnu/java/beans/editors/StringEditor.java \ +gnu/java/beans/info/ComponentBeanInfo.java \ +gnu/java/beans/BeanInfoEmbryo.java \ +gnu/java/beans/EmptyBeanInfo.java \ +gnu/java/beans/ExplicitBeanInfo.java \ +gnu/java/beans/IntrospectionIncubator.java \ +java/applet/Applet.java \ +java/applet/AppletStub.java \ +java/applet/AppletContext.java \ +java/applet/AudioClip.java \ +java/awt/AWTError.java \ java/awt/AWTEvent.java \ +java/awt/AWTEventMulticaster.java \ +java/awt/AWTException.java \ +java/awt/ActiveEvent.java \ +java/awt/Adjustable.java \ java/awt/BorderLayout.java \ -java/awt/Component.java \ -java/awt/Container.java \ -java/awt/Dimension.java \ +java/awt/Button.java \ +java/awt/Canvas.java \ +java/awt/Checkbox.java \ +java/awt/CheckboxGroup.java \ +java/awt/CheckboxMenuItem.java \ +java/awt/Choice.java \ +java/awt/Color.java \ +java/awt/Component.java \ +java/awt/ComponentOrientation.java \ +java/awt/Container.java \ +java/awt/Cursor.java \ +java/awt/Dialog.java \ +java/awt/Dimension.java \ java/awt/Event.java \ +java/awt/EventDispatchThread.java \ +java/awt/EventQueue.java \ +java/awt/FileDialog.java \ java/awt/Font.java \ +java/awt/FontMetrics.java \ java/awt/Frame.java \ +java/awt/Graphics.java \ +java/awt/Graphics2D.java \ +java/awt/GraphicsConfiguration.java \ +java/awt/IllegalComponentStateException.java \ +java/awt/Image.java \ +java/awt/Insets.java \ +java/awt/ItemSelectable.java \ +java/awt/Label.java \ java/awt/LayoutManager.java \ java/awt/LayoutManager2.java \ +java/awt/List.java \ java/awt/Menu.java \ java/awt/MenuBar.java \ -java/awt/MenuItem.java \ java/awt/MenuComponent.java \ java/awt/MenuContainer.java \ +java/awt/MenuItem.java \ +java/awt/MenuShortcut.java \ +java/awt/Paint.java \ +java/awt/PaintContext.java \ +java/awt/Panel.java \ java/awt/Point.java \ -java/awt/Rectangle.java \ +java/awt/PopupMenu.java \ +java/awt/Rectangle.java \ +java/awt/RenderingHints.java \ +java/awt/ScrollPane.java \ +java/awt/Scrollbar.java \ java/awt/Shape.java \ java/awt/TextArea.java \ java/awt/TextComponent.java \ +java/awt/TextField.java \ java/awt/Toolkit.java \ +java/awt/Transparency.java \ java/awt/Window.java \ -java/awt/event/ActionEvent.java \ +java/awt/color/ColorSpace.java \ +java/awt/color/ICC_ColorSpace.java \ +java/awt/color/ICC_Profile.java \ +java/awt/datatransfer/Clipboard.java \ +java/awt/event/AWTEventListener.java \ +java/awt/event/ActionEvent.java \ java/awt/event/ActionListener.java \ +java/awt/event/AdjustmentEvent.java \ +java/awt/event/AdjustmentListener.java \ +java/awt/event/ComponentAdapter.java \ java/awt/event/ComponentEvent.java \ +java/awt/event/ComponentListener.java \ +java/awt/event/ContainerAdapter.java \ +java/awt/event/ContainerEvent.java \ +java/awt/event/ContainerListener.java \ +java/awt/event/FocusAdapter.java \ +java/awt/event/FocusEvent.java \ +java/awt/event/FocusListener.java \ +java/awt/event/HierarchyBoundsAdapter.java \ +java/awt/event/HierarchyBoundsListener.java \ +java/awt/event/HierarchyEvent.java \ +java/awt/event/HierarchyListener.java \ java/awt/event/InputEvent.java \ +java/awt/event/InputMethodEvent.java \ +java/awt/event/InputMethodListener.java \ +java/awt/event/InvocationEvent.java \ +java/awt/event/ItemEvent.java \ +java/awt/event/ItemListener.java \ +java/awt/event/KeyAdapter.java \ java/awt/event/KeyEvent.java \ -java/awt/event/KeyListener.java \ +java/awt/event/KeyListener.java \ +java/awt/event/MouseAdapter.java \ +java/awt/event/MouseEvent.java \ +java/awt/event/MouseListener.java \ +java/awt/event/MouseMotionAdapter.java \ +java/awt/event/MouseMotionListener.java \ +java/awt/event/PaintEvent.java \ java/awt/event/TextEvent.java \ java/awt/event/TextListener.java \ java/awt/event/WindowAdapter.java \ -java/awt/event/WindowEvent.java \ +java/awt/event/WindowEvent.java \ java/awt/event/WindowListener.java \ -java/awt/geom/Point2D.java \ +java/awt/geom/AffineTransform.java \ java/awt/geom/Dimension2D.java \ +java/awt/geom/Ellipse2D.java \ +java/awt/geom/IllegalPathStateException.java \ +java/awt/geom/NoninvertibleTransformException.java \ +java/awt/geom/PathIterator.java \ +java/awt/geom/Point2D.java \ +java/awt/geom/Rectangle2D.java \ +java/awt/geom/RectangularShape.java \ +java/awt/image/BufferedImage.java \ +java/awt/image/ColorModel.java \ +java/awt/image/ComponentColorModel.java \ +java/awt/image/ComponentSampleModel.java \ +java/awt/image/DataBuffer.java \ +java/awt/image/DataBufferByte.java \ +java/awt/image/DataBufferInt.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/PackedColorModel.java \ +java/awt/image/Raster.java \ +java/awt/image/RasterOp.java \ +java/awt/image/SampleModel.java \ +java/awt/image/SinglePixelPackedSampleModel.java \ +java/awt/image/WritableRaster.java \ +java/awt/peer/ButtonPeer.java \ +java/awt/peer/CanvasPeer.java \ +java/awt/peer/CheckboxMenuItemPeer.java \ +java/awt/peer/CheckboxPeer.java \ +java/awt/peer/ChoicePeer.java \ java/awt/peer/ComponentPeer.java \ java/awt/peer/ContainerPeer.java \ +java/awt/peer/DialogPeer.java \ +java/awt/peer/FileDialogPeer.java \ +java/awt/peer/FontPeer.java \ java/awt/peer/FramePeer.java \ -java/awt/peer/WindowPeer.java - -# $(awt_java_source_files) - -## List of all .java files to be compiled. Please keep this list -## alphabetical. Please put files from gnu/gcj/convert into -## convert_source_files. If the .java file has a hand-maintained -## header, please list it in special_java_source_files. -ordinary_java_source_files = $(convert_source_files) \ -gnu/gcj/text/BaseBreakIterator.java \ -gnu/gcj/text/CharacterBreakIterator.java \ -gnu/gcj/text/LineBreakIterator.java \ -gnu/gcj/text/LocaleData_en.java \ -gnu/gcj/text/LocaleData_en_US.java \ -gnu/gcj/text/SentenceBreakIterator.java \ -gnu/gcj/text/WordBreakIterator.java \ -gnu/gcj/protocol/file/Connection.java \ -gnu/gcj/protocol/file/Handler.java \ -gnu/gcj/protocol/http/Connection.java \ -gnu/gcj/protocol/http/Handler.java \ -gnu/gcj/RawData.java \ -gnu/gcj/util/EnumerationChain.java \ -java/io/BufferedInputStream.java \ -java/io/BufferedOutputStream.java \ -java/io/BufferedReader.java \ -java/io/BufferedWriter.java \ -java/io/ByteArrayInputStream.java \ -java/io/ByteArrayOutputStream.java \ -java/io/CharArrayReader.java \ -java/io/CharArrayWriter.java \ -java/io/CharConversionException.java \ -java/io/DataInput.java \ -java/io/DataInputStream.java \ -java/io/DataOutput.java \ -java/io/DataOutputStream.java \ -java/io/EOFException.java \ -java/io/File.java \ -java/io/FileDescriptor.java \ -java/io/FileInputStream.java \ -java/io/FileNotFoundException.java \ -java/io/FileOutputStream.java \ -java/io/FileReader.java \ -java/io/FileWriter.java \ -java/io/FilenameFilter.java \ -java/io/FilterInputStream.java \ -java/io/FilterOutputStream.java \ -java/io/FilterReader.java \ -java/io/FilterWriter.java \ -java/io/IOException.java \ -java/io/InputStream.java \ -java/io/InputStreamReader.java \ -java/io/InterruptedIOException.java \ -java/io/LineNumberInputStream.java \ -java/io/LineNumberReader.java \ -java/io/OutputStream.java \ -java/io/OutputStreamWriter.java \ -java/io/PipedInputStream.java \ -java/io/PipedOutputStream.java \ -java/io/PipedReader.java \ -java/io/PipedWriter.java \ -java/io/PrintStream.java \ -java/io/PrintWriter.java \ -java/io/PushbackInputStream.java \ -java/io/PushbackReader.java \ -java/io/RandomAccessFile.java \ -java/io/Reader.java \ -java/io/SequenceInputStream.java \ -java/io/Serializable.java \ -java/io/StreamTokenizer.java \ -java/io/StringBufferInputStream.java \ -java/io/StringReader.java \ -java/io/StringWriter.java \ -java/io/SyncFailedException.java \ -java/io/UTFDataFormatException.java \ -java/io/UnsupportedEncodingException.java \ -java/io/Writer.java \ +java/awt/peer/LabelPeer.java \ +java/awt/peer/LightweightPeer.java \ +java/awt/peer/ListPeer.java \ +java/awt/peer/MenuBarPeer.java \ +java/awt/peer/MenuComponentPeer.java \ +java/awt/peer/MenuItemPeer.java \ +java/awt/peer/MenuPeer.java \ +java/awt/peer/PanelPeer.java \ +java/awt/peer/PopupMenuPeer.java \ +java/awt/peer/ScrollPanePeer.java \ +java/awt/peer/ScrollbarPeer.java \ +java/awt/peer/TextAreaPeer.java \ +java/awt/peer/TextComponentPeer.java \ +java/awt/peer/TextFieldPeer.java \ +java/awt/peer/WindowPeer.java \ +java/beans/beancontext/BeanContext.java \ +java/beans/beancontext/BeanContextChild.java \ +java/beans/beancontext/BeanContextChildComponentProxy.java \ +java/beans/beancontext/BeanContextChildSupport.java \ +java/beans/beancontext/BeanContextContainerProxy.java \ +java/beans/beancontext/BeanContextEvent.java \ +java/beans/beancontext/BeanContextMembershipEvent.java \ +java/beans/beancontext/BeanContextMembershipListener.java \ +java/beans/beancontext/BeanContextProxy.java \ +java/beans/beancontext/BeanContextServiceAvailableEvent.java \ +java/beans/beancontext/BeanContextServiceProvider.java \ +java/beans/beancontext/BeanContextServiceProviderBeanInfo.java \ +java/beans/beancontext/BeanContextServiceRevokedEvent.java \ +java/beans/beancontext/BeanContextServiceRevokedListener.java \ +java/beans/beancontext/BeanContextServices.java \ +java/beans/beancontext/BeanContextServicesListener.java \ +java/beans/BeanDescriptor.java \ +java/beans/BeanInfo.java \ +java/beans/Beans.java \ +java/beans/Customizer.java \ +java/beans/DesignMode.java \ +java/beans/EventSetDescriptor.java \ +java/beans/FeatureDescriptor.java \ +java/beans/IndexedPropertyDescriptor.java \ +java/beans/IntrospectionException.java \ +java/beans/Introspector.java \ +java/beans/MethodDescriptor.java \ +java/beans/ParameterDescriptor.java \ +java/beans/PropertyChangeEvent.java \ +java/beans/PropertyChangeListener.java \ +java/beans/PropertyChangeSupport.java \ +java/beans/PropertyDescriptor.java \ +java/beans/PropertyEditor.java \ +java/beans/PropertyEditorManager.java \ +java/beans/PropertyEditorSupport.java \ +java/beans/PropertyVetoException.java \ +java/beans/SimpleBeanInfo.java \ +java/beans/VetoableChangeListener.java \ +java/beans/VetoableChangeSupport.java \ +java/beans/Visibility.java + +## Java files which are created by configure and thus are in the build +## directory. +built_java_source_files = java/lang/ConcreteProcess.java \ + gnu/classpath/Configuration.java + +## Java files in the core packages java.lang, java.io, and java.util. +## These are built before the other source files, in order to reduce +## build time. +core_java_source_files = \ java/lang/AbstractMethodError.java \ java/lang/ArithmeticException.java \ java/lang/ArrayIndexOutOfBoundsException.java \ @@ -502,7 +785,6 @@ java/lang/Double.java \ java/lang/Error.java \ java/lang/Exception.java \ java/lang/ExceptionInInitializerError.java \ -java/lang/FirstThread.java \ java/lang/Float.java \ java/lang/IllegalAccessError.java \ java/lang/IllegalAccessException.java \ @@ -560,15 +842,195 @@ java/lang/reflect/InvocationTargetException.java \ java/lang/reflect/Member.java \ java/lang/reflect/Method.java \ java/lang/reflect/Modifier.java \ +java/lang/reflect/ReflectPermission.java \ +java/io/BlockDataException.java \ +java/io/BufferedInputStream.java \ +java/io/BufferedOutputStream.java \ +java/io/BufferedReader.java \ +java/io/BufferedWriter.java \ +java/io/ByteArrayInputStream.java \ +java/io/ByteArrayOutputStream.java \ +java/io/CharArrayReader.java \ +java/io/CharArrayWriter.java \ +java/io/CharConversionException.java \ +java/io/DataInput.java \ +java/io/DataInputStream.java \ +java/io/DataOutput.java \ +java/io/DataOutputStream.java \ +java/io/EOFException.java \ +java/io/Externalizable.java \ +java/io/File.java \ +java/io/FileDescriptor.java \ +java/io/FileFilter.java \ +java/io/FileInputStream.java \ +java/io/FileNotFoundException.java \ +java/io/FileOutputStream.java \ +java/io/FilePermission.java \ +java/io/FileReader.java \ +java/io/FileWriter.java \ +java/io/FilenameFilter.java \ +java/io/FilterInputStream.java \ +java/io/FilterOutputStream.java \ +java/io/FilterReader.java \ +java/io/FilterWriter.java \ +java/io/IOException.java \ +java/io/InputStream.java \ +java/io/InputStreamReader.java \ +java/io/InterruptedIOException.java \ +java/io/InvalidClassException.java \ +java/io/InvalidObjectException.java \ +java/io/LineNumberInputStream.java \ +java/io/LineNumberReader.java \ +java/io/NotActiveException.java \ +java/io/NotSerializableException.java \ +java/io/ObjectInput.java \ +java/io/ObjectInputStream.java \ +java/io/ObjectInputValidation.java \ +java/io/ObjectOutput.java \ +java/io/ObjectOutputStream.java \ +java/io/ObjectStreamClass.java \ +java/io/ObjectStreamConstants.java \ +java/io/ObjectStreamException.java \ +java/io/ObjectStreamField.java \ +java/io/OptionalDataException.java \ +java/io/OutputStream.java \ +java/io/OutputStreamWriter.java \ +java/io/PipedInputStream.java \ +java/io/PipedOutputStream.java \ +java/io/PipedReader.java \ +java/io/PipedWriter.java \ +java/io/PrintStream.java \ +java/io/PrintWriter.java \ +java/io/PushbackInputStream.java \ +java/io/PushbackReader.java \ +java/io/RandomAccessFile.java \ +java/io/Reader.java \ +java/io/SequenceInputStream.java \ +java/io/Serializable.java \ +java/io/SerializablePermission.java \ +java/io/StreamCorruptedException.java \ +java/io/StreamTokenizer.java \ +java/io/StringBufferInputStream.java \ +java/io/StringReader.java \ +java/io/StringWriter.java \ +java/io/SyncFailedException.java \ +java/io/UTFDataFormatException.java \ +java/io/UnsupportedEncodingException.java \ +java/io/WriteAbortedException.java \ +java/io/Writer.java \ +java/util/AbstractCollection.java \ +java/util/AbstractList.java \ +java/util/AbstractMap.java \ +java/util/AbstractSequentialList.java \ +java/util/AbstractSet.java \ +java/util/ArrayList.java \ +java/util/Arrays.java \ +java/util/BasicMapEntry.java \ +java/util/BitSet.java \ +java/util/Bucket.java \ +java/util/Calendar.java \ +java/util/Collection.java \ +java/util/Collections.java \ +java/util/Comparator.java \ +java/util/ConcurrentModificationException.java \ +java/util/Date.java \ +java/util/Dictionary.java \ +java/util/EmptyStackException.java \ +java/util/Enumeration.java \ +java/util/EventListener.java \ +java/util/EventObject.java \ +java/util/GregorianCalendar.java \ +java/util/HashMap.java \ +java/util/Hashtable.java \ +java/util/Iterator.java \ +java/util/LinkedList.java \ +java/util/List.java \ +java/util/ListIterator.java \ +java/util/ListResourceBundle.java \ +java/util/Locale.java \ +java/util/Map.java \ +java/util/MissingResourceException.java \ +java/util/NoSuchElementException.java \ +java/util/Observable.java \ +java/util/Observer.java \ +java/util/Properties.java \ +java/util/PropertyPermission.java \ +java/util/PropertyResourceBundle.java \ +java/util/Random.java \ +java/util/ResourceBundle.java \ +java/util/Set.java \ +java/util/SimpleTimeZone.java \ +java/util/SortedMap.java \ +java/util/SortedSet.java \ +java/util/Stack.java \ +java/util/StringTokenizer.java \ +java/util/TimeZone.java \ +java/util/Timer.java \ +java/util/TimerTask.java \ +java/util/TooManyListenersException.java \ +java/util/Vector.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 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/gcj/RawData.java \ +gnu/gcj/io/DefaultMimeTypes.java \ +gnu/gcj/io/MimeTypes.java \ +gnu/gcj/io/SimpleSHSStream.java \ +gnu/gcj/jni/NativeThread.java \ +gnu/gcj/math/MPN.java \ +gnu/gcj/protocol/file/Connection.java \ +gnu/gcj/protocol/file/Handler.java \ +gnu/gcj/protocol/http/Connection.java \ +gnu/gcj/protocol/http/Handler.java \ +gnu/gcj/protocol/jar/Connection.java \ +gnu/gcj/protocol/jar/Handler.java \ +gnu/gcj/runtime/FileDeleter.java \ +gnu/gcj/runtime/FirstThread.java \ +gnu/gcj/runtime/VMClassLoader.java \ +gnu/gcj/text/BaseBreakIterator.java \ +gnu/gcj/text/CharacterBreakIterator.java \ +gnu/gcj/text/LineBreakIterator.java \ +gnu/gcj/text/LocaleData_en.java \ +gnu/gcj/text/LocaleData_en_US.java \ +gnu/gcj/text/SentenceBreakIterator.java \ +gnu/gcj/text/WordBreakIterator.java \ +gnu/gcj/util/EnumerationChain.java \ +gnu/java/io/ClassLoaderObjectInputStream.java \ +gnu/java/io/NullOutputStream.java \ +gnu/java/io/ObjectIdentityWrapper.java \ +gnu/java/lang/ArrayHelper.java \ +gnu/java/lang/ClassHelper.java \ +gnu/java/lang/reflect/TypeSignature.java \ +gnu/java/locale/Calendar.java \ +gnu/java/locale/Calendar_de.java \ +gnu/java/locale/Calendar_en.java \ +gnu/java/locale/Calendar_nl.java \ +gnu/java/security/provider/Gnu.java \ +gnu/java/security/provider/SHA.java \ +gnu/java/security/provider/SHA1PRNG.java \ +java/math/BigDecimal.java \ +java/math/BigInteger.java \ java/net/BindException.java \ java/net/ConnectException.java \ java/net/ContentHandler.java \ java/net/ContentHandlerFactory.java \ +java/net/DatagramPacket.java \ +java/net/DatagramSocket.java \ +java/net/DatagramSocketImpl.java \ java/net/FileNameMap.java \ -java/net/HttpURLConnection.java \ +java/net/HttpURLConnection.java \ java/net/InetAddress.java \ +java/net/JarURLConnection.java \ java/net/MalformedURLException.java \ +java/net/MulticastSocket.java \ java/net/NoRouteToHostException.java \ +java/net/PlainDatagramSocketImpl.java \ java/net/PlainSocketImpl.java \ java/net/ProtocolException.java \ java/net/ServerSocket.java \ @@ -576,7 +1038,9 @@ java/net/Socket.java \ java/net/SocketException.java \ java/net/SocketImpl.java \ java/net/SocketImplFactory.java \ +java/net/SocketOptions.java \ java/net/URL.java \ +java/net/URLClassLoader.java \ java/net/URLConnection.java \ java/net/URLDecoder.java \ java/net/URLEncoder.java \ @@ -584,14 +1048,85 @@ java/net/URLStreamHandler.java \ java/net/URLStreamHandlerFactory.java \ java/net/UnknownHostException.java \ java/net/UnknownServiceException.java \ +java/security/AlgorithmParameterGeneratorSpi.java \ +java/security/BasicPermission.java \ +java/security/DigestException.java \ +java/security/DigestOutputStream.java \ +java/security/GeneralSecurityException.java \ +java/security/Guard.java \ +java/security/InvalidAlgorithmParameterException.java \ +java/security/InvalidKeyException.java \ +java/security/InvalidParameterException.java \ +java/security/Key.java \ +java/security/KeyException.java \ +java/security/KeyPair.java \ +java/security/KeyPairGenerator.java \ +java/security/KeyPairGeneratorSpi.java \ java/security/MessageDigest.java \ java/security/NoSuchAlgorithmException.java \ +java/security/NoSuchProviderException.java \ +java/security/Permission.java \ +java/security/PermissionCollection.java \ +java/security/Principal.java \ +java/security/PrivateKey.java \ +java/security/Provider.java \ +java/security/PublicKey.java \ +java/security/SecureClassLoader.java \ +java/security/SecureRandom.java \ +java/security/Security.java \ +java/security/Signature.java \ +java/security/SignatureException.java \ +java/security/cert/CRL.java \ +java/security/cert/CRLException.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/X509CRL.java \ +java/security/cert/X509CRLEntry.java \ +java/security/cert/X509Certificate.java \ +java/security/cert/X509Extension.java \ +java/security/interfaces/DSAKey.java \ +java/security/interfaces/DSAParams.java \ +java/security/interfaces/DSAPrivateKey.java \ +java/security/interfaces/DSAPublicKey.java \ +java/security/interfaces/RSAPrivateCrtKey.java \ +java/security/interfaces/RSAPrivateKey.java \ +java/security/interfaces/RSAPublicKey.java \ +java/security/spec/AlgorithmParameterSpec.java \ +java/security/spec/InvalidKeySpecException.java \ +java/security/spec/InvalidParameterSpecException.java \ +java/security/spec/KeySpec.java \ +java/security/spec/RSAPrivateCrtKeySpec.java \ +java/security/spec/RSAPrivateKeySpec.java \ +java/security/spec/RSAPublicKeySpec.java \ +java/sql/CallableStatement.java \ +java/sql/Connection.java \ +java/sql/DataTruncation.java \ +java/sql/DatabaseMetaData.java \ +java/sql/Date.java \ +java/sql/Driver.java \ +java/sql/DriverManager.java \ +java/sql/DriverPropertyInfo.java \ +java/sql/PreparedStatement.java \ +java/sql/ResultSet.java \ +java/sql/ResultSetMetaData.java \ +java/sql/SQLException.java \ +java/sql/SQLWarning.java \ +java/sql/Statement.java \ +java/sql/Time.java \ +java/sql/Timestamp.java \ +java/sql/Types.java \ java/text/BreakIterator.java \ java/text/CharacterIterator.java \ java/text/ChoiceFormat.java \ -java/text/CollationElementIterator.java \ +java/text/CollationElementIterator.java \ java/text/CollationKey.java \ -java/text/Collator.java \ +java/text/Collator.java \ java/text/DateFormat.java \ java/text/DateFormatSymbols.java \ java/text/DecimalFormat.java \ @@ -605,47 +1140,35 @@ java/text/ParsePosition.java \ java/text/RuleBasedCollator.java \ java/text/SimpleDateFormat.java \ java/text/StringCharacterIterator.java \ -java/util/BitSet.java \ -java/util/Calendar.java \ -java/util/ConcurrentModificationException.java \ -java/util/Date.java \ -java/util/Dictionary.java \ -java/util/EmptyStackException.java \ -java/util/Enumeration.java \ -java/util/EventListener.java \ -java/util/EventObject.java \ -java/util/GregorianCalendar.java \ -java/util/Hashtable.java \ -java/util/ListResourceBundle.java \ -java/util/Locale.java \ -java/util/MissingResourceException.java \ -java/util/NoSuchElementException.java \ -java/util/Observable.java \ -java/util/Observer.java \ -java/util/Properties.java \ -java/util/PropertyResourceBundle.java \ -java/util/Random.java \ -java/util/ResourceBundle.java \ -java/util/SimpleTimeZone.java \ -java/util/Stack.java \ -java/util/StringTokenizer.java \ -java/util/TimeZone.java \ -java/util/TooManyListenersException.java \ -java/util/Vector.java \ +java/util/jar/Attributes.java \ +java/util/jar/JarEntry.java \ +java/util/jar/JarException.java \ +java/util/jar/JarFile.java \ +java/util/jar/JarInputStream.java \ +java/util/jar/JarOutputStream.java \ +java/util/jar/Manifest.java \ java/util/zip/Adler32.java \ java/util/zip/CRC32.java \ +java/util/zip/CheckedInputStream.java \ +java/util/zip/CheckedOutputStream.java \ java/util/zip/Checksum.java \ +java/util/zip/DataFormatException.java \ java/util/zip/Deflater.java \ java/util/zip/DeflaterOutputStream.java \ -java/util/zip/InflaterInputStream.java \ +java/util/zip/GZIPInputStream.java \ +java/util/zip/GZIPOutputStream.java \ +java/util/zip/Inflater.java \ +java/util/zip/InflaterInputStream.java \ java/util/zip/ZipConstants.java \ java/util/zip/ZipEntry.java \ java/util/zip/ZipException.java \ java/util/zip/ZipFile.java \ java/util/zip/ZipInputStream.java \ -java/util/zip/ZipOutputStream.java +java/util/zip/ZipOutputStream.java \ +$(awt_java_source_files) \ +$(convert_source_files) -java_source_files = $(ordinary_java_source_files) $(special_java_source_files) +java_source_files = $(special_java_source_files) $(ordinary_java_source_files) ## Math library: C, not C++ c_source_files = \ @@ -670,16 +1193,24 @@ nat_source_files = \ gnu/gcj/convert/JIS0208_to_Unicode.cc \ gnu/gcj/convert/JIS0212_to_Unicode.cc \ gnu/gcj/convert/Unicode_to_JIS.cc \ +gnu/gcj/convert/natIconv.cc \ gnu/gcj/convert/natInput_EUCJIS.cc \ gnu/gcj/convert/natInput_SJIS.cc \ gnu/gcj/convert/natOutput_EUCJIS.cc \ gnu/gcj/convert/natOutput_SJIS.cc \ +gnu/gcj/io/natSimpleSHSStream.cc \ +gnu/gcj/io/shs.cc \ +gnu/gcj/jni/natNativeThread.cc \ +gnu/gcj/runtime/natFirstThread.cc \ java/io/natFile.cc \ java/io/natFileDescriptor.cc \ +java/io/natObjectInputStream.cc \ +java/io/natObjectOutputStream.cc \ java/lang/natCharacter.cc \ java/lang/natClass.cc \ +java/lang/natClassLoader.cc \ +java/lang/natConcreteProcess.cc \ java/lang/natDouble.cc \ -java/lang/natFirstThread.cc \ java/lang/natFloat.cc \ java/lang/natMath.cc \ java/lang/natObject.cc \ @@ -687,14 +1218,90 @@ java/lang/natRuntime.cc \ java/lang/natString.cc \ java/lang/natSystem.cc \ java/lang/natThread.cc \ +java/lang/natThrowable.cc \ java/lang/reflect/natArray.cc \ +java/lang/reflect/natConstructor.cc \ java/lang/reflect/natField.cc \ java/lang/reflect/natMethod.cc \ java/net/natInetAddress.cc \ +java/net/natPlainDatagramSocketImpl.cc \ java/net/natPlainSocketImpl.cc \ java/text/natCollator.cc \ -java/util/natDate.cc \ -java/util/natGregorianCalendar.cc +java/util/natGregorianCalendar.cc \ +java/util/zip/natDeflater.cc \ +java/util/zip/natInflater.cc + +x_java_source_files = \ +gnu/gcj/xlib/Clip.java \ +gnu/gcj/xlib/Colormap.java \ +gnu/gcj/xlib/Display.java \ +gnu/gcj/xlib/Drawable.java \ +gnu/gcj/xlib/Font.java \ +gnu/gcj/xlib/GC.java \ +gnu/gcj/xlib/Pixmap.java \ +gnu/gcj/xlib/Screen.java \ +gnu/gcj/xlib/Visual.java \ +gnu/gcj/xlib/WMSizeHints.java \ +gnu/gcj/xlib/Window.java \ +gnu/gcj/xlib/WindowAttributes.java \ +gnu/gcj/xlib/XAnyEvent.java \ +gnu/gcj/xlib/XButtonEvent.java \ +gnu/gcj/xlib/XColor.java \ +gnu/gcj/xlib/XConfigureEvent.java \ +gnu/gcj/xlib/XConnectException.java \ +gnu/gcj/xlib/XEvent.java \ +gnu/gcj/xlib/XException.java \ +gnu/gcj/xlib/XExposeEvent.java \ +gnu/gcj/xlib/XID.java \ +gnu/gcj/xlib/XImage.java \ +gnu/gcj/xlib/XUnmapEvent.java \ +gnu/awt/xlib/XCanvasPeer.java \ +gnu/awt/xlib/XEventLoop.java \ +gnu/awt/xlib/XEventQueue.java \ +gnu/awt/xlib/XFontMetrics.java \ +gnu/awt/xlib/XFramePeer.java \ +gnu/awt/xlib/XGraphics.java \ +gnu/awt/xlib/XGraphicsConfiguration.java \ +gnu/awt/xlib/XPanelPeer.java \ +gnu/awt/xlib/XToolkit.java + +x_nat_source_files = \ +gnu/gcj/xlib/natClip.cc \ +gnu/gcj/xlib/natColormap.cc \ +gnu/gcj/xlib/natDisplay.cc \ +gnu/gcj/xlib/natDrawable.cc \ +gnu/gcj/xlib/natFont.cc \ +gnu/gcj/xlib/natGC.cc \ +gnu/gcj/xlib/natPixmap.cc \ +gnu/gcj/xlib/natScreen.cc \ +gnu/gcj/xlib/natVisual.cc \ +gnu/gcj/xlib/natWMSizeHints.cc \ +gnu/gcj/xlib/natWindow.cc \ +gnu/gcj/xlib/natWindowAttributes.cc \ +gnu/gcj/xlib/natXAnyEvent.cc \ +gnu/gcj/xlib/natXButtonEvent.cc \ +gnu/gcj/xlib/natXColor.cc \ +gnu/gcj/xlib/natXConfigureEvent.cc \ +gnu/gcj/xlib/natXException.cc \ +gnu/gcj/xlib/natXExposeEvent.cc \ +gnu/gcj/xlib/natXImage.cc \ +gnu/gcj/xlib/natXUnmapEvent.cc + +## ################################################################ + +## +## Dependency tracking madness. +## + +## FIXME: depends on GNU make. +-include deps.mk + +## This is an evil hack to work around an automake limitation. We +## need to ensure that the built headers are built before we try to +## compile the C++ sources, but we can't make the .o files depend on +## the headers, because in that case we'll force a complete rebuild of +## the C++ code whenever any .java file is touched. +all-recursive: $(nat_headers) $(x_nat_headers) ## ################################################################ @@ -775,12 +1382,3 @@ distclean-multi: $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean maintainer-clean-multi: $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean - - -## ################################################################ - - -## See above. -cygnus_hack = - -