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=f0f60bba24ac3676b2eac426c2c05c8ae306350d;hb=b1f14d76cfc604fedd57499c6d8ce44a91391067;hpb=e84bde92db920acfff950727d1f2f8a91844ca9b

diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index f0f60bb..b8e031f 100644
--- a/subdirmk/regen.mk.in
+++ b/subdirmk/regen.mk.in
@@ -7,24 +7,40 @@ CONFIGURE_ACS 	+= $(CONFIGURE_AC)
 CONFIGURE_ACS 	+= subdirmk/subdirmk.ac
 
 $(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
-	cd &^ && autoconf
+	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)				\
-		$(top_srcdir)/Perdir.mk.in			\
+		$(MAKEFILE_TEMPLATES)				\
 		$(foreach m,$(MAKEFILES),$(top_srcdir)/$(m).in)
-	./$(CONFIG_STATUS)
-
-realclean: clean
+# 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 $(MAKEFILES)
+	$(RM) main.mk subdirmk/regen.mk $(MAKEFILES)
+	$(RM) $(addsuffix Makefile,$(dir $(MAKEFILES)))
 
 -include $(ALL_DEPFILES)