From 9c8ddb55e88d6e074d864bb8565edbebb9980d64 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 14 Feb 2001 02:33:40 +0000 Subject: [PATCH] * automake.in (do_one_merge_target): Always register $name and $name-am as phony. --- ChangeLog | 3 +++ Makefile.am | 13 +++++++++++++ Makefile.in | 42 ++++++++++++++++++++++++++---------------- automake.in | 3 +-- lib/am/Makefile.am | 13 +++++++++++++ m4/Makefile.in | 13 +++++++------ tests/Makefile.in | 6 +++--- 7 files changed, 66 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52d2727e..05a4a1ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-02-13 Tom Tromey + * automake.in (do_one_merge_target): Always register $name and + $name-am as phony. + * automake.in (do_one_merge_target): Register `all' as phony target. diff --git a/Makefile.am b/Makefile.am index 94995391..370cfdc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -138,3 +138,16 @@ path-check: distdir status=$$?; \ chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir); \ exit $$status + +## Program to use to fetch files. +WGET = wget + +## We assume all these are at ftp.gnu.org. +## FIXME: `missing' +FETCHFILES = config/config.guess config/config.sub + +## Fetch the latest versions of files we care about. +fetch: + cd $(srcdir) && \ + $(WGET) ftp://ftp.gnu.org/gnu/config/config.guess \ + $(WGET) ftp://ftp.gnu.org/gnu/config/config.sub \ diff --git a/Makefile.in b/Makefile.in index 6ffb42b4..2f13e1ee 100644 --- a/Makefile.in +++ b/Makefile.in @@ -107,6 +107,10 @@ ETAGS_ARGS = --lang=none \ TAGS_DEPENDENCIES = automake.texi EXTRA_DIST = ChangeLog.1996 ChangeLog.1998 + +WGET = wget + +FETCHFILES = config/config.guess config/config.sub subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -588,22 +592,23 @@ mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti -.PHONY: all-recursive check check-am check-recursive clean clean-generic \ - clean-recursive distclean distclean-generic distclean-recursive \ - distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ - info-recursive install install-am install-binSCRIPTS \ - install-data install-data-am install-data-recursive \ - install-dist_pkgdataDATA install-dist_scriptDATA install-exec \ - install-exec-am install-exec-recursive install-info-am \ - install-recursive install-strip installcheck installcheck-am \ - installcheck-local installcheck-recursive installdirs \ - installdirs-am installdirs-recursive maintainer-clean \ - maintainer-clean-aminfo maintainer-clean-generic \ - maintainer-clean-recursive maintainer-clean-vti mostlyclean \ - mostlyclean-aminfo mostlyclean-generic mostlyclean-recursive \ - mostlyclean-vti tags tags-recursive uninstall uninstall-am \ - uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \ - uninstall-dist_scriptDATA uninstall-info uninstall-recursive +.PHONY: all all-am all-recursive check check-am check-recursive clean \ + clean-generic clean-recursive distclean distclean-generic \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-binSCRIPTS install-data install-data-am \ + install-data-recursive install-dist_pkgdataDATA \ + install-dist_scriptDATA install-exec install-exec-am \ + install-exec-recursive install-info-am install-recursive \ + install-strip installcheck installcheck-am installcheck-local \ + installcheck-recursive installdirs installdirs-am \ + installdirs-recursive maintainer-clean maintainer-clean-aminfo \ + maintainer-clean-generic maintainer-clean-recursive \ + maintainer-clean-vti mostlyclean mostlyclean-aminfo \ + mostlyclean-generic mostlyclean-recursive mostlyclean-vti tags \ + tags-recursive uninstall uninstall-am uninstall-binSCRIPTS \ + uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA \ + uninstall-info uninstall-recursive install-data-hook: @@ -686,6 +691,11 @@ path-check: distdir chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir); \ exit $$status +fetch: + cd $(srcdir) && \ + $(WGET) ftp://ftp.gnu.org/gnu/config/config.guess \ + $(WGET) ftp://ftp.gnu.org/gnu/config/config.sub \ + # 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/automake.in b/automake.in index 526df720..aedac6af 100755 --- a/automake.in +++ b/automake.in @@ -3767,14 +3767,13 @@ sub do_one_merge_target } $output_all = "all: $all_target\n"; - &depend ('.PHONY', 'all'); } else { local ($lname) = $name . ($recursive_install ? '-recursive' : '-am'); &pretty_print_rule ($name . ":", "\t\t", $lname); - &depend ('.PHONY', $name . '-am', $name); } + &depend ('.PHONY', $name . '-am', $name); } # Handle check merge target specially. diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am index 94995391..370cfdc3 100644 --- a/lib/am/Makefile.am +++ b/lib/am/Makefile.am @@ -138,3 +138,16 @@ path-check: distdir status=$$?; \ chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir); \ exit $$status + +## Program to use to fetch files. +WGET = wget + +## We assume all these are at ftp.gnu.org. +## FIXME: `missing' +FETCHFILES = config/config.guess config/config.sub + +## Fetch the latest versions of files we care about. +fetch: + cd $(srcdir) && \ + $(WGET) ftp://ftp.gnu.org/gnu/config/config.guess \ + $(WGET) ftp://ftp.gnu.org/gnu/config/config.sub \ diff --git a/m4/Makefile.in b/m4/Makefile.in index 0c3c51e9..edafec34 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -194,12 +194,13 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -.PHONY: check check-am clean clean-generic distclean distclean-generic \ - distdir dvi dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-m4dataDATA \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic uninstall uninstall-am uninstall-m4dataDATA +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-m4dataDATA install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + uninstall uninstall-am uninstall-m4dataDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/Makefile.in b/tests/Makefile.in index 3ee23d5c..361dce75 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -493,9 +493,9 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -.PHONY: check check-TESTS check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ +.PHONY: all all-am check check-TESTS check-am clean clean-generic \ + distclean distclean-generic distdir dvi dvi-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic uninstall uninstall-am -- 2.43.5