allow target specific builddir list override

[librecmc/librecmc.git] / include / subdir.mk

diff --git a/include/subdir.mk b/include/subdir.mk
index 81a6f2a428bac257bd0f87a156bb66f533b83ac5..79624238b5a027980f40f0a7a58b60852fa8dbd2 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,7 +31,7 @@ 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)))
+      $(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
@@ -41,7 +39,7 @@ define subdir
        )
   )
   $(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