OSDN Git Service

2002-02-12 Adam Megacz <adam@xwt.org>
[pf3gnuchains/gcc-fork.git] / libjava / Makefile.in
index 058ee1d..8768d04 100644 (file)
@@ -103,6 +103,7 @@ OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
+PLATFORMOBJS = @PLATFORMOBJS@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 SYSDEP_SOURCES = @SYSDEP_SOURCES@
@@ -123,19 +124,13 @@ libgcj_basedir = @libgcj_basedir@
 mkinstalldirs = @mkinstalldirs@
 
 AUTOMAKE_OPTIONS = foreign
-@TESTSUBDIR_TRUE@SUBDIRS = \
-@TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include
-@TESTSUBDIR_FALSE@SUBDIRS = \
-@TESTSUBDIR_FALSE@$(DIRLTDL) gcj include
-@USE_LIBDIR_TRUE@toolexeclibdir = \
-@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
-@USE_LIBDIR_FALSE@toolexeclibdir = \
-@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
-@USE_LIBDIR_FALSE@toolexecdir = \
-@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
-@XLIB_AWT_TRUE@cond_x_ltlibrary = \
-@XLIB_AWT_TRUE@libgcjx.la
-@XLIB_AWT_FALSE@cond_x_ltlibrary = \
+@TESTSUBDIR_TRUE@SUBDIRS = @TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include
+@TESTSUBDIR_FALSE@SUBDIRS = @TESTSUBDIR_FALSE@$(DIRLTDL) gcj include
+@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
+@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
+@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
+@XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@libgcjx.la
+@XLIB_AWT_FALSE@cond_x_ltlibrary = 
 
 toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
 toolexeclib_DATA = libgcj.spec
@@ -143,20 +138,14 @@ data_DATA = libgcj.jar
 
 secdir = $(libdir)/security
 
-@NATIVE_TRUE@bin_PROGRAMS = \
-@NATIVE_TRUE@jv-convert gij rmic rmiregistry
+@NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry
 
 bin_SCRIPTS = addr2name.awk
-@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = \
-@CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
-@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = \
-@CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
-@CANADIAN_FALSE@ZIP = \
-@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
-@CANADIAN_TRUE@GCJH = \
-@CANADIAN_TRUE@gcjh
-@CANADIAN_FALSE@GCJH = \
-@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
+@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
+@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
+@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
+@CANADIAN_TRUE@GCJH = @CANADIAN_TRUE@gcjh
+@CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
 
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8
 
@@ -176,10 +165,8 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \
        @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
        -DPREFIX="\"$(prefix)\""
 
-@USING_GCC_TRUE@AM_CFLAGS = \
-@USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
-@USING_GCC_FALSE@AM_CFLAGS = \
-@USING_GCC_FALSE@@LIBGCJ_CFLAGS@
+@USING_GCC_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
+@USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@
 
 JCFLAGS = -g
 JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
@@ -199,19 +186,20 @@ javao_files = $(java_source_files:.java=.lo) \
 
 x_javao_files = $(x_java_source_files:.java=.lo)
 
-libgcj_la_SOURCES = prims.cc posix.cc jni.cc exception.cc \
+libgcj_la_SOURCES = prims.cc jni.cc exception.cc \
        resolve.cc defineclass.cc interpret.cc name-finder.cc verify.cc \
        $(nat_source_files)
 
 EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \
+       win32-threads.cc posix.cc win32.cc \
        $(c_source_files) $(java_source_files) $(built_java_source_files)
 
 libgcj_la_DEPENDENCIES = libgcj.jar $(javao_files) \
-       $(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL)
+       $(c_files) $(GCOBJS) $(THREADOBJS) $(PLATFORMOBJS) $(LIBLTDL)
 
 
 libgcj_la_LIBADD = $(javao_files) $(c_files) $(GCOBJS) \
-       $(THREADOBJS)
+       $(THREADOBJS) $(PLATFORMOBJS)
 
 # Include THREADLIBS here to ensure that the correct version of
 # certain linuxthread functions get linked:
@@ -252,8 +240,7 @@ extra_headers = java/lang/Object.h java/lang/Class.h
 
 NM = nm
 
-@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \
-@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS
+@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS
 
 CONVERT_DIR = gnu/gcj/convert
 
@@ -263,9 +250,7 @@ jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \
        -rpath $(toolexeclibdir) -shared-libgcc
 
 jv_convert_LINK = $(GCJLINK)
-jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \
-       $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
-
+jv_convert_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
 jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
        $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
 
@@ -336,10 +321,10 @@ 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/awt/BitMaskExtent.java \
+gnu/java/awt/Buffers.java \
+gnu/java/awt/ComponentDataBlitOp.java \
+gnu/java/awt/GLightweightPeer.java \
 gnu/java/beans/editors/ColorEditor.java        \
 gnu/java/beans/editors/FontEditor.java \
 gnu/java/beans/editors/NativeBooleanEditor.java        \
