Patchwork [4.6] Use automake no-dist everywhere

login
register
mail settings
Submitter Jakub Jelinek
Date Sept. 20, 2012, 1:34 p.m.
Message ID <20120920133410.GD1787@tucnak.redhat.com>
Download mbox | patch
Permalink /patch/185401/
State New
Headers show

Comments

Jakub Jelinek - Sept. 20, 2012, 1:34 p.m.
Hi!

Similarly for 4.6 branch.  Similar question for libgo, though I hope
no syncing is being performed to such old release branch anymore.

Ok for 4.6?

2012-09-20  Jakub Jelinek  <jakub@redhat.com>

	PR other/43620
libffi/
	* Makefile.in: Regenerated.
	* include/Makefile.in: Regenerated.
	* man/Makefile.in: Regenerated.
	* testsuite/Makefile.in: Regenerated.
libgo/
	* testsuite/Makefile.in: Regenerated.
libjava/classpath/
	* configure.ac (AM_INIT_AUTOMAKE): Add no-dist.
	* Makefile.in: Regenerated.
	* doc/Makefile.in: Regeneated.
	* doc/api/Makefile.in: Regeneated.
	* examples/Makefile.in: Regeneated.
	* external/Makefile.in: Regeneated.
	* external/jsr166/Makefile.in: Regeneated.
	* external/relaxngDatatype/Makefile.in: Regeneated.
	* external/sax/Makefile.in: Regeneated.
	* external/w3c_dom/Makefile.in: Regeneated.
	* include/Makefile.in: Regeneated.
	* lib/Makefile.in: Regeneated.
	* native/Makefile.in: Regeneated.
	* native/fdlibm/Makefile.in: Regeneated.
	* native/jawt/Makefile.in: Regeneated.
	* native/jni/Makefile.in: Regeneated.
	* native/jni/classpath/Makefile.in: Regeneated.
	* native/jni/gconf-peer/Makefile.in: Regeneated.
	* native/jni/gstreamer-peer/Makefile.in: Regeneated.
	* native/jni/gtk-peer/Makefile.in: Regeneated.
	* native/jni/java-io/Makefile.in: Regeneated.
	* native/jni/java-lang/Makefile.in: Regeneated.
	* native/jni/java-math/Makefile.in: Regeneated.
	* native/jni/java-net/Makefile.in: Regeneated.
	* native/jni/java-nio/Makefile.in: Regeneated.
	* native/jni/java-util/Makefile.in: Regeneated.
	* native/jni/midi-alsa/Makefile.in: Regeneated.
	* native/jni/midi-dssi/Makefile.in: Regeneated.
	* native/jni/native-lib/Makefile.in: Regeneated.
	* native/jni/qt-peer/Makefile.in: Regeneated.
	* native/jni/xmlj/Makefile.in: Regeneated.
	* native/plugin/Makefile.in: Regeneated.
	* resource/Makefile.in: Regeneated.
	* scripts/Makefile.in: Regeneated.
	* tools/Makefile.in: Regeneated.


	Jakub
Richard Guenther - Sept. 20, 2012, 2:45 p.m.
On Thu, Sep 20, 2012 at 3:34 PM, Jakub Jelinek <jakub@redhat.com> wrote:
> Hi!
>
> Similarly for 4.6 branch.  Similar question for libgo, though I hope
> no syncing is being performed to such old release branch anymore.
>
> Ok for 4.6?

Ok.

Thanks,
Richard.

