* automake.in (handle_merge_targets): Don't special-case "-local"

	targets.  Test all.test.

diff --git a/ChangeLog b/ChangeLog
index a467c0506ee8ba1fa359cec629c7153ae2fedca7..3dd773ab2004ca869e7a80b6afffc49f980117a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-01-10  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_merge_targets): Don't special-case "-local"
+       targets.  Test all.test.
+
        * automake.in (handle_texinfo): Prepend $(srcdir) to directory
        used to find texinfo.tex.  Report from Glenn Amerine.
 

diff --git a/TODO b/TODO
index 493b2eb78041d3ff6b107d07b4359b1ae68f031d..bd0430f571fbeb8ee3c56903660a231d8bc3f6ba 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-* all-local ends up as dependency of all-am twice
-
 * foo=bar
   if cond
   foo += joe

diff --git a/automake.in b/automake.in
index 278ba47c8d227edc97b7aa55435cc4ddfbebfd92..8a33c5fc26e630b7d86275ddf856939936b7cd13 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3364,18 +3364,6 @@ sub handle_merge_targets
                        "\`install-info-local' target defined but \`no-installinfo' option not in use");
     }
 
-    # Handle the various install targets specially.  We do this so
-    # that (eg) "make install-exec" will run "install-exec-recursive"
-    # if required, but "make install" won't run it twice.  Step one is
-    # to see if the user specified local versions of any of the
-    # targets we handle.  "all" is treated as one of these since
-    # "install" can run it.
-    push (@install_exec, 'install-exec-local')
-       if &target_defined ('install-exec-local');
-    push (@install_data, 'install-data-local')
-       if &target_defined ('install-data-local');
-    push (@uninstall, 'uninstall-local')
-       if &target_defined ('uninstall-local');
     local ($utarg);
     foreach $utarg ('uninstall-data-local', 'uninstall-data-hook',
                    'uninstall-exec-local', 'uninstall-exec-hook')
@@ -3387,8 +3375,6 @@ sub handle_merge_targets
            &am_line_error ($utarg, "use \`$x', not \`$utarg'");
        }
     }
-    push (@all, 'all-local')
-       if &target_defined ('all-local');
 
     if (&target_defined ('install-local'))
     {