From ce5a195f85b9cdaf5f412db4dda458fb976d6d36 Mon Sep 17 00:00:00 2001
From: Patrik Gornicz <Gornicz.P@gmail.com>
Date: Mon, 22 Jun 2009 23:47:22 -0400
Subject: [PATCH] removed srcpath

---
 src/Effects/dir.mk      |  6 +-----
 src/Effects/files.mk    | 18 +++++++-----------
 src/Entities/dir.mk     |  6 +-----
 src/Entities/files.mk   | 18 +++++++-----------
 src/GameStates/dir.mk   |  6 +-----
 src/GameStates/files.mk | 18 +++++++-----------
 src/config/dir.mk       |  6 +-----
 src/config/files.mk     | 18 +++++++-----------
 src/dir.mk              |  6 +-----
 src/files.mk            | 18 +++++++-----------
 src/graphics/dir.mk     |  6 +-----
 src/graphics/files.mk   | 18 +++++++-----------
 src/input/dir.mk        |  6 +-----
 src/input/files.mk      | 18 +++++++-----------
 14 files changed, 56 insertions(+), 112 deletions(-)

diff --git a/src/Effects/dir.mk b/src/Effects/dir.mk
index 40220ab..d0699c1 100644
--- a/src/Effects/dir.mk
+++ b/src/Effects/dir.mk
@@ -23,18 +23,14 @@ T_DIRNAME :=
 CURDIR_$D   := ${CURDIR}
 CURDIR      := ${CURDIR_$D}${DIRNAME}/
 
-SRCPATH_$D  := ${SRCPATH}
-SRCPATH     := ${SRCPATH_$D}${DIRNAME}/
-
 
 include ${CURDIR}${G_FILESMK}
-include $(addprefix ${SRCSDIR_$P},$(addsuffix ${G_DIRMK},${NEWDIRS}))
+include $(addsuffix ${G_DIRMK},${NEWDIRS})
 
 
 # restore
 
 CURDIR  := ${CURDIR_$D}
-SRCPATH := ${SRCPATH_$D}
 DIRNAME := ${DIRNAME_$D}
 D       := ${D_$D}
 
diff --git a/src/Effects/files.mk b/src/Effects/files.mk
index 74dd006..2ca7154 100644
--- a/src/Effects/files.mk
+++ b/src/Effects/files.mk
@@ -10,20 +10,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}%}
 
diff --git a/src/Entities/dir.mk b/src/Entities/dir.mk
index ab215b1..f60d4cb 100644
--- a/src/Entities/dir.mk
+++ b/src/Entities/dir.mk
@@ -23,18 +23,14 @@ T_DIRNAME :=
 CURDIR_$D   := ${CURDIR}
 CURDIR      := ${CURDIR_$D}${DIRNAME}/
 
-SRCPATH_$D  := ${SRCPATH}
-SRCPATH     := ${SRCPATH_$D}${DIRNAME}/
-
 
 include ${CURDIR}${G_FILESMK}
-include $(addprefix ${SRCSDIR_$P},$(addsuffix ${G_DIRMK},${NEWDIRS}))
+include $(addsuffix ${G_DIRMK},${NEWDIRS})
 
 
 # restore
 
 CURDIR  := ${CURDIR_$D}
-SRCPATH := ${SRCPATH_$D}
 DIRNAME := ${DIRNAME_$D}
 D       := ${D_$D}
 
diff --git a/src/Entities/files.mk b/src/Entities/files.mk
index 805444e..41f88b6 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}%}
 
diff --git a/src/GameStates/dir.mk b/src/GameStates/dir.mk
index 3712850..094861d 100644
--- a/src/GameStates/dir.mk
+++ b/src/GameStates/dir.mk
@@ -23,18 +23,14 @@ T_DIRNAME :=
 CURDIR_$D   := ${CURDIR}
 CURDIR      := ${CURDIR_$D}${DIRNAME}/
 
-SRCPATH_$D  := ${SRCPATH}
-SRCPATH     := ${SRCPATH_$D}${DIRNAME}/
-
 
 include ${CURDIR}${G_FILESMK}
-include $(addprefix ${SRCSDIR_$P},$(addsuffix ${G_DIRMK},${NEWDIRS}))
+include $(addsuffix ${G_DIRMK},${NEWDIRS})
 
 
 # restore
 
 CURDIR  := ${CURDIR_$D}
-SRCPATH := ${SRCPATH_$D}
 DIRNAME := ${DIRNAME_$D}
 D       := ${D_$D}
 
diff --git a/src/GameStates/files.mk b/src/GameStates/files.mk
index 5d230b9..04b4682 100644
--- a/src/GameStates/files.mk
+++ b/src/GameStates/files.mk
@@ -10,20 +10,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}%}
 
