summaryrefslogtreecommitdiff
path: root/lib/am/remake-hdr.am
diff options
context:
space:
mode:
Diffstat (limited to 'lib/am/remake-hdr.am')
-rw-r--r--lib/am/remake-hdr.am15
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 18414b7a7..6cda7557e 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -15,22 +15,21 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>.
%CONFIG_H%: %STAMP%
-## Recover from removal of CONFIG_HEADER.
- @test -f $@ || rm -f %STAMP%
- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) %STAMP%
-
+## Recover from removal of config headers. This is duplicated with the
+## '%STAMP%' rule below, but allow us to avoid a (potentially costly)
+## make recursion.
+ $(if $(wildcard $@),,@rm -f %STAMP%)
+ $(if $(wildcard $@),,cd $(top_builddir) && $(SHELL) ./config.status %CONFIG_H_PATH%)
%STAMP%: %CONFIG_H_DEPS% $(top_builddir)/config.status
@rm -f %STAMP%
cd $(top_builddir) && $(SHELL) ./config.status %CONFIG_H_PATH%
-
## Only the first file of AC_CONFIG_HEADERS is assumed to be generated
## by autoheader.
if %?FIRST-HDR%
-%CONFIG_HIN%: %MAINTAINER-MODE% $(am__configure_deps) %FILES%
-## Cater to parallel BSD make.
- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+%CONFIG_HIN%: $(am.remake.configure-deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
## Whenever $(AUTOHEADER) has run, we must make sure that
## ./config.status will rebuild config.h. The dependency from %STAMP%
## on %CONFIG_H_DEPS% (which contains config.hin) is not enough to