chiark
/
gitweb
/
~ian
/
subdirmk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor docs change
[subdirmk.git]
/
subdirmk
/
regen.mk.in
diff --git
a/subdirmk/regen.mk.in
b/subdirmk/regen.mk.in
index 7e9f0cf108c98f45e997973f2e3ba627279e74ab..65d75c2ebfc32db72ccb6e7e432ba4ee6b71cfda 100644
(file)
--- a/
subdirmk/regen.mk.in
+++ b/
subdirmk/regen.mk.in
@@
-1,3
+1,7
@@
+# 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
CONFIGURE ?= configure
CONFIGURE_AC ?= $(CONFIGURE).ac
@@
-12,14
+16,16
@@
$(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
$(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
./$(CONFIG_STATUS) --recheck
$(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
./$(CONFIG_STATUS) --recheck
-MAKEFILES += subdirmk/regen.mk
+MAKEFILE_TEMPLATES += $(top_srcdir)/Perdir.sd.mk
+MAKEFILE_TEMPLATES += $(addprefix $(top_srcdir)/, $(addsuffix .in, \
+ @_SUBDIRMK_MAKEFILES@ \
+ ))
main.mk $(MAKEFILES): .makefiles.stamp ;
.makefiles.stamp: \
$(top_srcdir)/subdirmk/generate \
$(CONFIG_STATUS) \
main.mk $(MAKEFILES): .makefiles.stamp ;
.makefiles.stamp: \
$(top_srcdir)/subdirmk/generate \
$(CONFIG_STATUS) \
- $(top_srcdir)/Perdir.mk.in \
- $(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
# 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
@@
-29,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 \
# 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 \
, $?),, \
, $?),, \
- $(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?)))
+ $(sort \
+ $(patsubst %.sd.mk,%.mk,$(filter %.sd.mk,$?)) \
+ $(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?))))
touch $@
realclean:: clean
touch $@
realclean:: clean