From 3ab8e59e0f541667a586234b551f7a2a694ff185 Mon Sep 17 00:00:00 2001 From: Simon Rose <simon.rose@ess.eu> Date: Thu, 17 Mar 2022 12:48:24 +0100 Subject: [PATCH] Further simplifications --- require-ess/tools/driver.makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile index 0688c377..ea0392c1 100644 --- a/require-ess/tools/driver.makefile +++ b/require-ess/tools/driver.makefile @@ -432,11 +432,8 @@ list2param = $(subst $(space),$(comma),$(strip $1)) exec = $(eval -exec=$1)$(eval -exec:=$$(call -exec,$(call list2param,$2)))$(-exec) while = $(if $(call exec,$1),$(eval $2)$(call while,$1,$2,$3),$(eval $3)) -pick = $(foreach elem,$1,$(word $(elem),$2)) - -select = $(strip $(call -select,$1,$(strip $2),$3)) --select = $(call --select,$2,$1,$3) ---select = $(if $1,$(if $(call exec,$3,$(call list2param,$(wordlist 1,2,$1))), $(call pick,$2,$1))$(call --select,$(wordlist 3,2147483647,$1),$2,$3)) +select = $(strip $(call -select,$(strip $2),$1,$3)) +-select = $(if $1,$(if $(call exec,$3,$(call list2param,$(wordlist 1,2,$1))), $(word $2,$1))$(call -select,$(wordlist 3,2147483647,$1),$2,$3)) str-eq = $(if $(subst x$1,,x$2),,t) -- GitLab