Add support for make V=1

buildsys.mk.in

@@ -170,7 +170,8 @@ depend: pre-depend ${SRCS}
 pre-depend:
 
 ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
-	${LINK_STATUS}
+	LDOBJS="${OBJS} ${OBJS_EXTRA}"; \
+	${LINK_STATUS}; \
 	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
 		${LINK_OK}; \
 	else \
@@ -194,6 +195,7 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
 	fi
 
 ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+	LDOBJS="${LIB_OBJS} ${LIB_OBJS_EXTRA}"; \
 	${LINK_STATUS}; \
 	objs=""; \
 	ars=""; \
@@ -229,7 +231,8 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
 	done
 
 ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
-	${LINK_STATUS}
+	LDOBJS="${PLUGIN_OBJS}"; \
+	${LINK_STATUS}; \
 	objs=""; \
 	ars=""; \
 	for i in ${PLUGIN_OBJS}; do \
@@ -264,8 +267,9 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
 	done
 
 ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
-	${LINK_STATUS}
+	LDOBJS="${OBJS} ${OBJS_EXTRA}"; \
-	rm -f $@
+	${LINK_STATUS}; \
+	rm -f $@; \
 	objs=""; \
 	ars=""; \
 	for i in ${OBJS} ${OBJS_EXTRA}; do \
@@ -301,7 +305,8 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
 	done
 
 ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
-	${LINK_STATUS}
+	LDOBJS="${LIB_OBJS} ${LIB_OBJS_EXTRA}"; \
+	${LINK_STATUS}; \
 	rm -f $@
 	objs=""; \
 	ars=""; \
@@ -340,59 +345,72 @@ ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_E
 locales: ${MO_FILES}
 
 .c.o:
