11-more-phony.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * texinfos.am, tags.am, subdirs.am, multilib.am, mans.am: Add a
        .PHONY target.
        * automake.in (handle_texinfo, handle_man_pages, handle_multilib)
        (handle_etags, handle_subdirs): Don't push into @phony.

Index: automake.in
--- automake.in Sun, 28 Jan 2001 15:27:26 +0100 akim (am/f/39_automake.i 1.14 
755)
+++ automake.in Sun, 28 Jan 2001 15:50:32 +0100 akim (am/f/39_automake.i 1.14 
755)
@@ -2396,7 +2396,6 @@ sub handle_texinfo
     $xform .= &transform ('TEXINFODIR' => $texinfodir);

     $output_rules .= &file_contents_with_transform ($xform, 'texinfos');
-    push (@phony, 'install-info-am', 'uninstall-info');
     push (@dist_targets, 'dist-info');

     # How to clean.  The funny name is due to --cygnus influence; in
@@ -2510,7 +2509,6 @@ sub handle_man_pages
        $output_rules .= &file_contents_with_transform ('s/address@hidden@/'
                                                        . $sect . '/g;',
                                                        'mans');
-       push (@phony, 'install-man' . $sect, 'uninstall-man' . $sect);
        push (@namelist, 'install-man' . $sect);
     }

@@ -2550,7 +2548,6 @@ sub handle_data
 # Handle TAGS.
 sub handle_tags
 {
-    push (@phony, 'tags');
     local (@tag_deps) = ();
     if (&variable_defined ('SUBDIRS'))
     {
@@ -2619,7 +2616,6 @@ sub handle_multilib

     $output_rules .= &file_contents ('multilib');
     &push_phony_cleaners ('multi');
-    push (@phony, 'all-multi', 'install-multi');
 }

 # Worker for handle_dist.
@@ -3138,14 +3134,11 @@ sub handle_subdirs

     # Push a bunch of phony targets.
     local ($phonies);
+    # FIXME: Suspicious name of phonies: there does not seem to be
+    # any `uninstall-data-recursive' target for instance.
     foreach $phonies ('', '-data', '-exec', 'dirs')
     {
-       push (@phony, 'install' . $phonies . '-recursive');
        push (@phony, 'uninstall' . $phonies . '-recursive');
-    }
-    foreach $phonies ('all', 'check', 'installcheck', 'info', 'dvi')
-    {
-       push (@phony, $phonies . '-recursive');
     }
     &push_phony_cleaners ('recursive');

Index: texinfos.am
--- texinfos.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/10_texinfos.a 1.1 
644)
+++ texinfos.am Sun, 28 Jan 2001 15:46:39 +0100 akim (am/g/10_texinfos.a 1.1 
644)
@@ -207,3 +207,5 @@
            || cp -p $$d/$$file $(distdir)/$$file; \
          done; \
        done
+
+.PHONY: install-info-am uninstall-info
Index: tags.am
--- tags.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/12_tags.am 1.1 644)
+++ tags.am Sun, 28 Jan 2001 15:46:39 +0100 akim (am/g/12_tags.am 1.1 644)
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 ## Free Software Foundation, Inc.

 ## This program is free software; you can redistribute it and/or modify
@@ -56,3 +56,5 @@
        here=`CDPATH=: && cd $(top_builddir) && pwd` \
          && cd $(top_srcdir) \
          && gtags -i $$here
+
+.PHONY: tags
Index: subdirs.am
--- subdirs.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/14_subdirs.am 1.1 644)
+++ subdirs.am Sun, 28 Jan 2001 15:46:39 +0100 akim (am/g/14_subdirs.am 1.1 644)
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 ## Free Software Foundation, Inc.

 ## This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,12 @@
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
+
+
+.PHONY: all-recursive install-data-recursive install-exec-recursive
+.PHONY: installdirs-recursive install-recursive uninstall-recursive
+.PHONY: @INSTALLINFO@ check-recursive installcheck-recursive info-recursive
+.PHONY: dvi-recursive

 all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \
Index: multilib.am
--- multilib.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/23_multilib.a 1.1 
644)
+++ multilib.am Sun, 28 Jan 2001 15:46:39 +0100 akim (am/g/23_multilib.a 1.1 
644)
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1998 Free Software Foundation, Inc.
+## Copyright 1998, 2001 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
@@ -43,3 +43,4 @@
 clean-recursive: clean-multi
 distclean-recursive: distclean-multi
 maintainer-clean-recursive: maintainer-clean-multi
+.PHONY: all-multi install-multi
Index: mans.am
--- mans.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/24_mans.am 1.1 644)
+++ mans.am Sun, 28 Jan 2001 15:46:39 +0100 akim (am/g/24_mans.am 1.1 644)
@@ -61,3 +61,5 @@
          echo " rm -f $(DESTDIR)$(address@hidden@dir)/$$inst"; \
          rm -f $(DESTDIR)$(address@hidden@dir)/$$inst; \
        done
+
+.PHONY: address@hidden@ address@hidden@
Index: dejagnu.am
--- dejagnu.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/45_dejagnu.am 1.1 644)
+++ dejagnu.am Sun, 28 Jan 2001 15:46:39 +0100 akim (am/g/45_dejagnu.am 1.1 644)
@@ -25,6 +25,7 @@
 ## Default flags to pass to dejagnu.  The user can override this.
 RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir

+.PHONY: check-DEJAGNU
 check-DEJAGNU: site.exp
 ## Life is easiest with an absolute srcdir, so do that.
        srcdir=`CDPATH=: && cd $(srcdir) && pwd`; export srcdir; \