From 54e4442421b3748e5028d71f1be5906a9f53e913 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Thu, 29 Aug 2019 10:20:30 +0200
Subject: [PATCH] filter out directories from headers, scrips, and templates to
 improve wildcard usage

---
 App/tools/driver.makefile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile
index a5d47ec..e464fcc 100644
--- a/App/tools/driver.makefile
+++ b/App/tools/driver.makefile
@@ -372,19 +372,23 @@ export MENUS
 BPTS = $(patsubst %.data,%.dbd,$(wildcard bpt*.data))
 export BPTS
 
-HDRS = ${HEADERS} ${RECORDS:%=${COMMON_DIR}/%.h} ${MENUS:%=${COMMON_DIR}/%.h}
-HDRS += ${HEADERS_${EPICS_BASETYPE}}
-HDRS += ${HEADERS_${EPICSVERSION}}
+HDRS = ${RECORDS:%=${COMMON_DIR}/%.h} ${MENUS:%=${COMMON_DIR}/%.h}
+HDRSX = ${HEADERS}
+HDRSX += ${HEADERS_${EPICS_BASETYPE}}
+HDRSX += ${HEADERS_${EPICSVERSION}}
+HDRS += $(filter-out $(realpath ${HDRSX:%=%/}),$(realpath ${HDRSX}))
 export HDRS
 
-TEMPLS = $(if ${TEMPLATES},$(filter-out -none-,${TEMPLATES}),$(wildcard *.template *.db *.subs))
-TEMPLS += ${TEMPLATES_${EPICS_BASETYPE}}
-TEMPLS += ${TEMPLATES_${EPICSVERSION}}
+TEMPLSX = $(if ${TEMPLATES},$(filter-out -none-,${TEMPLATES}),$(wildcard *.template *.db *.subs))
+TEMPLSX += ${TEMPLATES_${EPICS_BASETYPE}}
+TEMPLSX += ${TEMPLATES_${EPICSVERSION}}
+TEMPLS = $(filter-out $(realpath ${TEMPLSX:%=%/}),$(realpath ${TEMPLSX}))
 export TEMPLS
 
-SCR = $(if ${SCRIPTS},$(filter-out -none-,${SCRIPTS}),$(wildcard *.cmd))
-SCR += ${SCRIPTS_${EPICS_BASETYPE}}
-SCR += ${SCRIPTS_${EPICSVERSION}}
+SCRX = $(if ${SCRIPTS},$(filter-out -none-,${SCRIPTS}),$(wildcard *.cmd))
+SCRX += ${SCRIPTS_${EPICS_BASETYPE}}
+SCRX += ${SCRIPTS_${EPICSVERSION}}
+SCR = $(filter-out $(realpath ${SCRX:%=%/}),$(realpath ${SCRX}))
 export SCR
 
 DOCUDIR = .