-	${COMPILE_STATUS}
+	COMPILER="${CC}"; \
-	if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${CFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 .c.lib.o:
-	${COMPILE_LIB_STATUS}
+	COMPILER="${CC}"; \
-	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_LIB_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
 .c.plugin.o:
-	${COMPILE_PLUGIN_STATUS}
+	COMPILER="${CC}"; \
-	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_PLUGIN_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
 	fi
 
 .cc.o .cxx.o:
-	${COMPILE_STATUS}
+	COMPILER="${CXX}"; \
-	if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 .cc.lib.o .cxx.lib.o:
-	${COMPILE_LIB_STATUS}
+	COMPILER="${CXX}"; \
-	if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_LIB_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
 .cc.plugin.o .cxx.plugin.o:
-	${COMPILE_PLUGIN_STATUS}
+	COMPILER="${CXX}"; \
-	if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_PLUGIN_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
 	fi
 
 .d.o:
-	${COMPILE_STATUS}
+	COMPILER="${DC}"; \
-	if test x"$(basename ${DC})" = x"dmd"; then \
+	${COMPILE_STATUS}; \
-		if ${DC} ${DFLAGS} -c -of$@ $<; then \
+	if test x"$(basename ${COMPILER})" = x"dmd"; then \
+		if $${COMPILER} ${DFLAGS} -c -of$@ $<; then \
 			${COMPILE_OK}; \
 		else \
 			${COMPILE_FAILED}; \
 		fi \
 	else \
-		if ${DC} ${DFLAGS} -c -o $@ $<; then \
+		if $${COMPILER} ${DFLAGS} -c -o $@ $<; then \
 			${COMPILE_OK}; \
 		else \
 			${COMPILE_FAILED}; \
@@ -400,134 +418,168 @@ locales: ${MO_FILES}
 	fi
 
 .erl.beam:
-	${COMPILE_STATUS}
+	COMPILER="${ERLC}"; \
-	if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \
+	COMPILER_FLAGS="${ERLCFLAGS} -o $@ $<"; \
+	${COMPILE_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 
 .java.class:
-	${COMPILE_STATUS}
+	COMPILER="${JAVAC}"; \
-	if ${JAVAC} ${JAVACFLAGS} $<; then \
+	COMPILER_FLAGS="${JAVACFLAGS} $<"; \
+	${COMPILE_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS} $<; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 
 .m.o:
-	${COMPILE_STATUS}
+	COMPILER="${OBJC}"; \
-	if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 .m.lib.o:
-	${COMPILE_LIB_STATUS}
+	COMPILER="${OBJC}"; \
-	if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_LIB_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
 .m.plugin.o:
-	${COMPILE_PLUGIN_STATUS}
+	COMPILER="${OBJC}"; \
-	if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_PLUGIN_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
 	fi
 
 .mm.o:
-	${COMPILE_STATUS}
+	COMPILER="${OBJCXX}"; \
-	if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 .mm.lib.o:
-	${COMPILE_LIB_STATUS}
+	COMPILER="${OBJCXX}"; \
-	if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_LIB_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
 .mm.plugin.o:
-	${COMPILE_PLUGIN_STATUS}
+	COMPILER="${OBJCXX}"; \
-	if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_PLUGIN_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
 	fi
 
 .po.mo:
-	${COMPILE_STATUS}
+	COMPILER="${MSGFMT}"; \
-	if ${MSGFMT} -c -o $@ $<; then \
+	COMPILER_FLAGS="-c -o $@ $<"; \
-		${COMPILE_OK}; \
+	${COMPILE_RESOURCE_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
+		${COMPILE_RESOURCE_OK}; \
 	else \
-		${COMPILE_FAILED}; \
+		${COMPILE_RESOURCE_FAILED}; \
 	fi
 
 .py.pyc:
-	${COMPILE_STATUS}
+	COMPILER="${PYTHON}"; \
-	if ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \
+	COMPILER_FLAGS="${PYTHON_FLAGS}"; \
-		${COMPILE_OK}; \
+	${COMPILE_RESOURCE_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \
+		${COMPILE_RESOURCE_OK}; \
 	else \
-		${COMPILE_FAILED}; \
+		${COMPILE_RESOURCE_FAILED}; \
 	fi
 
 .rc.o .rc.lib.o .rc.plugin.o:
-	${COMPILE_STATUS}
+	COMPILER="${WINDRES}"; \
-	if ${WINDRES} ${CPPFLAGS} -J rc -O coff -o $@ $<; then \
+	COMPILER_FLAGS="${CPPFLAGS} -J rc -O coff -o $@ $<"; \
-		${COMPILE_OK}; \
+	${COMPILE_RESOURCE_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
+		${COMPILE_RESOURCE_OK}; \
 	else \
-		${COMPILE_FAILED}; \
+		${COMPILE_RESOURCE_FAILED}; \
 	fi
 
 .S.o:
-	${COMPILE_STATUS}
+	COMPILER="${AS}"; \
-	if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${ASFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 .S.lib.o:
-	${COMPILE_LIB_STATUS}
+	COMPILER="${AS}"; \
-	if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_LIB_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
 .S.plugin.o:
-	${COMPILE_PLUGIN_STATUS}
+	COMPILER="${AS}"; \
-	if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	COMPILER_FLAGS="${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<"; \
+	${COMPILE_PLUGIN_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
 	fi
 
 .xpm.o:
-	${COMPILE_STATUS}
+	COMPILER="${CC}"; \
-	if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+	COMPILER_FLAGS="${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<"; \
+	${COMPILE_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 .xpm.lib.o:
-	${COMPILE_LIB_STATUS}
+	COMPILER="${CC}"; \
-	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+	COMPILER_FLAGS="${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<"; \
+	${COMPILE_LIB_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
 .xpm.plugin.o:
-	${COMPILE_PLUGIN_STATUS}
+	COMPILER="${CC}"; \
-	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+	COMPILER_FLAGS="${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<"; \
+	${COMPILE_PLUGIN_STATUS}; \
+	if $${COMPILER} $${COMPILER_FLAGS}; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
 	fi
 
-install: all install-extra
+install: ${SHARED_LIB} ${STATIC_LIB} ${STATIC_PIC_LIB} ${PLUGIN} ${PROG} install-extra
 	for i in ${SUBDIRS}; do \
 		${DIR_ENTER}; \
 		${MAKE} ${MFLAGS} install || exit $$?; \
@@ -735,6 +787,8 @@ distclean: clean
 		fi \
 	done
 
+ifndef V
+
 DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit $$?
 DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd .. || exit $$?
 DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r"
@@ -749,6 +803,9 @@ COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @T
 COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r"
 COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n"
 COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit $$err
+COMPILE_RESOURCE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (resource)...@TERM_SGR0@\r"
+COMPILE_RESOURCE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (resource).@TERM_SGR0@\n"
+COMPILE_RESOURCE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (resource)!@TERM_SGR0@\n"; exit $$err
 LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
 LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
 LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
@@ -758,4 +815,34 @@ INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_
 DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n"
 DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
 
+else
+
+DIR_ENTER = printf "DirectoryEnter: $$i\n"; cd $$i || exit $$?
+DIR_LEAVE = printf "DirectoryLeave: $$i\n"; cd .. || exit $$?
+DEPEND_STATUS = printf "GenerateDependencies\n"
+DEPEND_OK = true
+DEPEND_FAILED = exit $$?
+COMPILE_STATUS = printf "CompileExe: $$COMPILER $${COMPILER_FLAGS}\n"
+COMPILE_OK = true
+COMPILE_FAILED = exit $$?
+COMPILE_LIB_STATUS = printf "CompileLib: $$COMPILER $${COMPILER_FLAGS}\n"
+COMPILE_LIB_OK = true
+COMPILE_LIB_FAILED = exit $$?
+COMPILE_PLUGIN_STATUS = printf "CompilePlugin: $$COMPILER $${COMPILER_FLAGS}\n"
+COMPILE_PLUGIN_OK = true
+COMPILE_PLUGIN_FAILED = exit $$?
+COMPILE_RESOURCE_STATUS = printf "CompileResource: $$COMPILER $${COMPILER_FLAGS}\n"
+COMPILE_RESOURCE_OK = true
+COMPILE_RESOURCE_FAILED = exit $$?
+LINK_STATUS = printf "Link: ${LD} $@ $$LDOBJS ${LDFLAGS} ${LIBS}\n"
+LINK_OK = true
+LINK_FAILED = exit $$?
+INSTALL_STATUS = printf "Install: $$i\n"
+INSTALL_OK = true
+INSTALL_FAILED = exit $$?
+DELETE_OK = printf "Delete: $$i\n"
+DELETE_FAILED = exit $$?
+
+endif
+
 include .deps