OSDN Git Service

Update to Automake 1.11.1.
[pf3gnuchains/gcc-fork.git] / libjava / Makefile.in
index 44962f0..c781cc5 100644 (file)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39,47 +39,55 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 @TESTSUBDIR_TRUE@am__append_1 = testsuite
-@USE_LIBGCJ_BC_TRUE@am__append_2 = libgcj_bc.la
-@XLIB_AWT_TRUE@am__append_3 = lib-gnu-awt-xlib.la
-@INSTALL_ECJ_JAR_TRUE@am__append_4 = $(ECJ_BUILD_JAR)
-@CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__append_5 = gjdoc
+@BUILD_SUBLIBS_TRUE@am__append_2 = libgcj-noncore.la
+@USE_LIBGCJ_BC_TRUE@am__append_3 = libgcj_bc.la
+@XLIB_AWT_TRUE@am__append_4 = lib-gnu-awt-xlib.la
+@INSTALL_ECJ_JAR_TRUE@am__append_5 = $(ECJ_BUILD_JAR)
+@CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__append_6 = gjdoc
 @NATIVE_TRUE@noinst_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4)
 @INSTALL_BINARIES_TRUE@@NATIVE_TRUE@bin_PROGRAMS = $(am__EXEEXT_2)
-@INSTALL_BINARIES_FALSE@@NATIVE_TRUE@am__append_6 = $(bin_programs)
-@INSTALL_AOT_RPM_TRUE@am__append_7 = contrib/aot-compile-rpm
+@INSTALL_BINARIES_FALSE@@NATIVE_TRUE@am__append_7 = $(bin_programs)
+@INSTALL_AOT_RPM_TRUE@am__append_8 = contrib/aot-compile-rpm
 @BUILD_ECJ1_TRUE@libexecsub_PROGRAMS = ecjx$(EXEEXT)
-@ANONVERSCRIPT_TRUE@am__append_8 = -Wl,--version-script=$(srcdir)/libgcj.ver
-@USING_GCC_TRUE@am__append_9 = $(WARNINGS)
-@USING_BOEHMGC_TRUE@am__append_10 = boehm.cc
-@USING_NOGC_TRUE@am__append_11 = nogc.cc
-@USING_POSIX_PLATFORM_TRUE@am__append_12 = posix.cc
-@USING_WIN32_PLATFORM_TRUE@am__append_13 = win32.cc
-@USING_DARWIN_CRT_TRUE@am__append_14 = darwin.cc
-@USING_POSIX_THREADS_TRUE@am__append_15 = posix-threads.cc
-@USING_WIN32_THREADS_TRUE@am__append_16 = win32-threads.cc
-@USING_NO_THREADS_TRUE@am__append_17 = no-threads.cc
-@ANONVERSCRIPT_TRUE@am__append_18 = $(srcdir)/libgcj.ver
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
-       $(srcdir)/../config.guess $(srcdir)/../config.sub \
-       $(srcdir)/../depcomp $(srcdir)/../install-sh \
-       $(srcdir)/../ltmain.sh $(srcdir)/../missing \
-       $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in $(srcdir)/libgcj-test.spec.in \
-       $(srcdir)/libgcj.pc.in $(srcdir)/libgcj.spec.in \
-       $(srcdir)/sources.am $(top_srcdir)/configure \
-       $(top_srcdir)/contrib/aot-compile-rpm.in \
-       $(top_srcdir)/contrib/aot-compile.in \
+@ANONVERSCRIPT_TRUE@am__append_9 = -Wl,--version-script=$(srcdir)/libgcj.ver
+@USING_GCC_TRUE@am__append_10 = $(WARNINGS)
+@BUILD_SUBLIBS_TRUE@am__append_11 = libgcj-noncore.la
+@USING_BOEHMGC_TRUE@am__append_12 = boehm.cc
+@USING_NOGC_TRUE@am__append_13 = nogc.cc
+@USING_POSIX_PLATFORM_TRUE@am__append_14 = posix.cc
+@USING_WIN32_PLATFORM_TRUE@am__append_15 = win32.cc
+@USING_DARWIN_CRT_TRUE@am__append_16 = darwin.cc
+@USING_POSIX_THREADS_TRUE@am__append_17 = posix-threads.cc
+@USING_WIN32_THREADS_TRUE@am__append_18 = win32-threads.cc
+@USING_NO_THREADS_TRUE@am__append_19 = no-threads.cc
+@ANONVERSCRIPT_TRUE@am__append_20 = $(srcdir)/libgcj.ver
+@ANONVERSCRIPT_TRUE@@BUILD_SUBLIBS_TRUE@am__append_21 = $(srcdir)/libgcj.ver
+@BUILD_SUBLIBS_TRUE@am__append_22 = libgcj-noncore.la
+@BUILD_SUBLIBS_TRUE@am__append_23 = libgcj-noncore.la
+@BUILD_SUBLIBS_TRUE@am__append_24 = libgcj-noncore.la
+DIST_COMMON = $(srcdir)/sources.am NEWS README ChangeLog THANKS \
+       $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+       $(top_srcdir)/configure $(am__configure_deps) \
+       $(srcdir)/../mkinstalldirs $(srcdir)/libgcj.pc.in \
+       $(srcdir)/libgcj.spec.in $(srcdir)/libgcj-test.spec.in \
        $(top_srcdir)/contrib/aotcompile.py.in \