> 2012-09-20  Jakub Jelinek  <jakub@redhat.com>
>
>         PR other/43620
> libffi/
>         * Makefile.in: Regenerated.
>         * include/Makefile.in: Regenerated.
>         * man/Makefile.in: Regenerated.
>         * testsuite/Makefile.in: Regenerated.
> libgo/
>         * testsuite/Makefile.in: Regenerated.
> libjava/classpath/
>         * configure.ac (AM_INIT_AUTOMAKE): Add no-dist.
>         * Makefile.in: Regenerated.
>         * doc/Makefile.in: Regeneated.
>         * doc/api/Makefile.in: Regeneated.
>         * examples/Makefile.in: Regeneated.
>         * external/Makefile.in: Regeneated.
>         * external/jsr166/Makefile.in: Regeneated.
>         * external/relaxngDatatype/Makefile.in: Regeneated.
>         * external/sax/Makefile.in: Regeneated.
>         * external/w3c_dom/Makefile.in: Regeneated.
>         * include/Makefile.in: Regeneated.
>         * lib/Makefile.in: Regeneated.
>         * native/Makefile.in: Regeneated.
>         * native/fdlibm/Makefile.in: Regeneated.
>         * native/jawt/Makefile.in: Regeneated.
>         * native/jni/Makefile.in: Regeneated.
>         * native/jni/classpath/Makefile.in: Regeneated.
>         * native/jni/gconf-peer/Makefile.in: Regeneated.
>         * native/jni/gstreamer-peer/Makefile.in: Regeneated.
>         * native/jni/gtk-peer/Makefile.in: Regeneated.
>         * native/jni/java-io/Makefile.in: Regeneated.
>         * native/jni/java-lang/Makefile.in: Regeneated.
>         * native/jni/java-math/Makefile.in: Regeneated.
>         * native/jni/java-net/Makefile.in: Regeneated.
>         * native/jni/java-nio/Makefile.in: Regeneated.
>         * native/jni/java-util/Makefile.in: Regeneated.
>         * native/jni/midi-alsa/Makefile.in: Regeneated.
>         * native/jni/midi-dssi/Makefile.in: Regeneated.
>         * native/jni/native-lib/Makefile.in: Regeneated.
>         * native/jni/qt-peer/Makefile.in: Regeneated.
>         * native/jni/xmlj/Makefile.in: Regeneated.
>         * native/plugin/Makefile.in: Regeneated.
>         * resource/Makefile.in: Regeneated.
>         * scripts/Makefile.in: Regeneated.
>         * tools/Makefile.in: Regeneated.
>
> --- libffi/configure.ac (revision 191562)
> +++ libffi/configure.ac (working copy)
> @@ -12,7 +12,7 @@ target_alias=${target_alias-$host_alias}
>
>  . ${srcdir}/configure.host
>
> -AM_INIT_AUTOMAKE
> +AM_INIT_AUTOMAKE([no-dist])
>
>  # The same as in boehm-gc and libstdc++. Have to borrow it from there.
>  # We must force CC to /not/ be precious variables; otherwise
> --- libffi/Makefile.in  (revision 191562)
> +++ libffi/Makefile.in  (working copy)
> @@ -61,13 +61,10 @@ target_triplet = @target@
>  @PA_LINUX_TRUE@am__append_24 = src/pa/linux.S src/pa/ffi.c
>  @PA_HPUX_TRUE@am__append_25 = src/pa/hpux32.S src/pa/ffi.c
>  subdir = .
> -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)/fficonfig.h.in \
> -       $(top_srcdir)/configure ChangeLog
> +DIST_COMMON = README ChangeLog $(srcdir)/Makefile.in \
> +       $(srcdir)/Makefile.am $(top_srcdir)/configure \
> +       $(am__configure_deps) $(srcdir)/fficonfig.h.in \
> +       $(srcdir)/../mkinstalldirs $(srcdir)/../depcomp
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
>         $(top_srcdir)/../config/lead-dot.m4 \
> @@ -201,7 +198,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>  SOURCES = $(libffi_la_SOURCES) $(nodist_libffi_la_SOURCES) \
>         $(libffi_convenience_la_SOURCES) \
>         $(nodist_libffi_convenience_la_SOURCES)
> -DIST_SOURCES = $(libffi_la_SOURCES) $(libffi_convenience_la_SOURCES)
>  MULTISRCTOP =
>  MULTIBUILDTOP =
>  MULTIDIRS =
> @@ -218,47 +214,10 @@ RECURSIVE_TARGETS = all-recursive check-
>  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 = $(SUBDIRS)
> -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@
>  ALLOCA = @ALLOCA@
>  AMTAR = @AMTAR@
> @@ -1184,182 +1143,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       $(am__remove_distdir)
> -       test -d "$(distdir)" || mkdir "$(distdir)"
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           test -d "$(distdir)/$$subdir" \
> -           || $(MKDIR_P) "$(distdir)/$$subdir" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
> -           $(am__relativize); \
> -           new_distdir=$$reldir; \
> -           dir1=$$subdir; dir2="$(top_distdir)"; \
> -           $(am__relativize); \
> -           new_top_distdir=$$reldir; \
> -           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
> -           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
> -           ($(am__cd) $$subdir && \
> -             $(MAKE) $(AM_MAKEFLAGS) \
> -               top_distdir="$$new_top_distdir" \
> -               distdir="$$new_distdir" \
> -               am__remove_distdir=: \
> -               am__skip_length_check=: \
> -               am__skip_mode_fix=: \
> -               distdir) \
> -             || exit 1; \
> -         fi; \
> -       done
> -       -test -n "$(am__skip_mode_fix)" \
> -       || 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 {} {} \; \
> -       || chmod -R a+r "$(distdir)"
> -dist-gzip: distdir
> -       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
> -       $(am__remove_distdir)
> -
> -dist-bzip2: distdir
> -       tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
> -       $(am__remove_distdir)
> -
> -dist-lzma: distdir
> -       tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
> -       $(am__remove_distdir)
> -
> -dist-xz: distdir
> -       tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
> -       $(am__remove_distdir)
> -
> -dist-tarZ: distdir
> -       tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
> -       $(am__remove_distdir)
> -
> -dist-shar: distdir
> -       shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
> -       $(am__remove_distdir)
> -
> -dist-zip: distdir
> -       -rm -f $(distdir).zip
> -       zip -rq $(distdir).zip $(distdir)
> -       $(am__remove_distdir)
> -
> -dist dist-all: distdir
> -       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
> -       $(am__remove_distdir)
> -
> -# This target untars the dist file and tries a VPATH configuration.  Then
> -# it guarantees that the distribution is self-contained by making another
> -# tarfile.
> -distcheck: dist
> -       case '$(DIST_ARCHIVES)' in \
> -       *.tar.gz*) \
> -         GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
> -       *.tar.bz2*) \
> -         bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
> -       *.tar.lzma*) \
> -         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) gzip -dc $(distdir).shar.gz | unshar ;;\
> -       *.zip*) \
> -         unzip $(distdir).zip ;;\
> -       esac
> -       chmod -R a-w $(distdir); chmod a+w $(distdir)
> -       mkdir $(distdir)/_build
> -       mkdir $(distdir)/_inst
> -       chmod a-w $(distdir)
> -       test -d $(distdir)/_build || exit 0; \
> -       dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
> -         && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
> -         && am__cwd=`pwd` \
> -         && $(am__cd) $(distdir)/_build \
> -         && ../configure --srcdir=.. --prefix="$$dc_install_base" \
> -           $(DISTCHECK_CONFIGURE_FLAGS) \
> -         && $(MAKE) $(AM_MAKEFLAGS) \
> -         && $(MAKE) $(AM_MAKEFLAGS) dvi \
> -         && $(MAKE) $(AM_MAKEFLAGS) check \
> -         && $(MAKE) $(AM_MAKEFLAGS) install \
> -         && $(MAKE) $(AM_MAKEFLAGS) installcheck \
> -         && $(MAKE) $(AM_MAKEFLAGS) uninstall \
> -         && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
> -               distuninstallcheck \
> -         && chmod -R a-w "$$dc_install_base" \
> -         && ({ \
> -              (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
> -              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
> -              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
> -              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
> -                   distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
> -             } || { rm -rf "$$dc_destdir"; exit 1; }) \
> -         && rm -rf "$$dc_destdir" \
> -         && $(MAKE) $(AM_MAKEFLAGS) dist \
> -         && rm -rf $(DIST_ARCHIVES) \
> -         && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
> -         && cd "$$am__cwd" \
> -         || exit 1
> -       $(am__remove_distdir)
> -       @(echo "$(distdir) archives ready for distribution: "; \
> -         list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
> -         sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
> -distuninstallcheck:
> -       @$(am__cd) '$(distuninstallcheck_dir)' \
> -       && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
> -          || { echo "ERROR: files left after uninstall:" ; \
> -               if test -n "$(DESTDIR)"; then \
> -                 echo "  (check DESTDIR support)"; \
> -               fi ; \
> -               $(distuninstallcheck_listfiles) ; \
> -               exit 1; } >&2
> -distcleancheck: distclean
> -       @if test '$(srcdir)' = . ; then \
> -         echo "ERROR: distcleancheck can only run from a VPATH build" ; \
> -         exit 1 ; \
> -       fi
> -       @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
> -         || { echo "ERROR: files left in build directory after distclean:" ; \
> -              $(distcleancheck_listfiles) ; \
> -              exit 1; } >&2
>  check-am: all-am
>  check: check-recursive
>  all-am: Makefile $(LTLIBRARIES) all-multi fficonfig.h
> @@ -1510,18 +1293,15 @@ uninstall-am: uninstall-toolexeclibLTLIB
>         all all-am all-multi am--refresh check check-am clean \
>         clean-generic clean-libtool clean-multi \
>         clean-noinstLTLIBRARIES 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-hdr \
> -       distclean-libtool distclean-multi distclean-tags \
> -       distcleancheck distdir distuninstallcheck dvi dvi-am html \
> -       html-am info info-am install install-am install-data \
> -       install-data-am install-dvi install-dvi-am install-exec \
> -       install-exec-am install-html install-html-am install-info \
> -       install-info-am install-man install-multi install-pdf \
> -       install-pdf-am install-ps install-ps-am install-strip \
> -       install-toolexeclibLTLIBRARIES installcheck installcheck-am \
> -       installdirs installdirs-am maintainer-clean \
> +       ctags-recursive distclean distclean-compile distclean-generic \
> +       distclean-hdr distclean-libtool distclean-multi distclean-tags \
> +       dvi dvi-am html html-am info info-am install install-am \
> +       install-data install-data-am install-dvi install-dvi-am \
> +       install-exec install-exec-am install-html install-html-am \
> +       install-info install-info-am install-man install-multi \
> +       install-pdf install-pdf-am install-ps install-ps-am \
> +       install-strip install-toolexeclibLTLIBRARIES installcheck \
> +       installcheck-am installdirs installdirs-am maintainer-clean \
>         maintainer-clean-generic maintainer-clean-multi mostlyclean \
>         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
>         mostlyclean-multi pdf pdf-am ps ps-am tags tags-recursive \
> --- libffi/include/Makefile.in  (revision 191562)
> +++ libffi/include/Makefile.in  (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = include
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
>         $(srcdir)/ffi.h.in $(toollibffi_HEADERS)
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
> @@ -54,7 +54,6 @@ CONFIG_HEADER = $(top_builddir)/fficonfi
>  CONFIG_CLEAN_FILES = ffi.h ffitarget.h
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
>  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>  am__vpath_adj = case $$p in \
>      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
> @@ -80,7 +79,6 @@ am__installdirs = "$(DESTDIR)$(toollibff
>  HEADERS = $(toollibffi_HEADERS)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  ALLOCA = @ALLOCA@
>  AMTAR = @AMTAR@
> @@ -329,37 +327,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(HEADERS)
> @@ -463,17 +430,16 @@ uninstall-am: uninstall-toollibffiHEADER
>
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool ctags distclean distclean-generic \
> -       distclean-libtool distclean-tags distdir dvi dvi-am html \
> -       html-am info info-am install install-am install-data \
> -       install-data-am install-dvi install-dvi-am install-exec \
> -       install-exec-am install-html install-html-am install-info \
> -       install-info-am install-man install-pdf install-pdf-am \
> -       install-ps install-ps-am install-strip \
> -       install-toollibffiHEADERS installcheck installcheck-am \
> -       installdirs maintainer-clean maintainer-clean-generic \
> -       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
> -       ps ps-am tags uninstall uninstall-am \
> -       uninstall-toollibffiHEADERS
> +       distclean-libtool distclean-tags dvi dvi-am html html-am info \
> +       info-am install install-am install-data install-data-am \
> +       install-dvi install-dvi-am install-exec install-exec-am \
> +       install-html install-html-am install-info install-info-am \
> +       install-man install-pdf install-pdf-am install-ps \
> +       install-ps-am install-strip install-toollibffiHEADERS \
> +       installcheck installcheck-am installdirs maintainer-clean \
> +       maintainer-clean-generic mostlyclean mostlyclean-generic \
> +       mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
> +       uninstall-am uninstall-toollibffiHEADERS
>
>
>  # Tell versions [3.59,3.63) of GNU make to not export all variables.
> --- libffi/man/Makefile.in      (revision 191562)
> +++ libffi/man/Makefile.in      (working copy)
> @@ -35,7 +35,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = man
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
>         $(top_srcdir)/../config/lead-dot.m4 \
> @@ -52,7 +52,6 @@ CONFIG_HEADER = $(top_builddir)/fficonfi
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
>  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>  am__vpath_adj = case $$p in \
>      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
> @@ -78,7 +77,6 @@ man3dir = $(mandir)/man3
>  am__installdirs = "$(DESTDIR)$(man3dir)"
>  NROFF = nroff
>  MANS = $(man_MANS)
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  ALLOCA = @ALLOCA@
>  AMTAR = @AMTAR@
> @@ -292,50 +290,6 @@ TAGS:
>  ctags: CTAGS
>  CTAGS:
>
> -
> -distdir: $(DISTFILES)
> -       @list='$(MANS)'; if test -n "$$list"; then \
> -         list=`for p in $$list; do \
> -           if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
> -           if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
> -         if test -n "$$list" && \
> -           grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
> -           echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
> -           grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
> -           echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
> -           echo "       typically \`make maintainer-clean' will remove them" >&2; \
> -           exit 1; \
> -         else :; fi; \
> -       else :; fi
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(MANS)
> @@ -439,16 +393,16 @@ uninstall-man: uninstall-man3
>  .MAKE: install-am install-strip
>
>  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> -       distclean distclean-generic distclean-libtool distdir dvi \
> -       dvi-am html html-am info info-am install install-am \
> -       install-data install-data-am install-dvi install-dvi-am \
> -       install-exec install-exec-am install-html install-html-am \
> -       install-info install-info-am install-man install-man3 \
> -       install-pdf install-pdf-am install-ps install-ps-am \
> -       install-strip installcheck installcheck-am installdirs \
> -       maintainer-clean maintainer-clean-generic mostlyclean \
> -       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
> -       uninstall uninstall-am uninstall-man uninstall-man3
> +       distclean distclean-generic distclean-libtool dvi dvi-am html \
> +       html-am info info-am install install-am install-data \
> +       install-data-am install-dvi install-dvi-am install-exec \
> +       install-exec-am install-html install-html-am install-info \
> +       install-info-am install-man install-man3 install-pdf \
> +       install-pdf-am install-ps install-ps-am install-strip \
> +       installcheck installcheck-am installdirs maintainer-clean \
> +       maintainer-clean-generic mostlyclean mostlyclean-generic \
> +       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
> +       uninstall-man uninstall-man3
>
>
>  # Tell versions [3.59,3.63) of GNU make to not export all variables.
> --- libffi/testsuite/Makefile.in        (revision 191562)
> +++ libffi/testsuite/Makefile.in        (working copy)
> @@ -35,7 +35,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = testsuite
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
>         $(top_srcdir)/../config/lead-dot.m4 \
> @@ -52,10 +52,8 @@ CONFIG_HEADER = $(top_builddir)/fficonfi
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
>  DEJATOOL = $(PACKAGE)
>  RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  ALLOCA = @ALLOCA@
>  AMTAR = @AMTAR@
> @@ -278,37 +276,6 @@ distclean-DEJAGNU:
>         -l='$(DEJATOOL)'; for tool in $$l; do \
>           rm -f $$tool.sum $$tool.log; \
>         done
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>         $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
>  check: check-am
> @@ -410,8 +377,8 @@ uninstall-am:
>
>  .PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \
>         clean-libtool distclean distclean-DEJAGNU distclean-generic \
> -       distclean-libtool distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-libtool dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-pdf install-pdf-am install-ps install-ps-am \
> --- libgo/configure.ac  (revision 191562)
> +++ libgo/configure.ac  (working copy)
> @@ -19,7 +19,7 @@ AM_ENABLE_MULTILIB(, ..)
>  AC_CANONICAL_SYSTEM
>  target_alias=${target_alias-$host_alias}
>
> -AM_INIT_AUTOMAKE([1.9.3 no-define foreign -Wall])
> +AM_INIT_AUTOMAKE([1.9.3 no-define foreign no-dist -Wall])
>  AH_TEMPLATE(PACKAGE, [Name of package])
>  AH_TEMPLATE(VERSION, [Version number of package])
>
> --- libgo/Makefile.in   (revision 191562)
> +++ libgo/Makefile.in   (working copy)
> @@ -46,12 +46,10 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = .
> -DIST_COMMON = README $(am__configure_deps) $(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)/config.h.in $(top_srcdir)/configure
> +DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
> +       $(top_srcdir)/configure $(am__configure_deps) \
> +       $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \
> +       $(srcdir)/../depcomp
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
>         $(top_srcdir)/../config/lead-dot.m4 \
> @@ -162,52 +160,6 @@ am__DEPENDENCIES_2 = asn1/asn1.lo big/bi
>  libgo_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
>         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
>         $(am__DEPENDENCIES_1)
> -am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.c \
> -       runtime/go-assert-interface.c \
> -       runtime/go-byte-array-to-string.c runtime/go-breakpoint.c \
> -       runtime/go-caller.c runtime/go-can-convert-interface.c \
> -       runtime/go-cgo.c runtime/go-chan-cap.c runtime/go-chan-len.c \
> -       runtime/go-check-interface.c runtime/go-close.c \
> -       runtime/go-closed.c runtime/go-construct-map.c \
> -       runtime/go-convert-interface.c runtime/go-copy.c \
> -       runtime/go-defer.c runtime/go-deferred-recover.c \
> -       runtime/go-eface-compare.c runtime/go-eface-val-compare.c \
> -       runtime/go-getgoroot.c runtime/go-go.c runtime/go-gomaxprocs.c \
> -       runtime/go-int-array-to-string.c runtime/go-int-to-string.c \
> -       runtime/go-interface-compare.c \
> -       runtime/go-interface-eface-compare.c \
> -       runtime/go-interface-val-compare.c runtime/go-lock-os-thread.c \
> -       runtime/go-map-delete.c runtime/go-map-index.c \
> -       runtime/go-map-len.c runtime/go-map-range.c \
> -       runtime/go-nanotime.c runtime/go-new-channel.c \
> -       runtime/go-new-map.c runtime/go-new.c runtime/go-note.c \
> -       runtime/go-panic.c runtime/go-panic-defer.c runtime/go-print.c \
> -       runtime/go-rec-big.c runtime/go-rec-nb-big.c \
> -       runtime/go-rec-nb-small.c runtime/go-rec-small.c \
> -       runtime/go-recover.c runtime/go-reflect.c \
> -       runtime/go-reflect-call.c runtime/go-reflect-chan.c \
> -       runtime/go-reflect-map.c runtime/go-rune.c \
> -       runtime/go-runtime-error.c runtime/go-sched.c \
> -       runtime/go-select.c runtime/go-semacquire.c \
> -       runtime/go-send-big.c runtime/go-send-nb-big.c \
> -       runtime/go-send-nb-small.c runtime/go-send-small.c \
> -       runtime/go-signal.c runtime/go-strcmp.c \
> -       runtime/go-string-to-byte-array.c \
> -       runtime/go-string-to-int-array.c runtime/go-strplus.c \
> -       runtime/go-strslice.c runtime/go-trampoline.c \
> -       runtime/go-type-eface.c runtime/go-type-error.c \
> -       runtime/go-type-identity.c runtime/go-type-interface.c \
> -       runtime/go-type-string.c runtime/go-typedesc-equal.c \
> -       runtime/go-typestring.c runtime/go-unreflect.c \
> -       runtime/go-unsafe-new.c runtime/go-unsafe-newarray.c \
> -       runtime/go-unsafe-pointer.c runtime/go-unwind.c \
> -       runtime/mcache.c runtime/mcentral.c \
> -       runtime/mem_posix_memalign.c runtime/mem.c runtime/mfinal.c \
> -       runtime/mfixalloc.c runtime/mgc0.c runtime/mheap.c \
> -       runtime/mheapmap32.c runtime/mheapmap64.c runtime/msize.c \
> -       runtime/proc.c runtime/thread.c \
> -       runtime/rtems-task-variable-add.c chan.c iface.c malloc.c \
> -       map.c mprof.c reflect.c sigqueue.c string.c
>  @HAVE_SYS_MMAN_H_FALSE@am__objects_1 = mem_posix_memalign.lo
>  @HAVE_SYS_MMAN_H_TRUE@am__objects_1 = mem.lo
>  @LIBGO_IS_RTEMS_TRUE@am__objects_2 = rtems-task-variable-add.lo
> @@ -256,7 +208,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libgobegin_a_SOURCES) $(libgo_la_SOURCES)
> -DIST_SOURCES = $(libgobegin_a_SOURCES) $(am__libgo_la_SOURCES_DIST)
>  MULTISRCTOP =
>  MULTIBUILDTOP =
>  MULTIDIRS =
> @@ -284,47 +235,10 @@ DATA = $(toolexeclibgo_DATA) $(toolexecl
>  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 = 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@
>  AR = @AR@
> @@ -3416,182 +3330,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       $(am__remove_distdir)
> -       test -d "$(distdir)" || mkdir "$(distdir)"
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           test -d "$(distdir)/$$subdir" \
> -           || $(MKDIR_P) "$(distdir)/$$subdir" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
> -           $(am__relativize); \
> -           new_distdir=$$reldir; \
> -           dir1=$$subdir; dir2="$(top_distdir)"; \
> -           $(am__relativize); \
> -           new_top_distdir=$$reldir; \
> -           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
> -           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
> -           ($(am__cd) $$subdir && \
> -             $(MAKE) $(AM_MAKEFLAGS) \
> -               top_distdir="$$new_top_distdir" \
> -               distdir="$$new_distdir" \
> -               am__remove_distdir=: \
> -               am__skip_length_check=: \
> -               am__skip_mode_fix=: \
> -               distdir) \
> -             || exit 1; \
> -         fi; \
> -       done
> -       -test -n "$(am__skip_mode_fix)" \
> -       || 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 {} {} \; \
> -       || chmod -R a+r "$(distdir)"
> -dist-gzip: distdir
> -       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
> -       $(am__remove_distdir)
> -
> -dist-bzip2: distdir
> -       tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
> -       $(am__remove_distdir)
> -
> -dist-lzma: distdir
> -       tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
> -       $(am__remove_distdir)
> -
> -dist-xz: distdir
> -       tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
> -       $(am__remove_distdir)
> -
> -dist-tarZ: distdir
> -       tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
> -       $(am__remove_distdir)
> -
> -dist-shar: distdir
> -       shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
> -       $(am__remove_distdir)
> -
> -dist-zip: distdir
> -       -rm -f $(distdir).zip
> -       zip -rq $(distdir).zip $(distdir)
> -       $(am__remove_distdir)
> -
> -dist dist-all: distdir
> -       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
> -       $(am__remove_distdir)
> -
> -# This target untars the dist file and tries a VPATH configuration.  Then
> -# it guarantees that the distribution is self-contained by making another
> -# tarfile.
> -distcheck: dist
> -       case '$(DIST_ARCHIVES)' in \
> -       *.tar.gz*) \
> -         GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
> -       *.tar.bz2*) \
> -         bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
> -       *.tar.lzma*) \
> -         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) gzip -dc $(distdir).shar.gz | unshar ;;\
> -       *.zip*) \
> -         unzip $(distdir).zip ;;\
> -       esac
> -       chmod -R a-w $(distdir); chmod a+w $(distdir)
> -       mkdir $(distdir)/_build
> -       mkdir $(distdir)/_inst
> -       chmod a-w $(distdir)
> -       test -d $(distdir)/_build || exit 0; \
> -       dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
> -         && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
> -         && am__cwd=`pwd` \
> -         && $(am__cd) $(distdir)/_build \
> -         && ../configure --srcdir=.. --prefix="$$dc_install_base" \
> -           $(DISTCHECK_CONFIGURE_FLAGS) \
> -         && $(MAKE) $(AM_MAKEFLAGS) \
> -         && $(MAKE) $(AM_MAKEFLAGS) dvi \
> -         && $(MAKE) $(AM_MAKEFLAGS) check \
> -         && $(MAKE) $(AM_MAKEFLAGS) install \
> -         && $(MAKE) $(AM_MAKEFLAGS) installcheck \
> -         && $(MAKE) $(AM_MAKEFLAGS) uninstall \
> -         && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
> -               distuninstallcheck \
> -         && chmod -R a-w "$$dc_install_base" \
> -         && ({ \
> -              (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
> -              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
> -              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
> -              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
> -                   distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
> -             } || { rm -rf "$$dc_destdir"; exit 1; }) \
> -         && rm -rf "$$dc_destdir" \
> -         && $(MAKE) $(AM_MAKEFLAGS) dist \
> -         && rm -rf $(DIST_ARCHIVES) \
> -         && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
> -         && cd "$$am__cwd" \
> -         || exit 1
> -       $(am__remove_distdir)
> -       @(echo "$(distdir) archives ready for distribution: "; \
> -         list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
> -         sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
> -distuninstallcheck:
> -       @$(am__cd) '$(distuninstallcheck_dir)' \
> -       && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
> -          || { echo "ERROR: files left after uninstall:" ; \
> -               if test -n "$(DESTDIR)"; then \
> -                 echo "  (check DESTDIR support)"; \
> -               fi ; \
> -               $(distuninstallcheck_listfiles) ; \
> -               exit 1; } >&2
> -distcleancheck: distclean
> -       @if test '$(srcdir)' = . ; then \
> -         echo "ERROR: distcleancheck can only run from a VPATH build" ; \
> -         exit 1 ; \
> -       fi
> -       @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
> -         || { echo "ERROR: files left in build directory after distclean:" ; \
> -              $(distcleancheck_listfiles) ; \
> -              exit 1; } >&2
>  check-am: all-am
>  check: check-recursive
>  all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) all-multi $(DATA) \
> @@ -3743,18 +3481,16 @@ uninstall-am: uninstall-toolexeclibLIBRA
>         all all-am all-multi am--refresh check check-am clean \
>         clean-generic clean-libtool clean-local clean-multi \
>         clean-toolexeclibLIBRARIES 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-hdr \
> -       distclean-libtool distclean-multi distclean-tags \
> -       distcleancheck distdir distuninstallcheck dvi dvi-am html \
> -       html-am info info-am install install-am install-data \
> -       install-data-am install-dvi install-dvi-am install-exec \
> -       install-exec-am install-html install-html-am install-info \
> -       install-info-am install-man install-multi install-pdf \
> -       install-pdf-am install-ps install-ps-am install-strip \
> -       install-toolexeclibLIBRARIES install-toolexeclibLTLIBRARIES \
> -       install-toolexeclibgoDATA install-toolexeclibgoarchiveDATA \
> +       ctags-recursive distclean distclean-compile distclean-generic \
> +       distclean-hdr distclean-libtool distclean-multi distclean-tags \
> +       dvi dvi-am html html-am info info-am install install-am \
> +       install-data install-data-am install-dvi install-dvi-am \
> +       install-exec install-exec-am install-html install-html-am \
> +       install-info install-info-am install-man install-multi \
> +       install-pdf install-pdf-am install-ps install-ps-am \
> +       install-strip install-toolexeclibLIBRARIES \
> +       install-toolexeclibLTLIBRARIES install-toolexeclibgoDATA \
> +       install-toolexeclibgoarchiveDATA \
>         install-toolexeclibgocompressDATA \
>         install-toolexeclibgocontainerDATA \
>         install-toolexeclibgocryptoDATA \
> --- libgo/testsuite/Makefile.in (revision 191562)
> +++ libgo/testsuite/Makefile.in (working copy)
> @@ -35,7 +35,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = testsuite
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
>         $(top_srcdir)/../config/lead-dot.m4 \
> @@ -54,10 +54,8 @@ CONFIG_HEADER = $(top_builddir)/config.h
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
>  DEJATOOL = $(PACKAGE)
>  RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  AR = @AR@
> @@ -298,37 +296,6 @@ distclean-DEJAGNU:
>         -l='$(DEJATOOL)'; for tool in $$l; do \
>           rm -f $$tool.sum $$tool.log; \
>         done
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>         $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
>  check: check-am
> @@ -430,8 +397,8 @@ uninstall-am:
>
>  .PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \
>         clean-libtool distclean distclean-DEJAGNU distclean-generic \
> -       distclean-libtool distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-libtool dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-pdf install-pdf-am install-ps install-ps-am \
> --- libjava/classpath/configure.ac      (revision 191562)
> +++ libjava/classpath/configure.ac      (working copy)
> @@ -75,7 +75,7 @@ CLASSPATH_CONVENIENCE="-no-undefined"
>  AC_SUBST(CLASSPATH_CONVENIENCE)
>
>  AC_PREREQ(2.64)
> -AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability])
> +AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar no-dist -Wno-portability])
>  AC_CONFIG_HEADERS([include/config.h])
>  AC_PREFIX_DEFAULT(/usr/local/classpath)
>
> --- libjava/classpath/Makefile.in       (revision 191562)
> +++ libjava/classpath/Makefile.in       (working copy)
> @@ -35,25 +35,15 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = .
> -DIST_COMMON = README $(am__configure_deps) $(srcdir)/../../compile \
> -       $(srcdir)/../../config.guess $(srcdir)/../../config.sub \
> -       $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
> -       $(srcdir)/../../missing $(srcdir)/../../mkinstalldirs \
> -       $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
> -       $(top_srcdir)/configure \
> +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
> +       $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
> +       $(top_srcdir)/configure $(am__configure_deps) \
> +       $(srcdir)/../../mkinstalldirs \
>         $(top_srcdir)/gnu/classpath/Configuration.java.in \
>         $(top_srcdir)/gnu/java/security/Configuration.java.in \
>         $(top_srcdir)/resource/META-INF/services/java.util.prefs.PreferencesFactory.in \
>         $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader.in \
> -       $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in \
> -       ../../ABOUT-NLS ../../COPYING ../../COPYING.LIB \
> -       ../../ChangeLog ../../README ../../compile ../../config.guess \
> -       ../../config.rpath ../../config.sub ../../depcomp \
> -       ../../install-sh ../../ltmain.sh ../../missing \
> -       ../../mkinstalldirs ../../ylwrap AUTHORS COPYING ChangeLog \
> -       INSTALL NEWS TODO compile config.guess config.rpath config.sub \
> -       depcomp install-sh ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh ltconfig \
> -       ltmain.sh missing mkinstalldirs
> +       $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -92,7 +82,6 @@ CONFIG_CLEAN_FILES = gnu/classpath/Confi
>         resource/META-INF/services/javax.sound.sampled.spi.MixerProvider
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
>  MULTISRCTOP =
>  MULTIBUILDTOP =
>  MULTIDIRS =
> @@ -109,46 +98,9 @@ RECURSIVE_TARGETS = all-recursive check-
>  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
> -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 = @ANTLR@
> @@ -582,185 +534,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       $(am__remove_distdir)
> -       test -d "$(distdir)" || mkdir "$(distdir)"
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           test -d "$(distdir)/$$subdir" \
> -           || $(MKDIR_P) "$(distdir)/$$subdir" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
> -           $(am__relativize); \
> -           new_distdir=$$reldir; \
> -           dir1=$$subdir; dir2="$(top_distdir)"; \
> -           $(am__relativize); \
> -           new_top_distdir=$$reldir; \
> -           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
> -           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
> -           ($(am__cd) $$subdir && \
> -             $(MAKE) $(AM_MAKEFLAGS) \
> -               top_distdir="$$new_top_distdir" \
> -               distdir="$$new_distdir" \
> -               am__remove_distdir=: \
> -               am__skip_length_check=: \
> -               am__skip_mode_fix=: \
> -               distdir) \
> -             || exit 1; \
> -         fi; \
> -       done
> -       $(MAKE) $(AM_MAKEFLAGS) \
> -         top_distdir="$(top_distdir)" distdir="$(distdir)" \
> -         dist-hook
> -       -test -n "$(am__skip_mode_fix)" \
> -       || 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 {} {} \; \
> -       || chmod -R a+r "$(distdir)"
> -dist-gzip: distdir
> -       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
> -       $(am__remove_distdir)
> -
> -dist-bzip2: distdir
> -       tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
> -       $(am__remove_distdir)
> -
> -dist-lzma: distdir
> -       tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
> -       $(am__remove_distdir)
> -
> -dist-xz: distdir
> -       tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
> -       $(am__remove_distdir)
> -
> -dist-tarZ: distdir
> -       tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
> -       $(am__remove_distdir)
> -
> -dist-shar: distdir
> -       shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
> -       $(am__remove_distdir)
> -
> -dist-zip: distdir
> -       -rm -f $(distdir).zip
> -       zip -rq $(distdir).zip $(distdir)
> -       $(am__remove_distdir)
> -
> -dist dist-all: distdir
> -       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
> -       $(am__remove_distdir)
> -
> -# This target untars the dist file and tries a VPATH configuration.  Then
> -# it guarantees that the distribution is self-contained by making another
> -# tarfile.
> -distcheck: dist
> -       case '$(DIST_ARCHIVES)' in \
> -       *.tar.gz*) \
> -         GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
> -       *.tar.bz2*) \
> -         bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
> -       *.tar.lzma*) \
> -         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) gzip -dc $(distdir).shar.gz | unshar ;;\
> -       *.zip*) \
> -         unzip $(distdir).zip ;;\
> -       esac
> -       chmod -R a-w $(distdir); chmod a+w $(distdir)
> -       mkdir $(distdir)/_build
> -       mkdir $(distdir)/_inst
> -       chmod a-w $(distdir)
> -       test -d $(distdir)/_build || exit 0; \
> -       dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
> -         && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
> -         && am__cwd=`pwd` \
> -         && $(am__cd) $(distdir)/_build \
> -         && ../configure --srcdir=.. --prefix="$$dc_install_base" \
> -           $(DISTCHECK_CONFIGURE_FLAGS) \
> -         && $(MAKE) $(AM_MAKEFLAGS) \
> -         && $(MAKE) $(AM_MAKEFLAGS) dvi \
> -         && $(MAKE) $(AM_MAKEFLAGS) check \
> -         && $(MAKE) $(AM_MAKEFLAGS) install \
> -         && $(MAKE) $(AM_MAKEFLAGS) installcheck \
> -         && $(MAKE) $(AM_MAKEFLAGS) uninstall \
> -         && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
> -               distuninstallcheck \
> -         && chmod -R a-w "$$dc_install_base" \
> -         && ({ \
> -              (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
> -              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
> -              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
> -              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
> -                   distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
> -             } || { rm -rf "$$dc_destdir"; exit 1; }) \
> -         && rm -rf "$$dc_destdir" \
> -         && $(MAKE) $(AM_MAKEFLAGS) dist \
> -         && rm -rf $(DIST_ARCHIVES) \
> -         && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
> -         && cd "$$am__cwd" \
> -         || exit 1
> -       $(am__remove_distdir)
> -       @(echo "$(distdir) archives ready for distribution: "; \
> -         list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
> -         sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
> -distuninstallcheck:
> -       @$(am__cd) '$(distuninstallcheck_dir)' \
> -       && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
> -          || { echo "ERROR: files left after uninstall:" ; \
> -               if test -n "$(DESTDIR)"; then \
> -                 echo "  (check DESTDIR support)"; \
> -               fi ; \
> -               $(distuninstallcheck_listfiles) ; \
> -               exit 1; } >&2
> -distcleancheck: distclean
> -       @if test '$(srcdir)' = . ; then \
> -         echo "ERROR: distcleancheck can only run from a VPATH build" ; \
> -         exit 1 ; \
> -       fi
> -       @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
> -         || { echo "ERROR: files left in build directory after distclean:" ; \
> -              $(distcleancheck_listfiles) ; \
> -              exit 1; } >&2
>  check-am: all-am
>  check: check-recursive
>  all-am: Makefile all-multi
> @@ -869,20 +642,17 @@ uninstall-am:
>  .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
>         all all-am all-multi am--refresh check check-am clean \
>         clean-generic clean-libtool clean-multi ctags ctags-recursive \
> -       dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \
> -       dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
> -       distclean-generic distclean-libtool distclean-multi \
> -       distclean-tags distcleancheck distdir distuninstallcheck dvi \
> -       dvi-am html html-am info info-am install install-am \
> -       install-data install-data-am install-dvi install-dvi-am \
> -       install-exec install-exec-am install-html install-html-am \
> -       install-info install-info-am install-man install-multi \
> -       install-pdf install-pdf-am install-ps install-ps-am \
> -       install-strip installcheck installcheck-am installdirs \
> -       installdirs-am maintainer-clean maintainer-clean-generic \
> -       maintainer-clean-multi mostlyclean mostlyclean-generic \
> -       mostlyclean-libtool mostlyclean-multi pdf pdf-am ps ps-am tags \
> -       tags-recursive uninstall uninstall-am
> +       distclean distclean-generic distclean-libtool distclean-multi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
> +       install-dvi-am install-exec install-exec-am install-html \
> +       install-html-am install-info install-info-am install-man \
> +       install-multi install-pdf install-pdf-am install-ps \
> +       install-ps-am install-strip installcheck installcheck-am \
> +       installdirs installdirs-am maintainer-clean \
> +       maintainer-clean-generic maintainer-clean-multi mostlyclean \
> +       mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \
> +       pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
>
>
>  native: lib
> --- libjava/classpath/doc/Makefile.in   (revision 191562)
> +++ libjava/classpath/doc/Makefile.in   (working copy)
> @@ -35,7 +35,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = doc
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in texinfo.tex
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -68,7 +68,6 @@ CONFIG_HEADER = $(top_builddir)/include/
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
>  INFO_DEPS = cp-tools.info
>  am__TEXINFO_TEX_DIR = $(srcdir)/../../gcc/doc/include
>  DVIS = cp-tools.dvi
> @@ -116,37 +115,10 @@ MANS = $(man_MANS)
>  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
> +       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
>  ETAGS = etags
>  CTAGS = ctags
>  DIST_SUBDIRS = $(SUBDIRS)
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> -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"
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -756,81 +728,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @list='$(MANS)'; if test -n "$$list"; then \
> -         list=`for p in $$list; do \
> -           if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
> -           if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
> -         if test -n "$$list" && \
> -           grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
> -           echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
> -           grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
> -           echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
> -           echo "       typically \`make maintainer-clean' will remove them" >&2; \
> -           exit 1; \
> -         else :; fi; \
> -       else :; fi
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           test -d "$(distdir)/$$subdir" \
> -           || $(MKDIR_P) "$(distdir)/$$subdir" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
> -           $(am__relativize); \
> -           new_distdir=$$reldir; \
> -           dir1=$$subdir; dir2="$(top_distdir)"; \
> -           $(am__relativize); \
> -           new_top_distdir=$$reldir; \
> -           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
> -           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
> -           ($(am__cd) $$subdir && \
> -             $(MAKE) $(AM_MAKEFLAGS) \
> -               top_distdir="$$new_top_distdir" \
> -               distdir="$$new_distdir" \
> -               am__remove_distdir=: \
> -               am__skip_length_check=: \
> -               am__skip_mode_fix=: \
> -               distdir) \
> -             || exit 1; \
> -         fi; \
> -       done
> -       $(MAKE) $(AM_MAKEFLAGS) \
> -         top_distdir="$(top_distdir)" distdir="$(distdir)" \
> -         dist-info
>  check-am: all-am
>  check: check-recursive
>  all-am: Makefile $(INFO_DEPS) $(MANS) all-local
> @@ -1020,18 +917,18 @@ uninstall-man: uninstall-man1
>         all all-am all-local check check-am clean clean-aminfo \
>         clean-generic clean-libtool ctags ctags-recursive dist-info \
>         distclean distclean-generic distclean-libtool distclean-tags \
> -       distdir dvi dvi-am html html-am info info-am install \
> -       install-am install-data install-data-am install-dvi \
> -       install-dvi-am install-exec install-exec-am install-html \
> -       install-html-am install-info install-info-am install-man \
> -       install-man1 install-pdf install-pdf-am install-ps \
> -       install-ps-am install-strip installcheck installcheck-am \
> -       installdirs installdirs-am maintainer-clean \
> -       maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
> -       mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool pdf \
> -       pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
> -       uninstall-dvi-am uninstall-html-am uninstall-info-am \
> -       uninstall-man uninstall-man1 uninstall-pdf-am uninstall-ps-am
> +       dvi dvi-am html html-am info info-am install install-am \
> +       install-data install-data-am install-dvi install-dvi-am \
> +       install-exec install-exec-am install-html install-html-am \
> +       install-info install-info-am install-man install-man1 \
> +       install-pdf install-pdf-am install-ps install-ps-am \
> +       install-strip installcheck installcheck-am installdirs \
> +       installdirs-am maintainer-clean maintainer-clean-aminfo \
> +       maintainer-clean-generic mostlyclean mostlyclean-aminfo \
> +       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
> +       tags tags-recursive uninstall uninstall-am uninstall-dvi-am \
> +       uninstall-html-am uninstall-info-am uninstall-man \
> +       uninstall-man1 uninstall-pdf-am uninstall-ps-am
>
>
>  .texinfo.dvi:
> --- libjava/classpath/doc/api/Makefile.in       (revision 191562)
> +++ libjava/classpath/doc/api/Makefile.in       (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = doc/api
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -69,9 +69,7 @@ CONFIG_HEADER = $(top_builddir)/include/
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
>  DATA = $(noinst_DATA)
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -330,37 +328,6 @@ TAGS:
>  ctags: CTAGS
>  CTAGS:
>
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(DATA)
> @@ -459,16 +426,16 @@ uninstall-am: uninstall-local
>  .MAKE: install-am install-strip
>
>  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> -       clean-local distclean distclean-generic distclean-libtool \
> -       distdir dvi dvi-am html html-am info info-am install \
> -       install-am install-data install-data-am install-data-local \
> -       install-dvi install-dvi-am install-exec install-exec-am \
> -       install-html install-html-am install-info install-info-am \
> -       install-man install-pdf install-pdf-am install-ps \
> -       install-ps-am install-strip installcheck installcheck-am \
> -       installdirs maintainer-clean maintainer-clean-generic \
> -       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
> -       ps ps-am uninstall uninstall-am uninstall-local
> +       clean-local distclean distclean-generic distclean-libtool dvi \
> +       dvi-am html html-am info info-am install install-am \
> +       install-data install-data-am install-data-local install-dvi \
> +       install-dvi-am install-exec install-exec-am install-html \
> +       install-html-am install-info install-info-am install-man \
> +       install-pdf install-pdf-am install-ps install-ps-am \
> +       install-strip installcheck installcheck-am installdirs \
> +       maintainer-clean maintainer-clean-generic mostlyclean \
> +       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
> +       uninstall uninstall-am uninstall-local
>
>
>  @CREATE_API_DOCS_TRUE@install-data-local:
> --- libjava/classpath/examples/Makefile.in      (revision 191562)
> +++ libjava/classpath/examples/Makefile.in      (working copy)
> @@ -36,8 +36,8 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = examples
> -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
> -       $(srcdir)/Makefile.java2d.in $(srcdir)/Makefile.jawt.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
> +       $(srcdir)/Makefile.jawt.in $(srcdir)/Makefile.java2d.in
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -70,7 +70,6 @@ CONFIG_HEADER = $(top_builddir)/include/
>  CONFIG_CLEAN_FILES = Makefile.jawt Makefile.java2d
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
>  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>  am__vpath_adj = case $$p in \
>      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
> @@ -94,7 +93,6 @@ am__base_list = \
>    sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
>  am__installdirs = "$(DESTDIR)$(exampledir)"
>  DATA = $(example_DATA)
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -419,40 +417,6 @@ TAGS:
>  ctags: CTAGS
>  CTAGS:
>
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       $(MAKE) $(AM_MAKEFLAGS) \
> -         top_distdir="$(top_distdir)" distdir="$(distdir)" \
> -         dist-hook
>  check-am: all-am
>  check: $(BUILT_SOURCES)
>         $(MAKE) $(AM_MAKEFLAGS) check-am
> @@ -557,17 +521,17 @@ uninstall-am: uninstall-exampleDATA unin
>  .MAKE: all check install install-am install-strip
>
>  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> -       clean-local dist-hook distclean distclean-generic \
> -       distclean-libtool distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am \
> -       install-data-local install-dvi install-dvi-am \
> -       install-exampleDATA install-exec install-exec-am install-html \
> -       install-html-am install-info install-info-am install-man \
> -       install-pdf install-pdf-am install-ps install-ps-am \
> -       install-strip installcheck installcheck-am installdirs \
> -       maintainer-clean maintainer-clean-generic mostlyclean \
> -       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
> -       uninstall uninstall-am uninstall-exampleDATA uninstall-local
> +       clean-local distclean distclean-generic distclean-libtool dvi \
> +       dvi-am html html-am info info-am install install-am \
> +       install-data install-data-am install-data-local install-dvi \
> +       install-dvi-am install-exampleDATA install-exec \
> +       install-exec-am install-html install-html-am install-info \
> +       install-info-am install-man install-pdf install-pdf-am \
> +       install-ps install-ps-am install-strip installcheck \
> +       installcheck-am installdirs maintainer-clean \
> +       maintainer-clean-generic mostlyclean mostlyclean-generic \
> +       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
> +       uninstall-exampleDATA uninstall-local
>
>
>  # Make sure all sources and icons are also installed so users can use them.
> --- libjava/classpath/external/Makefile.in      (revision 191562)
> +++ libjava/classpath/external/Makefile.in      (working copy)
> @@ -35,7 +35,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = external
> -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -68,7 +68,6 @@ CONFIG_HEADER = $(top_builddir)/include/
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
>  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
>         html-recursive info-recursive install-data-recursive \
>         install-dvi-recursive install-exec-recursive \
> @@ -79,37 +78,10 @@ RECURSIVE_TARGETS = all-recursive check-
>  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
> +       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
>  ETAGS = etags
>  CTAGS = ctags
>  DIST_SUBDIRS = $(SUBDIRS)
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> -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"
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -496,65 +468,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           test -d "$(distdir)/$$subdir" \
> -           || $(MKDIR_P) "$(distdir)/$$subdir" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
> -           $(am__relativize); \
> -           new_distdir=$$reldir; \
> -           dir1=$$subdir; dir2="$(top_distdir)"; \
> -           $(am__relativize); \
> -           new_top_distdir=$$reldir; \
> -           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
> -           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
> -           ($(am__cd) $$subdir && \
> -             $(MAKE) $(AM_MAKEFLAGS) \
> -               top_distdir="$$new_top_distdir" \
> -               distdir="$$new_distdir" \
> -               am__remove_distdir=: \
> -               am__skip_length_check=: \
> -               am__skip_mode_fix=: \
> -               distdir) \
> -             || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-recursive
>  all-am: Makefile
> @@ -657,13 +570,13 @@ uninstall-am:
>  .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
>         all all-am check check-am clean clean-generic clean-libtool \
>         ctags ctags-recursive distclean distclean-generic \
> -       distclean-libtool distclean-tags distdir dvi dvi-am html \
> -       html-am info info-am install install-am install-data \
> -       install-data-am install-dvi install-dvi-am install-exec \
> -       install-exec-am install-html install-html-am install-info \
> -       install-info-am install-man install-pdf install-pdf-am \
> -       install-ps install-ps-am install-strip installcheck \
> -       installcheck-am installdirs installdirs-am maintainer-clean \
> +       distclean-libtool distclean-tags dvi dvi-am html html-am info \
> +       info-am install install-am install-data install-data-am \
> +       install-dvi install-dvi-am install-exec install-exec-am \
> +       install-html install-html-am install-info install-info-am \
> +       install-man install-pdf install-pdf-am install-ps \
> +       install-ps-am install-strip installcheck installcheck-am \
> +       installdirs installdirs-am maintainer-clean \
>         maintainer-clean-generic mostlyclean mostlyclean-generic \
>         mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
>         uninstall uninstall-am
> --- libjava/classpath/external/jsr166/Makefile.in       (revision 191562)
> +++ libjava/classpath/external/jsr166/Makefile.in       (working copy)
> @@ -35,7 +35,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = external/jsr166
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -68,8 +68,6 @@ CONFIG_HEADER = $(top_builddir)/include/
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -398,37 +396,6 @@ TAGS:
>  ctags: CTAGS
>  CTAGS:
>
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile
> @@ -527,13 +494,13 @@ uninstall-am:
>  .MAKE: install-am install-strip
>
>  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> -       distclean distclean-generic distclean-libtool distdir dvi \
> -       dvi-am html html-am info info-am install install-am \
> -       install-data install-data-am install-dvi install-dvi-am \
> -       install-exec install-exec-am install-html install-html-am \
> -       install-info install-info-am install-man install-pdf \
> -       install-pdf-am install-ps install-ps-am install-strip \
> -       installcheck installcheck-am installdirs maintainer-clean \
> +       distclean distclean-generic distclean-libtool dvi dvi-am html \
> +       html-am info info-am install install-am install-data \
> +       install-data-am install-dvi install-dvi-am install-exec \
> +       install-exec-am install-html install-html-am install-info \
> +       install-info-am install-man install-pdf install-pdf-am \
> +       install-ps install-ps-am install-strip installcheck \
> +       installcheck-am installdirs maintainer-clean \
>         maintainer-clean-generic mostlyclean mostlyclean-generic \
>         mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
>
> --- libjava/classpath/external/relaxngDatatype/Makefile.in      (revision 191562)
> +++ libjava/classpath/external/relaxngDatatype/Makefile.in      (working copy)
> @@ -35,7 +35,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = external/relaxngDatatype
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -68,8 +68,6 @@ CONFIG_HEADER = $(top_builddir)/include/
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -338,37 +336,6 @@ TAGS:
>  ctags: CTAGS
>  CTAGS:
>
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile
> @@ -467,13 +434,13 @@ uninstall-am:
>  .MAKE: install-am install-strip
>
>  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> -       distclean distclean-generic distclean-libtool distdir dvi \
> -       dvi-am html html-am info info-am install install-am \
> -       install-data install-data-am install-dvi install-dvi-am \
> -       install-exec install-exec-am install-html install-html-am \
> -       install-info install-info-am install-man install-pdf \
> -       install-pdf-am install-ps install-ps-am install-strip \
> -       installcheck installcheck-am installdirs maintainer-clean \
> +       distclean distclean-generic distclean-libtool dvi dvi-am html \
> +       html-am info info-am install install-am install-data \
> +       install-data-am install-dvi install-dvi-am install-exec \
> +       install-exec-am install-html install-html-am install-info \
> +       install-info-am install-man install-pdf install-pdf-am \
> +       install-ps install-ps-am install-strip installcheck \
> +       installcheck-am installdirs maintainer-clean \
>         maintainer-clean-generic mostlyclean mostlyclean-generic \
>         mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
>
> --- libjava/classpath/external/sax/Makefile.in  (revision 191562)
> +++ libjava/classpath/external/sax/Makefile.in  (working copy)
> @@ -35,7 +35,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = external/sax
> -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -68,8 +68,6 @@ CONFIG_HEADER = $(top_builddir)/include/
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -366,37 +364,6 @@ TAGS:
>  ctags: CTAGS
>  CTAGS:
>
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile
> @@ -495,13 +462,13 @@ uninstall-am:
>  .MAKE: install-am install-strip
>
>  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> -       distclean distclean-generic distclean-libtool distdir dvi \
> -       dvi-am html html-am info info-am install install-am \
> -       install-data install-data-am install-dvi install-dvi-am \
> -       install-exec install-exec-am install-html install-html-am \
> -       install-info install-info-am install-man install-pdf \
> -       install-pdf-am install-ps install-ps-am install-strip \
> -       installcheck installcheck-am installdirs maintainer-clean \
> +       distclean distclean-generic distclean-libtool dvi dvi-am html \
> +       html-am info info-am install install-am install-data \
> +       install-data-am install-dvi install-dvi-am install-exec \
> +       install-exec-am install-html install-html-am install-info \
> +       install-info-am install-man install-pdf install-pdf-am \
> +       install-ps install-ps-am install-strip installcheck \
> +       installcheck-am installdirs maintainer-clean \
>         maintainer-clean-generic mostlyclean mostlyclean-generic \
>         mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
>
> --- libjava/classpath/external/w3c_dom/Makefile.in      (revision 191562)
> +++ libjava/classpath/external/w3c_dom/Makefile.in      (working copy)
> @@ -35,7 +35,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = external/w3c_dom
> -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -68,8 +68,6 @@ CONFIG_HEADER = $(top_builddir)/include/
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -473,37 +471,6 @@ TAGS:
>  ctags: CTAGS
>  CTAGS:
>
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile
> @@ -602,13 +569,13 @@ uninstall-am:
>  .MAKE: install-am install-strip
>
>  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> -       distclean distclean-generic distclean-libtool distdir dvi \
> -       dvi-am html html-am info info-am install install-am \
> -       install-data install-data-am install-dvi install-dvi-am \
> -       install-exec install-exec-am install-html install-html-am \
> -       install-info install-info-am install-man install-pdf \
> -       install-pdf-am install-ps install-ps-am install-strip \
> -       installcheck installcheck-am installdirs maintainer-clean \
> +       distclean distclean-generic distclean-libtool dvi dvi-am html \
> +       html-am info info-am install install-am install-data \
> +       install-data-am install-dvi install-dvi-am install-exec \
> +       install-exec-am install-html install-html-am install-info \
> +       install-info-am install-man install-pdf install-pdf-am \
> +       install-ps install-ps-am install-strip installcheck \
> +       installcheck-am installdirs maintainer-clean \
>         maintainer-clean-generic mostlyclean mostlyclean-generic \
>         mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
>
> --- libjava/classpath/include/Makefile.in       (revision 191562)
> +++ libjava/classpath/include/Makefile.in       (working copy)
> @@ -35,7 +35,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = include
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
>         $(srcdir)/config.h.in
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
> @@ -69,8 +69,6 @@ CONFIG_HEADER = config.h
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -500,37 +498,6 @@ TAGS:
>  ctags: CTAGS
>  CTAGS:
>
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  @CREATE_JNI_HEADERS_FALSE@all-local:
> @@ -632,8 +599,8 @@ uninstall-am:
>
>  .PHONY: all all-am all-local check check-am clean clean-generic \
>         clean-libtool distclean distclean-generic distclean-hdr \
> -       distclean-libtool distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-libtool dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-pdf install-pdf-am install-ps install-ps-am \
> --- libjava/classpath/lib/Makefile.in   (revision 191562)
> +++ libjava/classpath/lib/Makefile.in   (working copy)
> @@ -36,9 +36,9 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = lib
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
> -       $(srcdir)/copy-vmresources.sh.in $(srcdir)/gen-classlist.sh.in \
> -       $(srcdir)/mkcollections.pl.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
> +       $(srcdir)/mkcollections.pl.in $(srcdir)/gen-classlist.sh.in \
> +       $(srcdir)/copy-vmresources.sh.in
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -72,9 +72,7 @@ CONFIG_CLEAN_FILES = mkcollections.pl ge
>         copy-vmresources.sh
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
>  DATA = $(noinst_DATA)
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -356,40 +354,6 @@ TAGS:
>  ctags: CTAGS
>  CTAGS:
>
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       $(MAKE) $(AM_MAKEFLAGS) \
> -         top_distdir="$(top_distdir)" distdir="$(distdir)" \
> -         dist-hook
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(DATA)
> @@ -492,17 +456,16 @@ uninstall-am: uninstall-local
>  .MAKE: install-am install-strip
>
>  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> -       clean-local dist-hook distclean distclean-generic \
> -       distclean-libtool distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am \
> -       install-data-local install-dvi install-dvi-am install-exec \
> -       install-exec-am install-html install-html-am install-info \
> -       install-info-am install-man install-pdf install-pdf-am \
> -       install-ps install-ps-am install-strip installcheck \
> -       installcheck-am installdirs maintainer-clean \
> -       maintainer-clean-generic mostlyclean mostlyclean-generic \
> -       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
> -       uninstall-local
> +       clean-local distclean distclean-generic distclean-libtool dvi \
> +       dvi-am html html-am info info-am install install-am \
> +       install-data install-data-am install-data-local install-dvi \
> +       install-dvi-am install-exec install-exec-am install-html \
> +       install-html-am install-info install-info-am install-man \
> +       install-pdf install-pdf-am install-ps install-ps-am \
> +       install-strip installcheck installcheck-am installdirs \
> +       maintainer-clean maintainer-clean-generic mostlyclean \
> +       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
> +       uninstall uninstall-am uninstall-local
>
>
>  sinclude $(JAVA_DEPEND)
> --- libjava/classpath/native/Makefile.in        (revision 191562)
> +++ libjava/classpath/native/Makefile.in        (working copy)
> @@ -35,7 +35,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -68,7 +68,6 @@ CONFIG_HEADER = $(top_builddir)/include/
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
>  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
>         html-recursive info-recursive install-data-recursive \
>         install-dvi-recursive install-exec-recursive \
> @@ -79,36 +78,9 @@ RECURSIVE_TARGETS = all-recursive check-
>  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
> +       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> -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"
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -498,65 +470,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           test -d "$(distdir)/$$subdir" \
> -           || $(MKDIR_P) "$(distdir)/$$subdir" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
> -           $(am__relativize); \
> -           new_distdir=$$reldir; \
> -           dir1=$$subdir; dir2="$(top_distdir)"; \
> -           $(am__relativize); \
> -           new_top_distdir=$$reldir; \
> -           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
> -           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
> -           ($(am__cd) $$subdir && \
> -             $(MAKE) $(AM_MAKEFLAGS) \
> -               top_distdir="$$new_top_distdir" \
> -               distdir="$$new_distdir" \
> -               am__remove_distdir=: \
> -               am__skip_length_check=: \
> -               am__skip_mode_fix=: \
> -               distdir) \
> -             || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-recursive
>  all-am: Makefile
> @@ -659,13 +572,13 @@ uninstall-am:
>  .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
>         all all-am check check-am clean clean-generic clean-libtool \
>         ctags ctags-recursive distclean distclean-generic \
> -       distclean-libtool distclean-tags distdir dvi dvi-am html \
> -       html-am info info-am install install-am install-data \
> -       install-data-am install-dvi install-dvi-am install-exec \
> -       install-exec-am install-html install-html-am install-info \
> -       install-info-am install-man install-pdf install-pdf-am \
> -       install-ps install-ps-am install-strip installcheck \
> -       installcheck-am installdirs installdirs-am maintainer-clean \
> +       distclean-libtool distclean-tags dvi dvi-am html html-am info \
> +       info-am install install-am install-data install-data-am \
> +       install-dvi install-dvi-am install-exec install-exec-am \
> +       install-html install-html-am install-info install-info-am \
> +       install-man install-pdf install-pdf-am install-ps \
> +       install-ps-am install-strip installcheck installcheck-am \
> +       installdirs installdirs-am maintainer-clean \
>         maintainer-clean-generic mostlyclean mostlyclean-generic \
>         mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
>         uninstall uninstall-am
> --- libjava/classpath/native/fdlibm/Makefile.in (revision 191562)
> +++ libjava/classpath/native/fdlibm/Makefile.in (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/fdlibm
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -95,10 +95,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libfdlibm_la_SOURCES)
> -DIST_SOURCES = $(libfdlibm_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -553,37 +551,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -689,8 +656,8 @@ uninstall-am:
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-pdf install-pdf-am install-ps install-ps-am \
> --- libjava/classpath/native/jawt/Makefile.in   (revision 191562)
> +++ libjava/classpath/native/jawt/Makefile.in   (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jawt
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -112,10 +112,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libjawt_la_SOURCES)
> -DIST_SOURCES = $(libjawt_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -492,37 +490,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -631,8 +598,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/native/jni/Makefile.in    (revision 191562)
> +++ libjava/classpath/native/jni/Makefile.in    (working copy)
> @@ -35,7 +35,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -68,7 +68,6 @@ CONFIG_HEADER = $(top_builddir)/include/
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
>  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
>         html-recursive info-recursive install-data-recursive \
>         install-dvi-recursive install-exec-recursive \
> @@ -79,36 +78,9 @@ RECURSIVE_TARGETS = all-recursive check-
>  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
> +       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> -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"
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -510,65 +482,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           test -d "$(distdir)/$$subdir" \
> -           || $(MKDIR_P) "$(distdir)/$$subdir" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> -         if test "$$subdir" = .; then :; else \
> -           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
> -           $(am__relativize); \
> -           new_distdir=$$reldir; \
> -           dir1=$$subdir; dir2="$(top_distdir)"; \
> -           $(am__relativize); \
> -           new_top_distdir=$$reldir; \
> -           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
> -           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
> -           ($(am__cd) $$subdir && \
> -             $(MAKE) $(AM_MAKEFLAGS) \
> -               top_distdir="$$new_top_distdir" \
> -               distdir="$$new_distdir" \
> -               am__remove_distdir=: \
> -               am__skip_length_check=: \
> -               am__skip_mode_fix=: \
> -               distdir) \
> -             || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-recursive
>  all-am: Makefile all-local
> @@ -671,16 +584,16 @@ uninstall-am:
>  .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
>         all all-am all-local check check-am clean clean-generic \
>         clean-libtool ctags ctags-recursive distclean \
> -       distclean-generic distclean-libtool distclean-tags distdir dvi \
> -       dvi-am html html-am info info-am install install-am \
> -       install-data install-data-am install-dvi install-dvi-am \
> -       install-exec install-exec-am install-html install-html-am \
> -       install-info install-info-am install-man install-pdf \
> -       install-pdf-am install-ps install-ps-am install-strip \
> -       installcheck installcheck-am installdirs installdirs-am \
> -       maintainer-clean maintainer-clean-generic mostlyclean \
> -       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
> -       tags tags-recursive uninstall uninstall-am
> +       distclean-generic distclean-libtool distclean-tags dvi dvi-am \
> +       html html-am info info-am install install-am install-data \
> +       install-data-am install-dvi install-dvi-am install-exec \
> +       install-exec-am install-html install-html-am install-info \
> +       install-info-am install-man install-pdf install-pdf-am \
> +       install-ps install-ps-am install-strip installcheck \
> +       installcheck-am installdirs installdirs-am maintainer-clean \
> +       maintainer-clean-generic mostlyclean mostlyclean-generic \
> +       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
> +       uninstall uninstall-am
>
>
>  all-local:
> --- libjava/classpath/native/jni/classpath/Makefile.in  (revision 191562)
> +++ libjava/classpath/native/jni/classpath/Makefile.in  (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/classpath
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -86,10 +86,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libclasspath_la_SOURCES)
> -DIST_SOURCES = $(libclasspath_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -445,37 +443,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -581,8 +548,8 @@ uninstall-am:
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-pdf install-pdf-am install-ps install-ps-am \
> --- libjava/classpath/native/jni/gconf-peer/Makefile.in (revision 191562)
> +++ libjava/classpath/native/jni/gconf-peer/Makefile.in (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/gconf-peer
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -112,10 +112,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libgconfpeer_la_SOURCES)
> -DIST_SOURCES = $(libgconfpeer_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -489,37 +487,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -628,8 +595,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/native/jni/gstreamer-peer/Makefile.in     (revision 191562)
> +++ libjava/classpath/native/jni/gstreamer-peer/Makefile.in     (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/gstreamer-peer
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -114,10 +114,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libgstreamerpeer_la_SOURCES)
> -DIST_SOURCES = $(libgstreamerpeer_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -514,37 +512,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -653,8 +620,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/native/jni/gtk-peer/Makefile.in   (revision 191562)
> +++ libjava/classpath/native/jni/gtk-peer/Makefile.in   (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/gtk-peer
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -150,10 +150,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libgtkpeer_la_SOURCES)
> -DIST_SOURCES = $(libgtkpeer_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -620,37 +618,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -759,8 +726,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/native/jni/java-io/Makefile.in    (revision 191562)
> +++ libjava/classpath/native/jni/java-io/Makefile.in    (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/java-io
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -111,10 +111,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libjavaio_la_SOURCES)
> -DIST_SOURCES = $(libjavaio_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -494,37 +492,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -633,8 +600,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/native/jni/java-lang/Makefile.in  (revision 191562)
> +++ libjava/classpath/native/jni/java-lang/Makefile.in  (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/java-lang
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -123,12 +123,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>  SOURCES = $(libjavalang_la_SOURCES) \
>         $(libjavalangmanagement_la_SOURCES) \
>         $(libjavalangreflect_la_SOURCES)
> -DIST_SOURCES = $(libjavalang_la_SOURCES) \
> -       $(libjavalangmanagement_la_SOURCES) \
> -       $(libjavalangreflect_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -521,37 +517,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -660,8 +625,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/native/jni/java-math/Makefile.in  (revision 191562)
> +++ libjava/classpath/native/jni/java-math/Makefile.in  (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/java-math
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -112,10 +112,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libjavamath_la_SOURCES)
> -DIST_SOURCES = $(libjavamath_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -487,37 +485,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -626,8 +593,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/native/jni/java-net/Makefile.in   (revision 191562)
> +++ libjava/classpath/native/jni/java-net/Makefile.in   (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/java-net
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -96,10 +96,6 @@ libjavanet_la_DEPENDENCIES =  \
>         $(top_builddir)/native/jni/classpath/jcl.lo \
>         $(top_builddir)/native/jni/native-lib/libclasspathnative.la \
>         $(am__DEPENDENCIES_1)
> -am__libjavanet_la_SOURCES_DIST = javanet.c javanet.h \
> -       java_net_VMInetAddress.c java_net_VMNetworkInterface.c \
> -       java_net_VMURLConnection.c gnu_java_net_VMPlainSocketImpl.c \
> -       gnu_java_net_local_LocalSocketImpl.c local.c local.h
>  @ENABLE_LOCAL_SOCKETS_FALSE@am__objects_1 = gnu_java_net_local_LocalSocketImpl.lo
>  @ENABLE_LOCAL_SOCKETS_TRUE@am__objects_1 = gnu_java_net_local_LocalSocketImpl.lo \
>  @ENABLE_LOCAL_SOCKETS_TRUE@    local.lo
> @@ -121,10 +117,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libjavanet_la_SOURCES)
> -DIST_SOURCES = $(am__libjavanet_la_SOURCES_DIST)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -518,37 +512,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -657,8 +620,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/native/jni/java-nio/Makefile.in   (revision 191562)
> +++ libjava/classpath/native/jni/java-nio/Makefile.in   (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/java-nio
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -119,10 +119,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libjavanio_la_SOURCES)
> -DIST_SOURCES = $(libjavanio_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -519,37 +517,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -658,8 +625,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/native/jni/java-util/Makefile.in  (revision 191562)
> +++ libjava/classpath/native/jni/java-util/Makefile.in  (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/java-util
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -108,10 +108,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libjavautil_la_SOURCES)
> -DIST_SOURCES = $(libjavautil_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -483,37 +481,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -622,8 +589,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/native/jni/midi-alsa/Makefile.in  (revision 191562)
> +++ libjava/classpath/native/jni/midi-alsa/Makefile.in  (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/midi-alsa
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -114,10 +114,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libgjsmalsa_la_SOURCES)
> -DIST_SOURCES = $(libgjsmalsa_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -496,37 +494,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -635,8 +602,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/native/jni/midi-dssi/Makefile.in  (revision 191562)
> +++ libjava/classpath/native/jni/midi-dssi/Makefile.in  (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/midi-dssi
> -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -114,10 +114,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libgjsmdssi_la_SOURCES)
> -DIST_SOURCES = $(libgjsmdssi_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -496,37 +494,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -635,8 +602,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/native/jni/native-lib/Makefile.in (revision 191562)
> +++ libjava/classpath/native/jni/native-lib/Makefile.in (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/native-lib
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -86,10 +86,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libclasspathnative_la_SOURCES)
> -DIST_SOURCES = $(libclasspathnative_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -448,37 +446,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -584,8 +551,8 @@ uninstall-am:
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-pdf install-pdf-am install-ps install-ps-am \
> --- libjava/classpath/native/jni/qt-peer/Makefile.in    (revision 191562)
> +++ libjava/classpath/native/jni/qt-peer/Makefile.in    (working copy)
> @@ -39,7 +39,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/qt-peer
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -116,10 +116,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libqtpeer_la_SOURCES) $(nodist_libqtpeer_la_SOURCES)
> -DIST_SOURCES = $(libqtpeer_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -577,37 +575,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: $(BUILT_SOURCES)
>         $(MAKE) $(AM_MAKEFLAGS) check-am
> @@ -717,8 +684,8 @@ uninstall-am:
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-pdf install-pdf-am install-ps install-ps-am \
> --- libjava/classpath/native/jni/xmlj/Makefile.in       (revision 191562)
> +++ libjava/classpath/native/jni/xmlj/Makefile.in       (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/jni/xmlj
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -110,10 +110,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
>         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libxmlj_la_SOURCES)
> -DIST_SOURCES = $(libxmlj_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -511,37 +509,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -650,8 +617,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/native/plugin/Makefile.in (revision 191562)
> +++ libjava/classpath/native/plugin/Makefile.in (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = native/plugin
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -112,10 +112,8 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBT
>         --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
>  SOURCES = $(libgcjwebplugin_la_SOURCES)
> -DIST_SOURCES = $(libgcjwebplugin_la_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -497,37 +495,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(LTLIBRARIES)
> @@ -636,8 +603,8 @@ uninstall-am: uninstall-nativeexeclibLTL
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
>         clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
>         distclean-compile distclean-generic distclean-libtool \
> -       distclean-tags distdir dvi dvi-am html html-am info info-am \
> -       install install-am install-data install-data-am install-dvi \
> +       distclean-tags dvi dvi-am html html-am info info-am install \
> +       install-am install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>         install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
> --- libjava/classpath/resource/Makefile.in      (revision 191562)
> +++ libjava/classpath/resource/Makefile.in      (working copy)
> @@ -36,7 +36,7 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = resource
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -69,7 +69,6 @@ CONFIG_HEADER = $(top_builddir)/include/
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
>  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>  am__vpath_adj = case $$p in \
>      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
> @@ -93,7 +92,6 @@ am__base_list = \
>    sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
>  am__installdirs = "$(DESTDIR)$(loggingdir)" "$(DESTDIR)$(securitydir)"
>  DATA = $(logging_DATA) $(security_DATA)
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -393,37 +391,6 @@ TAGS:
>  ctags: CTAGS
>  CTAGS:
>
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile $(DATA)
> @@ -525,17 +492,17 @@ uninstall-am: uninstall-loggingDATA unin
>  .MAKE: install-am install-strip
>
>  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> -       distclean distclean-generic distclean-libtool distdir dvi \
> -       dvi-am html html-am info info-am install install-am \
> -       install-data install-data-am install-dvi install-dvi-am \
> -       install-exec install-exec-am install-html install-html-am \
> -       install-info install-info-am install-loggingDATA install-man \
> -       install-pdf install-pdf-am install-ps install-ps-am \
> -       install-securityDATA install-strip installcheck \
> -       installcheck-am installdirs maintainer-clean \
> -       maintainer-clean-generic mostlyclean mostlyclean-generic \
> -       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
> -       uninstall-loggingDATA uninstall-securityDATA
> +       distclean distclean-generic distclean-libtool dvi dvi-am html \
> +       html-am info info-am install install-am install-data \
> +       install-data-am install-dvi install-dvi-am install-exec \
> +       install-exec-am install-html install-html-am install-info \
> +       install-info-am install-loggingDATA install-man install-pdf \
> +       install-pdf-am install-ps install-ps-am install-securityDATA \
> +       install-strip installcheck installcheck-am installdirs \
> +       maintainer-clean maintainer-clean-generic mostlyclean \
> +       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
> +       uninstall uninstall-am uninstall-loggingDATA \
> +       uninstall-securityDATA
>
>
>  # Tell versions [3.59,3.63) of GNU make to not export all variables.
> --- libjava/classpath/scripts/Makefile.in       (revision 191562)
> +++ libjava/classpath/scripts/Makefile.in       (working copy)
> @@ -35,8 +35,8 @@ build_triplet = @build@
>  host_triplet = @host@
>  target_triplet = @target@
>  subdir = scripts
> -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
> -       $(srcdir)/check_jni_methods.sh.in $(srcdir)/classpath.spec.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
> +       $(srcdir)/classpath.spec.in $(srcdir)/check_jni_methods.sh.in
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -69,8 +69,6 @@ CONFIG_HEADER = $(top_builddir)/include/
>  CONFIG_CLEAN_FILES = classpath.spec check_jni_methods.sh
>  CONFIG_CLEAN_VPATH_FILES =
>  SOURCES =
> -DIST_SOURCES =
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -331,37 +329,6 @@ TAGS:
>  ctags: CTAGS
>  CTAGS:
>
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
>  check-am: all-am
>  check: check-am
>  all-am: Makefile
> @@ -460,13 +427,13 @@ uninstall-am:
>  .MAKE: install-am install-strip
>
>  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> -       distclean distclean-generic distclean-libtool distdir dvi \
> -       dvi-am html html-am info info-am install install-am \
> -       install-data install-data-am install-dvi install-dvi-am \
> -       install-exec install-exec-am install-html install-html-am \
> -       install-info install-info-am install-man install-pdf \
> -       install-pdf-am install-ps install-ps-am install-strip \
> -       installcheck installcheck-am installdirs maintainer-clean \
> +       distclean distclean-generic distclean-libtool dvi dvi-am html \
> +       html-am info info-am install install-am install-data \
> +       install-data-am install-dvi install-dvi-am install-exec \
> +       install-exec-am install-html install-html-am install-info \
> +       install-info-am install-man install-pdf install-pdf-am \
> +       install-ps install-ps-am install-strip installcheck \
> +       installcheck-am installdirs maintainer-clean \
>         maintainer-clean-generic mostlyclean mostlyclean-generic \
>         mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
>
> --- libjava/classpath/tools/Makefile.in (revision 191562)
> +++ libjava/classpath/tools/Makefile.in (working copy)
> @@ -44,13 +44,13 @@ target_triplet = @target@
>  @CREATE_WRAPPERS_TRUE@@INSTALL_BINARIES_FALSE@ $(am__EXEEXT_2)
>  @CREATE_GJDOC_TRUE@@CREATE_WRAPPERS_FALSE@am__append_2 = gjdoc
>  subdir = tools
> -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
> -       $(srcdir)/gappletviewer.in $(srcdir)/gjar.in \
> -       $(srcdir)/gjarsigner.in $(srcdir)/gjavah.in $(srcdir)/gjdoc.in \
> -       $(srcdir)/gkeytool.in $(srcdir)/gnative2ascii.in \
> -       $(srcdir)/gorbd.in $(srcdir)/grmic.in $(srcdir)/grmid.in \
> -       $(srcdir)/grmiregistry.in $(srcdir)/gserialver.in \
> -       $(srcdir)/gtnameserv.in
> +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
> +       $(srcdir)/gappletviewer.in $(srcdir)/gjarsigner.in \
> +       $(srcdir)/gkeytool.in $(srcdir)/gjar.in \
> +       $(srcdir)/gnative2ascii.in $(srcdir)/gserialver.in \
> +       $(srcdir)/grmiregistry.in $(srcdir)/gtnameserv.in \
> +       $(srcdir)/gorbd.in $(srcdir)/grmid.in $(srcdir)/grmic.in \
> +       $(srcdir)/gjavah.in $(srcdir)/gjdoc.in
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
>         $(top_srcdir)/../../config/lead-dot.m4 \
> @@ -96,7 +96,6 @@ CONFIG_CLEAN_VPATH_FILES =
>  @CREATE_WRAPPERS_TRUE@ $(am__EXEEXT_1)
>  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
>  PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
> -am__gappletviewer_SOURCES_DIST = toolwrapper.c
>  @CREATE_WRAPPERS_TRUE@am_gappletviewer_OBJECTS =  \
>  @CREATE_WRAPPERS_TRUE@ gappletviewer-toolwrapper.$(OBJEXT)
>  gappletviewer_OBJECTS = $(am_gappletviewer_OBJECTS)
> @@ -104,14 +103,12 @@ gappletviewer_LDADD = $(LDADD)
>  gappletviewer_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
>         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gappletviewer_CFLAGS) \
>         $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
> -am__gjar_SOURCES_DIST = toolwrapper.c
>  @CREATE_WRAPPERS_TRUE@am_gjar_OBJECTS = gjar-toolwrapper.$(OBJEXT)
>  gjar_OBJECTS = $(am_gjar_OBJECTS)
>  gjar_LDADD = $(LDADD)
>  gjar_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>         --mode=link $(CCLD) $(gjar_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
> -am__gjarsigner_SOURCES_DIST = toolwrapper.c
>  @CREATE_WRAPPERS_TRUE@am_gjarsigner_OBJECTS =  \
>  @CREATE_WRAPPERS_TRUE@ gjarsigner-toolwrapper.$(OBJEXT)
>  gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS)
> @@ -119,7 +116,6 @@ gjarsigner_LDADD = $(LDADD)
>  gjarsigner_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
>         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gjarsigner_CFLAGS) \
>         $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
> -am__gjavah_SOURCES_DIST = toolwrapper.c
>  @CREATE_WRAPPERS_TRUE@am_gjavah_OBJECTS =  \
>  @CREATE_WRAPPERS_TRUE@ gjavah-toolwrapper.$(OBJEXT)
>  gjavah_OBJECTS = $(am_gjavah_OBJECTS)
> @@ -127,14 +123,12 @@ gjavah_LDADD = $(LDADD)
>  gjavah_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>         --mode=link $(CCLD) $(gjavah_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
> -am__gjdoc_SOURCES_DIST = toolwrapper.c
>  @CREATE_WRAPPERS_TRUE@am_gjdoc_OBJECTS = gjdoc-toolwrapper.$(OBJEXT)
>  gjdoc_OBJECTS = $(am_gjdoc_OBJECTS)
>  gjdoc_LDADD = $(LDADD)
>  gjdoc_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>         --mode=link $(CCLD) $(gjdoc_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
> -am__gkeytool_SOURCES_DIST = toolwrapper.c
>  @CREATE_WRAPPERS_TRUE@am_gkeytool_OBJECTS =  \
>  @CREATE_WRAPPERS_TRUE@ gkeytool-toolwrapper.$(OBJEXT)
>  gkeytool_OBJECTS = $(am_gkeytool_OBJECTS)
> @@ -142,7 +136,6 @@ gkeytool_LDADD = $(LDADD)
>  gkeytool_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>         --mode=link $(CCLD) $(gkeytool_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
> -am__gnative2ascii_SOURCES_DIST = toolwrapper.c
>  @CREATE_WRAPPERS_TRUE@am_gnative2ascii_OBJECTS =  \
>  @CREATE_WRAPPERS_TRUE@ gnative2ascii-toolwrapper.$(OBJEXT)
>  gnative2ascii_OBJECTS = $(am_gnative2ascii_OBJECTS)
> @@ -150,28 +143,24 @@ gnative2ascii_LDADD = $(LDADD)
>  gnative2ascii_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
>         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gnative2ascii_CFLAGS) \
>         $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
> -am__gorbd_SOURCES_DIST = toolwrapper.c
>  @CREATE_WRAPPERS_TRUE@am_gorbd_OBJECTS = gorbd-toolwrapper.$(OBJEXT)
>  gorbd_OBJECTS = $(am_gorbd_OBJECTS)
>  gorbd_LDADD = $(LDADD)
>  gorbd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>         --mode=link $(CCLD) $(gorbd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
> -am__grmic_SOURCES_DIST = toolwrapper.c
>  @CREATE_WRAPPERS_TRUE@am_grmic_OBJECTS = grmic-toolwrapper.$(OBJEXT)
>  grmic_OBJECTS = $(am_grmic_OBJECTS)
>  grmic_LDADD = $(LDADD)
>  grmic_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>         --mode=link $(CCLD) $(grmic_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
> -am__grmid_SOURCES_DIST = toolwrapper.c
>  @CREATE_WRAPPERS_TRUE@am_grmid_OBJECTS = grmid-toolwrapper.$(OBJEXT)
>  grmid_OBJECTS = $(am_grmid_OBJECTS)
>  grmid_LDADD = $(LDADD)
>  grmid_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>         --mode=link $(CCLD) $(grmid_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>         $(LDFLAGS) -o $@
> -am__grmiregistry_SOURCES_DIST = toolwrapper.c
>  @CREATE_WRAPPERS_TRUE@am_grmiregistry_OBJECTS =  \
>  @CREATE_WRAPPERS_TRUE@ grmiregistry-toolwrapper.$(OBJEXT)
>  grmiregistry_OBJECTS = $(am_grmiregistry_OBJECTS)
> @@ -179,7 +168,6 @@ grmiregistry_LDADD = $(LDADD)
>  grmiregistry_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
>         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(grmiregistry_CFLAGS) \
>         $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
> -am__gserialver_SOURCES_DIST = toolwrapper.c
>  @CREATE_WRAPPERS_TRUE@am_gserialver_OBJECTS =  \
>  @CREATE_WRAPPERS_TRUE@ gserialver-toolwrapper.$(OBJEXT)
>  gserialver_OBJECTS = $(am_gserialver_OBJECTS)
> @@ -187,7 +175,6 @@ gserialver_LDADD = $(LDADD)
>  gserialver_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
>         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gserialver_CFLAGS) \
>         $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
> -am__gtnameserv_SOURCES_DIST = toolwrapper.c
>  @CREATE_WRAPPERS_TRUE@am_gtnameserv_OBJECTS =  \
>  @CREATE_WRAPPERS_TRUE@ gtnameserv-toolwrapper.$(OBJEXT)
>  gtnameserv_OBJECTS = $(am_gtnameserv_OBJECTS)
> @@ -235,17 +222,9 @@ SOURCES = $(gappletviewer_SOURCES) $(gja
>         $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \
>         $(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \
>         $(gserialver_SOURCES) $(gtnameserv_SOURCES)
> -DIST_SOURCES = $(am__gappletviewer_SOURCES_DIST) \
> -       $(am__gjar_SOURCES_DIST) $(am__gjarsigner_SOURCES_DIST) \
> -       $(am__gjavah_SOURCES_DIST) $(am__gjdoc_SOURCES_DIST) \
> -       $(am__gkeytool_SOURCES_DIST) $(am__gnative2ascii_SOURCES_DIST) \
> -       $(am__gorbd_SOURCES_DIST) $(am__grmic_SOURCES_DIST) \
> -       $(am__grmid_SOURCES_DIST) $(am__grmiregistry_SOURCES_DIST) \
> -       $(am__gserialver_SOURCES_DIST) $(am__gtnameserv_SOURCES_DIST)
>  DATA = $(noinst_DATA)
>  ETAGS = etags
>  CTAGS = ctags
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  ACLOCAL = @ACLOCAL@
>  AMTAR = @AMTAR@
>  ANTLR = @ANTLR@
> @@ -1199,40 +1178,6 @@ GTAGS:
>
>  distclean-tags:
>         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> -       list='$(DISTFILES)'; \
> -         dist_files=`for file in $$list; do echo $$file; done | \
> -         sed -e "s|^$$srcdirstrip/||;t" \
> -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> -       case $$dist_files in \
> -         */*) $(MKDIR_P) `echo "$$dist_files" | \
> -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> -                          sort -u` ;; \
> -       esac; \
> -       for file in $$dist_files; do \
> -         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> -         if test -d $$d/$$file; then \
> -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> -           if test -d "$(distdir)/$$file"; then \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> -             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> -             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> -           fi; \
> -           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> -         else \
> -           test -f "$(distdir)/$$file" \
> -           || cp -p $$d/$$file "$(distdir)/$$file" \
> -           || exit 1; \
> -         fi; \
> -       done
> -       $(MAKE) $(AM_MAKEFLAGS) \
> -         top_distdir="$(top_distdir)" distdir="$(distdir)" \
> -         dist-hook
>  check-am: all-am
>  check: $(BUILT_SOURCES)
>         $(MAKE) $(AM_MAKEFLAGS) check-am
> @@ -1343,9 +1288,9 @@ uninstall-am: uninstall-binPROGRAMS unin
>
>  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
>         clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
> -       ctags dist-hook distclean distclean-compile distclean-generic \
> -       distclean-libtool distclean-tags distdir dvi dvi-am html \
> -       html-am info info-am install install-am install-binPROGRAMS \
> +       ctags distclean distclean-compile distclean-generic \
> +       distclean-libtool distclean-tags dvi dvi-am html html-am info \
> +       info-am install install-am install-binPROGRAMS \
>         install-binSCRIPTS install-data install-data-am install-dvi \
>         install-dvi-am install-exec install-exec-am install-html \
>         install-html-am install-info install-info-am install-man \
>
>         Jakub
Ian Taylor - Sept. 20, 2012, 4:07 p.m.
On Thu, Sep 20, 2012 at 6:34 AM, Jakub Jelinek <jakub@redhat.com> wrote:
>
> Similarly for 4.6 branch.  Similar question for libgo, though I hope
> no syncing is being performed to such old release branch anymore.

Correct: I am not syncing to the 4.6 branch.  Go ahead and change it as needed.

Ian

Patch

--- libffi/configure.ac	(revision 191562)
+++ libffi/configure.ac	(working copy)
@@ -12,7 +12,7 @@  target_alias=${target_alias-$host_alias}
 
 . ${srcdir}/configure.host
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([no-dist])
 
 # The same as in boehm-gc and libstdc++. Have to borrow it from there.
 # We must force CC to /not/ be precious variables; otherwise
--- libffi/Makefile.in	(revision 191562)
+++ libffi/Makefile.in	(working copy)
@@ -61,13 +61,10 @@  target_triplet = @target@
 @PA_LINUX_TRUE@am__append_24 = src/pa/linux.S src/pa/ffi.c
 @PA_HPUX_TRUE@am__append_25 = src/pa/hpux32.S src/pa/ffi.c
 subdir = .
-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)/fficonfig.h.in \
-	$(top_srcdir)/configure ChangeLog
+DIST_COMMON = README ChangeLog $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/fficonfig.h.in \
+	$(srcdir)/../mkinstalldirs $(srcdir)/../depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
 	$(top_srcdir)/../config/lead-dot.m4 \
@@ -201,7 +198,6 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 SOURCES = $(libffi_la_SOURCES) $(nodist_libffi_la_SOURCES) \
 	$(libffi_convenience_la_SOURCES) \
 	$(nodist_libffi_convenience_la_SOURCES)
-DIST_SOURCES = $(libffi_la_SOURCES) $(libffi_convenience_la_SOURCES)
 MULTISRCTOP = 
 MULTIBUILDTOP = 
 MULTIDIRS = 
@@ -218,47 +214,10 @@  RECURSIVE_TARGETS = all-recursive check-
 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 = $(SUBDIRS)
-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@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
@@ -1184,182 +1143,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-test -n "$(am__skip_mode_fix)" \
-	|| 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 {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  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) gzip -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
 all-am: Makefile $(LTLIBRARIES) all-multi fficonfig.h
@@ -1510,18 +1293,15 @@  uninstall-am: uninstall-toolexeclibLTLIB
 	all all-am all-multi am--refresh check check-am clean \
 	clean-generic clean-libtool clean-multi \
 	clean-noinstLTLIBRARIES 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-hdr \
-	distclean-libtool distclean-multi distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-multi install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	install-toolexeclibLTLIBRARIES installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
+	ctags-recursive distclean distclean-compile distclean-generic \
+	distclean-hdr distclean-libtool distclean-multi distclean-tags \
+	dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-multi \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip install-toolexeclibLTLIBRARIES installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic maintainer-clean-multi mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	mostlyclean-multi pdf pdf-am ps ps-am tags tags-recursive \
--- libffi/include/Makefile.in	(revision 191562)
+++ libffi/include/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = include
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/ffi.h.in $(toollibffi_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
@@ -54,7 +54,6 @@  CONFIG_HEADER = $(top_builddir)/fficonfi
 CONFIG_CLEAN_FILES = ffi.h ffitarget.h
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -80,7 +79,6 @@  am__installdirs = "$(DESTDIR)$(toollibff
 HEADERS = $(toollibffi_HEADERS)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
@@ -329,37 +327,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
@@ -463,17 +430,16 @@  uninstall-am: uninstall-toollibffiHEADER
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip \
-	install-toollibffiHEADERS installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags uninstall uninstall-am \
-	uninstall-toollibffiHEADERS
+	distclean-libtool distclean-tags dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip install-toollibffiHEADERS \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-toollibffiHEADERS
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- libffi/man/Makefile.in	(revision 191562)
+++ libffi/man/Makefile.in	(working copy)
@@ -35,7 +35,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = man
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
 	$(top_srcdir)/../config/lead-dot.m4 \
@@ -52,7 +52,6 @@  CONFIG_HEADER = $(top_builddir)/fficonfi
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -78,7 +77,6 @@  man3dir = $(mandir)/man3
 am__installdirs = "$(DESTDIR)$(man3dir)"
 NROFF = nroff
 MANS = $(man_MANS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
@@ -292,50 +290,6 @@  TAGS:
 ctags: CTAGS
 CTAGS:
 
-
-distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(MANS)
@@ -439,16 +393,16 @@  uninstall-man: uninstall-man3
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-man3 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-man uninstall-man3
+	distclean distclean-generic distclean-libtool dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-man3 install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-man uninstall-man3
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- libffi/testsuite/Makefile.in	(revision 191562)
+++ libffi/testsuite/Makefile.in	(working copy)
@@ -35,7 +35,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = testsuite
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
 	$(top_srcdir)/../config/lead-dot.m4 \
@@ -52,10 +52,8 @@  CONFIG_HEADER = $(top_builddir)/fficonfi
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
 DEJATOOL = $(PACKAGE)
 RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
@@ -278,37 +276,6 @@  distclean-DEJAGNU:
 	-l='$(DEJATOOL)'; for tool in $$l; do \
 	  rm -f $$tool.sum $$tool.log; \
 	done
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
 check: check-am
@@ -410,8 +377,8 @@  uninstall-am:
 
 .PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \
 	clean-libtool distclean distclean-DEJAGNU distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-libtool dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
--- libgo/configure.ac	(revision 191562)
+++ libgo/configure.ac	(working copy)
@@ -19,7 +19,7 @@  AM_ENABLE_MULTILIB(, ..)
 AC_CANONICAL_SYSTEM
 target_alias=${target_alias-$host_alias}
 
-AM_INIT_AUTOMAKE([1.9.3 no-define foreign -Wall])
+AM_INIT_AUTOMAKE([1.9.3 no-define foreign no-dist -Wall])
 AH_TEMPLATE(PACKAGE, [Name of package])
 AH_TEMPLATE(VERSION, [Version number of package])
 
--- libgo/Makefile.in	(revision 191562)
+++ libgo/Makefile.in	(working copy)
@@ -46,12 +46,10 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(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)/config.h.in $(top_srcdir)/configure
+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \
+	$(srcdir)/../depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
 	$(top_srcdir)/../config/lead-dot.m4 \
@@ -162,52 +160,6 @@  am__DEPENDENCIES_2 = asn1/asn1.lo big/bi
 libgo_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.c \
-	runtime/go-assert-interface.c \
-	runtime/go-byte-array-to-string.c runtime/go-breakpoint.c \
-	runtime/go-caller.c runtime/go-can-convert-interface.c \
-	runtime/go-cgo.c runtime/go-chan-cap.c runtime/go-chan-len.c \
-	runtime/go-check-interface.c runtime/go-close.c \
-	runtime/go-closed.c runtime/go-construct-map.c \
-	runtime/go-convert-interface.c runtime/go-copy.c \
-	runtime/go-defer.c runtime/go-deferred-recover.c \
-	runtime/go-eface-compare.c runtime/go-eface-val-compare.c \
-	runtime/go-getgoroot.c runtime/go-go.c runtime/go-gomaxprocs.c \
-	runtime/go-int-array-to-string.c runtime/go-int-to-string.c \
-	runtime/go-interface-compare.c \
-	runtime/go-interface-eface-compare.c \
-	runtime/go-interface-val-compare.c runtime/go-lock-os-thread.c \
-	runtime/go-map-delete.c runtime/go-map-index.c \
-	runtime/go-map-len.c runtime/go-map-range.c \
-	runtime/go-nanotime.c runtime/go-new-channel.c \
-	runtime/go-new-map.c runtime/go-new.c runtime/go-note.c \
-	runtime/go-panic.c runtime/go-panic-defer.c runtime/go-print.c \
-	runtime/go-rec-big.c runtime/go-rec-nb-big.c \
-	runtime/go-rec-nb-small.c runtime/go-rec-small.c \
-	runtime/go-recover.c runtime/go-reflect.c \
-	runtime/go-reflect-call.c runtime/go-reflect-chan.c \
-	runtime/go-reflect-map.c runtime/go-rune.c \
-	runtime/go-runtime-error.c runtime/go-sched.c \
-	runtime/go-select.c runtime/go-semacquire.c \
-	runtime/go-send-big.c runtime/go-send-nb-big.c \
-	runtime/go-send-nb-small.c runtime/go-send-small.c \
-	runtime/go-signal.c runtime/go-strcmp.c \
-	runtime/go-string-to-byte-array.c \
-	runtime/go-string-to-int-array.c runtime/go-strplus.c \
-	runtime/go-strslice.c runtime/go-trampoline.c \
-	runtime/go-type-eface.c runtime/go-type-error.c \
-	runtime/go-type-identity.c runtime/go-type-interface.c \
-	runtime/go-type-string.c runtime/go-typedesc-equal.c \
-	runtime/go-typestring.c runtime/go-unreflect.c \
-	runtime/go-unsafe-new.c runtime/go-unsafe-newarray.c \
-	runtime/go-unsafe-pointer.c runtime/go-unwind.c \
-	runtime/mcache.c runtime/mcentral.c \
-	runtime/mem_posix_memalign.c runtime/mem.c runtime/mfinal.c \
-	runtime/mfixalloc.c runtime/mgc0.c runtime/mheap.c \
-	runtime/mheapmap32.c runtime/mheapmap64.c runtime/msize.c \
-	runtime/proc.c runtime/thread.c \
-	runtime/rtems-task-variable-add.c chan.c iface.c malloc.c \
-	map.c mprof.c reflect.c sigqueue.c string.c
 @HAVE_SYS_MMAN_H_FALSE@am__objects_1 = mem_posix_memalign.lo
 @HAVE_SYS_MMAN_H_TRUE@am__objects_1 = mem.lo
 @LIBGO_IS_RTEMS_TRUE@am__objects_2 = rtems-task-variable-add.lo
@@ -256,7 +208,6 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libgobegin_a_SOURCES) $(libgo_la_SOURCES)
-DIST_SOURCES = $(libgobegin_a_SOURCES) $(am__libgo_la_SOURCES_DIST)
 MULTISRCTOP = 
 MULTIBUILDTOP = 
 MULTIDIRS = 
@@ -284,47 +235,10 @@  DATA = $(toolexeclibgo_DATA) $(toolexecl
 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 = 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@
 AR = @AR@
@@ -3416,182 +3330,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-test -n "$(am__skip_mode_fix)" \
-	|| 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 {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  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) gzip -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
 all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) all-multi $(DATA) \
@@ -3743,18 +3481,16 @@  uninstall-am: uninstall-toolexeclibLIBRA
 	all all-am all-multi am--refresh check check-am clean \
 	clean-generic clean-libtool clean-local clean-multi \
 	clean-toolexeclibLIBRARIES 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-hdr \
-	distclean-libtool distclean-multi distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-multi install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	install-toolexeclibLIBRARIES install-toolexeclibLTLIBRARIES \
-	install-toolexeclibgoDATA install-toolexeclibgoarchiveDATA \
+	ctags-recursive distclean distclean-compile distclean-generic \
+	distclean-hdr distclean-libtool distclean-multi distclean-tags \
+	dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-multi \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip install-toolexeclibLIBRARIES \
+	install-toolexeclibLTLIBRARIES install-toolexeclibgoDATA \
+	install-toolexeclibgoarchiveDATA \
 	install-toolexeclibgocompressDATA \
 	install-toolexeclibgocontainerDATA \
 	install-toolexeclibgocryptoDATA \
--- libgo/testsuite/Makefile.in	(revision 191562)
+++ libgo/testsuite/Makefile.in	(working copy)
@@ -35,7 +35,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = testsuite
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
 	$(top_srcdir)/../config/lead-dot.m4 \
@@ -54,10 +54,8 @@  CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
 DEJATOOL = $(PACKAGE)
 RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -298,37 +296,6 @@  distclean-DEJAGNU:
 	-l='$(DEJATOOL)'; for tool in $$l; do \
 	  rm -f $$tool.sum $$tool.log; \
 	done
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
 check: check-am
@@ -430,8 +397,8 @@  uninstall-am:
 
 .PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \
 	clean-libtool distclean distclean-DEJAGNU distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-libtool dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
--- libjava/classpath/configure.ac	(revision 191562)
+++ libjava/classpath/configure.ac	(working copy)
@@ -75,7 +75,7 @@  CLASSPATH_CONVENIENCE="-no-undefined"
 AC_SUBST(CLASSPATH_CONVENIENCE)
 
 AC_PREREQ(2.64)
-AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability])
+AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar no-dist -Wno-portability])
 AC_CONFIG_HEADERS([include/config.h])
 AC_PREFIX_DEFAULT(/usr/local/classpath)
 
--- libjava/classpath/Makefile.in	(revision 191562)
+++ libjava/classpath/Makefile.in	(working copy)
@@ -35,25 +35,15 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/../../compile \
-	$(srcdir)/../../config.guess $(srcdir)/../../config.sub \
-	$(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
-	$(srcdir)/../../missing $(srcdir)/../../mkinstalldirs \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/configure \
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/../../mkinstalldirs \
 	$(top_srcdir)/gnu/classpath/Configuration.java.in \
 	$(top_srcdir)/gnu/java/security/Configuration.java.in \
 	$(top_srcdir)/resource/META-INF/services/java.util.prefs.PreferencesFactory.in \
 	$(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader.in \
-	$(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in \
-	../../ABOUT-NLS ../../COPYING ../../COPYING.LIB \
-	../../ChangeLog ../../README ../../compile ../../config.guess \
-	../../config.rpath ../../config.sub ../../depcomp \
-	../../install-sh ../../ltmain.sh ../../missing \
-	../../mkinstalldirs ../../ylwrap AUTHORS COPYING ChangeLog \
-	INSTALL NEWS TODO compile config.guess config.rpath config.sub \
-	depcomp install-sh ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh ltconfig \
-	ltmain.sh missing mkinstalldirs
+	$(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -92,7 +82,6 @@  CONFIG_CLEAN_FILES = gnu/classpath/Confi
 	resource/META-INF/services/javax.sound.sampled.spi.MixerProvider
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
 MULTISRCTOP = 
 MULTIBUILDTOP = 
 MULTIDIRS = 
@@ -109,46 +98,9 @@  RECURSIVE_TARGETS = all-recursive check-
 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
-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 = @ANTLR@
@@ -582,185 +534,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-	-test -n "$(am__skip_mode_fix)" \
-	|| 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 {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  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) gzip -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
 all-am: Makefile all-multi
@@ -869,20 +642,17 @@  uninstall-am:
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am all-multi am--refresh check check-am clean \
 	clean-generic clean-libtool clean-multi ctags ctags-recursive \
-	dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \
-	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
-	distclean-generic distclean-libtool distclean-multi \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-multi \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-multi mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-multi pdf pdf-am ps ps-am tags \
-	tags-recursive uninstall uninstall-am
+	distclean distclean-generic distclean-libtool distclean-multi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-multi install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-multi mostlyclean \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 native: lib
--- libjava/classpath/doc/Makefile.in	(revision 191562)
+++ libjava/classpath/doc/Makefile.in	(working copy)
@@ -35,7 +35,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in texinfo.tex
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -68,7 +68,6 @@  CONFIG_HEADER = $(top_builddir)/include/
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
 INFO_DEPS = cp-tools.info
 am__TEXINFO_TEX_DIR = $(srcdir)/../../gcc/doc/include
 DVIS = cp-tools.dvi
@@ -116,37 +115,10 @@  MANS = $(man_MANS)
 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
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-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"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -756,81 +728,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-info
 check-am: all-am
 check: check-recursive
 all-am: Makefile $(INFO_DEPS) $(MANS) all-local
@@ -1020,18 +917,18 @@  uninstall-man: uninstall-man1
 	all all-am all-local check check-am clean clean-aminfo \
 	clean-generic clean-libtool ctags ctags-recursive dist-info \
 	distclean distclean-generic distclean-libtool distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
-	mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-dvi-am uninstall-html-am uninstall-info-am \
-	uninstall-man uninstall-man1 uninstall-pdf-am uninstall-ps-am
+	dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-man1 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-aminfo \
+	maintainer-clean-generic mostlyclean mostlyclean-aminfo \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-dvi-am \
+	uninstall-html-am uninstall-info-am uninstall-man \
+	uninstall-man1 uninstall-pdf-am uninstall-ps-am
 
 
 .texinfo.dvi:
--- libjava/classpath/doc/api/Makefile.in	(revision 191562)
+++ libjava/classpath/doc/api/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = doc/api
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -69,9 +69,7 @@  CONFIG_HEADER = $(top_builddir)/include/
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
 DATA = $(noinst_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -330,37 +328,6 @@  TAGS:
 ctags: CTAGS
 CTAGS:
 
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
@@ -459,16 +426,16 @@  uninstall-am: uninstall-local
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	clean-local distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-data-local \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-local
+	clean-local distclean distclean-generic distclean-libtool dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-local
 
 
 @CREATE_API_DOCS_TRUE@install-data-local:
--- libjava/classpath/examples/Makefile.in	(revision 191562)
+++ libjava/classpath/examples/Makefile.in	(working copy)
@@ -36,8 +36,8 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = examples
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.java2d.in $(srcdir)/Makefile.jawt.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.jawt.in $(srcdir)/Makefile.java2d.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -70,7 +70,6 @@  CONFIG_HEADER = $(top_builddir)/include/
 CONFIG_CLEAN_FILES = Makefile.jawt Makefile.java2d
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -94,7 +93,6 @@  am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(exampledir)"
 DATA = $(example_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -419,40 +417,6 @@  TAGS:
 ctags: CTAGS
 CTAGS:
 
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
@@ -557,17 +521,17 @@  uninstall-am: uninstall-exampleDATA unin
 .MAKE: all check install install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	clean-local dist-hook distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am \
-	install-exampleDATA install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-exampleDATA uninstall-local
+	clean-local distclean distclean-generic distclean-libtool dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exampleDATA install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-exampleDATA uninstall-local
 
 
 # Make sure all sources and icons are also installed so users can use them.
--- libjava/classpath/external/Makefile.in	(revision 191562)
+++ libjava/classpath/external/Makefile.in	(working copy)
@@ -35,7 +35,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = external
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -68,7 +68,6 @@  CONFIG_HEADER = $(top_builddir)/include/
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -79,37 +78,10 @@  RECURSIVE_TARGETS = all-recursive check-
 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
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-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"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -496,65 +468,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-recursive
 all-am: Makefile
@@ -657,13 +570,13 @@  uninstall-am:
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
 	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
+	distclean-libtool distclean-tags dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am
--- libjava/classpath/external/jsr166/Makefile.in	(revision 191562)
+++ libjava/classpath/external/jsr166/Makefile.in	(working copy)
@@ -35,7 +35,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = external/jsr166
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -68,8 +68,6 @@  CONFIG_HEADER = $(top_builddir)/include/
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -398,37 +396,6 @@  TAGS:
 ctags: CTAGS
 CTAGS:
 
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile
@@ -527,13 +494,13 @@  uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	distclean distclean-generic distclean-libtool dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
--- libjava/classpath/external/relaxngDatatype/Makefile.in	(revision 191562)
+++ libjava/classpath/external/relaxngDatatype/Makefile.in	(working copy)
@@ -35,7 +35,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = external/relaxngDatatype
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -68,8 +68,6 @@  CONFIG_HEADER = $(top_builddir)/include/
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -338,37 +336,6 @@  TAGS:
 ctags: CTAGS
 CTAGS:
 
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile
@@ -467,13 +434,13 @@  uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	distclean distclean-generic distclean-libtool dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
--- libjava/classpath/external/sax/Makefile.in	(revision 191562)
+++ libjava/classpath/external/sax/Makefile.in	(working copy)
@@ -35,7 +35,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = external/sax
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -68,8 +68,6 @@  CONFIG_HEADER = $(top_builddir)/include/
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -366,37 +364,6 @@  TAGS:
 ctags: CTAGS
 CTAGS:
 
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile
@@ -495,13 +462,13 @@  uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	distclean distclean-generic distclean-libtool dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
--- libjava/classpath/external/w3c_dom/Makefile.in	(revision 191562)
+++ libjava/classpath/external/w3c_dom/Makefile.in	(working copy)
@@ -35,7 +35,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = external/w3c_dom
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -68,8 +68,6 @@  CONFIG_HEADER = $(top_builddir)/include/
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -473,37 +471,6 @@  TAGS:
 ctags: CTAGS
 CTAGS:
 
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile
@@ -602,13 +569,13 @@  uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	distclean distclean-generic distclean-libtool dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
--- libjava/classpath/include/Makefile.in	(revision 191562)
+++ libjava/classpath/include/Makefile.in	(working copy)
@@ -35,7 +35,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = include
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/config.h.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
@@ -69,8 +69,6 @@  CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -500,37 +498,6 @@  TAGS:
 ctags: CTAGS
 CTAGS:
 
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 @CREATE_JNI_HEADERS_FALSE@all-local:
@@ -632,8 +599,8 @@  uninstall-am:
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
 	clean-libtool distclean distclean-generic distclean-hdr \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-libtool dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
--- libjava/classpath/lib/Makefile.in	(revision 191562)
+++ libjava/classpath/lib/Makefile.in	(working copy)
@@ -36,9 +36,9 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/copy-vmresources.sh.in $(srcdir)/gen-classlist.sh.in \
-	$(srcdir)/mkcollections.pl.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/mkcollections.pl.in $(srcdir)/gen-classlist.sh.in \
+	$(srcdir)/copy-vmresources.sh.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -72,9 +72,7 @@  CONFIG_CLEAN_FILES = mkcollections.pl ge
 	copy-vmresources.sh
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
 DATA = $(noinst_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -356,40 +354,6 @@  TAGS:
 ctags: CTAGS
 CTAGS:
 
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
 check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
@@ -492,17 +456,16 @@  uninstall-am: uninstall-local
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	clean-local dist-hook distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-local
+	clean-local distclean distclean-generic distclean-libtool dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-local
 
 
 sinclude $(JAVA_DEPEND)
--- libjava/classpath/native/Makefile.in	(revision 191562)
+++ libjava/classpath/native/Makefile.in	(working copy)
@@ -35,7 +35,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -68,7 +68,6 @@  CONFIG_HEADER = $(top_builddir)/include/
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -79,36 +78,9 @@  RECURSIVE_TARGETS = all-recursive check-
 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
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-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"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -498,65 +470,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-recursive
 all-am: Makefile
@@ -659,13 +572,13 @@  uninstall-am:
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
 	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
+	distclean-libtool distclean-tags dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am
--- libjava/classpath/native/fdlibm/Makefile.in	(revision 191562)
+++ libjava/classpath/native/fdlibm/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/fdlibm
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -95,10 +95,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libfdlibm_la_SOURCES)
-DIST_SOURCES = $(libfdlibm_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -553,37 +551,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -689,8 +656,8 @@  uninstall-am:
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
--- libjava/classpath/native/jawt/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jawt/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jawt
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -112,10 +112,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libjawt_la_SOURCES)
-DIST_SOURCES = $(libjawt_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -492,37 +490,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -631,8 +598,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/native/jni/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/Makefile.in	(working copy)
@@ -35,7 +35,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -68,7 +68,6 @@  CONFIG_HEADER = $(top_builddir)/include/
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -79,36 +78,9 @@  RECURSIVE_TARGETS = all-recursive check-
 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
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-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"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -510,65 +482,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-recursive
 all-am: Makefile all-local
@@ -671,16 +584,16 @@  uninstall-am:
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am all-local check check-am clean clean-generic \
 	clean-libtool ctags ctags-recursive distclean \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
+	distclean-generic distclean-libtool distclean-tags dvi dvi-am \
+	html html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 
 all-local:
--- libjava/classpath/native/jni/classpath/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/classpath/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/classpath
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -86,10 +86,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libclasspath_la_SOURCES)
-DIST_SOURCES = $(libclasspath_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -445,37 +443,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -581,8 +548,8 @@  uninstall-am:
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
--- libjava/classpath/native/jni/gconf-peer/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/gconf-peer/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/gconf-peer
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -112,10 +112,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libgconfpeer_la_SOURCES)
-DIST_SOURCES = $(libgconfpeer_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -489,37 +487,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -628,8 +595,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/native/jni/gstreamer-peer/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/gstreamer-peer/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/gstreamer-peer
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -114,10 +114,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libgstreamerpeer_la_SOURCES)
-DIST_SOURCES = $(libgstreamerpeer_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -514,37 +512,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -653,8 +620,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/native/jni/gtk-peer/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/gtk-peer/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/gtk-peer
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -150,10 +150,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libgtkpeer_la_SOURCES)
-DIST_SOURCES = $(libgtkpeer_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -620,37 +618,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -759,8 +726,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/native/jni/java-io/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/java-io/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/java-io
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -111,10 +111,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libjavaio_la_SOURCES)
-DIST_SOURCES = $(libjavaio_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -494,37 +492,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -633,8 +600,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/native/jni/java-lang/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/java-lang/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/java-lang
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -123,12 +123,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 SOURCES = $(libjavalang_la_SOURCES) \
 	$(libjavalangmanagement_la_SOURCES) \
 	$(libjavalangreflect_la_SOURCES)
-DIST_SOURCES = $(libjavalang_la_SOURCES) \
-	$(libjavalangmanagement_la_SOURCES) \
-	$(libjavalangreflect_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -521,37 +517,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -660,8 +625,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/native/jni/java-math/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/java-math/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/java-math
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -112,10 +112,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libjavamath_la_SOURCES)
-DIST_SOURCES = $(libjavamath_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -487,37 +485,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -626,8 +593,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/native/jni/java-net/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/java-net/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/java-net
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -96,10 +96,6 @@  libjavanet_la_DEPENDENCIES =  \
 	$(top_builddir)/native/jni/classpath/jcl.lo \
 	$(top_builddir)/native/jni/native-lib/libclasspathnative.la \
 	$(am__DEPENDENCIES_1)
-am__libjavanet_la_SOURCES_DIST = javanet.c javanet.h \
-	java_net_VMInetAddress.c java_net_VMNetworkInterface.c \
-	java_net_VMURLConnection.c gnu_java_net_VMPlainSocketImpl.c \
-	gnu_java_net_local_LocalSocketImpl.c local.c local.h
 @ENABLE_LOCAL_SOCKETS_FALSE@am__objects_1 = gnu_java_net_local_LocalSocketImpl.lo
 @ENABLE_LOCAL_SOCKETS_TRUE@am__objects_1 = gnu_java_net_local_LocalSocketImpl.lo \
 @ENABLE_LOCAL_SOCKETS_TRUE@	local.lo
@@ -121,10 +117,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libjavanet_la_SOURCES)
-DIST_SOURCES = $(am__libjavanet_la_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -518,37 +512,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -657,8 +620,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/native/jni/java-nio/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/java-nio/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/java-nio
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -119,10 +119,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libjavanio_la_SOURCES)
-DIST_SOURCES = $(libjavanio_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -519,37 +517,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -658,8 +625,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/native/jni/java-util/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/java-util/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/java-util
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -108,10 +108,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libjavautil_la_SOURCES)
-DIST_SOURCES = $(libjavautil_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -483,37 +481,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -622,8 +589,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/native/jni/midi-alsa/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/midi-alsa/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/midi-alsa
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -114,10 +114,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libgjsmalsa_la_SOURCES)
-DIST_SOURCES = $(libgjsmalsa_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -496,37 +494,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -635,8 +602,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/native/jni/midi-dssi/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/midi-dssi/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/midi-dssi
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -114,10 +114,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libgjsmdssi_la_SOURCES)
-DIST_SOURCES = $(libgjsmdssi_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -496,37 +494,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -635,8 +602,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/native/jni/native-lib/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/native-lib/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/native-lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -86,10 +86,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libclasspathnative_la_SOURCES)
-DIST_SOURCES = $(libclasspathnative_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -448,37 +446,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -584,8 +551,8 @@  uninstall-am:
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
--- libjava/classpath/native/jni/qt-peer/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/qt-peer/Makefile.in	(working copy)
@@ -39,7 +39,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/qt-peer
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -116,10 +116,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libqtpeer_la_SOURCES) $(nodist_libqtpeer_la_SOURCES)
-DIST_SOURCES = $(libqtpeer_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -577,37 +575,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
@@ -717,8 +684,8 @@  uninstall-am:
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
--- libjava/classpath/native/jni/xmlj/Makefile.in	(revision 191562)
+++ libjava/classpath/native/jni/xmlj/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/jni/xmlj
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -110,10 +110,8 @@  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libxmlj_la_SOURCES)
-DIST_SOURCES = $(libxmlj_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -511,37 +509,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -650,8 +617,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/native/plugin/Makefile.in	(revision 191562)
+++ libjava/classpath/native/plugin/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = native/plugin
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -112,10 +112,8 @@  CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBT
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libgcjwebplugin_la_SOURCES)
-DIST_SOURCES = $(libgcjwebplugin_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -497,37 +495,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
@@ -636,8 +603,8 @@  uninstall-am: uninstall-nativeexeclibLTL
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	distclean-tags dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \
--- libjava/classpath/resource/Makefile.in	(revision 191562)
+++ libjava/classpath/resource/Makefile.in	(working copy)
@@ -36,7 +36,7 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = resource
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -69,7 +69,6 @@  CONFIG_HEADER = $(top_builddir)/include/
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -93,7 +92,6 @@  am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(loggingdir)" "$(DESTDIR)$(securitydir)"
 DATA = $(logging_DATA) $(security_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -393,37 +391,6 @@  TAGS:
 ctags: CTAGS
 CTAGS:
 
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
@@ -525,17 +492,17 @@  uninstall-am: uninstall-loggingDATA unin
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-loggingDATA install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-securityDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-loggingDATA uninstall-securityDATA
+	distclean distclean-generic distclean-libtool dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-loggingDATA install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-securityDATA \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-loggingDATA \
+	uninstall-securityDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- libjava/classpath/scripts/Makefile.in	(revision 191562)
+++ libjava/classpath/scripts/Makefile.in	(working copy)
@@ -35,8 +35,8 @@  build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = scripts
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/check_jni_methods.sh.in $(srcdir)/classpath.spec.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/classpath.spec.in $(srcdir)/check_jni_methods.sh.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -69,8 +69,6 @@  CONFIG_HEADER = $(top_builddir)/include/
 CONFIG_CLEAN_FILES = classpath.spec check_jni_methods.sh
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -331,37 +329,6 @@  TAGS:
 ctags: CTAGS
 CTAGS:
 
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 check: check-am
 all-am: Makefile
@@ -460,13 +427,13 @@  uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	distclean distclean-generic distclean-libtool dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
--- libjava/classpath/tools/Makefile.in	(revision 191562)
+++ libjava/classpath/tools/Makefile.in	(working copy)
@@ -44,13 +44,13 @@  target_triplet = @target@
 @CREATE_WRAPPERS_TRUE@@INSTALL_BINARIES_FALSE@	$(am__EXEEXT_2)
 @CREATE_GJDOC_TRUE@@CREATE_WRAPPERS_FALSE@am__append_2 = gjdoc
 subdir = tools
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/gappletviewer.in $(srcdir)/gjar.in \
-	$(srcdir)/gjarsigner.in $(srcdir)/gjavah.in $(srcdir)/gjdoc.in \
-	$(srcdir)/gkeytool.in $(srcdir)/gnative2ascii.in \
-	$(srcdir)/gorbd.in $(srcdir)/grmic.in $(srcdir)/grmid.in \
-	$(srcdir)/grmiregistry.in $(srcdir)/gserialver.in \
-	$(srcdir)/gtnameserv.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/gappletviewer.in $(srcdir)/gjarsigner.in \
+	$(srcdir)/gkeytool.in $(srcdir)/gjar.in \
+	$(srcdir)/gnative2ascii.in $(srcdir)/gserialver.in \
+	$(srcdir)/grmiregistry.in $(srcdir)/gtnameserv.in \
+	$(srcdir)/gorbd.in $(srcdir)/grmid.in $(srcdir)/grmic.in \
+	$(srcdir)/gjavah.in $(srcdir)/gjdoc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
@@ -96,7 +96,6 @@  CONFIG_CLEAN_VPATH_FILES =
 @CREATE_WRAPPERS_TRUE@	$(am__EXEEXT_1)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-am__gappletviewer_SOURCES_DIST = toolwrapper.c
 @CREATE_WRAPPERS_TRUE@am_gappletviewer_OBJECTS =  \
 @CREATE_WRAPPERS_TRUE@	gappletviewer-toolwrapper.$(OBJEXT)
 gappletviewer_OBJECTS = $(am_gappletviewer_OBJECTS)
@@ -104,14 +103,12 @@  gappletviewer_LDADD = $(LDADD)
 gappletviewer_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(gappletviewer_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am__gjar_SOURCES_DIST = toolwrapper.c
 @CREATE_WRAPPERS_TRUE@am_gjar_OBJECTS = gjar-toolwrapper.$(OBJEXT)
 gjar_OBJECTS = $(am_gjar_OBJECTS)
 gjar_LDADD = $(LDADD)
 gjar_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(gjar_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__gjarsigner_SOURCES_DIST = toolwrapper.c
 @CREATE_WRAPPERS_TRUE@am_gjarsigner_OBJECTS =  \
 @CREATE_WRAPPERS_TRUE@	gjarsigner-toolwrapper.$(OBJEXT)
 gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS)
@@ -119,7 +116,6 @@  gjarsigner_LDADD = $(LDADD)
 gjarsigner_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(gjarsigner_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am__gjavah_SOURCES_DIST = toolwrapper.c
 @CREATE_WRAPPERS_TRUE@am_gjavah_OBJECTS =  \
 @CREATE_WRAPPERS_TRUE@	gjavah-toolwrapper.$(OBJEXT)
 gjavah_OBJECTS = $(am_gjavah_OBJECTS)
@@ -127,14 +123,12 @@  gjavah_LDADD = $(LDADD)
 gjavah_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(gjavah_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__gjdoc_SOURCES_DIST = toolwrapper.c
 @CREATE_WRAPPERS_TRUE@am_gjdoc_OBJECTS = gjdoc-toolwrapper.$(OBJEXT)
 gjdoc_OBJECTS = $(am_gjdoc_OBJECTS)
 gjdoc_LDADD = $(LDADD)
 gjdoc_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(gjdoc_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__gkeytool_SOURCES_DIST = toolwrapper.c
 @CREATE_WRAPPERS_TRUE@am_gkeytool_OBJECTS =  \
 @CREATE_WRAPPERS_TRUE@	gkeytool-toolwrapper.$(OBJEXT)
 gkeytool_OBJECTS = $(am_gkeytool_OBJECTS)
@@ -142,7 +136,6 @@  gkeytool_LDADD = $(LDADD)
 gkeytool_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(gkeytool_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__gnative2ascii_SOURCES_DIST = toolwrapper.c
 @CREATE_WRAPPERS_TRUE@am_gnative2ascii_OBJECTS =  \
 @CREATE_WRAPPERS_TRUE@	gnative2ascii-toolwrapper.$(OBJEXT)
 gnative2ascii_OBJECTS = $(am_gnative2ascii_OBJECTS)
@@ -150,28 +143,24 @@  gnative2ascii_LDADD = $(LDADD)
 gnative2ascii_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(gnative2ascii_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am__gorbd_SOURCES_DIST = toolwrapper.c
 @CREATE_WRAPPERS_TRUE@am_gorbd_OBJECTS = gorbd-toolwrapper.$(OBJEXT)
 gorbd_OBJECTS = $(am_gorbd_OBJECTS)
 gorbd_LDADD = $(LDADD)
 gorbd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(gorbd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__grmic_SOURCES_DIST = toolwrapper.c
 @CREATE_WRAPPERS_TRUE@am_grmic_OBJECTS = grmic-toolwrapper.$(OBJEXT)
 grmic_OBJECTS = $(am_grmic_OBJECTS)
 grmic_LDADD = $(LDADD)
 grmic_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(grmic_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__grmid_SOURCES_DIST = toolwrapper.c
 @CREATE_WRAPPERS_TRUE@am_grmid_OBJECTS = grmid-toolwrapper.$(OBJEXT)
 grmid_OBJECTS = $(am_grmid_OBJECTS)
 grmid_LDADD = $(LDADD)
 grmid_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(grmid_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__grmiregistry_SOURCES_DIST = toolwrapper.c
 @CREATE_WRAPPERS_TRUE@am_grmiregistry_OBJECTS =  \
 @CREATE_WRAPPERS_TRUE@	grmiregistry-toolwrapper.$(OBJEXT)
 grmiregistry_OBJECTS = $(am_grmiregistry_OBJECTS)
@@ -179,7 +168,6 @@  grmiregistry_LDADD = $(LDADD)
 grmiregistry_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(grmiregistry_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am__gserialver_SOURCES_DIST = toolwrapper.c
 @CREATE_WRAPPERS_TRUE@am_gserialver_OBJECTS =  \
 @CREATE_WRAPPERS_TRUE@	gserialver-toolwrapper.$(OBJEXT)
 gserialver_OBJECTS = $(am_gserialver_OBJECTS)
@@ -187,7 +175,6 @@  gserialver_LDADD = $(LDADD)
 gserialver_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(gserialver_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am__gtnameserv_SOURCES_DIST = toolwrapper.c
 @CREATE_WRAPPERS_TRUE@am_gtnameserv_OBJECTS =  \
 @CREATE_WRAPPERS_TRUE@	gtnameserv-toolwrapper.$(OBJEXT)
 gtnameserv_OBJECTS = $(am_gtnameserv_OBJECTS)
@@ -235,17 +222,9 @@  SOURCES = $(gappletviewer_SOURCES) $(gja
 	$(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \
 	$(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \
 	$(gserialver_SOURCES) $(gtnameserv_SOURCES)
-DIST_SOURCES = $(am__gappletviewer_SOURCES_DIST) \
-	$(am__gjar_SOURCES_DIST) $(am__gjarsigner_SOURCES_DIST) \
-	$(am__gjavah_SOURCES_DIST) $(am__gjdoc_SOURCES_DIST) \
-	$(am__gkeytool_SOURCES_DIST) $(am__gnative2ascii_SOURCES_DIST) \
-	$(am__gorbd_SOURCES_DIST) $(am__grmic_SOURCES_DIST) \
-	$(am__grmid_SOURCES_DIST) $(am__grmiregistry_SOURCES_DIST) \
-	$(am__gserialver_SOURCES_DIST) $(am__gtnameserv_SOURCES_DIST)
 DATA = $(noinst_DATA)
 ETAGS = etags
 CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 ANTLR = @ANTLR@
@@ -1199,40 +1178,6 @@  GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
@@ -1343,9 +1288,9 @@  uninstall-am: uninstall-binPROGRAMS unin
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
-	ctags dist-hook distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
+	ctags distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags dvi dvi-am html html-am info \
+	info-am install install-am install-binPROGRAMS \
 	install-binSCRIPTS install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \