From 22e25aed6f6bab0dded36af51dcf7899cb5b6439 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Tue, 8 Oct 2019 17:40:02 -0400 Subject: [PATCH] remove one more $(shell ...) --- src/tests/keywords/all.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk index b03c44cf7fe..ac5c0425f53 100644 --- a/src/tests/keywords/all.mk +++ b/src/tests/keywords/all.mk @@ -71,7 +71,16 @@ $(OUTPUT)/%.attrs: $(DIR)/%.attrs $(DIR)/default-input.attrs | $(OUTPUT) # .PRECIOUS: $(OUTPUT)/%.attrs -KEYWORD_MODULES := $(shell grep -- mods-enabled src/tests/keywords/unit_test_module.conf | sed 's,.*/,,') +# +# Cache the list of modules which are enabled, so that we don't run +# the shell script on every build. +# +# KEYWORD_MODULES := $(shell grep -- mods-enabled src/tests/keywords/unit_test_module.conf | sed 's,.*/,,') +# +$(OUTPUT)/enabled.mk: src/tests/keywords/unit_test_module.conf | $(OUTPUT) + ${Q}echo "KEYWORD_MODULES := " $$(grep -- mods-enabled src/tests/keywords/unit_test_module.conf | sed 's,.*/,,' | tr '\n' ' ' ) > $@ +-include $(OUTPUT)/enabled.mk + KEYWORD_RADDB := $(addprefix raddb/mods-enabled/,$(KEYWORD_MODULES)) KEYWORD_LIBS := $(addsuffix .la,$(addprefix rlm_,$(KEYWORD_MODULES))) rlm_example.la rlm_cache.la rlm_csv.la -- 2.47.3