+       $(top_srcdir)/contrib/aot-compile.in \
+       $(top_srcdir)/contrib/aot-compile-rpm.in \
        $(top_srcdir)/contrib/generate-cacerts.pl.in \
        $(top_srcdir)/contrib/rebuild-gcj-db.in \
+       $(top_srcdir)/scripts/jar.in \
+       $(top_srcdir)/java/lang/nat${PLATFORM}Process.cc \
        $(top_srcdir)/gnu/java/nio/natVMPipe${PLATFORM}.cc \
        $(top_srcdir)/gnu/java/nio/natVMSelector${PLATFORM}.cc \
-       $(top_srcdir)/java/lang/nat${PLATFORM}Process.cc \
-       $(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS
-@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am__append_19 = gen-from-JIS
-@NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_20 = libgcj_bc.la
-@NATIVE_TRUE@@USE_LIBGCJ_BC_FALSE@am__append_21 = libgcj.la
-@XLIB_AWT_TRUE@am__append_22 = $(xlib_nat_headers)
+       $(srcdir)/../depcomp
+@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am__append_25 = gen-from-JIS
+@BUILD_SUBLIBS_TRUE@am__append_26 = libgcj-noncore.la
+@BUILD_SUBLIBS_TRUE@am__append_27 = libgcj-noncore.la
+@BUILD_SUBLIBS_TRUE@am__append_28 = libgcj-noncore.la
+@BUILD_SUBLIBS_TRUE@@NATIVE_TRUE@am__append_29 = libgcj-noncore.la
+@NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_30 = libgcj_bc.la
+@NATIVE_TRUE@@USE_LIBGCJ_BC_FALSE@am__append_31 = libgcj.la
+@XLIB_AWT_TRUE@am__append_32 = $(xlib_nat_headers)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \
@@ -174,7 +182,10 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo \
 am_lib_gnu_awt_xlib_la_OBJECTS = $(am__objects_1)
 lib_gnu_awt_xlib_la_OBJECTS = $(am_lib_gnu_awt_xlib_la_OBJECTS)
 @XLIB_AWT_TRUE@am_lib_gnu_awt_xlib_la_rpath = -rpath $(toolexeclibdir)
-libgcj_tools_la_LIBADD =
+am_libgcj_noncore_la_OBJECTS =
+libgcj_noncore_la_OBJECTS = $(am_libgcj_noncore_la_OBJECTS)
+@BUILD_SUBLIBS_TRUE@am_libgcj_noncore_la_rpath = -rpath \
+@BUILD_SUBLIBS_TRUE@   $(toolexeclibdir)
 am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo
 libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS)
 @INTERPRETER_TRUE@am__DEPENDENCIES_1 = gnu/classpath/jdwp.lo \
@@ -304,7 +315,12 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
        javax/transaction/xa.lo org/ietf/jgss.lo sun/awt.lo \
        sun/misc.lo sun/reflect.lo sun/reflect/annotation.lo \
        sun/reflect/misc.lo $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_3 =
+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(propertyo_files) \
+       $(bc_objects)
+@BUILD_SUBLIBS_FALSE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
+@BUILD_SUBLIBS_TRUE@am__DEPENDENCIES_4 =  \
+@BUILD_SUBLIBS_TRUE@   $(CORE_PACKAGE_SOURCE_FILES_LO)
+am__DEPENDENCIES_5 =
 am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
        stacktrace.cc link.cc defineclass.cc verify.cc jvmti.cc \
        interpret.cc gnu/classpath/jdwp/natVMFrame.cc \
@@ -454,14 +470,8 @@ libgcj_bc_la_OBJECTS = $(am_libgcj_bc_la_OBJECTS)
 @USE_LIBGCJ_BC_TRUE@am_libgcj_bc_la_rpath = -rpath $(toolexeclibdir)
 am_libgij_la_OBJECTS = gij.lo
 libgij_la_OBJECTS = $(am_libgij_la_OBJECTS)
-libgij_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-       $(CXXFLAGS) $(libgij_la_LDFLAGS) $(LDFLAGS) -o $@
 am_libjvm_la_OBJECTS = jni-libjvm.lo
 libjvm_la_OBJECTS = $(am_libjvm_la_OBJECTS)
-libjvm_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-       $(CXXFLAGS) $(libjvm_la_LDFLAGS) $(LDFLAGS) -o $@
 @CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__EXEEXT_1 = gjdoc$(EXEEXT)
 @NATIVE_TRUE@am__EXEEXT_2 = jv-convert$(EXEEXT) gij$(EXEEXT) \
 @NATIVE_TRUE@  grmic$(EXEEXT) grmiregistry$(EXEEXT) \
