X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile;h=e6fe96b1cd373560a9b4205ef1453d4622219cbf;hb=a4bb9ac2979ef7fae7b17a563dfdefe3c138a92f;hp=77339f01a9fc1605b3e4af4b2637396da27c063b;hpb=466ce08d3c5946b1215be52a26dfc51d38c740a2;p=physics.git

diff --git a/src/Makefile b/src/Makefile
index 77339f0..e6fe96b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,8 +10,11 @@ PRFFLAGS := ${DBGFLAGS} -pg
 #CXX := g++
 CXXFLAGS := -Wall -pedantic -ansi ${DBGFLAGS}
 
+TARGET := ../run_physics
 
-SRCS := entityManager.cpp
+SRCS := # simply to keep every line below the same
+SRCS += entityManager.cpp
+SRCS += entityCreator.cpp
 SRCS += game.cpp
 SRCS += main.cpp
 SRCS += mathw.cpp
@@ -37,45 +40,75 @@ 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
 
-TARGET := ../run_physics
-DEPENDS := ${SRCS:.cpp=.d}
+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 ""
-
-.PHONY: depend
-depend: ${SRCS}
-	${CXX} -MM $^ > ${DEPENDS}
+	${Q1}echo "${CXX}: $@"
+	${Q2}${CXX} ${CXXFLAGS} -o ${TARGET} $^ ${LIBS}
 
-# how to make a depend file from a source file
+# rule to make a depend file from a .cpp
 %.d: %.cpp
-	@echo "DEP: $@"
-	@${CXX} -M ${CXXFLAGS} $< | sed 's,: , $@: ,' > $@
+	${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
+%.o: %.cpp
+	${Q1}echo "${CXX}: $@"
+	${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
 
 
 .PHONY: clean
 clean:
-	rm -f ${OBJS} ${TARGET} *~ prof gmon.out
+	${Q1}echo "CLEAN: OBJS"
+	${Q2}rm -f ${OBJS}
+	${Q1}echo "CLEAN: TARGET"
+	${Q2}rm -f ${TARGET}
 
 .PHONY: distclean
 distclean: clean
-	rm -f tags ${DEPENDS}
+	${Q1}echo "CLEAN: DEPENDS"
+	${Q2}rm -f ${DEPENDS}
+	${Q1}echo "CLEAN: tags prof gmon.out"
+	${Q2}rm -f tags prof gmon.out
 
 tags: ${SRCS}
 	ctags $^
 
-tar: clean
-	cd ..; tar -cjf physics.tar.bz2 src/
+tar:
+	${Q1}echo "tar: physics.tar"
+	${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
 
+git-tar:
+	${Q1}echo "git-archive: ../physics.tar.bz2"
+	${Q2}cd ..; git-archive --prefix=physics/ HEAD | bzip2 > physics.tar.bz2
 
 .PHONY: run
 run: all