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 885bc9e..65787c3 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,17 +6,25 @@ 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 := entityManager.cpp
+SRCS := # simply to keep every line below the same
 SRCS += game.cpp
 SRCS += main.cpp
 SRCS += mathw.cpp
 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
@@ -32,54 +40,113 @@ SRCS += GameStates/GameState.cpp
 SRCS += GameStates/Paused.cpp
 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}
+OBJS := $(addprefix ${OBJSDIR},${OBJS})
 
+DEPSDIR := ../deps/
+DEPS := ${SRCS:.cpp=.d}
+DEPS := $(addprefix ${DEPSDIR},${DEPS})
 
-TARGET := ../run_physics
-DEPENDS := ${SRCS:.cpp=.d}
+HRDS := ${SRCS:.cpp=.h}
+HRDS := $(filter-out main.h,$HRDS) # remove main.h
+HRDS += debug.h
 
+HRDS += graphics/colors.h
+
+TARS := ${SRCS} ${HRDS} Makefile
+
+
+VERBOSE := 0
+
+ifeq (${VERBOSE},0)
+    # quiet the echo command
+    Q1 := @
+    # quiet the command that is `replaced' by an echo
+    Q2 := @
+else
+    # EAT the echo command as if it was not there
+    Q1 := @true # NOTE: the space between @true and the # is VERY important!!
+    # do not quiet the command output
+    Q2 :=
+endif
 
 .PHONY: all
 all: ${TARGET}
 
 ${TARGET}: ${OBJS}
-       ${CXX} ${CXXFLAGS} -o ${TARGET} $^ ${LIBS}
-       @echo ""
+       ${Q1}echo "${CXX}: $@"
+       ${Q2}${CXX} ${CXXFLAGS} -o $@ $^ ${LIBS}
 
-# how to make a depend file from a source file
-%.d: %.cpp
-       @echo "DEP: $@"
-       @${CXX} -M ${CXXFLAGS} $< | sed 's,: , $@: ,' > $@
+# rule to make a depend file from a .cpp
+${DEPSDIR}%.d: %.cpp
+       ${Q1}echo "DEP: $@"
+       ${Q2}${CXX} -M ${CXXFLAGS} $< | sed 's,: , $@: ,' > $@
 
-#@${CXX} -M ${CXXFLAGS} $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
+# rule to make an object file from a .cpp
+${OBJSDIR}%.o: %.cpp
+       ${Q1}echo "${CXX}: $@"
+       ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
 
 
 .PHONY: clean
 clean:
-       rm -f ${OBJS} ${TARGET}
+       ${Q1}echo "CLEAN: OBJS"
+       ${Q2}rm -f ${OBJS}
+       ${Q1}echo "CLEAN: TARGET"
+       ${Q2}rm -f ${TARGET}
 
 .PHONY: distclean
 distclean: clean
-       rm -f ${DEPENDS} tags prof gmon.out
+       ${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: clean
-       cd ..; tar -cjf physics.tar.bz2 src/
+.PHONY: tar
+tar: ../physics.tar.bz2
 
+.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
 
 .PHONY: run
 run: all
        ${TARGET}
 
+.PHONY: gdb
+gdb: all
+       gdb ${TARGET}
+
 .PHONY: val
 val: all
-       valgrind ${TARGET}
+       valgrind ${VALFLAGS} ${TARGET}
 
 .PHONY: prof
 prof: all
@@ -87,4 +154,4 @@ prof: all
        gprof -b ${TARGET} > prof
        kprof -f prof
 
--include ${DEPENDS}
+-include ${DEPS}