* 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.

diff --git a/ChangeLog b/ChangeLog
index 9ffaf58..cdcadf7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2001-01-29  Akim Demaille  <akim@epita.fr>
 
+       * 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.
+
+2001-01-29  Akim Demaille  <akim@epita.fr>
+
        * automake.in (scan_one_autoconf_file): Correctly recognize
        configure.ac.
 

diff --git a/automake.in b/automake.in
index 6134bf1..3db5855 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2397,7 +2397,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
@@ -2511,7 +2510,6 @@ sub handle_man_pages
        $output_rules .= &file_contents_with_transform ('s/\@SECTION\@/'
                                                        . $sect . '/g;',
                                                        'mans');
-       push (@phony, 'install-man' . $sect, 'uninstall-man' . $sect);
        push (@namelist, 'install-man' . $sect);
     }
 
@@ -2551,7 +2549,6 @@ sub handle_data
 # Handle TAGS.
 sub handle_tags
 {
-    push (@phony, 'tags');
     local (@tag_deps) = ();
     if (&variable_defined ('SUBDIRS'))
     {
@@ -2620,7 +2617,6 @@ sub handle_multilib
 
     $output_rules .= &file_contents ('multilib');
     &push_phony_cleaners ('multi');
-    push (@phony, 'all-multi', 'install-multi');
 }
 
 # Worker for handle_dist.
@@ -3136,18 +3132,6 @@ sub handle_subdirs
                       : '')
                      . '/;');
     $output_rules .= &file_contents_with_transform ($xform, 'subdirs');
-
-    # Push a bunch of phony targets.
-    local ($phonies);
-    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');
 
     $recursive_install = 1;

diff --git a/dejagnu.am b/dejagnu.am
index d52ee83..1f4cdf5 100644 (file)
--- a/dejagnu.am
+++ b/dejagnu.am
@@ -25,6 +25,7 @@ DEJATOOL = $(PACKAGE)
 ## 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; \

diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index d52ee83..1f4cdf5 100644 (file)
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -25,6 +25,7 @@ DEJATOOL = $(PACKAGE)
 ## 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; \

diff --git a/lib/am/mans.am b/lib/am/mans.am
index fb9bafb..65bcc7c 100644 (file)
--- a/lib/am/mans.am
+++ b/lib/am/mans.am
@@ -61,3 +61,5 @@ uninstall-man@SECTION@:
          echo " rm -f $(DESTDIR)$(man@SECTION@dir)/$$inst"; \
          rm -f $(DESTDIR)$(man@SECTION@dir)/$$inst; \
        done
+
+.PHONY: install-man@SECTION@ uninstall-man@SECTION@

diff --git a/lib/am/multilib.am b/lib/am/multilib.am
index 1c24cab..f89fbc5 100644 (file)
--- a/lib/am/multilib.am
+++ b/lib/am/multilib.am
@@ -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 @@ mostlyclean-recursive: mostlyclean-multi
 clean-recursive: clean-multi
 distclean-recursive: distclean-multi
 maintainer-clean-recursive: maintainer-clean-multi
+.PHONY: all-multi install-multi

diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index b6f80ab..54d3f0d 100644 (file)
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -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
@@ -23,6 +23,12 @@
 #     (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@ \
 check-recursive installcheck-recursive info-recursive dvi-recursive:

diff --git a/lib/am/tags.am b/lib/am/tags.am
index 3bc80e8..80680f1 100644 (file)
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -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 @@ GTAGS:
        here=`CDPATH=: && cd $(top_builddir) && pwd` \
          && cd $(top_srcdir) \
          && gtags -i $$here
+
+.PHONY: tags

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 41392c2..9414bad 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -207,3 +207,5 @@ CYGNUS        if test -f $$base; then d=.; else d=$(srcdir); fi; \
            || cp -p $$d/$$file $(distdir)/$$file; \
          done; \
        done
+
+.PHONY: install-info-am uninstall-info

diff --git a/mans.am b/mans.am
index fb9bafb..65bcc7c 100644 (file)
--- a/mans.am
+++ b/mans.am
@@ -61,3 +61,5 @@ uninstall-man@SECTION@:
          echo " rm -f $(DESTDIR)$(man@SECTION@dir)/$$inst"; \
          rm -f $(DESTDIR)$(man@SECTION@dir)/$$inst; \
        done
+
+.PHONY: install-man@SECTION@ uninstall-man@SECTION@

diff --git a/multilib.am b/multilib.am
index 1c24cab..f89fbc5 100644 (file)
--- a/multilib.am
+++ b/multilib.am
@@ -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 @@ mostlyclean-recursive: mostlyclean-multi
 clean-recursive: clean-multi
 distclean-recursive: distclean-multi
 maintainer-clean-recursive: maintainer-clean-multi
+.PHONY: all-multi install-multi

diff --git a/subdirs.am b/subdirs.am
index b6f80ab..54d3f0d 100644 (file)
--- a/subdirs.am
+++ b/subdirs.am
@@ -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
@@ -23,6 +23,12 @@
 #     (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@ \
 check-recursive installcheck-recursive info-recursive dvi-recursive:

diff --git a/tags.am b/tags.am
index 3bc80e8..80680f1 100644 (file)
--- a/tags.am
+++ b/tags.am
@@ -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 @@ GTAGS:
        here=`CDPATH=: && cd $(top_builddir) && pwd` \
          && cd $(top_srcdir) \
          && gtags -i $$here
+
+.PHONY: tags

diff --git a/texinfos.am b/texinfos.am
index 41392c2..9414bad 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -207,3 +207,5 @@ CYGNUS        if test -f $$base; then d=.; else d=$(srcdir); fi; \
            || cp -p $$d/$$file $(distdir)/$$file; \
          done; \
        done
+
+.PHONY: install-info-am uninstall-info