allow -local clean rules

diff --git a/ChangeLog b/ChangeLog
index 5f63f055f660dcf7ab7151fa26adb6e8de4b82a1..f081032a17f92f12ec90c61cae51d4df475d4ed8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec  4 00:41:23 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (do_one_clean_target): Allow -local version of clean
+       targets.
+
 Tue Dec  3 18:58:40 1996  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_dependencies): Skip C-only lines in

diff --git a/Makefile.in b/Makefile.in
index 7c67f95de1a4885c212022827b2d51fc6d96f45f..f533eeb96d676a03c0360ca78844917d4414dcd4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1j from Makefile.am
+# Makefile.in generated automatically by automake 1.1k from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -404,14 +404,14 @@ maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-vti mostlyclean-info mostlyclean-tags \
                mostlyclean-generic
 
-clean-am:  clean-vti clean-info clean-tags clean-generic mostlyclean-am 
+clean-am:  clean-vti clean-info clean-tags clean-generic mostlyclean-am
 
 distclean-am:  distclean-vti distclean-info distclean-tags \
-               distclean-generic clean-am 
+               distclean-generic clean-am
 
 maintainer-clean-am:  maintainer-clean-vti maintainer-clean-info \
                maintainer-clean-tags maintainer-clean-generic \
-               distclean-am 
+               distclean-am
 
 mostlyclean:  mostlyclean-am mostlyclean-recursive
 

diff --git a/TODO b/TODO
index 6ce01b7e6eb1e333e52c6d2ae4ce1c8d26a27b0f..5decff5058380295b9713ad727bb6559cfcb7d35 100644 (file)
--- a/TODO
+++ b/TODO
@@ -392,6 +392,8 @@ document that dependencies:
 * are put into .deps
 * are system-dependent
 
+clean-local rules
+
 ================================================================
 
 Things to do for autoconf:

diff --git a/automake.in b/automake.in
index 18542d29ec5b6a9a7452e5ac9619d47fe404516b..b6ba814c18a92b7087b4b16e7d03ea8faccb353a 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2861,10 +2861,17 @@ sub do_one_clean_target
     {
        if ($last_name || $name ne 'mostly')
        {
-           push (@deps, $last_name . $target . " ");
+           push (@deps, $last_name . $target);
        }
     }
-    # FIXME: not sure if I like the tabs here.
+
+    # If a -local version of the rule is given, add it to the list.
+    if (defined $contents{$name . $target . '-local'})
+    {
+       push (@deps, $name . $target . '-local');
+    }
+
+    # Print the target and the dependencies.
     &pretty_print_rule ($name . $target . ": ", "\t\t", @deps);
 
     # FIXME: shouldn't we really print these messages before running

diff --git a/configure b/configure
index 3d1e3d90a69e9d58f61e9b7e1096f92d594be706..0f842849bc37cd4f00b969f7641fa41822d8c062 100755 (executable)
--- a/configure
+++ b/configure
@@ -608,7 +608,7 @@ cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-VERSION=1.1j
+VERSION=1.1k
 
 cat >> confdefs.h <<EOF
 #define VERSION "$VERSION"

diff --git a/configure.in b/configure.in
index e02380bcd3c540f06f266418bae16c42910f9e0a..1236bd507b4e58995886bd7a3bb09b3da2e43d8c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(automake.in)
 
-AM_INIT_AUTOMAKE(automake, 1.1j)
+AM_INIT_AUTOMAKE(automake, 1.1k)
 
 AC_PATH_PROG(PERL, perl)
 if test -z "$PERL"; then

diff --git a/m4/Makefile.in b/m4/Makefile.in
index d05603643c5e8cabf0f57a63e5510c0941b1e655..258d2d54d8a602e715bd2eff276996075dc3975e 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1j from Makefile.am
+# Makefile.in generated automatically by automake 1.1k from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -142,12 +142,12 @@ maintainer-clean-generic:
        test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
-clean:  clean-generic mostlyclean 
+clean:  clean-generic mostlyclean
 
-distclean:  distclean-generic clean 
+distclean:  distclean-generic clean
        rm -f config.status
 
-maintainer-clean:  maintainer-clean-generic distclean 
+maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 86b4ed3cadbb7833f7157371fb623a718640873b..bbd27025cbbfbcf80ced41c0ad0212646ea58957 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec  4 00:41:44 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * Makefile.am (distclean-local): New target.
+
 Tue Dec  3 11:55:18 1996  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
 
        * dup.test, dup2.test: Modified, now that aclocal allows

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 922dff759e658944509112cc5ea8a608fc88ce56..a30d7f99c7b0d8c5b4e84280fd8dabd8b2cbbc4c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,3 +21,6 @@ acsilent.test distdir.test lex2.test libobj4.test libobj5.test version.test \
 ranlib.test confvar.test confvar2.test stdlib.test
 
 EXTRA_DIST = defs $(TESTS)
+
+distclean-local:
+       rm -rf testSubdir

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 13fd7a46bf9d2551aadfae16579ac443476eefcb..383e1e82cf49b33ea23c73aa585716049aead87f 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1j from Makefile.am
+# Makefile.in generated automatically by automake 1.1k from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -156,12 +156,12 @@ maintainer-clean-generic:
        test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
-clean:  clean-generic mostlyclean 
+clean:  clean-generic mostlyclean
 
-distclean:  distclean-generic clean 
+distclean:  distclean-generic clean distclean-local
        rm -f config.status
 
-maintainer-clean:  maintainer-clean-generic distclean 
+maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
@@ -171,6 +171,9 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
+distclean-local:
+       rm -rf testSubdir
+
 # 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/version.texi b/version.texi
index ba348410e713a5df0ebb6bd653ee65ca4e4297fa..17eb9fffa86e4734a796d9b49c3c7832a5d49e14 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
 @set UPDATED 28 November 1996
-@set EDITION 1.1j
-@set VERSION 1.1j
+@set EDITION 1.1k
+@set VERSION 1.1k