Drop Perdir.sd.mk from explicit MAKEFILE_TEMPLATES

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

diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index b8e031f7686c929cf5e1da072162a43bebe621e3..a5e426a6d428df4bfbe16d669d48986685f19bcb 100644 (file)
--- a/subdirmk/regen.mk.in
+++ b/subdirmk/regen.mk.in
@@ -1,10 +1,14 @@
+# subdirmk - rules for regenerating makefiles etc.
+#  Copyright 2019 Mark Wooding
+#  Copyright 2019 Ian Jackson
+# SPDX-License-Identifier: LGPL-2.0-or-later
 
 CONFIGURE      ?= configure
-CONFIGURE_AC   ?= $(CONFIGURE).ac
-CONFIG_STATUS  ?= config.status
+CONFIGURE_AC   ?= $(CONFIGURE).ac
+CONFIG_STATUS  ?= config.status
 
-CONFIGURE_ACS  += $(CONFIGURE_AC)
-CONFIGURE_ACS  += subdirmk/subdirmk.ac
+CONFIGURE_ACS  += $(CONFIGURE_AC)
+CONFIGURE_ACS  += subdirmk/subdirmk.ac
 
 $(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
        cd $(top_srcdir) && autoconf
@@ -12,16 +16,16 @@ $(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
 $(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
        ./$(CONFIG_STATUS) --recheck
 
-MAKEFILES += subdirmk/regen.mk
-
-MAKEFILE_TEMPLATES += $(top_srcdir)/Perdir.mk.in
+# Normally, generate will add all the inputs to MAKEFILE_TEMPLATES.
+MAKEFILE_TEMPLATES += $(addprefix $(top_srcdir)/, $(addsuffix .in, \
+       @_SUBDIRMK_MAKEFILES@ \
+       ))
 
 main.mk $(MAKEFILES): .makefiles.stamp ;
-.makefiles.stamp:                                              \
+.makefiles.stamp:                                              \
                $(top_srcdir)/subdirmk/generate                 \
                $(CONFIG_STATUS)                                \
-               $(MAKEFILE_TEMPLATES)                           \
-               $(foreach m,$(MAKEFILES),$(top_srcdir)/$(m).in)
+               $(MAKEFILE_TEMPLATES)
 # 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
@@ -31,11 +35,12 @@ main.mk $(MAKEFILES): .makefiles.stamp ;
 # 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      \
+               $(filter-out Subdir.sd.mk %/Subdir.sd.mk        \
+                            %.mk.in                            \
                        , $?),,                                 \
-               $(sort $(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?))))
+               $(patsubst $(top_srcdir)/%,%, $(sort            \
+                       $(patsubst %.sd.mk,%.mk,$(filter %.sd.mk,$?)) \
+                       $(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?)))))
        touch $@
 
 realclean:: clean