@@ -414,6 +399,8 @@ java/awt/Panel.java \
 java/awt/Point.java \
 java/awt/Polygon.java \
 java/awt/PopupMenu.java        \
+java/awt/PrintGraphics.java \
+java/awt/PrintJob.java \
 java/awt/Rectangle.java        \
 java/awt/RenderingHints.java \
 java/awt/ScrollPane.java \
@@ -430,6 +417,14 @@ java/awt/color/ColorSpace.java \
 java/awt/color/ICC_ColorSpace.java \
 java/awt/color/ICC_Profile.java        \
 java/awt/datatransfer/Clipboard.java \
+java/awt/datatransfer/ClipboardOwner.java \
+java/awt/datatransfer/DataFlavor.java \
+java/awt/datatransfer/FlavorMap.java \
+java/awt/datatransfer/MimeTypeParseException.java \
+java/awt/datatransfer/StringSelection.java \
+java/awt/datatransfer/SystemFlavorMap.java \
+java/awt/datatransfer/Transferable.java        \
+java/awt/datatransfer/UnsupportedFlavorException.java \
 java/awt/event/AWTEventListener.java \
 java/awt/event/ActionEvent.java        \
 java/awt/event/ActionListener.java \
@@ -479,22 +474,30 @@ java/awt/geom/Point2D.java \
 java/awt/geom/Rectangle2D.java \
 java/awt/geom/RectangularShape.java \
 java/awt/geom/RoundRectangle2D.java \
+java/awt/image/AreaAveragingScaleFilter.java \
 java/awt/image/BufferedImage.java \
 java/awt/image/ColorModel.java \
 java/awt/image/ComponentColorModel.java        \
 java/awt/image/ComponentSampleModel.java \
+java/awt/image/CropImageFilter.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/FilteredImageSource.java        \
 java/awt/image/ImageConsumer.java \
+java/awt/image/ImageFilter.java        \
 java/awt/image/ImageObserver.java \
 java/awt/image/ImageProducer.java \
 java/awt/image/IndexColorModel.java \
+java/awt/image/MemoryImageSource.java \
 java/awt/image/PackedColorModel.java \
+java/awt/image/PixelGrabber.java \
+java/awt/image/RGBImageFilter.java \
 java/awt/image/Raster.java \
 java/awt/image/RasterOp.java \
+java/awt/image/ReplicateScaleFilter.java \
 java/awt/image/SampleModel.java        \
 java/awt/image/SinglePixelPackedSampleModel.java \
 java/awt/image/WritableRaster.java \
@@ -1015,10 +1018,140 @@ gnu/java/locale/Calendar_de.java \
 gnu/java/locale/Calendar_en.java \
 gnu/java/locale/Calendar_nl.java \
 gnu/java/locale/LocaleInformation.java \
+gnu/java/locale/LocaleInformation_af_ZA.java \
+gnu/java/locale/LocaleInformation_ar_AE.java \
+gnu/java/locale/LocaleInformation_ar_BH.java \
+gnu/java/locale/LocaleInformation_ar_DZ.java \
+gnu/java/locale/LocaleInformation_ar_EG.java \
+gnu/java/locale/LocaleInformation_ar_IN.java \
+gnu/java/locale/LocaleInformation_ar_IQ.java \
+gnu/java/locale/LocaleInformation_ar_JO.java \
+gnu/java/locale/LocaleInformation_ar_KW.java \
+gnu/java/locale/LocaleInformation_ar_LB.java \
+gnu/java/locale/LocaleInformation_ar_LY.java \
+gnu/java/locale/LocaleInformation_ar_MA.java \
+gnu/java/locale/LocaleInformation_ar_OM.java \
+gnu/java/locale/LocaleInformation_ar_QA.java \
+gnu/java/locale/LocaleInformation_ar_SD.java \
+gnu/java/locale/LocaleInformation_ar_SY.java \
+gnu/java/locale/LocaleInformation_ar_TN.java \
+gnu/java/locale/LocaleInformation_ar_YE.java \
+gnu/java/locale/LocaleInformation_be_BY.java \
+gnu/java/locale/LocaleInformation_bn_IN.java \
+gnu/java/locale/LocaleInformation_br_FR.java \
+gnu/java/locale/LocaleInformation_bs_BA.java \
+gnu/java/locale/LocaleInformation_ca_ES.java \
+gnu/java/locale/LocaleInformation_cs_CZ.java \
+gnu/java/locale/LocaleInformation_cy_GB.java \
+gnu/java/locale/LocaleInformation_da_DK.java \
 gnu/java/locale/LocaleInformation_de.java \
