build system: Fix automatic autoheader invocation.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Subdir.sd.mk b/Subdir.sd.mk
index d7af1d35fdc742f4c7ad238d54421a12b6cf5993..2841cb1ba3eb267abd64eb33359d6e2f5b7796e0 100644 (file)
--- a/Subdir.sd.mk
+++ b/Subdir.sd.mk
@@ -84,15 +84,12 @@ STALE_PYTHON_FILES= $(foreach e, py pyc, \
 
 all::  $(TARGETS) check
 
-include subdirmk/regen.mk
-
-# autoheader might not change config.h.in, so touch a stamp file.
-${srcdir}/config.h.in: config.stamp.in
-${srcdir}/config.stamp.in: configure.ac
+${srcdir}/config.h.in: configure.ac
        cd ${srcdir} && autoheader
-       echo timestamp > ${srcdir}/config.stamp.in
+       touch $@
 
 MAKEFILE_TEMPLATES += config.h.in
+CONFIG_STATUS_OUTPUTS += config.h
 
 # C and header file dependency rules
 SOURCES:=$(OBJECTS:.o=.c) $(TEST_OBJECTS:.o=.c)
@@ -221,6 +218,8 @@ realclean:: clean
 
 distclean::    realclean
 
+include subdirmk/regen.mk
+
 # Release checklist:
 #
 #  0. Use this checklist from Makefile.in