tidying

[subdirmk.git] / subdirmk / regen.mk.in

diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index 0e8bb6a3245ddc82e8508a7119848c813da4e6da..f0f60bba24ac3676b2eac426c2c05c8ae306350d 100644 (file)
--- 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)