From b1dce6a7b903e43e94f0dacb4e5cb3309afe24ea Mon Sep 17 00:00:00 2001 From: Simon Rose <simon.rose@ess.eu> Date: Thu, 17 Mar 2022 17:09:06 +0100 Subject: [PATCH] Try to avoid a MACROPRAGMA_DEP_VERSION, e.g. --- require-ess/tools/driver.makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile index 32254685..bdb0c704 100644 --- a/require-ess/tools/driver.makefile +++ b/require-ess/tools/driver.makefile @@ -448,6 +448,9 @@ _MODULES += $$(_lm) endef $(foreach m,$(patsubst %_DEP_VERSION,%,$(filter %_DEP_VERSION,$(.VARIABLES))),$(eval $(call fetch_module_versions,$m))) +# Only keep actual modules, however +_MODULES := $(filter $(shell ls $(E3_SITEMODS_PATH) $(EPICS_MODULES)),$(_MODULES)) + # Fetches the data from .dep files to be parsed by the above define fetch_deps $(shell cat $(E3_SITEMODS_PATH)/$1/$($1_VERSION)/lib/$(T_A)/$1.dep | sed '1d') -- GitLab