+gnu/java/locale/LocaleInformation_de_AT.java \
+gnu/java/locale/LocaleInformation_de_BE.java \
+gnu/java/locale/LocaleInformation_de_CH.java \
+gnu/java/locale/LocaleInformation_de_DE.java \
+gnu/java/locale/LocaleInformation_de_LU.java \
+gnu/java/locale/LocaleInformation_el_GR.java \
 gnu/java/locale/LocaleInformation_en.java \
+gnu/java/locale/LocaleInformation_en_AU.java \
+gnu/java/locale/LocaleInformation_en_BW.java \
+gnu/java/locale/LocaleInformation_en_CA.java \
+gnu/java/locale/LocaleInformation_en_DK.java \
+gnu/java/locale/LocaleInformation_en_GB.java \
+gnu/java/locale/LocaleInformation_en_HK.java \
+gnu/java/locale/LocaleInformation_en_IE.java \
+gnu/java/locale/LocaleInformation_en_IN.java \
+gnu/java/locale/LocaleInformation_en_NZ.java \
+gnu/java/locale/LocaleInformation_en_PH.java \
+gnu/java/locale/LocaleInformation_en_SG.java \
 gnu/java/locale/LocaleInformation_en_US.java \
+gnu/java/locale/LocaleInformation_en_ZA.java \
+gnu/java/locale/LocaleInformation_en_ZW.java \
+gnu/java/locale/LocaleInformation_es_AR.java \
+gnu/java/locale/LocaleInformation_es_BO.java \
+gnu/java/locale/LocaleInformation_es_CL.java \
+gnu/java/locale/LocaleInformation_es_CO.java \
+gnu/java/locale/LocaleInformation_es_CR.java \
+gnu/java/locale/LocaleInformation_es_DO.java \
+gnu/java/locale/LocaleInformation_es_EC.java \
+gnu/java/locale/LocaleInformation_es_ES.java \
+gnu/java/locale/LocaleInformation_es_GT.java \
+gnu/java/locale/LocaleInformation_es_HN.java \
+gnu/java/locale/LocaleInformation_es_MX.java \
+gnu/java/locale/LocaleInformation_es_NI.java \
+gnu/java/locale/LocaleInformation_es_PA.java \
+gnu/java/locale/LocaleInformation_es_PE.java \
+gnu/java/locale/LocaleInformation_es_PR.java \
+gnu/java/locale/LocaleInformation_es_PY.java \
+gnu/java/locale/LocaleInformation_es_SV.java \
+gnu/java/locale/LocaleInformation_es_US.java \
+gnu/java/locale/LocaleInformation_es_UY.java \
+gnu/java/locale/LocaleInformation_es_VE.java \
+gnu/java/locale/LocaleInformation_et_EE.java \
+gnu/java/locale/LocaleInformation_eu_ES.java \
+gnu/java/locale/LocaleInformation_fa_IR.java \
+gnu/java/locale/LocaleInformation_fi_FI.java \
+gnu/java/locale/LocaleInformation_fo_FO.java \
+gnu/java/locale/LocaleInformation_fr_BE.java \
+gnu/java/locale/LocaleInformation_fr_CA.java \
+gnu/java/locale/LocaleInformation_fr_CH.java \
+gnu/java/locale/LocaleInformation_fr_FR.java \
+gnu/java/locale/LocaleInformation_fr_LU.java \
+gnu/java/locale/LocaleInformation_ga_IE.java \
+gnu/java/locale/LocaleInformation_gd_GB.java \
+gnu/java/locale/LocaleInformation_gl_ES.java \
+gnu/java/locale/LocaleInformation_gv_GB.java \
+gnu/java/locale/LocaleInformation_he_IL.java \
+gnu/java/locale/LocaleInformation_hi_IN.java \
+gnu/java/locale/LocaleInformation_hr_HR.java \
+gnu/java/locale/LocaleInformation_hu_HU.java \
+gnu/java/locale/LocaleInformation_id_ID.java \
+gnu/java/locale/LocaleInformation_it_CH.java \
+gnu/java/locale/LocaleInformation_it_IT.java \
+gnu/java/locale/LocaleInformation_iw_IL.java \
+gnu/java/locale/LocaleInformation_ja_JP.java \
+gnu/java/locale/LocaleInformation_ka_GE.java \
+gnu/java/locale/LocaleInformation_kl_GL.java \
+gnu/java/locale/LocaleInformation_ko_KR.java \
+gnu/java/locale/LocaleInformation_kw_GB.java \
+gnu/java/locale/LocaleInformation_lt_LT.java \
+gnu/java/locale/LocaleInformation_lv_LV.java \
+gnu/java/locale/LocaleInformation_mi_NZ.java \
+gnu/java/locale/LocaleInformation_mk_MK.java \
+gnu/java/locale/LocaleInformation_mr_IN.java \
+gnu/java/locale/LocaleInformation_mt_MT.java \
 gnu/java/locale/LocaleInformation_nl.java \