@@ -486,8 +496,6 @@ am_gcj_dbtool_OBJECTS = gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT)
 gcj_dbtool_OBJECTS = $(am_gcj_dbtool_OBJECTS)
 am_gcjh_OBJECTS =
 gcjh_OBJECTS = $(am_gcjh_OBJECTS)
-am__gen_from_JIS_SOURCES_DIST = gnu/gcj/convert/gen-from-JIS.c \
-       gnu/gcj/convert/make-trie.c gnu/gcj/convert/make-trie.h
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am_gen_from_JIS_OBJECTS = gnu/gcj/convert/gen-from-JIS.$(OBJEXT) \
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gnu/gcj/convert/make-trie.$(OBJEXT)
 gen_from_JIS_OBJECTS = $(am_gen_from_JIS_OBJECTS)
@@ -544,28 +552,16 @@ GCJCOMPILE = $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)
 LTGCJCOMPILE = $(LIBTOOL) --tag=GCJ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=compile $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)
 GCJLD = $(GCJ)
-SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(libgcj_tools_la_SOURCES) \
-       $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) \
-       $(libgcj_bc_la_SOURCES) $(libgij_la_SOURCES) \
-       $(libjvm_la_SOURCES) $(ecjx_SOURCES) $(gappletviewer_SOURCES) \
-       $(gc_analyze_SOURCES) $(gcj_dbtool_SOURCES) $(gcjh_SOURCES) \
-       $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(gjar_SOURCES) \
-       $(gjarsigner_SOURCES) $(gjavah_SOURCES) $(gjdoc_SOURCES) \
-       $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \
-       $(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \
-       $(gserialver_SOURCES) $(gtnameserv_SOURCES) \
-       $(jv_convert_SOURCES)
-DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
-       $(libgcj_tools_la_SOURCES) $(am__libgcj_la_SOURCES_DIST) \
+SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(libgcj_noncore_la_SOURCES) \
+       $(libgcj_tools_la_SOURCES) $(libgcj_la_SOURCES) \
        $(EXTRA_libgcj_la_SOURCES) $(libgcj_bc_la_SOURCES) \
        $(libgij_la_SOURCES) $(libjvm_la_SOURCES) $(ecjx_SOURCES) \
        $(gappletviewer_SOURCES) $(gc_analyze_SOURCES) \
-       $(gcj_dbtool_SOURCES) $(gcjh_SOURCES) \
-       $(am__gen_from_JIS_SOURCES_DIST) $(gij_SOURCES) \
-       $(gjar_SOURCES) $(gjarsigner_SOURCES) $(gjavah_SOURCES) \
-       $(gjdoc_SOURCES) $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) \
-       $(gorbd_SOURCES) $(grmic_SOURCES) $(grmid_SOURCES) \
-       $(grmiregistry_SOURCES) $(gserialver_SOURCES) \
+       $(gcj_dbtool_SOURCES) $(gcjh_SOURCES) $(gen_from_JIS_SOURCES) \
+       $(gij_SOURCES) $(gjar_SOURCES) $(gjarsigner_SOURCES) \
+       $(gjavah_SOURCES) $(gjdoc_SOURCES) $(gkeytool_SOURCES) \
+       $(gnative2ascii_SOURCES) $(gorbd_SOURCES) $(grmic_SOURCES) \
+       $(grmid_SOURCES) $(grmiregistry_SOURCES) $(gserialver_SOURCES) \
        $(gtnameserv_SOURCES) $(jv_convert_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        html-recursive info-recursive install-data-recursive \
@@ -578,47 +574,10 @@ DATA = $(dbexec_DATA) $(jar_DATA) $(toolexecmainlib_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-       distdir dist dist-all distcheck
+       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = @DIRLTDL@ gcj include classpath testsuite
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR_JAR = @ANTLR_JAR@
@@ -648,6 +607,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIRLTDL = @DIRLTDL@
 DIVIDESPEC = @DIVIDESPEC@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -715,6 +675,8 @@ LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
 LIBGCJ_LD_SYMBOLIC = @LIBGCJ_LD_SYMBOLIC@
 LIBGCJ_LD_SYMBOLIC_FUNCTIONS = @LIBGCJ_LD_SYMBOLIC_FUNCTIONS@
 LIBGCJ_SPEC = @LIBGCJ_SPEC@
+LIBGCJ_SUBLIB_CORE_EXTRA_DEPS = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
+LIBGCJ_SUBLIB_LTFLAGS = @LIBGCJ_SUBLIB_LTFLAGS@
 LIBICONV = @LIBICONV@
 LIBLTDL = @LIBLTDL@
 LIBOBJS = @LIBOBJS@
@@ -786,6 +748,7 @@ abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_GCJ = @ac_ct_GCJ@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -806,9 +769,8 @@ dbexecdir = @dbexecdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_gij_ldflags = @extra_gij_ldflags@
 extra_ldflags = @extra_ldflags@
-extra_ldflags_libjava = @extra_ldflags_libjava@ $(am__append_8)
+extra_ldflags_libjava = @extra_ldflags_libjava@ $(am__append_9)
 gcc_suffix = @gcc_suffix@
 gcjsubdir = @gcjsubdir@
 gxx_include_dir = @gxx_include_dir@
@@ -829,7 +791,6 @@ libexecdir = @libexecdir@
 libstdcxx_incdir = @libstdcxx_incdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 mkinstalldirs = @mkinstalldirs@
@@ -882,20 +843,167 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) \
             echo $$i; i=`expr $$i + $(write_entries_to_file_split)`; done), \
          $(shell echo $(wordlist $(range), \
                          $(shell expr $(range) + $(write_entries_to_file_split) - 1), $(1)) \
-            | tr ' ' '\n' >> $(2)))
+            | tr ' ' '\012' >> $(2)))
 
 
 # This is required by TL_AC_GXX_INCLUDE_DIR.
 libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
 libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
 toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la \
