X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=subdirmk%2Fregen.mk.in;h=f0f60bba24ac3676b2eac426c2c05c8ae306350d;hp=0e8bb6a3245ddc82e8508a7119848c813da4e6da;hb=e84bde92db920acfff950727d1f2f8a91844ca9b;hpb=8d746a1d7b875ae2118247d08e944f2fd7700e8a

diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index 0e8bb6a..f0f60bb 100644
--- a/subdirmk/regen.mk.in
+++ b/subdirmk/regen.mk.in
@@ -2,16 +2,29 @@
 CONFIGURE	?= configure
 CONFIGURE_AC 	?= $(CONFIGURE).ac
 CONFIG_STATUS 	?= config.status
-SUBDIRMK	?= subdirmk
 
-&^/$(CONFIGURE): &^/$(CONFIGURE_AC)
+CONFIGURE_ACS 	+= $(CONFIGURE_AC)
+CONFIGURE_ACS 	+= subdirmk/subdirmk.ac
+
+$(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
 	cd &^ && autoconf
 
-$(CONFIG_STATUS): &^/$(CONFIGURE)
+$(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
 	./$(CONFIG_STATUS) --recheck
 
-all-subdirs.mk $(MAKFILES): makefiles.phantom
+MAKEFILES += subdirmk/regen.mk
+
+main.mk $(MAKFILES): makefiles.phantom
 .INTERMEDIATE: makefiles.phantom
-makefiles.phantom: $(addprefix &^/,$(addsuffix .in,$(MAKEFILES)))	\
-		$(CONFIG_STATUS) &^/$(SUBDIRMK)/generate
+makefiles.phantom: 						\
+		$(top_srcdir)/subdirmk/generate			\
+		$(CONFIG_STATUS)				\
+		$(top_srcdir)/Perdir.mk.in			\
+		$(foreach m,$(MAKEFILES),$(top_srcdir)/$(m).in)
 	./$(CONFIG_STATUS)
+
+realclean: clean
+	$(RM) config.status config.log
+	$(RM) main.mk $(MAKEFILES)
+
+-include $(ALL_DEPFILES)