+gnu/java/locale/LocaleInformation_nl_BE.java \
+gnu/java/locale/LocaleInformation_nl_NL.java \
+gnu/java/locale/LocaleInformation_nn_NO.java \
+gnu/java/locale/LocaleInformation_no_NO.java \
+gnu/java/locale/LocaleInformation_oc_FR.java \
+gnu/java/locale/LocaleInformation_pl_PL.java \
+gnu/java/locale/LocaleInformation_pt_BR.java \
+gnu/java/locale/LocaleInformation_pt_PT.java \
+gnu/java/locale/LocaleInformation_ro_RO.java \
+gnu/java/locale/LocaleInformation_ru_RU.java \
+gnu/java/locale/LocaleInformation_ru_UA.java \
+gnu/java/locale/LocaleInformation_se_NO.java \
+gnu/java/locale/LocaleInformation_sk_SK.java \
+gnu/java/locale/LocaleInformation_sl_SI.java \
+gnu/java/locale/LocaleInformation_sq_AL.java \
+gnu/java/locale/LocaleInformation_sr_YU.java \
+gnu/java/locale/LocaleInformation_sv_FI.java \
+gnu/java/locale/LocaleInformation_sv_SE.java \
+gnu/java/locale/LocaleInformation_ta_IN.java \
+gnu/java/locale/LocaleInformation_te_IN.java \
+gnu/java/locale/LocaleInformation_tg_TJ.java \
+gnu/java/locale/LocaleInformation_tl_PH.java \
+gnu/java/locale/LocaleInformation_tr_TR.java \
+gnu/java/locale/LocaleInformation_uk_UA.java \
+gnu/java/locale/LocaleInformation_ur_PK.java \
+gnu/java/locale/LocaleInformation_uz_UZ.java \
+gnu/java/locale/LocaleInformation_vi_VN.java \
+gnu/java/locale/LocaleInformation_yi_US.java \
+gnu/java/locale/LocaleInformation_zh_CN.java \
+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/security/provider/DefaultPolicy.java \
 gnu/java/security/provider/Gnu.java \
@@ -1518,7 +1651,7 @@ X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libgcj_la_OBJECTS =  prims.lo posix.lo jni.lo exception.lo resolve.lo \
+libgcj_la_OBJECTS =  prims.lo jni.lo exception.lo resolve.lo \
 defineclass.lo interpret.lo name-finder.lo verify.lo gnu/gcj/natCore.lo \
 gnu/gcj/convert/JIS0208_to_Unicode.lo \
 gnu/gcj/convert/JIS0212_to_Unicode.lo gnu/gcj/convert/Unicode_to_JIS.lo \
@@ -1586,7 +1719,7 @@ libgcj-test.spec.in libgcj.spec.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 DIST_SUBDIRS =  @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include
 DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
@@ -1604,11 +1737,8 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/gnu/awt/xlib/XGraphicsConfiguration.P \
 .deps/gnu/awt/xlib/XPanelPeer.P .deps/gnu/awt/xlib/XToolkit.P \
 .deps/gnu/classpath/Configuration.P .deps/gnu/gcj/Core.P \
-.deps/gnu/gcj/RawData.P .deps/gnu/gcj/awt/BitMaskExtent.P \
-.deps/gnu/gcj/awt/Buffers.P .deps/gnu/gcj/awt/ComponentDataBlitOp.P \
-.deps/gnu/gcj/awt/GLightweightPeer.P \
-.deps/gnu/gcj/convert/BytesToUnicode.P .deps/gnu/gcj/convert/Convert.P \
-.deps/gnu/gcj/convert/IOConverter.P \
+.deps/gnu/gcj/RawData.P .deps/gnu/gcj/convert/BytesToUnicode.P \
+.deps/gnu/gcj/convert/Convert.P .deps/gnu/gcj/convert/IOConverter.P \
 .deps/gnu/gcj/convert/Input_8859_1.P \
 .deps/gnu/gcj/convert/Input_ASCII.P \
 .deps/gnu/gcj/convert/Input_EUCJIS.P \
@@ -1674,6 +1804,9 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/gnu/gcj/xlib/natXColor.P .deps/gnu/gcj/xlib/natXConfigureEvent.P \
 .deps/gnu/gcj/xlib/natXException.P .deps/gnu/gcj/xlib/natXExposeEvent.P \
 .deps/gnu/gcj/xlib/natXImage.P .deps/gnu/gcj/xlib/natXUnmapEvent.P \
