From ec218ecdc67f3a2f48dc713f39e0b3552fcee177 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Wed, 15 Sep 2021 13:45:13 +0200 Subject: [PATCH] filter out -none- from all VERSIONCHECKFILES --- App/tools/driver.makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile index b54a662..994a0fe 100644 --- a/App/tools/driver.makefile +++ b/App/tools/driver.makefile @@ -142,8 +142,7 @@ $(foreach v,$(sort $(basename $(basename $(basename ${BUILD_EPICS_VERSIONS}))) $ SUBMODULES:=$(foreach f,$(wildcard .gitmodules),$(shell awk '/^\[submodule/ { print gensub(/["\]]/,"","g",$$2) }' $f)) # Check only version of files needed to build the module. But which are they? -VERSIONCHECKFILES = $(filter-out /% -none-, $(USERMAKEFILE) $(wildcard *.db *.template *.subs *.dbd *.cmd *.iocsh)) -VERSIONCHECKFILES += ${SOURCES} ${DBDS} ${TEMPLATES} ${SCRIPTS} $($(filter SOURCES_% DBDS_%,${.VARIABLES})) +VERSIONCHECKFILES = $(filter-out /% -none-, $(USERMAKEFILE) $(wildcard *.db *.template *.subs *.dbd *.cmd *.iocsh) ${SOURCES} ${DBDS} ${TEMPLATES} ${SCRIPTS} $($(filter SOURCES_% DBDS_%,${.VARIABLES}))) VERSIONCHECKFILES += ${SUBMODULES} VERSIONCHECKCMD = ${MAKEHOME}/getVersion.pl ${VERSIONDEBUGFLAG} ${VERSIONCHECKFILES} LIBVERSION = $(or $(filter-out test,$(shell ${VERSIONCHECKCMD} 2>/dev/null)),${USER},test)