diff options
author | Tom Tromey <tromey@redhat.com> | 1996-12-04 07:48:44 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 1996-12-04 07:48:44 +0000 |
commit | 1f62a0eb602f46722d664e836637f2126261ffa3 (patch) | |
tree | 477f330da88ae6de919ddc2daad41b49616fec63 | |
parent | 38bca416289b2da147cd85d9579464daf01405ca (diff) | |
download | automake-1f62a0eb602f46722d664e836637f2126261ffa3.tar.gz |
allow -local clean rules
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Makefile.in | 8 | ||||
-rw-r--r-- | TODO | 2 | ||||
-rwxr-xr-x | automake.in | 11 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | m4/Makefile.in | 8 | ||||
-rw-r--r-- | tests/ChangeLog | 4 | ||||
-rw-r--r-- | tests/Makefile.am | 3 | ||||
-rw-r--r-- | tests/Makefile.in | 11 | ||||
-rw-r--r-- | version.texi | 4 |
11 files changed, 42 insertions, 18 deletions
@@ -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 7c67f95de..f533eeb96 100644 --- 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 @@ -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 18542d29e..b6ba814c1 100755 --- 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 @@ -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 e02380bcd..1236bd507 100644 --- 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 d05603643..258d2d54d 100644 --- 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 86b4ed3ca..bbd27025c 100644 --- 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 922dff759..a30d7f99c 100644 --- 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 13fd7a46b..383e1e82c 100644 --- 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 ba348410e..17eb9fffa 100644 --- 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 |