diff --git a/src/config/dir.mk b/src/config/dir.mk
index 5d686ed..46482b6 100644
--- a/src/config/dir.mk
+++ b/src/config/dir.mk
@@ -23,18 +23,14 @@ T_DIRNAME :=
 CURDIR_$D   := ${CURDIR}
 CURDIR      := ${CURDIR_$D}${DIRNAME}/
 
-SRCPATH_$D  := ${SRCPATH}
-SRCPATH     := ${SRCPATH_$D}${DIRNAME}/
-
 
 include ${CURDIR}${G_FILESMK}
-include $(addprefix ${SRCSDIR_$P},$(addsuffix ${G_DIRMK},${NEWDIRS}))
+include $(addsuffix ${G_DIRMK},${NEWDIRS})
 
 
 # restore
 
 CURDIR  := ${CURDIR_$D}
-SRCPATH := ${SRCPATH_$D}
 DIRNAME := ${DIRNAME_$D}
 D       := ${D_$D}
 
diff --git a/src/config/files.mk b/src/config/files.mk
index 89dc34f..1370fd2 100644
--- a/src/config/files.mk
+++ b/src/config/files.mk
@@ -9,20 +9,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}%}
 
diff --git a/src/dir.mk b/src/dir.mk
index 37c1041..122aae5 100644
--- a/src/dir.mk
+++ b/src/dir.mk
@@ -23,18 +23,14 @@ T_DIRNAME :=
 CURDIR_$D   := ${CURDIR}
 CURDIR      := ${CURDIR_$D}${DIRNAME}/
 
-# top define
-SRCPATH :=
-
 
 include ${CURDIR}${G_FILESMK}
-include $(addprefix ${SRCSDIR_$P},$(addsuffix ${G_DIRMK},${NEWDIRS}))
+include $(addsuffix ${G_DIRMK},${NEWDIRS})
 
 
 # restore
 
 CURDIR  := ${CURDIR_$D}
-SRCPATH :=
 DIRNAME := ${DIRNAME_$D}
 D       := ${D_$D}
 
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}%}
 
diff --git a/src/graphics/dir.mk b/src/graphics/dir.mk
index 9328018..a591a8c 100644
--- a/src/graphics/dir.mk
+++ b/src/graphics/dir.mk
@@ -23,18 +23,14 @@ T_DIRNAME :=
 CURDIR_$D   := ${CURDIR}
 CURDIR      := ${CURDIR_$D}${DIRNAME}/
 
-SRCPATH_$D  := ${SRCPATH}
-SRCPATH     := ${SRCPATH_$D}${DIRNAME}/
-
 
 include ${CURDIR}${G_FILESMK}
-include $(addprefix ${SRCSDIR_$P},$(addsuffix ${G_DIRMK},${NEWDIRS}))
+include $(addsuffix ${G_DIRMK},${NEWDIRS})
 
 
 # restore
 
 CURDIR  := ${CURDIR_$D}
-SRCPATH := ${SRCPATH_$D}
 DIRNAME := ${DIRNAME_$D}
 D       := ${D_$D}
 
diff --git a/src/graphics/files.mk b/src/graphics/files.mk
index 888ed59..bb292dd 100644
--- a/src/graphics/files.mk
+++ b/src/graphics/files.mk
@@ -7,20 +7,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}%}
 
diff --git a/src/input/dir.mk b/src/input/dir.mk
index 8577950..cb1c4f3 100644
--- a/src/input/dir.mk
+++ b/src/input/dir.mk
@@ -23,18 +23,14 @@ T_DIRNAME :=
 CURDIR_$D   := ${CURDIR}
 CURDIR      := ${CURDIR_$D}${DIRNAME}/
 
-SRCPATH_$D  := ${SRCPATH}
-SRCPATH     := ${SRCPATH_$D}${DIRNAME}/
-
 
 include ${CURDIR}${G_FILESMK}
-include $(addprefix ${SRCSDIR_$P},$(addsuffix ${G_DIRMK},${NEWDIRS}))
+include $(addsuffix ${G_DIRMK},${NEWDIRS})
 
 
 # restore
 
 CURDIR  := ${CURDIR_$D}
-SRCPATH := ${SRCPATH_$D}
 DIRNAME := ${DIRNAME_$D}
 D       := ${D_$D}
 
diff --git a/src/input/files.mk b/src/input/files.mk
index 20c8b9e..264545a 100644
--- a/src/input/files.mk
+++ b/src/input/files.mk
@@ -7,20 +7,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}%}
 
-- 
2.10.2