more build system cleanup

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

diff --git a/include/subdir.mk b/include/subdir.mk
index 81a6f2a428bac257bd0f87a156bb66f533b83ac5..407f8a81db5599f2d96fe455d86fcfe272b68c3d 100644 (file)
--- a/include/subdir.mk
+++ b/include/subdir.mk
@@ -5,7 +5,7 @@
 # l: show legacy targets
 
 ifeq ($(DEBUG),all)
-  build_debug:=dt
+  build_debug:=dlt
 else
   build_debug:=$(DEBUG)
 endif
@@ -23,8 +23,6 @@ $(call warn,$(1),$(2),$(3)    $(4))
 $(4)
 endef
 
-dep/compile=$(1)/prepare
-dep/install=$(1)/compile
 SUBTARGETS:=clean download prepare compile install update refresh prereq
 
 # Parameters: <subdir>
@@ -33,15 +31,15 @@ define subdir
   $(foreach bd,$($(1)/builddirs),
     $(call warn,$(1),d,BD $(1)/$(bd))
     $(foreach target,$(SUBTARGETS),
-      $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(target): $(call dep/$(target),$(1)/$(bd)) $($(1)/$(bd)/$(target)) $($(1)//$(target)))
-               @$$(MAKE) -j1 -C $(1)/$(bd) $(target)
+      $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(target): $($(1)/$(bd)/$(target)) $(call $(1)//$(target),$(1)/$(bd)))
+               @+$$(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
 
@@ -51,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