removed usages of $${@D} in favour of $${SS_DIR}
authorPatrik Gornicz <Gornicz.P@gmail.com>
Fri, 4 Sep 2009 04:28:05 +0000 (00:28 -0400)
committerPatrik Gornicz <Gornicz.P@gmail.com>
Fri, 4 Sep 2009 04:28:25 +0000 (00:28 -0400)
lib/dir.mk
physics/dir.mk
rules.mk
tests/dir.mk
tests/src/1/rules.mk
tests/src/printTrace/rules.mk

index fb6824a..3c98bfa 100644 (file)
@@ -19,8 +19,6 @@ include ${CURDIR}/${G_TVARSMK}
 
 include ${CURDIR}/${G_RULESMK}
 
-${L_BLDDIRS_$P}: | $${@D}
-
 L_BLDDIRS_$P  += ${OBJSDIR_$P}
 L_BLDDIRS_$P  += ${DEPSDIR_$P}
 L_BLDDIRS_$P  += ${BINDIR_$P}
index 80771cb..f551a4c 100644 (file)
@@ -24,11 +24,6 @@ include ${CURDIR}/${G_RULESMK}
 L_BLDDIRS_$P  += ${DSTCFGDIR_$P}
 L_BLDDIRS_$P  += ${DSTLIBSDIR_$P}
 
-# every directory depends on its parent
-${L_BLDDIRS_$P}: | $${@D}
-
-# however, these do not depend on parent
-# (to prevent circular dep with phony physics)
 L_BLDDIRS_$P  += ${OBJSDIR_$P}
 L_BLDDIRS_$P  += ${DEPSDIR_$P}
 L_BLDDIRS_$P  += ${BINDIR_$P}
index efeb8c1..b33a037 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -35,7 +35,7 @@ define cmd-cpp_to_obj_and_dep
 endef
 
 
-${L_BLDDIRS}:
+${L_BLDDIRS}: | $${SS_DIR}
        ${Q1s}${PRNTLOG} "mkdir" "$@" ${Q1e}
        ${Q2s}${PRNTFMT} "mkdir" "$@" ${Q2e}
        ${Q3s}mkdir $@ ${Q3e}
index 9b0daa8..eb5e629 100644 (file)
@@ -21,8 +21,6 @@ include ${CURDIR}/${G_TVARSMK}
 
 include ${CURDIR}/${G_RULESMK}
 
-${L_BLDDIRS_$P}: | $${@D}
-
 L_BLDDIRS_$P  += ${OBJSDIR_$P}
 L_BLDDIRS_$P  += ${DEPSDIR_$P}
 L_BLDDIRS_$P  += ${BINDIR_$P}
index 5c8ea92..57203c5 100644 (file)
@@ -6,10 +6,10 @@ ${G_TESTS}-${DIRNAME}: ${TARGET_$D}
 ${TARGETTMP_$D}: ${BINDIR_$P}/${SONAME_${G_LIB}}
 
 # how to link the main target
-${TARGETTMP_$D}: ${L_OBJS_$D} | $${@D}
+${TARGETTMP_$D}: ${L_OBJS_$D} | $${SS_DIR}
        ${cmd-link}
 
 # rule to copy tmp target to working directory
-${TARGET_$D}: ${TARGETTMP_$D} | $${@D}
+${TARGET_$D}: ${TARGETTMP_$D} | $${SS_DIR}
        ${cmd-cp}
 
index 5c8ea92..57203c5 100644 (file)
@@ -6,10 +6,10 @@ ${G_TESTS}-${DIRNAME}: ${TARGET_$D}
 ${TARGETTMP_$D}: ${BINDIR_$P}/${SONAME_${G_LIB}}
 
 # how to link the main target
-${TARGETTMP_$D}: ${L_OBJS_$D} | $${@D}
+${TARGETTMP_$D}: ${L_OBJS_$D} | $${SS_DIR}
        ${cmd-link}
 
 # rule to copy tmp target to working directory
-${TARGET_$D}: ${TARGETTMP_$D} | $${@D}
+${TARGET_$D}: ${TARGETTMP_$D} | $${SS_DIR}
        ${cmd-cp}