diff --git a/build-aux/m4/buildsys.m4 b/build-aux/m4/buildsys.m4 index e219db7..8329299 100644 --- a/build-aux/m4/buildsys.m4 +++ b/build-aux/m4/buildsys.m4 @@ -59,105 +59,6 @@ AC_DEFUN([BUILDSYS_INIT], [ AC_SUBST(AMIGA_LIB_CFLAGS) AC_SUBST(AMIGA_LIB_LDFLAGS) - case "$build_os" in - morphos*) - dnl Don't use tput on MorphOS: The colored output is - dnl quite unreadable and in some MorphOS versions the - dnl output from tput is not 8-bit safe, with awk (for - dnl AC_SUBST) failing as a result. - ;; - *) - AC_PATH_PROG(TPUT, tput) - ;; - esac - - AS_IF([test x"$TPUT" != x""], [ - if x=$($TPUT el 2>/dev/null); then - AC_SUBST(TERM_EL, "$x") - else - AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)") - fi - - if x=$($TPUT sgr0 2>/dev/null); then - AC_SUBST(TERM_SGR0, "$x") - else - AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)") - fi - - if x=$($TPUT bold 2>/dev/null); then - AC_SUBST(TERM_BOLD, "$x") - else - AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)") - fi - - if x=$($TPUT setaf 1 2>/dev/null); then - AC_SUBST(TERM_SETAF1, "$x") - AC_SUBST(TERM_SETAF2, - "$($TPUT setaf 2 2>/dev/null)") - AC_SUBST(TERM_SETAF3, - "$($TPUT setaf 3 2>/dev/null)") - AC_SUBST(TERM_SETAF4, - "$($TPUT setaf 4 2>/dev/null)") - AC_SUBST(TERM_SETAF6, - "$($TPUT setaf 6 2>/dev/null)") - AC_SUBST(TERM_SETAF9, - "$($TPUT setaf 9 2>/dev/null)") - AC_SUBST(TERM_SETAF10, - "$($TPUT setaf 10 2>/dev/null)") - AC_SUBST(TERM_SETAF11, - "$($TPUT setaf 11 2>/dev/null)") - AC_SUBST(TERM_SETAF12, - "$($TPUT setaf 12 2>/dev/null)") - AC_SUBST(TERM_SETAF14, - "$($TPUT setaf 14 2>/dev/null)") - dnl OpenBSD seems to want 3 parameters for terminals - dnl ending in -256color, but the additional two - dnl parameters don't seem to do anything, so we set - dnl them to 0. - elif x=$($TPUT setaf 1 0 0 2>/dev/null); then - AC_SUBST(TERM_SETAF1, "$x") - AC_SUBST(TERM_SETAF2, - "$($TPUT setaf 2 0 0 2>/dev/null)") - AC_SUBST(TERM_SETAF3, - "$($TPUT setaf 3 0 0 2>/dev/null)") - AC_SUBST(TERM_SETAF4, - "$($TPUT setaf 4 0 0 2>/dev/null)") - AC_SUBST(TERM_SETAF6, - "$($TPUT setaf 6 0 0 2>/dev/null)") - AC_SUBST(TERM_SETAF9, - "$($TPUT setaf 9 0 0 2>/dev/null)") - AC_SUBST(TERM_SETAF10, - "$($TPUT setaf 10 0 0 2>/dev/null)") - AC_SUBST(TERM_SETAF11, - "$($TPUT setaf 11 0 0 2>/dev/null)") - AC_SUBST(TERM_SETAF12, - "$($TPUT setaf 12 0 0 2>/dev/null)") - AC_SUBST(TERM_SETAF14, - "$($TPUT setaf 14 0 0 2>/dev/null)") - else - AC_SUBST(TERM_SETAF1, - "$($TPUT AF 1 2>/dev/null)") - AC_SUBST(TERM_SETAF2, - "$($TPUT AF 2 2>/dev/null)") - AC_SUBST(TERM_SETAF3, - "$($TPUT AF 3 2>/dev/null)") - AC_SUBST(TERM_SETAF4, - "$($TPUT AF 4 2>/dev/null)") - AC_SUBST(TERM_SETAF6, - "$($TPUT AF 6 2>/dev/null)") - AC_SUBST(TERM_SETAF9, - "$($TPUT AF 9 2>/dev/null)") - AC_SUBST(TERM_SETAF10, - "$($TPUT AF 10 2>/dev/null)") - AC_SUBST(TERM_SETAF11, - "$($TPUT AF 11 2>/dev/null)") - AC_SUBST(TERM_SETAF12, - "$($TPUT AF 12 2>/dev/null)") - AC_SUBST(TERM_SETAF14, - "$($TPUT AF 14 2>/dev/null)") - fi - ]) - AS_IF([test x"$enable_silent_rules" != x"no"], [ AC_SUBST(SILENT, '.SILENT:') AC_SUBST(MAKEFLAGS_SILENT, '-s') diff --git a/buildsys.mk.in b/buildsys.mk.in index 5ee83e6..1f96601 100644 --- a/buildsys.mk.in +++ b/buildsys.mk.in @@ -1114,28 +1114,28 @@ print-hierarchy: print-var: printf '%s\n' '${${VAR}}' -DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_SETAF14@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd $$i || exit $$? -DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_SETAF14@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd .. || exit $$? -COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_SETAF11@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$<" -COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_SETAF10@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$<" -COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_SETAF9@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$<"; exit $$err -COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_SETAF11@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" "$<" -COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_SETAF10@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" "$<" -COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_SETAF9@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n" "$<"; exit $$err -COMPILE_AMIGA_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_SETAF11@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (Amiga lib)...@TERM_SGR0@\r" "$<" -COMPILE_AMIGA_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_SETAF10@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (Amiga lib).@TERM_SGR0@\n" "$<" -COMPILE_AMIGA_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_SETAF9@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (Amiga lib)!@TERM_SGR0@\n" "$<"; exit $$err -COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_SETAF11@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" "$<" -COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_SETAF10@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" "$<" -COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_SETAF9@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n" "$<"; exit $$err -LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_SETAF11@@TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" -LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_SETAF10@@TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" -LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_SETAF9@@TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err -INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_SETAF11@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$$i" -INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_SETAF10@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$$i" -INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_SETAF9@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err -DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_SETAF12@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" "$$i" -DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_SETAF9@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err +DIR_ENTER = printf "\033[2K\033[36mEntering directory \033[96m\033[1m%s\033[0m\033[36m.\033[0m\n" "$$i"; cd $$i || exit $$? +DIR_LEAVE = printf "\033[2K\033[36mLeaving directory \033[96m\033[1m%s\033[0m\033[36m.\033[0m\n" "$$i"; cd .. || exit $$? +COMPILE_STATUS = printf "\033[2K\033[33mCompiling \033[93m\033[1m%s\033[0m\033[33m...\033[0m\r" "$<" +COMPILE_OK = printf "\033[2K\033[32mSuccessfully compiled \033[92m\033[1m%s\033[0m\033[32m.\033[0m\n" "$<" +COMPILE_FAILED = err=$$?; printf "\033[2K\033[31mFailed to compile \033[91m\033[1m%s\033[0m\033[31m!\033[0m\n" "$<"; exit $$err +COMPILE_LIB_STATUS = printf "\033[2K\033[33mCompiling \033[93m\033[1m%s\033[0m\033[33m (lib)...\033[0m\r" "$<" +COMPILE_LIB_OK = printf "\033[2K\033[32mSuccessfully compiled \033[92m\033[1m%s\033[0m\033[32m (lib).\033[0m\n" "$<" +COMPILE_LIB_FAILED = err=$$?; printf "\033[2K\033[31mFailed to compile \033[91m\033[1m%s\033[0m\033[31m (lib)!\033[0m\n" "$<"; exit $$err +COMPILE_AMIGA_LIB_STATUS = printf "\033[2K\033[33mCompiling \033[93m\033[1m%s\033[0m\033[33m (Amiga lib)...\033[0m\r" "$<" +COMPILE_AMIGA_LIB_OK = printf "\033[2K\033[32mSuccessfully compiled \033[92m\033[1m%s\033[0m\033[32m (Amiga lib).\033[0m\n" "$<" +COMPILE_AMIGA_LIB_FAILED = err=$$?; printf "\033[2K\033[31mFailed to compile \033[91m\033[1m%s\033[0m\033[31m (Amiga lib)!\033[0m\n" "$<"; exit $$err +COMPILE_PLUGIN_STATUS = printf "\033[2K\033[33mCompiling \033[93m\033[1m%s\033[0m\033[33m (plugin)...\033[0m\r" "$<" +COMPILE_PLUGIN_OK = printf "\033[2K\033[32mSuccessfully compiled \033[92m\033[1m%s\033[0m\033[32m (plugin).\033[0m\n" "$<" +COMPILE_PLUGIN_FAILED = err=$$?; printf "\033[2K\033[31mFailed to compile \033[91m\033[1m%s\033[0m\033[31m (plugin)!\033[0m\n" "$<"; exit $$err +LINK_STATUS = printf "\033[2K\033[33mLinking \033[93m\033[1m$@\033[0m\033[33m...\033[0m\r" +LINK_OK = printf "\033[2K\033[32mSuccessfully linked \033[92m\033[1m$@\033[0m\033[32m.\033[0m\n" +LINK_FAILED = err=$$?; printf "\033[2K\033[31mFailed to link \033[91m\033[1m$@\033[0m\033[31m!\033[0m\n"; exit $$err +INSTALL_STATUS = printf "\033[2K\033[33mInstalling \033[93m\033[1m%s\033[0m\033[33m...\033[0m\r" "$$i" +INSTALL_OK = printf "\033[2K\033[32mSuccessfully installed \033[92m\033[1m%s\033[0m\033[32m.\033[0m\n" "$$i" +INSTALL_FAILED = err=$$?; printf "\033[2K\033[31mFailed to install \033[91m\033[1m%s\033[0m\033[31m!\033[0m\n" "$$i"; exit $$err +DELETE_OK = printf "\033[2K\033[34mDeleted \033[94m\033[1m%s\033[0m\033[34m.\033[0m\n" "$$i" +DELETE_FAILED = err=$$?; printf "\033[2K\033[31mFailed to delete \033[91m\033[1m%s\033[0m\033[31m!\033[0m\n" "$$i"; exit $$err .CURDIR ?= . -include ${.CURDIR}/.deps