From 8c2670868c3821c173d54ebff317dd98a5db4296 Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Sat, 13 Jun 2009 00:06:14 -0400 Subject: [PATCH] fixes tests deps rule, changed to one line --- lib/rules.mk | 3 +-- tests/rules.mk | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/rules.mk b/lib/rules.mk index 9f0ebe8..aae1039 100644 --- a/lib/rules.mk +++ b/lib/rules.mk @@ -45,8 +45,7 @@ ${OBJSDIR_$P}%.o: ${SRCSDIR_$P}%.cpp | $${@D} # DON'T simply use another sed delimiter or it can't appear in the file paths ${DEPSDIR_$P}%.d: ${SRCSDIR_$P}%.cpp | $${@D} ${Q1}${PRNTFMT} "DEP" "$@" - ${Q2}${CXX} -MM ${CXXFLAGS} $< ${INCFLAGS} | \ - sed 's/\(^.*\):/$(subst /,\/,${@:${DEPSDIR}%.d=${OBJSDIR}%.o} $@):/' > $@ + ${Q2}${CXX} -MM ${CXXFLAGS} $< ${INCFLAGS} | sed 's/\(^.*\):/$(subst /,\/,${@:${DEPSDIR}%.d=${OBJSDIR}%.o} $@):/' > $@ L_CLEANCMDS += $P-cleanbin diff --git a/tests/rules.mk b/tests/rules.mk index 0ac584f..5d4d5b1 100644 --- a/tests/rules.mk +++ b/tests/rules.mk @@ -14,8 +14,7 @@ ${OBJSDIR_$P}%.o: ${SRCSDIR_$P}%.cpp | $${@D} # DON'T simply use another sed delimiter or it can't appear in the file paths ${DEPSDIR_$P}%.d: ${SRCSDIR_$P}%.cpp | $${@D} ${Q1}${PRNTFMT} "DEP" "$@" - ${Q2}${CXX} -MM ${CXXFLAGS} $< ${INCFLAGS} | \ - sed 's/\(^.*\):/$(subst /,\/,${OBJSDIR}\1 $@):/' > $@ + ${Q2}${CXX} -MM ${CXXFLAGS} $< ${INCFLAGS} | sed 's/\(^.*\):/$(subst /,\/,${@:${DEPSDIR}%.d=${OBJSDIR}%.o} $@):/' > $@ CLEANCMDS += $P-cleanbin .PHONY: $P-cleanbin -- 2.10.2