+.deps/gnu/java/awt/BitMaskExtent.P .deps/gnu/java/awt/Buffers.P \
+.deps/gnu/java/awt/ComponentDataBlitOp.P \
+.deps/gnu/java/awt/GLightweightPeer.P \
 .deps/gnu/java/beans/BeanInfoEmbryo.P \
 .deps/gnu/java/beans/EmptyBeanInfo.P \
 .deps/gnu/java/beans/ExplicitBeanInfo.P \
@@ -1697,11 +1830,142 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/gnu/java/locale/Calendar.P .deps/gnu/java/locale/Calendar_de.P \
 .deps/gnu/java/locale/Calendar_en.P .deps/gnu/java/locale/Calendar_nl.P \
 .deps/gnu/java/locale/LocaleInformation.P \
+.deps/gnu/java/locale/LocaleInformation_af_ZA.P \
+.deps/gnu/java/locale/LocaleInformation_ar_AE.P \
+.deps/gnu/java/locale/LocaleInformation_ar_BH.P \
+.deps/gnu/java/locale/LocaleInformation_ar_DZ.P \
+.deps/gnu/java/locale/LocaleInformation_ar_EG.P \
+.deps/gnu/java/locale/LocaleInformation_ar_IN.P \
+.deps/gnu/java/locale/LocaleInformation_ar_IQ.P \
+.deps/gnu/java/locale/LocaleInformation_ar_JO.P \
+.deps/gnu/java/locale/LocaleInformation_ar_KW.P \
+.deps/gnu/java/locale/LocaleInformation_ar_LB.P \
+.deps/gnu/java/locale/LocaleInformation_ar_LY.P \
+.deps/gnu/java/locale/LocaleInformation_ar_MA.P \
+.deps/gnu/java/locale/LocaleInformation_ar_OM.P \
+.deps/gnu/java/locale/LocaleInformation_ar_QA.P \
+.deps/gnu/java/locale/LocaleInformation_ar_SD.P \
+.deps/gnu/java/locale/LocaleInformation_ar_SY.P \
+.deps/gnu/java/locale/LocaleInformation_ar_TN.P \
+.deps/gnu/java/locale/LocaleInformation_ar_YE.P \
+.deps/gnu/java/locale/LocaleInformation_be_BY.P \
+.deps/gnu/java/locale/LocaleInformation_bn_IN.P \
+.deps/gnu/java/locale/LocaleInformation_br_FR.P \
+.deps/gnu/java/locale/LocaleInformation_bs_BA.P \
+.deps/gnu/java/locale/LocaleInformation_ca_ES.P \
+.deps/gnu/java/locale/LocaleInformation_cs_CZ.P \
+.deps/gnu/java/locale/LocaleInformation_cy_GB.P \
+.deps/gnu/java/locale/LocaleInformation_da_DK.P \
 .deps/gnu/java/locale/LocaleInformation_de.P \
+.deps/gnu/java/locale/LocaleInformation_de_AT.P \
+.deps/gnu/java/locale/LocaleInformation_de_BE.P \
+.deps/gnu/java/locale/LocaleInformation_de_CH.P \
+.deps/gnu/java/locale/LocaleInformation_de_DE.P \
+.deps/gnu/java/locale/LocaleInformation_de_LU.P \
+.deps/gnu/java/locale/LocaleInformation_el_GR.P \
 .deps/gnu/java/locale/LocaleInformation_en.P \
+.deps/gnu/java/locale/LocaleInformation_en_AU.P \
+.deps/gnu/java/locale/LocaleInformation_en_BW.P \
+.deps/gnu/java/locale/LocaleInformation_en_CA.P \
+.deps/gnu/java/locale/LocaleInformation_en_DK.P \
+.deps/gnu/java/locale/LocaleInformation_en_GB.P \
+.deps/gnu/java/locale/LocaleInformation_en_HK.P \
+.deps/gnu/java/locale/LocaleInformation_en_IE.P \
+.deps/gnu/java/locale/LocaleInformation_en_IN.P \
+.deps/gnu/java/locale/LocaleInformation_en_NZ.P \
+.deps/gnu/java/locale/LocaleInformation_en_PH.P \
+.deps/gnu/java/locale/LocaleInformation_en_SG.P \
 .deps/gnu/java/locale/LocaleInformation_en_US.P \