-       $(am__append_2) $(am__append_3)
+       $(am__append_2) $(am__append_3) $(am__append_4)
 toolexecmainlib_DATA = libgcj.spec
+LOWER_PACKAGE_FILES_LO = \
+       $(propertyo_files) \
+       gnu-CORBA.lo \
+       gnu-java-awt-dnd-peer-gtk.lo \
+       gnu-java-awt-peer-gtk.lo \
+       gnu-java-awt-peer-swing.lo \
+       gnu-java-lang-management.lo \
+       gnu-javax-management.lo \
+       gnu-javax-rmi.lo \
+       gnu-javax-sound-midi.lo \
+       gnu-xml-aelfred2.lo \
+       gnu-xml-dom.lo \
+       gnu-xml-libxmlj.lo \
+       gnu-xml-pipeline.lo \
+       gnu-xml-stream.lo \
+       gnu-xml-transform.lo \
+       gnu-xml-util.lo \
+       gnu-xml-validation.lo \
+       gnu-xml-xpath.lo \
+       java-lang-management.lo \
+       javax-imageio.lo \
+       javax-rmi.lo \
+       jni-libjvm.lo \
+       org-omg-CORBA.lo \
+       org-omg-CORBA_2_3.lo \
+       org-omg-CosNaming.lo \
+       org-omg-Dynamic.lo \
+       org-omg-DynamicAny.lo \
+       org-omg-IOP.lo \
+       org-omg-Messaging.lo \
+       org-omg-PortableInterceptor.lo \
+       org-omg-PortableServer.lo \
+       org-omg-SendingContext.lo \
+       org-omg-stub.lo \
+       org-relaxng.lo \
+       org-xml.lo \
+       META-INF/services/java.util.prefs.PreferencesFactory.in.lo \
+       META-INF/services/java.util.prefs.PreferencesFactory.lo \
+       META-INF/services/javax.sound.midi.spi.MidiDeviceProvider.lo \
+       META-INF/services/javax.sound.midi.spi.MidiFileReader.lo \
+       META-INF/services/javax.sound.midi.spi.MidiFileWriter.lo \
+       META-INF/services/javax.sound.sampled.spi.AudioFileReader.lo \
+       classpath/native/jni/classpath/jcl.lo \
+       classpath/native/jni/classpath/jnilink.lo \
+       classpath/native/jni/java-math/gnu_java_math_GMP.lo \
+       classpath/tools/libgcj_tools_la-tools.lo \
+       gnu/awt.lo \
+       gnu/awt/j2d.lo \
+       gnu/gcj/io.lo \
+       gnu/gcj/io/natSimpleSHSStream.lo \
+       gnu/gcj/io/shs.lo \
+       gnu/gcj/tools/gcj_dbtool.lo \
+       gnu/gcj/util/natDebug.lo \
+       gnu/gcj/util/natGCInfo.lo \
+       gnu/java/awt/dnd.lo \
+       gnu/java/awt/font.lo \
+       gnu/java/awt/image.lo \
+       gnu/java/awt/print.lo \
+       gnu/java/awt/font/autofit.lo \
+       gnu/java/awt/font/opentype.lo \
+       gnu/java/awt/font/opentype/truetype.lo \
+       gnu/java/lang/management/natVMClassLoadingMXBeanImpl.lo \
+       gnu/java/lang/management/natVMCompilationMXBeanImpl.lo \
+       gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.lo \
+       gnu/java/lang/management/natVMMemoryMXBeanImpl.lo \
+       gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.lo \
+       gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.lo \
+       gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.lo \
+       gnu/java/lang/management/natVMRuntimeMXBeanImpl.lo \
+       gnu/java/lang/management/natVMThreadMXBeanImpl.lo \
+       gnu/java/net/local.lo \
+       gnu/java/net/protocol/ftp.lo \
+       gnu/java/net/protocol/gcjlib.lo \
+       gnu/java/net/protocol/https.lo \
+       gnu/javax/imageio.lo \
+       gnu/javax/print.lo \
+       gnu/javax/sound.lo \
+       gnu/javax/activation/viewers.lo \
+       gnu/javax/imageio/bmp.lo \
+       gnu/javax/imageio/gif.lo \
+       gnu/javax/imageio/jpeg.lo \
+       gnu/javax/imageio/png.lo \
+       gnu/javax/naming/giop.lo \
+       gnu/javax/naming/ictxImpl/trans.lo \
+       gnu/javax/naming/jndi/url/corbaname.lo \
+       gnu/javax/naming/jndi/url/rmi.lo \
+       gnu/javax/print/ipp.lo \
+       gnu/javax/print/ipp/attribute.lo \
+       gnu/javax/print/ipp/attribute/defaults.lo \
+       gnu/javax/print/ipp/attribute/job.lo \
+       gnu/javax/print/ipp/attribute/printer.lo \
+       gnu/javax/print/ipp/attribute/supported.lo \
+       gnu/javax/security/auth/login.lo \
+       gnu/javax/sound/sampled/AU.lo \
+       gnu/javax/sound/sampled/WAV.lo \
+       gnu/javax/swing/plaf/gnu.lo \
+       gnu/javax/swing/plaf/metal.lo \
+       java/sql.lo \
+       java/awt/im.lo \
+       java/awt/print.lo \
+       java/awt/im/spi.lo \
+       java/security/acl.lo \
+       javax/activation.lo \
+       javax/activity.lo \
+       javax/management.lo \
+       javax/naming.lo \
+       javax/print.lo \
+       javax/sql.lo \
+       javax/tools.lo \
+       javax/transaction.lo \
+       javax/management/loading.lo \
+       javax/management/openmbean.lo \
+       javax/management/remote.lo \
+       javax/management/remote/rmi.lo \
+       javax/naming/directory.lo \
+       javax/naming/event.lo \
+       javax/naming/ldap.lo \
+       javax/naming/spi.lo \
+       javax/print/attribute.lo \
+       javax/print/event.lo \
+       javax/print/attribute/standard.lo \
+       javax/security/cert.lo \
+       javax/security/auth/kerberos.lo \
+       javax/security/auth/login.lo \
+       javax/security/auth/spi.lo \
+       javax/sound/midi.lo \
+       javax/sound/midi/spi.lo \
+       javax/swing/plaf/multi.lo \
+       javax/swing/plaf/synth.lo \
+       javax/swing/text/rtf.lo \
+       javax/swing/text/html/default.css.lo \
+       javax/transaction/xa.lo \
+       org/ietf/jgss.lo \
+       sun/awt.lo
+
+ALL_PACKAGE_SOURCE_FILES_LO = $(all_packages_source_files:.list=.lo) $(propertyo_files) $(bc_objects)
+NONCORE_PACKAGE_SOURCE_FILES_LO = $(filter $(LOWER_PACKAGE_FILES_LO),$(ALL_PACKAGE_SOURCE_FILES_LO))
+CORE_PACKAGE_SOURCE_FILES_LO = $(filter-out $(LOWER_PACKAGE_FILES_LO),$(ALL_PACKAGE_SOURCE_FILES_LO))
+@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_LIBADD_SUBOBJECTS = $(NONCORE_PACKAGE_SOURCE_FILES_LO)
+# If not building sublibraries, everything goes in libgcj,
+# and it cannot be usefully built shared on PE platforms.
+@BUILD_SUBLIBS_FALSE@libgcj_la_LIBADD_SUBOBJECTS = $(ALL_PACKAGE_SOURCE_FILES_LO)
+@BUILD_SUBLIBS_TRUE@libgcj_la_LIBADD_SUBOBJECTS = $(CORE_PACKAGE_SOURCE_FILES_LO)
+@BUILD_SUBLIBS_FALSE@LIBJAVA_LDFLAGS_NOUNDEF = 
+@BUILD_SUBLIBS_TRUE@LIBJAVA_LDFLAGS_NOUNDEF = $(LIBGCJ_SUBLIB_LTFLAGS)
+@BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
+@BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
 dbexec_LTLIBRARIES = libjvm.la
 pkgconfigdir = $(libdir)/pkgconfig
 jardir = $(datadir)/java
 jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
