X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FEntities%2Ffiles.mk;h=bffa3ac598a8a297cb562dee2a969f5f8859563b;hb=389bf8fdd7e1b8f4fe21e5a9fdb477d40d03d829;hp=805444e258eb2d2af8265d0117b9a7ebd2ce7634;hpb=6d8ae4070f65c0c2571556cbc8742bdda8011f43;p=physics.git

diff --git a/src/Entities/files.mk b/src/Entities/files.mk
index 805444e..bffa3ac 100644
--- a/src/Entities/files.mk
+++ b/src/Entities/files.mk
@@ -14,20 +14,16 @@ NEWDIRS := # := start; empty
 
 ################################################################################
 
-NEWSRCS := $(addprefix ${SRCPATH},${NEWSRCS})
-NEWDIRS := $(addprefix ${SRCPATH},${NEWDIRS})
-NEWOBJS := ${NEWSRCS:.cpp=.o}
-NEWDEPS := ${NEWSRCS:.cpp=.d}
-
-NEWOBJSDIRS := $(addprefix ${OBJSDIR_$P},${NEWDIRS})
-NEWDEPSDIRS := $(addprefix ${DEPSDIR_$P},${NEWDIRS})
+NEWSRCS := $(addprefix ${CURDIR}/,${NEWSRCS})
+NEWDIRS := $(addprefix ${CURDIR}/,${NEWDIRS})
 
 # Append to lists
 
 L_SRCS_$P     += ${NEWSRCS}
-L_OBJS_$P     += $(addprefix ${OBJSDIR_$P},${NEWOBJS})
-L_DEPS_$P     += $(addprefix ${DEPSDIR_$P},${NEWDEPS})
 
-L_BLDDIRS_$P  += ${NEWOBJSDIRS}
-L_BLDDIRS_$P  += ${NEWDEPSDIRS}
+L_OBJS_$P     += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${OBJSDIR_$P}%.o}
+L_DEPS_$P     += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${DEPSDIR_$P}%.d}
+
+L_BLDDIRS_$P  += ${NEWDIRS:${SRCSDIR_$P}%=${OBJSDIR_$P}%}
+L_BLDDIRS_$P  += ${NEWDIRS:${SRCSDIR_$P}%=${DEPSDIR_$P}%}