From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 14 Nov 2019 00:20:46 +0000 (+0000)
Subject: build system: Fix automatic autoheader invocation.
X-Git-Tag: v0.5.1~38
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=70f479a7d7c90682562a82d3300a066f9cc92b19

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 d7af1d3..2841cb1 100644
--- 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