BLDDIRS clean up

[physics.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index ecfbc07..bcdb416 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,13 +16,13 @@ CXX := g++
 SRCS := # := start
 
 DIRS := # := start
-DIRS += .
-DIRS += Entities
-DIRS += GameStates
-DIRS += Effects
-DIRS += config
-DIRS += input
-DIRS += graphics
+DIRS += ./
+DIRS += Entities/
+DIRS += GameStates/
+DIRS += Effects/
+DIRS += config/
+DIRS += input/
+DIRS += graphics/
 
 include $(addsuffix /files.mk,${DIRS})
 
@@ -39,7 +39,9 @@ TARGETNAME  := run_physics
 TARGETTMP   := ${OBJSDIR}${TARGETNAME}
 TARGET                 := ${WORKINGDIR}${TARGETNAME}
 
-BLDDIRS := $(addprefix ${DEPSDIR},${DIRS}) $(addprefix ${OBJSDIR},${DIRS}) ${WORKINGDIR}
+DEPSBLDDIRS := $(addprefix ${DEPSDIR},${DIRS})
+OBJSBLDDIRS := $(addprefix ${OBJSDIR},${DIRS})
+BLDDIRS := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR}
 
 
 VERBOSE := 0
@@ -60,7 +62,7 @@ endif
 all: ${TARGET}
 
 # rule to copy tmp target to working directory
-${TARGET}: ${TARGETTMP}
+${TARGET}: ${TARGETTMP} | ${WORKINGDIR}
        ${Q1}echo "cp: $@"
        ${Q2}cp $^ $@
 
@@ -74,12 +76,12 @@ ${BLDDIRS}:
        ${Q2}mkdir -p $@
 
 # rule to make a depend file from a .cpp
-${DEPSDIR}%.d: %.cpp | ${BLDDIRS}
+${DEPSDIR}%.d: %.cpp | ${DEPSBLDDIRS}
        ${Q1}echo "DEP: $@"
        ${Q2}${CXX} -MM ${CXXFLAGS} $< | sed 's,\(^.*\):,${OBJSDIR}\1 $@:,' > $@
 
 # rule to make an object file from a .cpp
-${OBJSDIR}%.o: %.cpp | ${BLDDIRS}
+${OBJSDIR}%.o: %.cpp | ${OBJSBLDDIRS}
        ${Q1}echo "${CXX}: $@"
        ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
 
@@ -148,7 +150,7 @@ MINGMAKEARGS := "LIBGL      := -lopengl32 -lglu32" \
                 "CXXFLAGS   := ${OPTFLAGS}" \
                 "CXX        := mingw32-g++" \
                 "OBJSDIR    := ../objs-mingw32/" \
-                "WORKINGDIR := ../bin-mingw32" \
+                "WORKINGDIR := ../bin-mingw32/" \
                 "TARGETNAME := run_physics.exe"
 
 .PHONY: mingw32