-       $(am__append_4)
+       $(am__append_5)
 @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
 @JAVA_HOME_SET_TRUE@JAVA_HOME_DIR = $(JAVA_HOME)
 @JAVA_HOME_SET_FALSE@BOOT_CLASS_PATH_DIR = $(jardir)/libgcj-$(gcc_version).jar
@@ -905,10 +1013,10 @@ db_pathtail = $(gcjsubdir)/$(db_name)
 @NATIVE_TRUE@bin_programs = jv-convert gij grmic grmiregistry \
 @NATIVE_TRUE@  gcj-dbtool gappletviewer gjarsigner gkeytool gjar \
 @NATIVE_TRUE@  gcjh gjavah gnative2ascii gorbd grmid gserialver \
-@NATIVE_TRUE@  gtnameserv gc-analyze $(am__append_5)
+@NATIVE_TRUE@  gtnameserv gc-analyze $(am__append_6)
 @NATIVE_TRUE@dbexec_DATA = $(db_name)
 bin_SCRIPTS = contrib/rebuild-gcj-db contrib/aot-compile \
-       $(am__append_7)
+       $(am__append_8)
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
 LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
 GCJLINK = $(LIBTOOL) --tag=GCJ $(LIBTOOLFLAGS) --mode=link $(GCJ) -L$(here) \
