finished changes to deps directory building

diff --git a/rules.mk b/rules.mk
index 4a92b77..5a5eb5b 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -8,36 +8,32 @@ ${TARGETTMP_$D}: ${BINDIR_$P}/${LIBSDIRNAME_$P}/${SONAME_${G_LIB}}
 
 
 # rule to copy library lib into the working directory
-${BINDIR_$P}/${LIBSDIRNAME_$P}/${SONAME_${G_LIB}}: ${TARGET_${G_LIB}} | $${@D}
+${BINDIR_$P}/${LIBSDIRNAME_$P}/${SONAME_${G_LIB}}: ${TARGET_${G_LIB}} | $${SS_DIR}
        ${cmd-cp}
 
 # how to link the main target
-${TARGETTMP_$P}: ${L_OBJS_$P} | $${@D}
+${TARGETTMP_$P}: ${L_OBJS_$P} | $${SS_DIR}
        ${cmd-link}
 
 # rule to copy tmp target to working directory
-${TARGET_$P}: ${TARGETTMP_$P} | $${@D}
+${TARGET_$P}: ${TARGETTMP_$P} | $${SS_DIR}
        ${cmd-cp}
 
 # rule to copy the config files into the working directory
-${DSTCFGDIR_$P}%: ${SRCCFGDIR_$P}% | $${@D}
+${DSTCFGDIR_$P}/%: ${SRCCFGDIR_$P}/% | $${SS_DIR}
        ${cmd-cp}
 
 # rule to copy the library files into the working directory
-${DSTLIBSDIR_$P}%: ${SRCLIBSDIR_$P}% | $${@D}
+${DSTLIBSDIR_$P}/%: ${SRCLIBSDIR_$P}/% | $${SS_DIR}
        ${cmd-cp}
 
 # rule to copy the text files into the working directory
-${DSTTXTDIR_$P}%: ${SRCTXTDIR_$P}% | $${@D}
+${DSTTXTDIR_$P}/%: ${SRCTXTDIR_$P}/% | $${SS_DIR}
        ${cmd-cp}
 
 # rule to make an object file from a .cpp
-${OBJSDIR_$P}%.o: ${SRCSDIR_$P}%.cpp | $${@D}
-       ${cmd-cpptoobj}
-
-# rule to make a depend file from a .cpp
-${DEPSDIR_$P}%.d: ${SRCSDIR_$P}%.cpp | $${@D}
-       ${cmd-cpptodep}
+${OBJSDIR_$P}/%.o: ${SRCSDIR_$P}/%.cpp | $${SS_DIR} $${call SS_DEPSDIR,$P}
+       ${cmd-cpp_to_obj_and_dep}
 
 
 T := $P