diff options
| -rw-r--r-- | BSDmakefile | 2 | ||||
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | docs/common-usage.txt | 2 | ||||
| -rw-r--r-- | docs/make-tips.txt | 2 | ||||
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 2 | ||||
| -rw-r--r-- | rules.mk | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/BSDmakefile b/BSDmakefile index d7f7992aa..ddf869106 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -19,7 +19,7 @@ ${.TARGETS}: _subdir _subdir: ${_subdir_dep} cd ${.CURDIR}/${subdir} && ADK_TOPDIR=${.CURDIR} DEVELOPER=1 \ - ${GMAKE} VERBOSE=1 ${.MFLAGS} ${_subdir} + ${GMAKE} ADK_VERBOSE=1 ${.MFLAGS} ${_subdir} . include "${.CURDIR}/prereq.mk" .else diff --git a/GNUmakefile b/GNUmakefile index 698c0ea68..1cd73044e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -16,7 +16,7 @@ ${MAKECMDGOALS}: _subdir _subdir: ${_subdir_dep} cd ${subdir} && ADK_TOPDIR=${ADK_TOPDIR} DEVELOPER=1 \ - make VERBOSE=1 ${MAKEFLAGS} ${MAKECMDGOALS} + make ADK_VERBOSE=1 ${MAKEFLAGS} ${MAKECMDGOALS} include prereq.mk else @@ -9,7 +9,7 @@ all: .prereq_done checkreloc v: .prereq_done @(echo; echo "Build started on $$(LC_ALL=C LANGUAGE=C date)"; \ - set -x; ${_UNLIMIT} ${GMAKE_FMK} VERBOSE=1 all) 2>&1 | tee -a make.log + set -x; ${_UNLIMIT} ${GMAKE_FMK} ADK_VERBOSE=1 all) 2>&1 | tee -a make.log help: @echo 'Configuration targets:' diff --git a/docs/common-usage.txt b/docs/common-usage.txt index bd842370c..28d04da41 100644 --- a/docs/common-usage.txt +++ b/docs/common-usage.txt @@ -72,7 +72,7 @@ to +make+. * +ADK_TARGET_ARCH+, the architecture of the target system * +ADK_TARGET_SYSTEM+, the embedded target system name * +ADK_TARGET_LIBC+, the C library for the target system -* +VERBOSE+, verbose build, when set to 1 +* +ADK_VERBOSE+, verbose build, when set to 1 An example that creates a configuration file for Raspberry PI with all software packages enabled, but not included in the resulting firmware image: diff --git a/docs/make-tips.txt b/docs/make-tips.txt index 9d647cbea..95cf7914b 100644 --- a/docs/make-tips.txt +++ b/docs/make-tips.txt @@ -22,7 +22,7 @@ The result of the search shows the help message of the matching items. or -------------------- - $ make VERBOSE=1 <target> + $ make ADK_VERBOSE=1 <target> -------------------- .Display all available targets: diff --git a/mk/build.mk b/mk/build.mk index 238d66a4c..5aa144150 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -542,7 +542,7 @@ buildall: @mkdir -p firmware @echo "=== building $(ADK_TARGET_SYSTEM) ($(ADK_TARGET_ARCH)) with $(ADK_TARGET_LIBC) ===" $(GMAKE) ADK_TARGET_ARCH=$(ADK_TARGET_ARCH) ADK_TARGET_SYSTEM=$(ADK_TARGET_SYSTEM) ADK_TARGET_LIBC=$(ADK_TARGET_LIBC) allmodconfig - $(GMAKE) VERBOSE=1 all 2>&1 | tee firmware/buildall.log + $(GMAKE) ADK_VERBOSE=1 all 2>&1 | tee firmware/buildall.log $(ADK_TOPDIR)/adk/tools/pkgmaker: $(ADK_TOPDIR)/adk/tools/pkgmaker.c $(ADK_TOPDIR)/adk/tools/sortfile.c $(ADK_TOPDIR)/adk/tools/strmap.c @$(HOST_CC) -O0 -g0 -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c diff --git a/mk/vars.mk b/mk/vars.mk index c3034d229..1a18990ee 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -314,7 +314,7 @@ EXTRACT_CMD= PATH='${HOST_PATH}'; mkdir -p ${WRKDIR}; \ false ;; \ esac; done -ifeq ($(VERBOSE),1) +ifeq ($(ADK_VERBOSE),1) QUIET:= else QUIET:= --quiet @@ -4,7 +4,7 @@ include $(ADK_TOPDIR)/prereq.mk -include $(ADK_TOPDIR)/.config -ifeq ($(VERBOSE),1) +ifeq ($(ADK_VERBOSE),1) START_TRACE:= : END_TRACE:= : TRACE:= : |