* Makefile.am (automake_cvsweb, automake_cvsargs, autom4te_files)

(autom4te-update): New.
* Makefile.cfg (update): Bind autom4te-update.

diff --git a/ChangeLog b/ChangeLog
index f68de523593b9343605dfbcaa2dc9e61a15d83dc..9569ac757e507ed2e991e5e35c146e808cf404a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-20  Akim Demaille  <akim@epita.fr>
+
+       * Makefile.am (automake_cvsweb, automake_cvsargs, autom4te_files)
+       (autom4te-update): New.
+       * Makefile.cfg (update): Bind autom4te-update.
+
 2003-08-19  Derek Price  <derek@ximbiot.com>
 
        * lib/autotest/general.m4: Comment various HELP_* diversions.

diff --git a/Makefile.am b/Makefile.am
index 80ba0ba38f2b5cdbfd130d22d01d94441d27501d..0ac7f719a5d0f8bb777ca41a66c4844c99d5b70f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in. -*-Makefile-*-
 
 ## Makefile for Autoconf.
-## Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -54,3 +54,32 @@ INSTALL: $(top_srcdir)/doc/install.texi
 maintainer-check: maintainer-check-tests
 maintainer-check-tests:
        cd tests && make maintainer-check
+
+
+## ----------------------------------- ##
+## Updating Perl files from Automake.  ##
+## ----------------------------------- ##
+
+## Fetch the latest versions of files we care about.
+automake_cvsweb = \
+   http://sources.redhat.com/cgi-bin/cvsweb.cgi/~checkout~/automake
+automake_cvsargs = \
+   'content-type=text/plain&cvsroot=automake'
+autom4te_files = \
+  Autom4te/Configure_ac.pm \
+  Autom4te/Channels.pm \
+  Autom4te/FileUtils.pm
+
+autom4te-update:
+       rm -rf Fetchdir > /dev/null 2>&1
+       mkdir Fetchdir; mkdir Fetchdir/Autom4te
+## If a get fails then that is a problem.
+       (cd Fetchdir && \
+       $(WGET) $(automake_cvsweb)/lib/Automake/Configure_ac.pm?$(automake_cvsargs) -O Autom4te/Configure_ac.pm; \
+       $(WGET) $(automake_cvsweb)/lib/Automake/Channels.pm?$(automake_cvsargs) -O Autom4te/Channels.pm; \
+       $(WGET) $(automake_cvsweb)/lib/Automake/FileUtils.pm?$(automake_cvsargs) -O Autom4te/FileUtils.pm; \
+       :)
+       perl -pi -e 's/Automake::/Autom4te::/g' Fetchdir/Autom4te/*.pm
+       for file in $(autom4te_files); do \
+         $(move_if_change) Fetchdir/$$file $(srcdir)/lib/$$file; \
+       done

diff --git a/Makefile.cfg b/Makefile.cfg
index cd77750ef1142442a91d616d2790e37b64dddf26..8943dbc70e47fa24da2e61b755f47876ce8d2922 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -31,4 +31,5 @@ cvs_files = \
   $(srcdir)/config/missing \
   $(srcdir)/config/mkinstalldirs
 
-local_updates = wget-update cvs-update
+# autom4te-update is defined in Makefile.am.
+local_updates = wget-update cvs-update autom4te-update

diff --git a/Makefile.in b/Makefile.in
index 237447655a3e8cfb29ddb419da9cd7deb709b6c8..7d9115324b5f120411786fb9e099b6cf359165ad 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,10 +34,11 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = README $(am__configure_deps) AUTHORS COPYING ChangeLog \
-       INSTALL Makefile.am Makefile.in NEWS README-alpha THANKS TODO \
-       aclocal.m4 configure configure.ac
 subdir = .
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.in \
+       $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
+       Makefile.am NEWS README-alpha THANKS TODO aclocal.m4 configure \
+       configure.ac
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__configure_deps = $(top_srcdir)/config/m4.m4
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -141,10 +142,22 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
 MAINTAINERCLEANFILES = INSTALL
 pkgdata_DATA = INSTALL
 AM_MAKEINFOFLAGS = --no-headers --no-validate --no-split
+automake_cvsweb = \
+   http://sources.redhat.com/cgi-bin/cvsweb.cgi/~checkout~/automake
+
+automake_cvsargs = \
+   'content-type=text/plain&cvsroot=automake'
+
+autom4te_files = \
+  Autom4te/Configure_ac.pm \
+  Autom4te/Channels.pm \
+  Autom4te/FileUtils.pm
+
 all: all-recursive
 
 .SUFFIXES:
 am--refresh:
+       @:
 $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
        @for dep in $?; do \
          case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
@@ -483,7 +496,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -495,6 +508,8 @@ clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+
+       -rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
@@ -518,6 +533,8 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
+
+       -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
@@ -563,6 +580,19 @@ INSTALL: $(top_srcdir)/doc/install.texi
 maintainer-check: maintainer-check-tests
 maintainer-check-tests:
        cd tests && make maintainer-check
+
+autom4te-update:
+       rm -rf Fetchdir > /dev/null 2>&1
+       mkdir Fetchdir; mkdir Fetchdir/Autom4te
+       (cd Fetchdir && \
+       $(WGET) $(automake_cvsweb)/lib/Automake/Configure_ac.pm?$(automake_cvsargs) -O Autom4te/Configure_ac.pm; \
+       $(WGET) $(automake_cvsweb)/lib/Automake/Channels.pm?$(automake_cvsargs) -O Autom4te/Channels.pm; \
+       $(WGET) $(automake_cvsweb)/lib/Automake/FileUtils.pm?$(automake_cvsargs) -O Autom4te/FileUtils.pm; \
+       :)
+       perl -pi -e 's/Automake::/Autom4te::/g' Fetchdir/Autom4te/*.pm
+       for file in $(autom4te_files); do \
+         $(move_if_change) Fetchdir/$$file $(srcdir)/lib/$$file; \
+       done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/aclocal.m4 b/aclocal.m4
index cfc75c74d81d2581a098916a9487fbb9d801f4a9..2400fa75f8bb141b9a8b7466501839c5d780d7bd 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -545,18 +545,32 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
   am_cv_$1_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -574,11 +588,12 @@ AC_CACHE_CHECK([dependency style of $depcc],
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # (even with -Werror).  So we grep stderr for any message

diff --git a/bin/Makefile.in b/bin/Makefile.in
index fe5071dd8a857744607be12285645a221d0b35f5..536419972a710ded640784ad9503911c95fbc838 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -34,7 +34,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/../lib/freeze.mk Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/../lib/freeze.mk $(srcdir)/Makefile.in \
+       Makefile.am
 subdir = bin
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__configure_deps = $(top_srcdir)/config/m4.m4
@@ -342,7 +343,6 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS)
-
 installdirs:
        $(mkinstalldirs) $(DESTDIR)$(bindir)
 install: install-am
@@ -365,7 +365,7 @@ clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -375,6 +375,7 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
+       -rm -f Makefile
 
 distclean-am: clean-am distclean-generic distclean-tags
 
@@ -399,6 +400,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
 
 maintainer-clean-am: distclean-am maintainer-clean-generic
 

diff --git a/config/Makefile.in b/config/Makefile.in
index 727011bfdf243a58f0f0562e18ff68921eb98cb5..d4fe51fda126e1b45220369af962e2e7b7f4742a 100644 (file)
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -33,12 +33,12 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = Makefile.am Makefile.in config.guess config.sub \
-       elisp-comp install-sh mdate-sh missing mkinstalldirs \
-       texinfo.tex
 subdir = config
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__configure_deps = $(top_srcdir)/config/m4.m4
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am config.guess \
+       config.sub elisp-comp install-sh mdate-sh missing \
+       mkinstalldirs texinfo.tex
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -189,7 +189,6 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -210,7 +209,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -221,6 +220,7 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
+       -rm -f Makefile
 
 distclean-am: clean-am distclean-generic
 
@@ -245,6 +245,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
 
 maintainer-clean-am: distclean-am maintainer-clean-generic
 

diff --git a/configure b/configure
index 199198f18b90f940d325f87ad1ae714027561034..3e2d8cf0a99b95fb074b0e6f8291f42aa052e683 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57a for GNU Autoconf 2.57b.
+# Generated by GNU Autoconf 2.57b for GNU Autoconf 2.57b.
 #
 # Report bugs to <bug-autoconf@gnu.org>.
 #
@@ -872,7 +872,7 @@ test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU Autoconf configure 2.57b
-generated by GNU Autoconf 2.57a
+generated by GNU Autoconf 2.57b
 
 Copyright (C) 2003 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -886,7 +886,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU Autoconf $as_me 2.57b, which was
-generated by GNU Autoconf 2.57a.  Invocation command line was
+generated by GNU Autoconf 2.57b.  Invocation command line was
 
   $ $0 $@
 
@@ -2352,7 +2352,7 @@ _ASBOX
 cat >&5 <<_CSEOF
 
 This file was extended by GNU Autoconf $as_me 2.57b, which was
-generated by GNU Autoconf 2.57a.  Invocation command line was
+generated by GNU Autoconf 2.57b.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2410,7 +2410,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 GNU Autoconf config.status 2.57b
-configured by $0, generated by GNU Autoconf 2.57a,
+configured by $0, generated by GNU Autoconf 2.57b,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2003 Free Software Foundation, Inc.

diff --git a/doc/Makefile.in b/doc/Makefile.in
index ae1e7420fb7d04dc8d77d042707ce54e34e9cd36..c9fac0f7b60afc1af0beef620d6c717a0a64a5ce 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -33,11 +33,11 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \
-       Makefile.in stamp-vti version.texi
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__configure_deps = $(top_srcdir)/config/m4.m4
+DIST_COMMON = $(autoconf_TEXINFOS) $(srcdir)/Makefile.in \
+       $(standards_TEXINFOS) Makefile.am stamp-vti version.texi
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -316,7 +316,6 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile $(INFO_DEPS)
-
 installdirs:
        $(mkinstalldirs) $(DESTDIR)$(infodir)
 install: install-am
@@ -339,7 +338,7 @@ clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -349,6 +348,7 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
+       -rm -f Makefile
 
 distclean-am: clean-am distclean-generic
 
@@ -399,6 +399,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
 
 maintainer-clean-am: distclean-am maintainer-clean-aminfo \
        maintainer-clean-generic maintainer-clean-vti

diff --git a/lib/Autom4te/Makefile.in b/lib/Autom4te/Makefile.in
index 45a97d60d123d76f33463058d8747d0f44e63c58..a6fd997f91a68cb8c09ee0990524f789d84d8161 100644 (file)
--- a/lib/Autom4te/Makefile.in
+++ b/lib/Autom4te/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -34,10 +34,10 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = $(dist_perllib_DATA) Makefile.am Makefile.in
 subdir = lib/Autom4te
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__configure_deps = $(top_srcdir)/config/m4.m4
+DIST_COMMON = $(dist_perllib_DATA) $(srcdir)/Makefile.in Makefile.am
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -240,7 +240,6 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
-
 installdirs:
        $(mkinstalldirs) $(DESTDIR)$(perllibdir)
 install: install-am
@@ -262,7 +261,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -272,6 +271,7 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
+       -rm -f Makefile
 
 distclean-am: clean-am distclean-generic distclean-tags
 
@@ -296,6 +296,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
 
 maintainer-clean-am: distclean-am maintainer-clean-generic
 

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1dac02295f11b9d58f2920fe390d73d44bd3ce1a..ac15a4eaafa3160375b18dffcebedce8caf6a43f 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -34,19 +34,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = Makefile.am Makefile.in
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__configure_deps = $(top_srcdir)/config/m4.m4
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-       ps-recursive html-recursive install-info-recursive \
-       uninstall-info-recursive all-recursive install-data-recursive \
-       install-exec-recursive installdirs-recursive install-recursive \
-       uninstall-recursive check-recursive installcheck-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+       install-exec-recursive install-info-recursive \
+       install-recursive installcheck-recursive installdirs-recursive \
+       pdf-recursive ps-recursive uninstall-info-recursive \
+       uninstall-recursive
 am__installdirs = $(DESTDIR)$(pkgdatadir)
 nodist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(nodist_pkgdata_DATA)
@@ -350,7 +351,6 @@ all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -371,7 +371,7 @@ clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -381,7 +381,7 @@ clean: clean-recursive
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
-
+       -rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
@@ -405,7 +405,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-
+       -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
@@ -427,20 +427,15 @@ uninstall-info: uninstall-info-recursive
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
        clean clean-generic clean-recursive ctags ctags-recursive \
        distclean distclean-generic distclean-recursive distclean-tags \
-       distdir dvi dvi-am dvi-recursive html html-am html-recursive \
-       info info-am info-recursive install install-am install-data \
-       install-data-am install-data-recursive install-exec \
-       install-exec-am install-exec-recursive install-info \
-       install-info-am install-info-recursive install-man \
-       install-nodist_pkgdataDATA install-recursive install-strip \
-       installcheck installcheck-am installdirs installdirs-am \
-       installdirs-recursive maintainer-clean \
+       distdir dvi dvi-am html html-am info info-am install \
+       install-am install-data install-data-am install-exec \
+       install-exec-am install-info install-info-am install-man \
+       install-nodist_pkgdataDATA install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
        maintainer-clean-generic maintainer-clean-recursive \
        mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-       pdf-am pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-       uninstall uninstall-am uninstall-info-am \
-       uninstall-info-recursive uninstall-nodist_pkgdataDATA \
-       uninstall-recursive
+       pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+       uninstall-info-am uninstall-nodist_pkgdataDATA
 
 autom4te.cfg: $(srcdir)/autom4te.in Makefile
        rm -f autom4te.cfg autom4te.tmp

diff --git a/lib/autoconf/Makefile.in b/lib/autoconf/Makefile.in
index cca8eec85b70250bb976afd8695c54606729303c..72ad426b7959c57c60befb62a3765e79b61a3178 100644 (file)
--- a/lib/autoconf/Makefile.in
+++ b/lib/autoconf/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(dist_autoconflib_DATA) $(srcdir)/../freeze.mk \
-       Makefile.am Makefile.in
+       $(srcdir)/Makefile.in Makefile.am
 subdir = lib/autoconf
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__configure_deps = $(top_srcdir)/config/m4.m4
@@ -334,7 +334,6 @@ check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
 all-am: Makefile $(DATA)
-
 installdirs:
        $(mkinstalldirs) $(DESTDIR)$(autoconflibdir) $(DESTDIR)$(autoconflibdir)
 install: install-am
@@ -357,7 +356,7 @@ clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -367,6 +366,7 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
+       -rm -f Makefile
 
 distclean-am: clean-am distclean-generic distclean-tags
 
@@ -392,6 +392,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
 
 maintainer-clean-am: distclean-am maintainer-clean-generic
 

diff --git a/lib/autoscan/Makefile.in b/lib/autoscan/Makefile.in
index 8ade8da2a6dfced566b363a1ca4d5cc6843b8e1c..62d38ae5376ce9c52ba2a480f0d9be51ff88974c 100644 (file)
--- a/lib/autoscan/Makefile.in
+++ b/lib/autoscan/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -34,7 +34,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/../freeze.mk Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/../freeze.mk $(srcdir)/Makefile.in Makefile.am
 subdir = lib/autoscan
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__configure_deps = $(top_srcdir)/config/m4.m4
@@ -258,7 +258,6 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
-
 installdirs:
        $(mkinstalldirs) $(DESTDIR)$(autoscanlibdir)
 install: install-am
@@ -281,7 +280,7 @@ clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -291,6 +290,7 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
+       -rm -f Makefile
 
 distclean-am: clean-am distclean-generic
 
@@ -315,6 +315,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
 
 maintainer-clean-am: distclean-am maintainer-clean-generic
 

diff --git a/lib/autotest/Makefile.in b/lib/autotest/Makefile.in
index 0ceec4a319608b2bc2eaadff4c23265c27933103..01db75fe42bbc64ff310b7cbcbad6a79d4b1414d 100644 (file)
--- a/lib/autotest/Makefile.in
+++ b/lib/autotest/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(dist_autotestlib_DATA) $(srcdir)/../freeze.mk \
-       Makefile.am Makefile.in
+       $(srcdir)/Makefile.in Makefile.am
 subdir = lib/autotest
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__configure_deps = $(top_srcdir)/config/m4.m4
@@ -328,7 +328,6 @@ check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
 all-am: Makefile $(DATA)
-
 installdirs:
        $(mkinstalldirs) $(DESTDIR)$(autotestlibdir) $(DESTDIR)$(autotestlibdir)
 install: install-am
@@ -351,7 +350,7 @@ clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -361,6 +360,7 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
+       -rm -f Makefile
 
 distclean-am: clean-am distclean-generic distclean-tags
 
@@ -386,6 +386,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
 
 maintainer-clean-am: distclean-am maintainer-clean-generic
 

diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in
index a4ed65c18d9b1462db319d42603ccc022c210c60..adaaa69d45137f0de3d4f74f773a282fe6d5cc21 100644 (file)
--- a/lib/emacs/Makefile.in
+++ b/lib/emacs/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -34,10 +34,10 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = $(dist_lisp_LISP) Makefile.am Makefile.in
 subdir = lib/emacs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__configure_deps = $(top_srcdir)/config/m4.m4
+DIST_COMMON = $(dist_lisp_LISP) $(srcdir)/Makefile.in Makefile.am
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -225,7 +225,6 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile $(LISP) elc-stamp $(ELCFILES)
-
 installdirs:
        $(mkinstalldirs) $(DESTDIR)$(lispdir)
 install: install-am
@@ -247,7 +246,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -257,6 +256,7 @@ clean: clean-am
 clean-am: clean-generic clean-lisp mostlyclean-am
 
 distclean: distclean-am
+       -rm -f Makefile
 
 distclean-am: clean-am distclean-generic
 
@@ -281,6 +281,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
 
 maintainer-clean-am: distclean-am maintainer-clean-generic
 

diff --git a/lib/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in
index 530f5ad9b36c62f663266c5a25430b41c3097fdf..2aba9a8989059a9753cdb8eac99536523c56000e 100644 (file)
--- a/lib/m4sugar/Makefile.in
+++ b/lib/m4sugar/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(dist_m4sugarlib_DATA) $(srcdir)/../freeze.mk \
-       Makefile.am Makefile.in
+       $(srcdir)/Makefile.in Makefile.am
 subdir = lib/m4sugar
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__configure_deps = $(top_srcdir)/config/m4.m4
@@ -328,7 +328,6 @@ check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
 all-am: Makefile $(DATA)
-
 installdirs:
        $(mkinstalldirs) $(DESTDIR)$(m4sugarlibdir) $(DESTDIR)$(m4sugarlibdir)
 install: install-am
@@ -351,7 +350,7 @@ clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -361,6 +360,7 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
+       -rm -f Makefile
 
 distclean-am: clean-am distclean-generic distclean-tags
 
@@ -386,6 +386,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
 
 maintainer-clean-am: distclean-am maintainer-clean-generic
 

diff --git a/man/Makefile.in b/man/Makefile.in
index be91027f14d3da4e18da37dfca7ee90564a3fb99..baeaf41ecbd6be5fd00b78f20161c9798f78772c 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -33,10 +33,10 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = $(dist_man_MANS) Makefile.am Makefile.in
 subdir = man
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__configure_deps = $(top_srcdir)/config/m4.m4
+DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in Makefile.am
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -232,7 +232,6 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile $(MANS)
-
 installdirs:
        $(mkinstalldirs) $(DESTDIR)$(man1dir)
 install: install-am
@@ -254,7 +253,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -265,6 +264,7 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
+       -rm -f Makefile
 
 distclean-am: clean-am distclean-generic
 
@@ -289,6 +289,7 @@ install-man: install-man1
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
 
 maintainer-clean-am: distclean-am maintainer-clean-generic
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0a94c5a4bdc500dc2ecc30b718a1b1196308b6da..e2585204fddc85e1feb7fcbe852e36e84c864ba8 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -33,8 +33,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/../lib/freeze.mk Makefile.am Makefile.in \
-       atlocal.in wrapper.in
+DIST_COMMON = $(srcdir)/../lib/freeze.mk $(srcdir)/Makefile.in \
+       Makefile.am atlocal.in wrapper.in
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__configure_deps = $(top_srcdir)/config/m4.m4
@@ -308,7 +308,6 @@ check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
 all-am: Makefile
-
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -330,7 +329,7 @@ clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -342,6 +341,7 @@ clean: clean-am
 clean-am: clean-generic clean-local mostlyclean-am
 
 distclean: distclean-am
+       -rm -f Makefile
 
 distclean-am: clean-am distclean-generic
 
@@ -366,6 +366,7 @@ install-man:
 installcheck-am: installcheck-local
 
 maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
 
 maintainer-clean-am: distclean-am maintainer-clean-generic