From d3a3e4c42042ad764bcf41fa5af74b0047cc3adb Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Fri, 9 Oct 2015 15:25:01 +0200
Subject: [PATCH] add + only to dependencies with numeric versions
---
App/tools/driver.makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile
index adca5948..6d031675 100644
--- a/App/tools/driver.makefile
+++ b/App/tools/driver.makefile
@@ -885,8 +885,8 @@ ${DEPFILE}: ${LIBOBJS} $(USERMAKEFILE)
@echo "Collecting dependencies"
$(RM) $@
@echo "# Generated file. Do not edit." > $@
- cat *.d 2>/dev/null | sed 's/ /\n/g' | sed -n 's%$(EPICS_MODULES)/*\([^/]*\)/\([^/]*\)/.*%\1 \2+%p'| sort -u >> $@
- $(foreach m,${REQ},echo "$m $(basename ${$m_VERSION})+" >> $@;)
+ cat *.d 2>/dev/null | sed 's/ /\n/g' | sed -n 's%${EPICS_MODULES}/*\([^/]*\)/\([0-9.]*\)/.*%\1 \2+%p;s%$(EPICS_MODULES)/*\([^/]*\)/\([^/]*\)/.*%\1 \2%p'| sort -u >> $@
+ $(foreach m,${REQ},echo "$m ${$m_VERSION}$(if $(filter-out $(basename ${$m_VERSION}),${$m_VERSION}),+)" >> $@;)
$(BUILDRULE)
$(RM) MakefileInclude
--
GitLab