fixes tests deps rule, changed to one line
authorPatrik Gornicz <Gornicz.P@gmail.com>
Sat, 13 Jun 2009 04:06:14 +0000 (00:06 -0400)
committerPatrik Gornicz <Gornicz.P@gmail.com>
Sat, 13 Jun 2009 04:06:14 +0000 (00:06 -0400)
lib/rules.mk
tests/rules.mk

index 9f0ebe8..aae1039 100644 (file)
@@ -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
index 0ac584f..5d4d5b1 100644 (file)
@@ -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