@@ -950,7 +1058,7 @@ AM_GCJFLAGS = \
        --encoding=UTF-8 \
        -Wno-deprecated -fbootstrap-classes
 
-AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_9)
+AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_10)
 @SUPPRESS_LIBGCJ_BC_FALSE@LIBGCJ_BC_FLAGS = -findirect-dispatch -fno-indirect-classes
 @SUPPRESS_LIBGCJ_BC_TRUE@LIBGCJ_BC_FLAGS = 
 @BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE@LIBGCJ_REDUCED_REFLECTION_FLAGS = 
@@ -968,25 +1076,26 @@ AM_CPPFLAGS = -I$(top_srcdir) \
 
 BOOTCLASSPATH = $(srcdir)/classpath/lib
 libgij_la_SOURCES = gij.cc
-libgij_la_DEPENDENCIES = libgcj.la libgcj.spec
+libgij_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_11)
 libgij_la_LIBADD = -L$(here)/.libs libgcj.la
-libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
+libgij_la_LDFLAGS = -rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \
         -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
 
+libgij_la_LINK = $(CXXLINK) $(libgij_la_LDFLAGS)
 @INTERPRETER_FALSE@libgcj_interpret_source_files = 
 @INTERPRETER_TRUE@libgcj_interpret_source_files = jvmti.cc interpret.cc
 libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \
        defineclass.cc verify.cc $(libgcj_interpret_source_files) \
-       $(nat_source_files) $(am__append_10) $(am__append_11) \
-       $(am__append_12) $(am__append_13) $(am__append_14) \
-       $(am__append_15) $(am__append_16) $(am__append_17)
+       $(nat_source_files) $(am__append_12) $(am__append_13) \
+       $(am__append_14) $(am__append_15) $(am__append_16) \
+       $(am__append_17) $(am__append_18) $(am__append_19)
 nat_files = $(nat_source_files:.cc=.lo)
 xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
 
 # Include THREADLIBS here to ensure that the correct version of
 # certain linuxthread functions get linked:
 libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \
-       $(LIBLTDL) $(SYS_ZLIBS) \
+       $(LIBLTDL) $(SYS_ZLIBS) $(LIBJAVA_LDFLAGS_NOUNDEF) \
        -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
        $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
 
@@ -995,17 +1104,24 @@ libgcj_la_LIBADD = \
        java/lang/Object.lo \
        java/lang/Class.lo \
        java/process-$(PLATFORM).lo \
-       $(all_packages_source_files:.list=.lo) \
-       $(bc_objects) \
-       $(propertyo_files) \
+       $(libgcj_la_LIBADD_SUBOBJECTS) \
        $(LIBFFI) $(ZLIBS) $(GCLIBS)
 
 libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar java/lang/Object.lo \
        java/lang/Class.lo java/process-$(PLATFORM).lo \
-       $(all_packages_source_files:.list=.lo) $(LIBLTDL) \
-       $(libgcj_la_LIBADD) $(am__append_18)
+       $(ALL_PACKAGE_SOURCE_FILES_LO) $(LIBLTDL) $(libgcj_la_LIBADD) \
+       $(LIBJAVA_CORE_EXTRA) $(am__append_20)
 libgcj_la_LINK = $(LIBLINK) $(libgcj_la_LDFLAGS)
 EXTRA_libgcj_la_SOURCES = java/lang/Object.java
+@BUILD_SUBLIBS_TRUE@DLL_VERSION = `expr \`grep -v '^\#' $(srcdir)/libtool-version | sed -e 's/\(.*\):\(.*\):.*/\1 + \2/'\``
+@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_SOURCES = 
+@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_LDFLAGS = $(libgcj_la_LDFLAGS)
+@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_LIBADD = $(libgcj_noncore_la_LIBADD_SUBOBJECTS) libgcj.la
+@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_DEPENDENCIES =  \
+@BUILD_SUBLIBS_TRUE@   libgcj-$(gcc_version).jar $(LIBLTDL) \
+@BUILD_SUBLIBS_TRUE@   $(libgcj_noncore_la_LIBADD) libgcj.la \
+@BUILD_SUBLIBS_TRUE@   $(am__append_21)
+@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_LINK = $(libgcj_la_LINK)
 
 # We compile libgcj_tools with -findirect-dispatch so that they can
 # depend on external classes: in particular, gjdoc uses antlr.  In
@@ -1019,20 +1135,22 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \
 
 libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
  -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
- $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
+ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF)
 
-libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
+libgcj_tools_la_LIBADD = libgcj.la -lm
+libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_22)
 libgcj_tools_la_LINK = $(LIBLINK) $(libgcj_tools_la_LDFLAGS)
 libjvm_la_SOURCES = jni-libjvm.cc
-libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec
+libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_23)
 libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
-libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC)
+libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC) \
+ $(LIBJAVA_LDFLAGS_NOUNDEF)
+
+libjvm_la_LINK = $(CXXLINK) $(libjvm_la_LDFLAGS)
 lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files)
 lib_gnu_awt_xlib_la_LIBADD = gnu/awt/xlib.lo gnu/gcj/xlib.lo
-lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
-       libgcj.la libgcj.spec \
-       $(lib_gnu_awt_xlib_la_LIBADD)
-
+lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar libgcj.la \
+       libgcj.spec $(lib_gnu_awt_xlib_la_LIBADD) $(am__append_24)
 lib_gnu_awt_xlib_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -I../libstdc++-v3/include \
@@ -1041,13 +1159,13 @@ lib_gnu_awt_xlib_la_CPPFLAGS = \
 
 lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \
        @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
-        -rpath $(toolexeclibdir) \
+        -rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \
         -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
 
 lib_gnu_awt_xlib_la_LINK = $(LIBLINK) $(lib_gnu_awt_xlib_la_LDFLAGS)
 libgcj_bc_la_SOURCES = libgcj_bc.c
 libgcj_bc_la_LDFLAGS = -rpath $(toolexeclibdir) -no-static -version-info 1:0:0 \
-       $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
+       $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF)
 
 libgcj_bc_la_DEPENDENCIES = libgcj.la
 libgcj_bc_la_LINK = $(LIBLINK) $(libgcj_bc_la_LDFLAGS)
@@ -8310,7 +8428,7 @@ jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \
 
 jv_convert_LINK = $(GCJLINK) $(jv_convert_LDFLAGS)
 jv_convert_LDADD = -L$(here)/.libs libgcj.la
-jv_convert_DEPENDENCIES = libgcj.la libgcj.spec
+jv_convert_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_26)
 gcj_dbtool_SOURCES = \
 gnu/gcj/tools/gcj_dbtool/natMain.cc
 
@@ -8319,18 +8437,19 @@ gcj_dbtool_LDFLAGS = --main=gnu.gcj.tools.gcj_dbtool.Main \
 
 gcj_dbtool_LINK = $(GCJLINK) $(gcj_dbtool_LDFLAGS)
 gcj_dbtool_LDADD = gnu/gcj/tools/gcj_dbtool.lo -L$(here)/.libs libgcj.la
-gcj_dbtool_DEPENDENCIES = gnu/gcj/tools/gcj_dbtool.lo libgcj.la libgcj.spec
+gcj_dbtool_DEPENDENCIES = gnu/gcj/tools/gcj_dbtool.lo libgcj.la \
+       libgcj.spec $(am__append_27)
 gc_analyze_SOURCES = 
 gc_analyze_LDFLAGS = --main=gnu.gcj.tools.gc_analyze.MemoryAnalyze \
         -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gc_analyze_LINK = $(GCJLINK) $(gc_analyze_LDFLAGS)
 gc_analyze_LDADD = -L$(here)/.libs libgcj-tools.la libgcj.la
-gc_analyze_DEPENDENCIES = libgcj-tools.la libgcj.la libgcj.spec
+gc_analyze_DEPENDENCIES = libgcj-tools.la libgcj.la libgcj.spec \
+       $(am__append_28)
 gij_SOURCES = 
 gij_LDFLAGS = -rpath $(dbexecdir) -rpath $(toolexeclibdir) \
-       -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) \
-       $(extra_gij_ldflags) 
+       -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gij_LINK = $(GCJLINK) $(gij_LDFLAGS)
 gij_LDADD = -L$(here)/.libs libgij.la
@@ -8346,10 +8465,10 @@ ECJX_BASE_FLAGS = -findirect-dispatch \
 @NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
 @NATIVE_FALSE@ecjx_LDADD = 
 @NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs $(extra_ldflags) \
-@NATIVE_TRUE@  $(am__append_21)
+@NATIVE_TRUE@  $(am__append_31)
 @NATIVE_FALSE@ecjx_DEPENDENCIES = 
 @NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \
-@NATIVE_TRUE@  $(am__append_20)
+@NATIVE_TRUE@  $(am__append_29) $(am__append_30)
 gappletviewer_SOURCES = 
 gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \
        -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
@@ -8566,7 +8685,7 @@ gnu/gcj/xlib/natXImage.cc \
 gnu/gcj/xlib/natXUnmapEvent.cc
 
 sourcesdir = $(jardir)
-headers_to_make = $(nat_headers) $(am__append_22)
+headers_to_make = $(nat_headers) $(am__append_32)
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
@@ -8602,6 +8721,7 @@ AM_MAKEFLAGS = \
        "gxx_include_dir=$(gxx_include_dir)" \
        "AR=$(AR)" \
        "AS=$(AS)" \
+       "DLLTOOL=$(DLLTOOL)" \
        "LD=$(LD)" \
        "LIBCFLAGS=$(LIBCFLAGS)" \
        "NM=$(NM)" \