-.deps/gnu/java/locale/LocaleInformation_nl.P .deps/gnu/java/math/MPN.P \
-.deps/gnu/java/rmi/dgc/DGCImpl.P .deps/gnu/java/rmi/dgc/DGCImpl_Skel.P \
+.deps/gnu/java/locale/LocaleInformation_en_ZA.P \
+.deps/gnu/java/locale/LocaleInformation_en_ZW.P \
+.deps/gnu/java/locale/LocaleInformation_es_AR.P \
+.deps/gnu/java/locale/LocaleInformation_es_BO.P \
+.deps/gnu/java/locale/LocaleInformation_es_CL.P \
+.deps/gnu/java/locale/LocaleInformation_es_CO.P \
+.deps/gnu/java/locale/LocaleInformation_es_CR.P \
+.deps/gnu/java/locale/LocaleInformation_es_DO.P \
+.deps/gnu/java/locale/LocaleInformation_es_EC.P \
+.deps/gnu/java/locale/LocaleInformation_es_ES.P \
+.deps/gnu/java/locale/LocaleInformation_es_GT.P \
+.deps/gnu/java/locale/LocaleInformation_es_HN.P \
+.deps/gnu/java/locale/LocaleInformation_es_MX.P \
+.deps/gnu/java/locale/LocaleInformation_es_NI.P \
+.deps/gnu/java/locale/LocaleInformation_es_PA.P \
+.deps/gnu/java/locale/LocaleInformation_es_PE.P \
+.deps/gnu/java/locale/LocaleInformation_es_PR.P \
+.deps/gnu/java/locale/LocaleInformation_es_PY.P \
+.deps/gnu/java/locale/LocaleInformation_es_SV.P \
+.deps/gnu/java/locale/LocaleInformation_es_US.P \
+.deps/gnu/java/locale/LocaleInformation_es_UY.P \
+.deps/gnu/java/locale/LocaleInformation_es_VE.P \
+.deps/gnu/java/locale/LocaleInformation_et_EE.P \
+.deps/gnu/java/locale/LocaleInformation_eu_ES.P \
+.deps/gnu/java/locale/LocaleInformation_fa_IR.P \
+.deps/gnu/java/locale/LocaleInformation_fi_FI.P \
+.deps/gnu/java/locale/LocaleInformation_fo_FO.P \
+.deps/gnu/java/locale/LocaleInformation_fr_BE.P \
+.deps/gnu/java/locale/LocaleInformation_fr_CA.P \
+.deps/gnu/java/locale/LocaleInformation_fr_CH.P \
+.deps/gnu/java/locale/LocaleInformation_fr_FR.P \
+.deps/gnu/java/locale/LocaleInformation_fr_LU.P \
+.deps/gnu/java/locale/LocaleInformation_ga_IE.P \
+.deps/gnu/java/locale/LocaleInformation_gd_GB.P \
+.deps/gnu/java/locale/LocaleInformation_gl_ES.P \
+.deps/gnu/java/locale/LocaleInformation_gv_GB.P \
+.deps/gnu/java/locale/LocaleInformation_he_IL.P \
+.deps/gnu/java/locale/LocaleInformation_hi_IN.P \
+.deps/gnu/java/locale/LocaleInformation_hr_HR.P \
+.deps/gnu/java/locale/LocaleInformation_hu_HU.P \
+.deps/gnu/java/locale/LocaleInformation_id_ID.P \
+.deps/gnu/java/locale/LocaleInformation_it_CH.P \
+.deps/gnu/java/locale/LocaleInformation_it_IT.P \
+.deps/gnu/java/locale/LocaleInformation_iw_IL.P \
+.deps/gnu/java/locale/LocaleInformation_ja_JP.P \
+.deps/gnu/java/locale/LocaleInformation_ka_GE.P \
+.deps/gnu/java/locale/LocaleInformation_kl_GL.P \
+.deps/gnu/java/locale/LocaleInformation_ko_KR.P \
+.deps/gnu/java/locale/LocaleInformation_kw_GB.P \
+.deps/gnu/java/locale/LocaleInformation_lt_LT.P \
+.deps/gnu/java/locale/LocaleInformation_lv_LV.P \
+.deps/gnu/java/locale/LocaleInformation_mi_NZ.P \
+.deps/gnu/java/locale/LocaleInformation_mk_MK.P \
+.deps/gnu/java/locale/LocaleInformation_mr_IN.P \
+.deps/gnu/java/locale/LocaleInformation_mt_MT.P \
+.deps/gnu/java/locale/LocaleInformation_nl.P \
+.deps/gnu/java/locale/LocaleInformation_nl_BE.P \
+.deps/gnu/java/locale/LocaleInformation_nl_NL.P \
+.deps/gnu/java/locale/LocaleInformation_nn_NO.P \
+.deps/gnu/java/locale/LocaleInformation_no_NO.P \
+.deps/gnu/java/locale/LocaleInformation_oc_FR.P \
+.deps/gnu/java/locale/LocaleInformation_pl_PL.P \
+.deps/gnu/java/locale/LocaleInformation_pt_BR.P \
+.deps/gnu/java/locale/LocaleInformation_pt_PT.P \
+.deps/gnu/java/locale/LocaleInformation_ro_RO.P \
+.deps/gnu/java/locale/LocaleInformation_ru_RU.P \
+.deps/gnu/java/locale/LocaleInformation_ru_UA.P \
+.deps/gnu/java/locale/LocaleInformation_se_NO.P \
+.deps/gnu/java/locale/LocaleInformation_sk_SK.P \
+.deps/gnu/java/locale/LocaleInformation_sl_SI.P \
+.deps/gnu/java/locale/LocaleInformation_sq_AL.P \
+.deps/gnu/java/locale/LocaleInformation_sr_YU.P \
+.deps/gnu/java/locale/LocaleInformation_sv_FI.P \
+.deps/gnu/java/locale/LocaleInformation_sv_SE.P \
+.deps/gnu/java/locale/LocaleInformation_ta_IN.P \
+.deps/gnu/java/locale/LocaleInformation_te_IN.P \
+.deps/gnu/java/locale/LocaleInformation_tg_TJ.P \
+.deps/gnu/java/locale/LocaleInformation_tl_PH.P \
+.deps/gnu/java/locale/LocaleInformation_tr_TR.P \
+.deps/gnu/java/locale/LocaleInformation_uk_UA.P \
+.deps/gnu/java/locale/LocaleInformation_ur_PK.P \
+.deps/gnu/java/locale/LocaleInformation_uz_UZ.P \
+.deps/gnu/java/locale/LocaleInformation_vi_VN.P \
+.deps/gnu/java/locale/LocaleInformation_yi_US.P \
+.deps/gnu/java/locale/LocaleInformation_zh_CN.P \
+.deps/gnu/java/locale/LocaleInformation_zh_HK.P \
+.deps/gnu/java/locale/LocaleInformation_zh_SG.P \
+.deps/gnu/java/locale/LocaleInformation_zh_TW.P \
+.deps/gnu/java/math/MPN.P .deps/gnu/java/rmi/dgc/DGCImpl.P \
+.deps/gnu/java/rmi/dgc/DGCImpl_Skel.P \
 .deps/gnu/java/rmi/dgc/DGCImpl_Stub.P \
 .deps/gnu/java/rmi/registry/RegistryImpl.P \
 .deps/gnu/java/rmi/registry/RegistryImpl_Skel.P \
