reworked print formating

diff --git a/Makefile b/Makefile
index 7e8ef21..e1b2afd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -70,17 +70,19 @@ else
     Q2 :=
 endif
 
+PRNTFMT := printf "%-5s: %s\n"
+
 .PHONY: all
 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,50 +91,50 @@ ${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: $@"
+       ${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"
+       ${Q1}${PRNTFMT} "CLEAN" "OBJS"
        ${Q2}rm -f ${OBJS}
-       ${Q1}echo "CLEAN: TARGET"
+       ${Q1}${PRNTFMT} "CLEAN" "TARGET"
        ${Q2}rm -f ${TARGET}
 
 .PHONY: distclean
 distclean: clean
-       ${Q1}echo "CLEAN: DEPS"
+       ${Q1}${PRNTFMT} "CLEAN" "DEPS"
        ${Q2}rm -f ${DEPS}
-       ${Q1}echo "CLEAN: tags prof gmon.out"
+       ${Q1}${PRNTFMT} "CLEAN" "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 +142,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
@@ -176,7 +178,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 +187,7 @@ FINALMAKEARGS := "CXXFLAGS   := ${OPTFLAGS}" \
 
 .PHONY: final
 final:
-       ${Q1}echo "make: final"
+       ${Q1}${PRNTFMT} "make" "final"
        ${Q2}${MAKE} ${FINALMAKEARGS} clean all
 
 -include ${DEPS}