X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fdebug.mk;h=faead042dc4a81909cef3689b94f9a11b367ad74;hb=589922047c57acda6a9bedffec450a3e85a9b148;hp=73e61790602f8dbc30fde0da97a57bcba74651ce;hpb=af927159a9e65228875999840012a1cde1c36b6a;p=openwrt-10.03%2F.git

diff --git a/include/debug.mk b/include/debug.mk
index 73e617906..faead042d 100644
--- a/include/debug.mk
+++ b/include/debug.mk
@@ -10,22 +10,29 @@
 # d: show subdirectory tree
 # t: show added targets
 # l: show legacy targets
+# r: show autorebuild messages
 # v: verbose (no .SILENCE for common targets)
 
-ifeq ($(DEBUG),all)
-  build_debug:=dltv
-else
-  build_debug:=$(DEBUG)
+ifeq ($(DUMP),)
+  ifeq ($(DEBUG),all)
+    build_debug:=dltvr
+  else
+    build_debug:=$(DEBUG)
+  endif
 endif
 
 define debug
-$$(findstring $(2),$$(if $$(DEBUG_DIR),$$(if $$(filter $$(DEBUG_DIR)%,$(1)),$(build_debug)),$(build_debug)))
+$$(findstring $(2),$$(if $$(DEBUG_SCOPE_DIR),$$(if $$(filter $$(DEBUG_SCOPE_DIR)%,$(1)),$(build_debug)),$(build_debug)))
 endef
 
 define warn
 $$(if $(call debug,$(1),$(2)),$$(warning $(3)))
 endef
 
+define debug_eval
+$$(if $(call debug,$(1),$(2)),$(3))
+endef
+
 define warn_eval
 $(call warn,$(1),$(2),$(3)	$(4))
 $(4)