@@ -1761,7 +2025,8 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/awt/MenuItem.P .deps/java/awt/MenuShortcut.P \
 .deps/java/awt/Paint.P .deps/java/awt/PaintContext.P \
 .deps/java/awt/Panel.P .deps/java/awt/Point.P .deps/java/awt/Polygon.P \
-.deps/java/awt/PopupMenu.P .deps/java/awt/Rectangle.P \
+.deps/java/awt/PopupMenu.P .deps/java/awt/PrintGraphics.P \
+.deps/java/awt/PrintJob.P .deps/java/awt/Rectangle.P \
 .deps/java/awt/RenderingHints.P .deps/java/awt/ScrollPane.P \
 .deps/java/awt/Scrollbar.P .deps/java/awt/Shape.P \
 .deps/java/awt/SystemColor.P .deps/java/awt/TextArea.P \
@@ -1771,6 +2036,14 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/awt/color/ICC_ColorSpace.P \
 .deps/java/awt/color/ICC_Profile.P \
 .deps/java/awt/datatransfer/Clipboard.P \
+.deps/java/awt/datatransfer/ClipboardOwner.P \
+.deps/java/awt/datatransfer/DataFlavor.P \
+.deps/java/awt/datatransfer/FlavorMap.P \
+.deps/java/awt/datatransfer/MimeTypeParseException.P \
+.deps/java/awt/datatransfer/StringSelection.P \
+.deps/java/awt/datatransfer/SystemFlavorMap.P \
+.deps/java/awt/datatransfer/Transferable.P \
+.deps/java/awt/datatransfer/UnsupportedFlavorException.P \
 .deps/java/awt/event/AWTEventListener.P \
 .deps/java/awt/event/ActionEvent.P \
 .deps/java/awt/event/ActionListener.P \
@@ -1811,19 +2084,27 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/awt/geom/Rectangle2D.P \
 .deps/java/awt/geom/RectangularShape.P \
 .deps/java/awt/geom/RoundRectangle2D.P \
+.deps/java/awt/image/AreaAveragingScaleFilter.P \
 .deps/java/awt/image/BufferedImage.P .deps/java/awt/image/ColorModel.P \
 .deps/java/awt/image/ComponentColorModel.P \
 .deps/java/awt/image/ComponentSampleModel.P \
+.deps/java/awt/image/CropImageFilter.P \
 .deps/java/awt/image/DataBuffer.P .deps/java/awt/image/DataBufferByte.P \
 .deps/java/awt/image/DataBufferInt.P \
 .deps/java/awt/image/DataBufferUShort.P \
 .deps/java/awt/image/DirectColorModel.P \
