From bfa0e486452c1bdede83b1d63cbcb84b43baab31 Mon Sep 17 00:00:00 2001
From: Patrik Gornicz <Gornicz.P@gmail.com>
Date: Fri, 4 Sep 2009 00:28:05 -0400
Subject: [PATCH] removed usages of $${@D} in favour of $${SS_DIR}

---
 lib/dir.mk                    | 2 --
 physics/dir.mk                | 5 -----
 rules.mk                      | 2 +-
 tests/dir.mk                  | 2 --
 tests/src/1/rules.mk          | 4 ++--
 tests/src/printTrace/rules.mk | 4 ++--
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/lib/dir.mk b/lib/dir.mk
index fb6824a..3c98bfa 100644
--- a/lib/dir.mk
+++ b/lib/dir.mk
@@ -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}
diff --git a/physics/dir.mk b/physics/dir.mk
index 80771cb..f551a4c 100644
--- a/physics/dir.mk
+++ b/physics/dir.mk
@@ -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}
diff --git a/rules.mk b/rules.mk
index efeb8c1..b33a037 100644
--- 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}
diff --git a/tests/dir.mk b/tests/dir.mk
index 9b0daa8..eb5e629 100644
--- a/tests/dir.mk
+++ b/tests/dir.mk
@@ -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}
diff --git a/tests/src/1/rules.mk b/tests/src/1/rules.mk
index 5c8ea92..57203c5 100644
--- a/tests/src/1/rules.mk
+++ b/tests/src/1/rules.mk
@@ -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}
 
diff --git a/tests/src/printTrace/rules.mk b/tests/src/printTrace/rules.mk
index 5c8ea92..57203c5 100644
--- a/tests/src/printTrace/rules.mk
+++ b/tests/src/printTrace/rules.mk
@@ -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}
 
-- 
2.10.2