Sfoglia il codice sorgente

don't force the install->compile, compile->prepare dependencies in subdir.mk

SVN-Revision: 8202
Felix Fietkau 18 anni fa
parent
commit
02a7e555de
2 ha cambiato i file con 5 aggiunte e 4 eliminazioni
  1. 1 3
      include/subdir.mk
  2. 4 1
      tools/Makefile

+ 1 - 3
include/subdir.mk

@@ -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

+ 4 - 1
tools/Makefile

@@ -23,6 +23,9 @@ $(STAGING_DIR)/include-host/.done:
 
 # prerequisites for the individual targets
 $(curdir)/ := .config
-$(curdir)//prepare := $(STAGING_DIR)/include-host/.done
+$(curdir)//prepare = $(STAGING_DIR)/include-host/.done
+$(curdir)//compile = $(1)/prepare
+$(curdir)//install = $(1)/compile
+
 $(eval $(call stampfile,$(curdir),tools))
 $(eval $(call subdir,$(curdir)))