more build system cleanup

[openwrt-10.03/.git] / include / subdir.mk

diff --git a/include/subdir.mk b/include/subdir.mk
index 046a6adf6f370c32310d8b5d933a8eb23b833c42..407f8a81db5599f2d96fe455d86fcfe272b68c3d 100644 (file)
--- a/include/subdir.mk
+++ b/include/subdir.mk
@@ -32,14 +32,14 @@ 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,$($(1)/builddirs),$(1)/$(bd)/$(target)))
+    $(call warn_eval,$(1),t,T,$(1)/$(target): $($(1)/) $(foreach bd,$(if $($(1)/builddirs-$(target)),$($(1)/builddirs-$(target)),$($(1)/builddirs)),$(1)/$(bd)/$(target)))
   )
 endef
 
@@ -49,7 +49,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