Changeset 696 for trunk/kBuild/header.kmk

Timestamp:

Dec 10, 2006, 8:16:02 AM (19 years ago)

Author:

bird

Message:

Implemented KBUILD_QUIET and KBUILD_VERBOSE={1|full} (was BUILD_QUIET, BUILD_VERBOSE, BUILD_DEBUG).

File:

• trunk/kBuild/header.kmk (modified) (2 diffs)

trunk/kBuild/header.kmk

@@ -436 +436 @@
 LN_SYMLINK  := $(LN) -s
 
-
-
-#
-# Message macros.
-#
-
-ifndef BUILD_QUIET
-ifdef BUILD_DEBUG
-BUILD_VERBOSE := 9
-endif
-MSG_L1          = @$(ECHO) "kBuild: $1"
-ifdef BUILD_VERBOSE
-MSG_L2          = @$(ECHO) "kBuild: $1"
-QUIET           :=
-else
-QUIET           := @
-MSG_L2          =
-endif
-ifdef BUILD_DEBUG
-MSG_L3      = @$(ECHO) "kBuild: $1"
-else
-MSG_L3      =
-endif
-else
-QUIET           :=
-MSG_L1          =
-MSG_L2      =
-MSG_L3      =
-endif
-
 ## ABSPATH - make paths absolute.
 # This implementation is clumsy and doesn't resolve '..' and '.' components.
 #
 # @param        $1      The paths to make absolute.
+# @obsolete Use the GNU make function $(abspath) directly now.
 ABSPATH = $(abspath $(1))
 
@@ -705 +676 @@
 
 
+#
+# Message macros.
+#
+# This is done after including Config.kmk as to allow for 
+# KBUILD_QUIET and KBUILD_VERBOSE to be configurable.
+#
+ifdef KBUILD_QUIET
+ # minimal output.
+ QUIET := @
+ QUIET2:= @
+ MSG_L1 =
+ MSG_L2 =
+ MSG_L3 =
+else
+ ifndef KBUILD_VERBOSE
+  QUIET := @
+  QUIET2:= @
+  MSG_L1 = @$(ECHO) "kBuild: $1"
+  MSG_L2 =
+  MSG_L3 =
+ else
+  # maximal output.
+  QUIET :=
+  MSG_L1 = @$(ECHO) "kBuild: $1 $2"
+  MSG_L2 = @$(ECHO) "kBuild: $1"
+  ifeq ($(KBUILD_VERBOSE),full)
+   QUIET2:= @
+  else
+   QUIET2:=
+  endif
+ endif
+endif
+
 # end-of-file-content
 __header_kmk__ := 1