started smart includes

[physics.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 6ab9af2..95fdbfc 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,48 +6,24 @@ 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
-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
-SRCS += Entities/Line.cpp
-SRCS += Entities/Particle.cpp
-SRCS += Entities/PhysicsEntity.cpp
-SRCS += Entities/Point.cpp
-SRCS += Entities/Polygon.cpp
-SRCS += Entities/WindParticle.cpp
-
-SRCS += GameStates/CreatingPolygon.cpp
-SRCS += GameStates/GameState.cpp
-SRCS += GameStates/Paused.cpp
-SRCS += GameStates/Running.cpp
-
-SRCS += Effects/Effect.cpp
-SRCS += Effects/Gravity.cpp
-SRCS += Effects/Screen.cpp
-
-SRCS += input/inputManager.cpp
-
-SRCS += graphics/graphics.cpp
+
+DIRS := # := start
+DIRS += .
+DIRS += Entities
+DIRS += GameStates
+DIRS += Effects
+DIRS += config
+DIRS += input
+DIRS += graphics
+
+include $(addsuffix /files.mk,${DIRS})
 
 OBJSDIR := ../objs/
 OBJS := ${SRCS:.cpp=.o}
@@ -58,7 +34,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
@@ -82,15 +58,17 @@ endif
 
 .PHONY: all
 all: ${TARGET}
+       echo "${SRCS}"
+       echo "${FILES}"
 
 ${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
 ${DEPSDIR}%.d: %.cpp
        ${Q1}echo "DEP: $@"
-       ${Q2}${CXX} -M ${CXXFLAGS} $< | sed 's,: , $@: ,' > $@
+       ${Q2}${CXX} -MM ${CXXFLAGS} $< | sed 's,: , $@: ,' > $@
 
 # rule to make an object file from a .cpp
 ${OBJSDIR}%.o: %.cpp
@@ -112,25 +90,31 @@ 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
 
 .PHONY: run
 run: all
-       ${TARGET}
+       cd ..; ./run_physics
 
 .PHONY: gdb
 gdb: all