From 99c6cb29f2db83cdd80f6d47c3b6a2777dcc8132 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Tue, 15 Sep 2015 17:30:59 +0200 Subject: [PATCH] formatting only --- App/tools/driver.makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile index 7057294..9c40432 100644 --- a/App/tools/driver.makefile +++ b/App/tools/driver.makefile @@ -670,7 +670,8 @@ EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS) # Setup searchpaths from all used files # find all sources whatever suffix -$(foreach filetype,SRCS TEMPLS SCR,$(foreach ext,$(sort $(suffix ${${filetype}})),$(eval vpath %${ext} $(sort $(dir $(filter %${ext},${${filetype}:%=../%})))))) +$(foreach filetype,SRCS TEMPLS SCR,$(foreach ext,$(sort $(suffix ${${filetype}})),\ + $(eval vpath %${ext} $(sort $(dir $(filter %${ext},${${filetype}:%=../%})))))) # Do not tread %.dbd the same way because it creates a circular dependency # if a source dbd has the same name as the project dbd. Have to clear %.dbd. @@ -846,7 +847,7 @@ ${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 >> $@ + 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})+" >> $@;) $(BUILDRULE)