X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=subdirmk%2Fregen.mk.in;h=b8e031f7686c929cf5e1da072162a43bebe621e3;hp=81739b9180e1ac72863eace9ca725841ab7ab349;hb=b1f14d76cfc604fedd57499c6d8ce44a91391067;hpb=47bbde5189c25e9a43c821d7c1db3d88a63eeafd

diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index 81739b9..b8e031f 100644
--- a/subdirmk/regen.mk.in
+++ b/subdirmk/regen.mk.in
@@ -3,18 +3,44 @@ CONFIGURE	?= configure
 CONFIGURE_AC 	?= $(CONFIGURE).ac
 CONFIG_STATUS 	?= config.status
 
-$(top_srcdir)/$(CONFIGURE): $(top_srcdir)/$(CONFIGURE_AC)
-	cd &^ && autoconf
+CONFIGURE_ACS 	+= $(CONFIGURE_AC)
+CONFIGURE_ACS 	+= subdirmk/subdirmk.ac
+
+$(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
+	cd $(top_srcdir) && autoconf
 
 $(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
 	./$(CONFIG_STATUS) --recheck
 
 MAKEFILES += subdirmk/regen.mk
 
-main.mk $(MAKFILES): makefiles.phantom
-.INTERMEDIATE: makefiles.phantom
-makefiles.phantom: 						\
+MAKEFILE_TEMPLATES += $(top_srcdir)/Perdir.mk.in
+
+main.mk $(MAKEFILES): .makefiles.stamp ;
+.makefiles.stamp: 						\
 		$(top_srcdir)/subdirmk/generate			\
 		$(CONFIG_STATUS)				\
+		$(MAKEFILE_TEMPLATES)				\
 		$(foreach m,$(MAKEFILES),$(top_srcdir)/$(m).in)
-	./$(CONFIG_STATUS)
+# This filtering arranges that we can often run config.status to
+# generate only particular output files.  We look for *inputs* that
+# have changed.  If the only inputs that have changed are ones that we
+# know affect only one output (Subdir.mk.in and regen.mk.in), we pass
+# config.status the corresponding output file names.  Otherwise we
+# pass nothing and config.status does them all.  We need to mention
+# regen.mk.in twice because if $(top_srcdir) is `.', make elides the
+# directory part from $?.
+	./$(CONFIG_STATUS) $(if					\
+		$(filter-out Subdir.mk.in %/Subdir.mk.in	\
+			subdirmk/regen.mk.in			\
+			$(top_srcdir)/subdirmk/regen.mk.in	\
+			, $?),,					\
+		$(sort $(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?))))
+	touch $@
+
+realclean:: clean
+	$(RM) config.status config.log
+	$(RM) main.mk subdirmk/regen.mk $(MAKEFILES)
+	$(RM) $(addsuffix Makefile,$(dir $(MAKEFILES)))
+
+-include $(ALL_DEPFILES)