X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=subdirmk%2Fregen.mk.in;fp=subdirmk%2Fregen.mk.in;h=bd56a24e677174d10a57d362d272ecc0158e1d84;hp=65d75c2ebfc32db72ccb6e7e432ba4ee6b71cfda;hb=b65616faf82880a08baf30080e3f18d41cda2fbd;hpb=1c1948504ec808f30a0fd631d6cbc11ebd7ab371 diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in index 65d75c2..bd56a24 100644 --- a/subdirmk/regen.mk.in +++ b/subdirmk/regen.mk.in @@ -4,11 +4,11 @@ # 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 @@ -22,7 +22,7 @@ MAKEFILE_TEMPLATES += $(addprefix $(top_srcdir)/, $(addsuffix .in, \ )) main.mk $(MAKEFILES): .makefiles.stamp ; -.makefiles.stamp: \ +.makefiles.stamp: \ $(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 \ , $?),, \ - $(sort \ + $(patsubst $(top_srcdir)/%,%, $(sort \ $(patsubst %.sd.mk,%.mk,$(filter %.sd.mk,$?)) \ - $(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?)))) + $(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?))))) touch $@ realclean:: clean