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 7e6abee..65787c3 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,11 +6,10 @@ LIBS := ${LIBSDL} ${LIBGL}
 OPTFLAGS := -O2
 DBGFLAGS := -ggdb
 PRFFLAGS := ${DBGFLAGS} -pg
-VALFLAGS := --leak-check=full
-
-#CXX := g++
 CXXFLAGS := -Wall -pedantic -ansi ${DBGFLAGS}
 
+VALFLAGS := --leak-check=full
+
 TARGET := ../run_physics
 
 SRCS := # simply to keep every line below the same
@@ -43,8 +42,11 @@ 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
@@ -58,7 +60,7 @@ 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
@@ -112,19 +114,25 @@ distclean: clean
        ${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 $^
 
 .PHONY: tar
-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: git-tar
-git-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