-.deps/java/awt/image/ImageConsumer.P \
+.deps/java/awt/image/FilteredImageSource.P \
+.deps/java/awt/image/ImageConsumer.P .deps/java/awt/image/ImageFilter.P \
 .deps/java/awt/image/ImageObserver.P \
 .deps/java/awt/image/ImageProducer.P \
 .deps/java/awt/image/IndexColorModel.P \
-.deps/java/awt/image/PackedColorModel.P .deps/java/awt/image/Raster.P \
-.deps/java/awt/image/RasterOp.P .deps/java/awt/image/SampleModel.P \
+.deps/java/awt/image/MemoryImageSource.P \
+.deps/java/awt/image/PackedColorModel.P \
+.deps/java/awt/image/PixelGrabber.P \
+.deps/java/awt/image/RGBImageFilter.P .deps/java/awt/image/Raster.P \
+.deps/java/awt/image/RasterOp.P \
+.deps/java/awt/image/ReplicateScaleFilter.P \
+.deps/java/awt/image/SampleModel.P \
 .deps/java/awt/image/SinglePixelPackedSampleModel.P \
 .deps/java/awt/image/WritableRaster.P .deps/java/awt/peer/ButtonPeer.P \
 .deps/java/awt/peer/CanvasPeer.P \
@@ -2395,7 +2676,8 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/org/xml/sax/helpers/XMLFilterImpl.P \
 .deps/org/xml/sax/helpers/XMLReaderAdapter.P \
 .deps/org/xml/sax/helpers/XMLReaderFactory.P .deps/posix-threads.P \
-.deps/posix.P .deps/prims.P .deps/resolve.P .deps/verify.P
+.deps/posix.P .deps/prims.P .deps/resolve.P .deps/verify.P \
+.deps/win32-threads.P .deps/win32.P
 SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(libgcjx_la_SOURCES) $(EXTRA_libgcjx_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(rmic_SOURCES) $(EXTRA_rmic_SOURCES) $(rmiregistry_SOURCES) $(EXTRA_rmiregistry_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES)
 OBJECTS = $(libgcj_la_OBJECTS) $(libgcjx_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(rmic_OBJECTS) $(rmiregistry_OBJECTS) $(gen_from_JIS_OBJECTS)
 
@@ -2736,7 +3018,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
-           cp -pr $$/$$file $(distdir)/$$file; \
+           cp -pr $$d/$$file $(distdir)/$$file; \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -2942,6 +3224,10 @@ libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_file
 clean-local:
        find . -name '*.class' -print | xargs rm -f
 
+# Just remove the objects from C++ sources, for testing the C++ compiler.
+clean-nat:
+       rm -f $(nat_files) $(x_nat_files)
+
 .class.lo:
        $(GCJCOMPILE) -o $@ $<
 
@@ -3028,6 +3314,46 @@ java/lang/reflect/Method.h: java/lang/reflect/Method.class
            -friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
            $(basename $<)
 
+java/lang/Boolean.h: java/lang/Boolean.class
+       $(GCJH) -classpath $(top_builddir) \
+           -friend 'class java::lang::reflect::Method;' \
+           $(basename $<)
+
+java/lang/Byte.h: java/lang/Byte.class
+       $(GCJH) -classpath $(top_builddir) \
+           -friend 'class java::lang::reflect::Method;' \
+           $(basename $<)
+
+java/lang/Short.h: java/lang/Short.class
+       $(GCJH) -classpath $(top_builddir) \
+           -friend 'class java::lang::reflect::Method;' \
+           $(basename $<)
+
+java/lang/Character.h: java/lang/Character.class
+       $(GCJH) -classpath $(top_builddir) \
+           -friend 'class java::lang::reflect::Method;' \
+           $(basename $<)
+
+java/lang/Integer.h: java/lang/Integer.class
+       $(GCJH) -classpath $(top_builddir) \
+           -friend 'class java::lang::reflect::Method;' \
+           $(basename $<)
+
+java/lang/Long.h: java/lang/Long.class
+       $(GCJH) -classpath $(top_builddir) \
+           -friend 'class java::lang::reflect::Method;' \
+           $(basename $<)
+
+java/lang/Float.h: java/lang/Float.class
+       $(GCJH) -classpath $(top_builddir) \
+           -friend 'class java::lang::reflect::Method;' \
+           $(basename $<)
+
+java/lang/Double.h: java/lang/Double.class
+       $(GCJH) -classpath $(top_builddir) \
+           -friend 'class java::lang::reflect::Method;' \
+           $(basename $<)
+
 gnu/gcj/runtime/VMClassLoader.h: gnu/gcj/runtime/VMClassLoader.class
        $(GCJH) -classpath $(top_builddir) \
            -friend 'class ::java::lang::ClassLoader;' \