X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?p=physics.git;a=blobdiff_plain;f=src%2Ffiles.mk;h=06037b4465240c72c0a039238a8a098e48943466;hp=5c22328bc5ddeef34ac4cc27464d9bd3a9500f9e;hb=ce5a195f85b9cdaf5f412db4dda458fb976d6d36;hpb=6d8ae4070f65c0c2571556cbc8742bdda8011f43

diff --git a/src/files.mk b/src/files.mk
index 5c22328..06037b4 100644
--- a/src/files.mk
+++ b/src/files.mk
@@ -22,20 +22,16 @@ NEWDIRS += graphics/
 
 ################################################################################
 
-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}%}