renamed to dir.mk files

[physics.git] / Makefile

diff --git a/Makefile b/Makefile
index 597a1e6..85ac199 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,8 @@ DIRS += locks/
 SRCSDIR := src/
 SRCS    := # := start
 
-# include all of the files.mk
-include $(addprefix ${SRCSDIR},$(addsuffix files.mk,${DIRS}))
+# include all of the dir.mk
+include $(addprefix ${SRCSDIR},$(addsuffix dir.mk,${DIRS}))
 
 WORKINGDIR  := bind/
 
@@ -56,6 +56,8 @@ OBJSBLDDIRS := $(addprefix ${OBJSDIR},${DIRS})
 BLDDIRS     := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
 
 
+PRNTFMT := printf "%-5s: %s\n"
+
 VERBOSE := 0
 
 ifeq (${VERBOSE},0)
@@ -75,12 +77,12 @@ 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
@@ -89,57 +91,60 @@ ${BLDDIRS}:
 
 # rule to make an object file from a .cpp
 ${OBJSDIR}%.o: ${SRCSDIR}%.cpp | ${OBJSBLDDIRS}
-       ${Q1}echo "${CXX}: $@"
+       ${Q1}${PRNTFMT} "${CXX}" "$@"
        ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
 
 # 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} $< | sed 's,\(^.*\):,${OBJSDIR}\1 $@:,' > $@
+       ${Q1}${PRNTFMT} "DEP" "$@"
+       ${Q2}${CXX} -MM ${CXXFLAGS} $< | \
+               sed 's/\(^.*\):/$(subst /,\/,${OBJSDIR}\1 $@):/' > $@
 
 # rule to copy the config files into the working directory
 ${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | ${DSTCFGDIR}
-       ${Q1}echo "cp: $@"
+       ${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: show, use gitcleanf to force"
-       ${Q2}cd ..; git clean -nxd
+       ${Q1}${PRNTFMT} "git clean" "showing; use gitcleanf to force removal"
+       ${Q2}git clean -nxd
 
 .PHONY: gitcleanf
 gitcleanf:
-       ${Q1}echo "git-clean: forced"
-       ${Q2}cd ..; git clean -fxd
+       ${Q1}${PRNTFMT} "git clean" "forcing"
+       ${Q2}git clean -fxd
 
 .PHONY: tar
-tar: ../physics.tar.bz2
+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: physics.tar.bz2
+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
@@ -167,22 +172,22 @@ MINGMAKEARGS := "LIBGL      := -lopengl32 -lglu32" \
                 "LIBSDL     := `/usr/mingw32/bin/sdl-config --libs`" \
                 "CXXFLAGS   := ${OPTFLAGS}" \
                 "CXX        := mingw32-g++" \
-                "OBJSDIR    := ../objs-mingw32/" \
-                "WORKINGDIR := ../bin-mingw32/" \
+                "OBJSDIR    := objs-mingw32/" \
+                "WORKINGDIR := bin-mingw32/" \
                 "TARGETNAME := run_physics.exe"
 
 .PHONY: mingw32
 mingw32:
-       ${Q1}echo "make: mingw32"
+       ${Q1}${PRNTFMT} "make" "mingw32"
        ${Q2}${MAKE} ${MINGMAKEARGS} clean all
 
 FINALMAKEARGS := "CXXFLAGS   := ${OPTFLAGS}" \
-                 "OBJSDIR    := ../objs/" \
-                 "WORKINGDIR := ../bin/"
+                 "OBJSDIR    := objs/" \
+                 "WORKINGDIR := bin/"
 
 .PHONY: final
 final:
-       ${Q1}echo "make: final"
+       ${Q1}${PRNTFMT} "make" "final"
        ${Q2}${MAKE} ${FINALMAKEARGS} clean all
 
 -include ${DEPS}