added gitclean and gitcleanf to Makefile, insures local copy matches what is being...

[physics.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index b7fcb11..65787c3 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,15 +6,13 @@ LIBS := ${LIBSDL} ${LIBGL}
 OPTFLAGS := -O2
 DBGFLAGS := -ggdb
 PRFFLAGS := ${DBGFLAGS} -pg
-
-#CXX := g++
 CXXFLAGS := -Wall -pedantic -ansi ${DBGFLAGS}
 
+VALFLAGS := --leak-check=full
+
 TARGET := ../run_physics
 
 SRCS := # simply to keep every line below the same
-SRCS += entityManager.cpp
-SRCS += entityCreator.cpp
 SRCS += game.cpp
 SRCS += main.cpp
 SRCS += mathw.cpp
@@ -22,6 +20,12 @@ SRCS += ticks.cpp
 SRCS += Vector2.cpp
 SRCS += handleSignal.cpp
 
+SRCS += entityManager.cpp
+SRCS += effectManager.cpp
+SRCS += entityCreator.cpp
+SRCS += collisionHandler.cpp
+SRCS += CollisionInfo.cpp
+
 SRCS += Entities/Ball.cpp
 SRCS += Entities/Entity.cpp
 SRCS += Entities/Line.cpp
@@ -38,16 +42,25 @@ SRCS += GameStates/Running.cpp
 
 SRCS += Effects/Effect.cpp
 SRCS += Effects/Gravity.cpp
+SRCS += Effects/GravityWell.cpp
+SRCS += Effects/Screen.cpp
+
+SRCS += config/config.cpp
 
 SRCS += input/inputManager.cpp
 
 SRCS += graphics/graphics.cpp
 
+OBJSDIR := ../objs/
 OBJS := ${SRCS:.cpp=.o}
-DEPENDS := ${SRCS:.cpp=.d}
+OBJS := $(addprefix ${OBJSDIR},${OBJS})
+
+DEPSDIR := ../deps/
+DEPS := ${SRCS:.cpp=.d}
+DEPS := $(addprefix ${DEPSDIR},${DEPS})
 
 HRDS := ${SRCS:.cpp=.h}
-HRDS := ${HRDS:main.h=} # remove main.h
+HRDS := $(filter-out main.h,$HRDS) # remove main.h
 HRDS += debug.h
 
 HRDS += graphics/colors.h
@@ -74,15 +87,15 @@ all: ${TARGET}
 
 ${TARGET}: ${OBJS}
        ${Q1}echo "${CXX}: $@"
-       ${Q2}${CXX} ${CXXFLAGS} -o ${TARGET} $^ ${LIBS}
+       ${Q2}${CXX} ${CXXFLAGS} -o $@ $^ ${LIBS}
 
 # rule to make a depend file from a .cpp
-%.d: %.cpp
+${DEPSDIR}%.d: %.cpp
        ${Q1}echo "DEP: $@"
        ${Q2}${CXX} -M ${CXXFLAGS} $< | sed 's,: , $@: ,' > $@
 
 # rule to make an object file from a .cpp
-%.o: %.cpp
+${OBJSDIR}%.o: %.cpp
        ${Q1}echo "${CXX}: $@"
        ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
 
@@ -96,22 +109,30 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-       ${Q1}echo "CLEAN: DEPENDS"
-       ${Q2}rm -f ${DEPENDS}
+       ${Q1}echo "CLEAN: DEPS"
+       ${Q2}rm -f ${DEPS}
        ${Q1}echo "CLEAN: tags prof gmon.out"
        ${Q2}rm -f tags prof gmon.out
 
+.PHONY: gitclean
+gitclean:
+       ${Q1}echo "git-clean: show, use gitcleanf to force"
+       ${Q2}cd ..; git clean -nxd
+
+.PHONY: gitcleanf
+gitcleanf:
+       ${Q1}echo "git-clean: forced"
+       ${Q2}cd ..; git clean -fxd
+
 tags: ${SRCS}
        ctags $^
 
-tar:
-       ${Q1}echo "tar: physics.tar.bz2"
-       ${Q2}rm -f physics.tar # prevents appending
-       ${Q2}for f in ${TARS}; do\
-               tar -C ../.. -rf physics.tar "physics/src/$$f"; done
-       ${Q2}bzip2 physics.tar
+.PHONY: tar
+tar: ../physics.tar.bz2
 
-git-tar:
+.PHONY: ../physics.tar.bz2
+../physics.tar.bz2:
+       @echo "git-archive: Warning, archives HEAD not current"
        ${Q1}echo "git-archive: ../physics.tar.bz2"
        ${Q2}cd ..; git-archive --prefix=physics/ HEAD | bzip2 > physics.tar.bz2
 
@@ -119,9 +140,13 @@ git-tar:
 run: all
        ${TARGET}
 
+.PHONY: gdb
+gdb: all
+       gdb ${TARGET}
+
 .PHONY: val
 val: all
-       valgrind --leak-check=full ${TARGET}
+       valgrind ${VALFLAGS} ${TARGET}
 
 .PHONY: prof
 prof: all
@@ -129,4 +154,4 @@ prof: all
        gprof -b ${TARGET} > prof
        kprof -f prof
 
--include ${DEPENDS}
+-include ${DEPS}