@@ -8807,6 +8927,8 @@ gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo:  \
 gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo:  \
        gnu/gcj/xlib/$(am__dirstamp) \
        gnu/gcj/xlib/$(DEPDIR)/$(am__dirstamp)
+libgcj-noncore.la: $(libgcj_noncore_la_OBJECTS) $(libgcj_noncore_la_DEPENDENCIES) 
+       $(libgcj_noncore_la_LINK) $(am_libgcj_noncore_la_rpath) $(libgcj_noncore_la_OBJECTS) $(libgcj_noncore_la_LIBADD) $(LIBS)
 classpath/tools/$(am__dirstamp):
        @$(MKDIR_P) classpath/tools
        @: > classpath/tools/$(am__dirstamp)
@@ -10096,7 +10218,7 @@ uninstall-toolexecmainlibDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
@@ -10121,7 +10243,7 @@ $(RECURSIVE_TARGETS):
        fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
@@ -10285,7 +10407,8 @@ distdir: $(DISTFILES)
          fi; \
        done
        -test -n "$(am__skip_mode_fix)" \
-       || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+       || find "$(distdir)" -type d ! -perm -755 \
+               -exec chmod u+rwx,go+rx {} \; -o \
          ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -10329,17 +10452,17 @@ dist dist-all: distdir
 distcheck: dist
        case '$(DIST_ARCHIVES)' in \
        *.tar.gz*) \
-         GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+         GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
        *.tar.bz2*) \
-         bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+         bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
        *.tar.lzma*) \
-         unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+         lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
        *.tar.xz*) \
          xz -dc $(distdir).tar.xz | $(am__untar) ;;\
        *.tar.Z*) \
          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
        *.shar.gz*) \
-         GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+         GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
        *.zip*) \
          unzip $(distdir).zip ;;\
        esac
@@ -10535,6 +10658,8 @@ install-exec-am: install-binPROGRAMS install-binSCRIPTS \
        install-toolexeclibLTLIBRARIES install-toolexecmainlibDATA
        @$(NORMAL_INSTALL)
        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-html: install-html-recursive
+
 install-html-am:
 
 install-info: install-info-recursive
@@ -10543,6 +10668,8 @@ install-info-am:
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
 install-pdf-am:
 
 install-ps: install-ps-recursive
@@ -10586,14 +10713,11 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
        clean-binPROGRAMS clean-dbexecLTLIBRARIES clean-generic \
        clean-libexecsubPROGRAMS clean-libtool clean-multi \
        clean-noinstPROGRAMS clean-toolexeclibLTLIBRARIES ctags \
-       ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzma \
-       dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
-       distclean-compile distclean-generic distclean-libtool \
-       distclean-local distclean-multi distclean-tags distcleancheck \
-       distdir distuninstallcheck dvi dvi-am html html-am info \
-       info-am install install-am install-binPROGRAMS \
-       install-binSCRIPTS install-data install-data-am \
-       install-data-local install-dbexecDATA \
+       ctags-recursive distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-local distclean-multi \
+       distclean-tags dvi dvi-am html html-am info info-am install \
+       install-am install-binPROGRAMS install-binSCRIPTS install-data \
+       install-data-am install-data-local install-dbexecDATA \
        install-dbexecLTLIBRARIES install-dvi install-dvi-am \
        install-exec install-exec-am install-exec-hook install-html \
        install-html-am install-info install-info-am install-jarDATA \
@@ -10613,6 +10737,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 
 
 interpret.lo:  AM_CXXFLAGS += -fwrapv
+@BUILD_SUBLIBS_TRUE@libgcj-noncore-dummy.dll.a : $(srcdir)/libgcj-noncore-dummy.def
+@BUILD_SUBLIBS_TRUE@   $(DLLTOOL) -d $^ -l $@ --dllname cyggcj-noncore-$(DLL_VERSION).dll 
 
 $(db_name): gcj-dbtool$(EXEEXT)
        @rm -f $(db_name)
@@ -11772,7 +11898,7 @@ java/io.list: $(java_io_source_files)
 
 java/lang.list: $(java_lang_source_files)
        @$(mkinstalldirs) $(dir $@)
-       echo $(srcdir)/classpath/lib/java/lang/*.class | tr ' ' '\n' | fgrep -v Object.class | fgrep -v Class.class | egrep -v '(Ecos|Posix|Win32)Process' > java/lang.list
+       echo $(srcdir)/classpath/lib/java/lang/*.class | tr ' ' '\012' | fgrep -v Object.class | fgrep -v Class.class | egrep -v '(Ecos|Posix|Win32)Process' > java/lang.list
 
 -include java/lang.deps
 
@@ -12773,11 +12899,6 @@ $(libgcj_la_OBJECTS) $(gcj_dbtool_OBJECTS) $(xlib_nat_files): headers.stamp
 $(libgij_la_OBJECTS): headers.stamp
 $(libjvm_la_OBJECTS): headers.stamp
 
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
 # Multilib support.
 .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
        maintainer-clean-multi