summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-28 02:53:54 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-28 02:53:54 +0000
commit69ac130ada34e7792c1b86d82949123d7573a7d9 (patch)
tree3f608b5d62e9aee734ffd182dfa4c3f2341fde77
parent7a209707c3e61b00ab1666d73778372fe4bb4790 (diff)
don't force the install->compile, compile->prepare dependencies in subdir.mk
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8202 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/subdir.mk4
-rw-r--r--tools/Makefile5
2 files changed, 5 insertions, 4 deletions
diff --git a/include/subdir.mk b/include/subdir.mk
index 81a6f2a42..fe46ed0de 100644
--- a/include/subdir.mk
+++ b/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
diff --git a/tools/Makefile b/tools/Makefile
index 0d6b51597..49b30be44 100644
--- a/tools/Makefile
+++ b/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)))