X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Fsubdir.mk;h=16e4f4b6c4b908711c558662d468dc8c81b4a8ca;hb=506d2a0161e0a82f842f2473f66aa22c9985ad9b;hp=79624238b5a027980f40f0a7a58b60852fa8dbd2;hpb=ddade98e1046a6c701d0a96d97fb870d01c8c052;p=openwrt-10.03%2F.git

diff --git a/include/subdir.mk b/include/subdir.mk
index 79624238b..16e4f4b6c 100644
--- a/include/subdir.mk
+++ b/include/subdir.mk
@@ -25,6 +25,11 @@ endef
 
 SUBTARGETS:=clean download prepare compile install update refresh prereq
 
+define subtarget
+  $(call warn_eval,$(1),t,T,$(1)/$(2): $($(1)/) $(foreach bd,$(if $($(1)/builddirs-$(2)),$($(1)/builddirs-$(2)),$($(1)/builddirs)),$(1)/$(bd)/$(2)))
+
+endef
+
 # Parameters: <subdir>
 define subdir
   $(call warn,$(1),d,D $(1))
@@ -32,15 +37,13 @@ define subdir
     $(call warn,$(1),d,BD $(1)/$(bd))
     $(foreach target,$(SUBTARGETS),
       $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(target): $($(1)/$(bd)/$(target)) $(call $(1)//$(target),$(1)/$(bd)))
-		@$$(MAKE) -j1 -C $(1)/$(bd) $(target)
+		@+$$(MAKE) -j1 -C $(1)/$(bd) $(target)
 
       # legacy targets
       $(call warn_eval,$(1)/$(bd),l,T,$(1)/$(bd)-$(target): $(1)/$(bd)/$(target))
 	)
   )
-  $(foreach target,$(SUBTARGETS),
-    $(call warn_eval,$(1),t,T,$(1)/$(target): $($(1)/) $(foreach bd,$(if $($(1)/builddirs-$(target)),$($(1)/builddirs-$(target)),$($(1)/builddirs)),$(1)/$(bd)/$(target)))
-  )
+  $(foreach target,$(SUBTARGETS),$(call subtarget,$(1),$(target)))
 endef
 
 # Parameters: <subdir> <name>
@@ -49,7 +52,7 @@ define stampfile
   $(call rdep,$(1),$$($(1)/stamp))
 
   $$($(1)/stamp):
-	@$(MAKE) $(1)/install
+	@+$(MAKE) $(1)/install
 	@mkdir -p $$$$(dirname $$($(1)/stamp))
 	@touch $$($(1)/stamp)
   .PRECIOUS: $$($(1)/stamp) # work around a make bug