chiark
/
gitweb
/
~ian
/
subdirmk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://git.distorted.org.uk/~markw/subdirmk
[subdirmk.git]
/
subdirmk
/
regen.mk.in
diff --git
a/subdirmk/regen.mk.in
b/subdirmk/regen.mk.in
index 65d75c2ebfc32db72ccb6e7e432ba4ee6b71cfda..bd56a24e677174d10a57d362d272ecc0158e1d84 100644
(file)
--- a/
subdirmk/regen.mk.in
+++ b/
subdirmk/regen.mk.in
@@
-4,11
+4,11
@@
# SPDX-License-Identifier: LGPL-2.0-or-later
CONFIGURE ?= configure
# 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
$(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
cd $(top_srcdir) && autoconf
@@
-22,7
+22,7
@@
MAKEFILE_TEMPLATES += $(addprefix $(top_srcdir)/, $(addsuffix .in, \
))
main.mk $(MAKEFILES): .makefiles.stamp ;
))
main.mk $(MAKEFILES): .makefiles.stamp ;
-.makefiles.stamp: \
+.makefiles.stamp: \
$(top_srcdir)/subdirmk/generate \
$(CONFIG_STATUS) \
$(MAKEFILE_TEMPLATES)
$(top_srcdir)/subdirmk/generate \
$(CONFIG_STATUS) \
$(MAKEFILE_TEMPLATES)
@@
-38,9
+38,9
@@
main.mk $(MAKEFILES): .makefiles.stamp ;
$(filter-out Subdir.sd.mk %/Subdir.sd.mk \
%.mk.in \
, $?),, \
$(filter-out Subdir.sd.mk %/Subdir.sd.mk \
%.mk.in \
, $?),, \
- $(
sort
\
+ $(
patsubst $(top_srcdir)/%,%, $(sort
\
$(patsubst %.sd.mk,%.mk,$(filter %.sd.mk,$?)) \
$(patsubst %.sd.mk,%.mk,$(filter %.sd.mk,$?)) \
- $(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?))))
+ $(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?))))
)
touch $@
realclean:: clean
touch $@
realclean:: clean