diff options
author | Eric Blake <ebb9@byu.net> | 2009-03-14 16:23:29 -0600 |
---|---|---|
committer | Eric Blake <ebb9@byu.net> | 2009-03-14 16:23:29 -0600 |
commit | e994faac09d1760b28d9d1e4d95468ffdfc1bdab (patch) | |
tree | 435c7c0add86de10c6725ffb615a1b29ad3e4646 /GNUmakefile | |
parent | ee55d7737cc623ad00cab035a51a1f96be7ef774 (diff) | |
download | autoconf-e994faac09d1760b28d9d1e4d95468ffdfc1bdab.tar.gz |
Resync upstream files.
* GNUmakefile: Run 'make fetch'.
* build-aux/announce-gen: Likewise.
* build-aux/config.guess: Likewise.
* build-aux/config.sub: Likewise.
* build-aux/gnupload: Likewise.
* build-aux/texinfo.tex: Likewise.
* build-aux/vc-list-files: Likewise.
* doc/gnu-oids.texi: Likewise.
* doc/standards.texi: Likewise.
Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile index 0fdd3fa7..33eb3aa4 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -5,7 +5,7 @@ # It is necessary if you want to build targets usually of interest # only to the maintainer. -# Copyright (C) 2001, 2003, 2006-2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2006-2009 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 @@ -38,6 +38,9 @@ ifeq ($(_have-Makefile),yes) # Make tar archive easier to reproduce. export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner +# Allow the user to add to this in the Makefile. +ALL_RECURSIVE_TARGETS = + include Makefile # Some projects override e.g., _autoreconf here. @@ -61,7 +64,7 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) && $(_build-aux)/git-version-gen .tarball-version) ifneq ($(_curr-ver),$(VERSION)) ifeq ($(_curr-ver),UNKNOWN) - $(info WARNING: unable to verify if $(VERSION) is correct version) + $(info WARNING: unable to verify if $(VERSION) is the correct version) else ifneq (,$(_is-install-target)) # GNU Coding Standards state that 'make install' should not cause @@ -107,6 +110,18 @@ abort-due-to-no-makefile: endif # Tell version 3.79 and up of GNU make to not build goals in this -# directory in parallel. This is necessary in case someone tries to -# build multiple targets on one command line. +# directory in parallel, in case someone tries to build multiple +# targets, and one of them can cause a recursive target to be invoked. + +# Only set this if Automake doesn't provide it. +AM_RECURSIVE_TARGETS ?= $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) \ + dist distcheck tags ctags + +ALL_RECURSIVE_TARGETS += $(AM_RECURSIVE_TARGETS) + +ifneq ($(word 2, $(MAKECMDGOALS)), ) +ifneq ($(filter $(ALL_RECURSIVE_TARGETS), $(MAKECMDGOALS)), ) .NOTPARALLEL: +endif +endif |