Remove generated files at clean time

diff --git a/ChangeLog b/ChangeLog
index b57e862..9d74c95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Sun Aug 11 00:20:16 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * Makefile.am (CLEANFILES): Removed.
+
+       * automake.in (handle_configure): Define CONFIG_CLEAN_FILES.
+
+       * clean.am (clean-generic): Remove $(CONFIG_CLEAN_FILES).
+
        * compile-vars.am (CC, CFLAGS, COMPILE, LINK): Removed.
 
        * automake.in (handle_yacc_lex_cxx): Require ylwrap in

diff --git a/Makefile.am b/Makefile.am
index 3231fb4..7bfaa1e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,6 @@ ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
 pkgdata_SCRIPTS = config.guess config.sub install-sh interlock mdate-sh \
 mkinstalldirs elisp-comp ylwrap
 
-CLEANFILES = automake aclocal
-
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = automake.in aclocal.in --lang=none \
  --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi

diff --git a/NEWS b/NEWS
index ccc4c60..32ebed3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ New in 1.1b:
 * Now uses `AM_' macro names everywhere
 * ansi2knr option can have directory prefix (eg `../lib/ansi2knr')
 * Better C++, yacc, lex support
+* Random files listed in AC_OUTPUT now removed by "make clean"
 \f
 New in 1.0:
 * Bug fixes

diff --git a/THANKS b/THANKS
index 77ad91b..888c4c5 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -16,6 +16,7 @@ Jason Molenda <crash@cygnus.co.jp>
 Jerome Santini <santini@chambord.univ-orleans.fr>
 Jim Meyering <meyering@na-net.ornl.gov>
 Joerg-Martin Schwarz <jms@jms.prima.ruhr.de>
+Josh MacDonald <jmacd@cs.berkeley.edu>
 Joshua Cowan <jcowan@jcowan.reslife.okstate.edu>
 Karl Berry <kb@cs.umb.edu>
 Mark Galassi <rosalia@nis.lanl.gov>

diff --git a/automake.in b/automake.in
index 27b245d..10101e8 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1834,6 +1834,7 @@ sub handle_configure
 
     # Now look for other files in this directory which must be remade
     # by config.status, and generate rules for them.
+    local (@actual_other_files) = ();
     local ($file, $local, $input);
     foreach $file (@other_input_files)
     {
@@ -1864,10 +1865,14 @@ sub handle_configure
                          . ($relative_dir eq '.' ? '' : '$(subdir)/')
                          . '$@ CONFIG_HEADERS= ./config.status'
                          . "\n");
+       push (@actual_other_files, $local);
 
        &require_file_with_conf_line ($ac_output_line, $FOREIGN,
                                      $input);
     }
+
+    # These files get removed by "make clean".
+    @pretty_print ('CONFIG_CLEAN_FILES = ', '', @actual_other_files);
 }
 
 # Handle C headers.

diff --git a/clean.am b/clean.am
index f716d28..79c310a 100644 (file)
--- a/clean.am
+++ b/clean.am
@@ -24,6 +24,7 @@ mostlyclean-generic:
 
 clean-generic:
        test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 distclean-generic:
        rm -f Makefile $(DISTCLEANFILES)

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 3231fb4..7bfaa1e 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -24,8 +24,6 @@ ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
 pkgdata_SCRIPTS = config.guess config.sub install-sh interlock mdate-sh \
 mkinstalldirs elisp-comp ylwrap
 
-CLEANFILES = automake aclocal
-
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = automake.in aclocal.in --lang=none \
  --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi

diff --git a/lib/am/clean.am b/lib/am/clean.am
index f716d28..79c310a 100644 (file)
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -24,6 +24,7 @@ mostlyclean-generic:
 
 clean-generic:
        test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 distclean-generic:
        rm -f Makefile $(DISTCLEANFILES)