off loaded including of subdirectories to dir.mk files (fixes dependencies problems)

[physics.git] / Makefile

diff --git a/Makefile b/Makefile
index 7e8ef21..6049377 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,30 +14,21 @@ 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
 
-# include all of the files.mk
-include $(addprefix ${SRCSDIR},$(addsuffix files.mk,${DIRS}))
-
-WORKINGDIR  := bind/
-
 OBJSDIR := objsd/
-OBJS    := ${SRCS:.cpp=.o}
-OBJS    := $(addprefix ${OBJSDIR},${OBJS})
+OBJS    := # := start
 
 DEPSDIR := deps/
-DEPS    := ${SRCS:.cpp=.d}
-DEPS    := $(addprefix ${DEPSDIR},${DEPS})
+DEPS    := # := start
+
+# include all of the dir.mk
+DIRMK   := dir.mk
+include ${SRCSDIR}${DIRMK}
+
+WORKINGDIR  := bind/
 
 CFGDIRNAME := configs/
 SRCCFGDIR  := ${CFGDIRNAME}
@@ -51,20 +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 :=
@@ -75,64 +70,68 @@ all: ${TARGET} ${CFGS}
 
 # how to link the main target
 ${TARGETTMP}: ${OBJS}
-       ${Q1}echo "${CXX}: $@"
+       ${Q1}${PRNTFMT} "${CXX}" "$@"
        ${Q2}${CXX} ${CXXFLAGS} -o $@ $^ ${LIBS}
 
 # rule to copy tmp target to working directory
 ${TARGET}: ${TARGETTMP} | ${WORKINGDIR}
-       ${Q1}echo "cp: $@"
+       ${Q1}${PRNTFMT} "cp" "$@"
        ${Q2}cp $< $@
 
 # how to make a directory
 ${BLDDIRS}:
+       ${Q1}${PRNTFMT} "mkdir" "$@"
        ${Q2}mkdir -p $@
 
+# cause the below directory rules to work out
+.SECONDEXPANSION:
+
 # rule to make an object file from a .cpp
-${OBJSDIR}%.o: ${SRCSDIR}%.cpp | ${OBJSBLDDIRS}
-       ${Q1}echo "${CXX}: $@"
-       ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
+${OBJSDIR}%.o: ${SRCSDIR}%.cpp | $$(dir $$@)
+       ${Q1}${PRNTFMT} "${CXX}" "$@"
+       ${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}
-       ${Q1}echo "DEP: $@"
-       ${Q2}${CXX} -MM ${CXXFLAGS} $< | \
+${DEPSDIR}%.d: ${SRCSDIR}%.cpp | $$(dir $$@)
+       ${Q1}${PRNTFMT} "DEP" "$@"
+       ${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}
-       ${Q1}echo "cp: $@"
+${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | $$(dir $$@)
+       ${Q1}${PRNTFMT} "cp" "$@"
        ${Q2}cp $< $@
 
 
 tags: ${SRCS}
-       ${Q1}echo "ctags: $@"
+       ${Q1}${PRNTFMT} "ctags" "$@"
        ${Q2}ctags $^
 
 
 .PHONY: clean
 clean:
-       ${Q1}echo "CLEAN: OBJS"
-       ${Q2}rm -f ${OBJS}
-       ${Q1}echo "CLEAN: TARGET"
+       ${Q1}${PRNTFMT} "rm" "${OBJSDIR}"
+       ${Q2}rm -rf ${OBJSDIR}
+       ${Q1}${PRNTFMT} "rm" "${TARGET} ${TARGETTMP}"
        ${Q2}rm -f ${TARGET}
 
 .PHONY: distclean
 distclean: clean
-       ${Q1}echo "CLEAN: DEPS"
-       ${Q2}rm -f ${DEPS}
-       ${Q1}echo "CLEAN: tags prof gmon.out"
+       ${Q1}${PRNTFMT} "rm" "${DEPSDIR}"
+       ${Q2}rm -rf ${DEPSDIR}
+       ${Q1}${PRNTFMT} "rm" "tags prof gmon.out"
        ${Q2}rm -f tags prof gmon.out
 
 .PHONY: gitclean
 gitclean:
-       ${Q1}echo "git clean: showing; use gitcleanf to force removal"
+       ${Q1}${PRNTFMT} "git clean" "showing; use gitcleanf to force removal"
        ${Q2}git clean -nxd
 
 .PHONY: gitcleanf
 gitcleanf:
-       ${Q1}echo "git clean: forcing"
+       ${Q1}${PRNTFMT} "git clean" "forcing"
        ${Q2}git clean -fxd
 
 .PHONY: tar
@@ -140,9 +139,9 @@ 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}git-archive --prefix=physics/ HEAD | bzip2 > physics.tar.bz2
+       @${PRNTFMT} "git archive" "Warning, archives HEAD not current"
+       ${Q1}${PRNTFMT} "git archive" "physics.tar.bz2"
+       ${Q2}git archive --prefix=physics/ HEAD | bzip2 > physics.tar.bz2
 
 .PHONY: run
 run: all
@@ -162,8 +161,8 @@ val: all
 
 .PHONY: prof
 prof: run
-       cd ${WORKINGDIR}; gprof -b ${TARGETNAME} > src/prof
-       kprof -f prof
+       cd ${WORKINGDIR}; gprof -b ${TARGETNAME} > prof
+       cd ${WORKINGDIR}; kprof -f prof
 
 
 MINGMAKEARGS := "LIBGL      := -lopengl32 -lglu32" \
@@ -176,7 +175,7 @@ MINGMAKEARGS := "LIBGL      := -lopengl32 -lglu32" \
 
 .PHONY: mingw32
 mingw32:
-       ${Q1}echo "make: mingw32"
+       ${Q1}${PRNTFMT} "make" "mingw32"
        ${Q2}${MAKE} ${MINGMAKEARGS} clean all
 
 FINALMAKEARGS := "CXXFLAGS   := ${OPTFLAGS}" \
@@ -185,7 +184,8 @@ FINALMAKEARGS := "CXXFLAGS   := ${OPTFLAGS}" \
 
 .PHONY: final
 final:
-       ${Q1}echo "make: final"
+       ${Q1}${PRNTFMT} "make" "final"
        ${Q2}${MAKE} ${FINALMAKEARGS} clean all
 
+
 -include ${DEPS}