-LIBALLG = `allegro-config --libs release`
-LIBGL = -lGL -lGLU
-LIBSDL = `sdl-config --libs`
-LIBS = ${LIBSDL} ${LIBGL}
-
-CXX = g++
-CXXFLAGS = -ggdb -Wall -pedantic
-
-SRCS = Vector2.cpp ticks.cpp main.cpp game.cpp entityManager.cpp graphics.cpp
-OBJS = ${SRCS:.cpp=.o}
-
-TARGETS = ../run_physics
-DEPEND = depend.mk
-
-# set suffixes to look for ...
-.SUFFIXES: .cpp .o
-
-# set default action for a *.cc to create a *.o
-.cpp.o:
- g++ -c $< ${CXXFLAGS}
-
-all: ${TARGETS}
-
-depend:
- ${CXX} -MM ${SRCS} > ${DEPEND}
-
-tags:
- ctags ${SRCS}
-
+LIBGL := -lGL -lGLU
+LIBSDL := `sdl-config --libs`
+LIBS := ${LIBSDL} ${LIBGL}
+
+OPTFLAGS := -O2
+DBGFLAGS := -ggdb
+PRFFLAGS := ${DBGFLAGS} -pg
+
+#CXX := g++
+CXXFLAGS := -Wall -pedantic -ansi ${DBGFLAGS}
+
+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
+SRCS += ticks.cpp
+SRCS += Vector2.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 += input/inputManager.cpp
+
+SRCS += graphics/graphics.cpp
+
+OBJS := ${SRCS:.cpp=.o}
+DEPENDS := ${SRCS:.cpp=.d}
+
+HRDS := ${SRCS:.cpp=.h}
+HRDS := ${HRDS:main.h=} # 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}
+ ${Q1}echo "${CXX}: $@"
+ ${Q2}${CXX} ${CXXFLAGS} -o ${TARGET} $^ ${LIBS}
+
+# rule to make a depend file from a .cpp
+%.d: %.cpp
+ ${Q1}echo "DEP: $@"
+ ${Q2}${CXX} -M ${CXXFLAGS} $< | sed 's,: , $@: ,' > $@
+
+# rule to make an object file from a .cpp
+%.o: %.cpp
+ ${Q1}echo "${CXX}: $@"
+ ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
+
+
+.PHONY: clean