X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile;h=14cc64ba16d72b97885a63c9af32279eaeb16108;hb=42f62a7503a4d516020b6222eecb3a30ccc66127;hp=6ab9af2823ea12239601509c77a0bdb304ed33ad;hpb=4c16f98141d54a00964b5dd82275838f142f1cc9;p=physics.git

diff --git a/src/Makefile b/src/Makefile
index 6ab9af2..14cc64b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,69 +1,42 @@
 
-LIBGL := -lGL -lGLU
+LIBGL  := -lGL -lGLU
 LIBSDL := `sdl-config --libs`
-LIBS := ${LIBSDL} ${LIBGL}
+LIBS   := ${LIBSDL} ${LIBGL}
 
 OPTFLAGS := -O2
 DBGFLAGS := -ggdb
 PRFFLAGS := ${DBGFLAGS} -pg
-VALFLAGS := --leak-check=full
-
-#CXX := g++
 CXXFLAGS := -Wall -pedantic -ansi ${DBGFLAGS}
 
-TARGET := ../run_physics
+VALFLAGS := --leak-check=full
+
+WORKINGDIR  := ..
+TARGETNAME  := run_physics
+TARGET      := ${WORKINGDIR}/${TARGETNAME}
 
 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
 
-OBJSDIR := ../objs/
-OBJS := ${SRCS:.cpp=.o}
-OBJS := $(addprefix ${OBJSDIR},${OBJS})
+DIRS := # := start
+DIRS += .
+DIRS += Entities
+DIRS += GameStates
+DIRS += Effects
+DIRS += config
+DIRS += input
+DIRS += graphics
 
-DEPSDIR := ../deps/
-DEPS := ${SRCS:.cpp=.d}
-DEPS := $(addprefix ${DEPSDIR},${DEPS})
+include $(addsuffix /files.mk,${DIRS})
 
-HRDS := ${SRCS:.cpp=.h}
-HRDS := ${HRDS:main.h=} # remove main.h
-HRDS += debug.h
+OBJSDIR := ../objs/
+OBJS    := ${SRCS:.cpp=.o}
+OBJS    := $(addprefix ${OBJSDIR},${OBJS})
 
-HRDS += graphics/colors.h
+DEPSDIR := ../deps/
+DEPS    := ${SRCS:.cpp=.d}
+DEPS    := $(addprefix ${DEPSDIR},${DEPS})
 
-TARS := ${SRCS} ${HRDS} Makefile
+BLDDIRS := $(addprefix ${DEPSDIR},${DIRS}) $(addprefix ${OBJSDIR},${DIRS})
+BLDDIRS := $(addsuffix /,${BLDDIRS})
 
 
 VERBOSE := 0
@@ -83,21 +56,31 @@ endif
 .PHONY: all
 all: ${TARGET}
 
+# how to link the main target
 ${TARGET}: ${OBJS}
 	${Q1}echo "${CXX}: $@"
-	${Q2}${CXX} ${CXXFLAGS} -o ${TARGET} $^ ${LIBS}
+	${Q2}${CXX} ${CXXFLAGS} -o $@ $^ ${LIBS}
+
+# how to make a directory
+${BLDDIRS}:
+	${Q2}mkdir -p $@
 
 # rule to make a depend file from a .cpp
-${DEPSDIR}%.d: %.cpp
+${DEPSDIR}%.d: %.cpp | ${BLDDIRS}
 	${Q1}echo "DEP: $@"
-	${Q2}${CXX} -M ${CXXFLAGS} $< | sed 's,: , $@: ,' > $@
+	${Q2}${CXX} -MM ${CXXFLAGS} $< | sed 's,\(^.*\):,${OBJSDIR}\1 $@:,' > $@
 
 # rule to make an object file from a .cpp
-${OBJSDIR}%.o: %.cpp
+${OBJSDIR}%.o: %.cpp | ${BLDDIRS}
 	${Q1}echo "${CXX}: $@"
 	${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
 
 
+tags: ${SRCS}
+	${Q1}echo "ctags: $@"
+	${Q2}ctags $^
+
+
 .PHONY: clean
 clean:
 	${Q1}echo "CLEAN: OBJS"
@@ -112,38 +95,44 @@ distclean: clean
 	${Q1}echo "CLEAN: tags prof gmon.out"
 	${Q2}rm -f tags prof gmon.out
 
-tags: ${SRCS}
-	ctags $^
+.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
 
 .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 ${WORKINGDIR}; ./${TARGETNAME}
 
 .PHONY: gdb
 gdb: all
-	gdb ${TARGET}
+	cd ${WORKINGDIR}; gdb ${TARGETNAME}
+
+.PHONY: cgdb
+cgdb: all
+	cd ${WORKINGDIR}; cgdb ${TARGETNAME}
 
 .PHONY: val
 val: all
-	valgrind ${VALFLAGS} ${TARGET}
+	cd ${WORKINGDIR}; valgrind ${VALFLAGS} ${TARGETNAME}
 
 .PHONY: prof
-prof: all
-	${TARGET}
-	gprof -b ${TARGET} > prof
+prof: run
+	cd ${WORKINGDIR}; gprof -b ${TARGETNAME} > src/prof
 	kprof -f prof
 
 -include ${DEPS}