X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=e61452cfa564d26e02773cc45b0c6a85d8731296;hb=81fc4f043502a5389761d500e95575f1d074daf4;hp=cad83c99ca8be5db04a3722d0e521d56f9f64344;hpb=06699cc74060b88a5f37dbb28d5764edba11c3f5;p=physics.git

diff --git a/Makefile b/Makefile
index cad83c9..e61452c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,14 +14,6 @@ CXXFLAGS := ${MYFLAGS} ${DBGFLAGS}
 CXX := g++
 
 DIRS := # := start
-DIRS += ./
-DIRS += Entities/
-DIRS += GameStates/
-DIRS += Effects/
-DIRS += config/
-DIRS += input/
-DIRS += graphics/
-DIRS += locks/
 
 SRCSDIR := src/
 SRCS    := # := start
@@ -33,7 +25,8 @@ DEPSDIR := deps/
 DEPS    := # := start
 
 # include all of the dir.mk
-include $(addprefix ${SRCSDIR},$(addsuffix dir.mk,${DIRS}))
+DIRMK   := dir.mk
+include ${SRCSDIR}${DIRMK}
 
 WORKINGDIR  := bind/
 
@@ -49,22 +42,24 @@ TARGETNAME  := run_physics
 TARGETTMP   := ${OBJSDIR}${TARGETNAME}
 TARGET      := ${WORKINGDIR}${TARGETNAME}
 
-DEPSBLDDIRS := $(addprefix ${DEPSDIR},${DIRS})
-OBJSBLDDIRS := $(addprefix ${OBJSDIR},${DIRS})
+DEPSBLDDIRS := ${DEPSDIR} $(addprefix ${DEPSDIR},${DIRS})
+OBJSBLDDIRS := ${OBJSDIR} $(addprefix ${OBJSDIR},${DIRS})
 BLDDIRS     := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
 
+INCDIRS     := ${SRCSDIR}
+
 
 PRNTFMT := printf "%-5s: %s\n"
 
 VERBOSE := 0
 
 ifeq (${VERBOSE},0)
-    # quiet the echo command
+    # quiet the printf command
     Q1 := @
     # quiet the command that is `replaced' by an echo
     Q2 := @
 else
-    # EAT the echo command as if it was not there
+    # EAT the printf 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 :=
@@ -85,45 +80,52 @@ ${TARGET}: ${TARGETTMP} | ${WORKINGDIR}
 
 # how to make a directory
 ${BLDDIRS}:
+	${Q1}${PRNTFMT} "mkdir" "$@"
 	${Q2}mkdir -p $@
 
+#${SRCSDIR}%.cpp: ${SRCSDIR}%.h
+
+# cause the below directory rules to work out
+.SECONDEXPANSION:
+
 # rule to make an object file from a .cpp
-${OBJSDIR}%.o: ${SRCSDIR}%.cpp | ${OBJSBLDDIRS}
+${OBJSDIR}%.o: ${SRCSDIR}%.cpp | $$(dir $$@)
 	${Q1}${PRNTFMT} "${CXX}" "$@"
-	${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
+	${Q2}${CXX} ${CXXFLAGS} -c -o $@ $< -I "${INCDIRS}"
 
 # rule to make a depend file from a .cpp
 #   be clever and escape the / chars in file paths
 #   DON'T simply use another sed delimiter or it can't appear in the file paths
-${DEPSDIR}%.d: ${SRCSDIR}%.cpp | ${DEPSBLDDIRS}
+${DEPSDIR}%.d: ${SRCSDIR}%.cpp | $$(dir $$@)
 	${Q1}${PRNTFMT} "DEP" "$@"
-	${Q2}${CXX} -MM ${CXXFLAGS} $< | \
+	${Q2}${CXX} -MM ${CXXFLAGS} $< -I "${INCDIRS}" | \
 		sed 's/\(^.*\):/$(subst /,\/,${OBJSDIR}\1 $@):/' > $@
 
 # rule to copy the config files into the working directory
-${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | ${DSTCFGDIR}
+${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | $$(dir $$@)
 	${Q1}${PRNTFMT} "cp" "$@"
 	${Q2}cp $< $@
 
+.PHONY: cleantargets
+cleantargets:
+	${Q1}${PRNTFMT} "rm" "${TARGET} ${TARGETTMP}"
+	${Q2}rm -f ${TARGET}
 
-tags: ${SRCS}
-	${Q1}${PRNTFMT} "ctags" "$@"
-	${Q2}ctags $^
-
-
-.PHONY: clean
-clean:
+.PHONY: cleanobjs
+cleanobjs:
 	${Q1}${PRNTFMT} "rm" "${OBJSDIR}"
 	${Q2}rm -rf ${OBJSDIR}
-	${Q1}${PRNTFMT} "rm" "${TARGET} ${TARGETTMP}"
-	${Q2}rm -f ${TARGET}
 
-.PHONY: distclean
-distclean: clean
+.PHONY: cleandeps
+cleandeps:
 	${Q1}${PRNTFMT} "rm" "${DEPSDIR}"
 	${Q2}rm -rf ${DEPSDIR}
-	${Q1}${PRNTFMT} "rm" "tags prof gmon.out"
-	${Q2}rm -f tags prof gmon.out
+
+.PHONY: clean
+clean: cleantargets cleanobjs
+
+.PHONY: cleanall
+cleanall: clean cleandeps
 
 .PHONY: gitclean
 gitclean: