diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-07-30 21:14:08 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-07-30 21:14:08 +0000 |
| commit | 03ffe176e52417222656cd86a4c8439863e53dda (patch) | |
| tree | 4c27d19447167e10ac4a4589830a46b794048164 /include/subdir.mk | |
| parent | afb02558759e846d6ffd541a6b841bed995a6539 (diff) | |
| download | upstream-03ffe176e52417222656cd86a4c8439863e53dda.tar.gz upstream-03ffe176e52417222656cd86a4c8439863e53dda.tar.bz2 upstream-03ffe176e52417222656cd86a4c8439863e53dda.zip | |
next round of cleanup, convert target/ - make -j works now ;)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8242 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include/subdir.mk')
| -rw-r--r-- | include/subdir.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/subdir.mk b/include/subdir.mk index da37573c78..4348c7b93d 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -24,7 +24,8 @@ 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) + $$(if $(call debug,$(1)/$(bd),v),,.SILENT: $(1)/$(bd)/$(target)) # legacy targets $(call warn_eval,$(1)/$(bd),l,T,$(1)/$(bd)-$(target): $(1)/$(bd)/$(target)) @@ -36,12 +37,18 @@ endef # Parameters: <subdir> <name> <target> define stampfile $(1)/stamp-$(3):=$(STAGING_DIR)/stampfiles/.$(2)_$(3) - $(call rdep,$(1),$$($(1)/stamp-$(3)),) + $(if __rdep_$(1),, + $(call rdep,$(1),$$($(1)/stamp-$(3)),) + __rdep_$(1):=1 + ) $$($(1)/stamp-$(3)): - @+$(MAKE) $(1)/$(3) + @+$(MAKE) $$($(1)/flags-$(3)) $(1)/$(3) @mkdir -p $$$$(dirname $$($(1)/stamp-$(3))) @touch $$($(1)/stamp-$(3)) + + $$(if $(call debug,$(1),v),,.SILENT: $$($(1)/stamp-$(3))) + .PRECIOUS: $$($(1)/stamp-$(3)) # work around a make bug $(1)//clean:=$(1)/stamp-$(3)/clean |