diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-03-03 14:16:48 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-03-03 14:16:48 +0000 |
| commit | 0a459754666702f197bf979ed8957cc4e100b134 (patch) | |
| tree | cd406ad9cd2fffdea72f48b6a2a5531a54170b7c | |
| parent | 285b593164e1512ca7e76a847f69a1b16249fa16 (diff) | |
| download | upstream-0a459754666702f197bf979ed8957cc4e100b134.tar.gz upstream-0a459754666702f197bf979ed8957cc4e100b134.tar.bz2 upstream-0a459754666702f197bf979ed8957cc4e100b134.zip | |
avoid implicit rules in even more places
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14737 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/toplevel.mk | 14 |
2 files changed, 8 insertions, 8 deletions
@@ -72,7 +72,7 @@ prereq: $(target/stamp-prereq) tmp/.prereq_packages prepare: .config $(tools/stamp-install) $(toolchain/stamp-install) world: prepare $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare) $(target/stamp-install) FORCE - $(_SINGLE)$(SUBMAKE) package/index + $(_SINGLE)$(SUBMAKE) -r package/index # update all feeds, re-create index files, install symlinks package/symlinks: diff --git a/include/toplevel.mk b/include/toplevel.mk index eaaf6d37d1..7f5308fc26 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -40,8 +40,8 @@ prepare-mk: FORCE ; prepare-tmpinfo: FORCE mkdir -p tmp/info - $(_SINGLE)$(NO_TRACE_MAKE) -j1 -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk" SCAN_DEPTH=5 SCAN_EXTRA="" - $(_SINGLE)$(NO_TRACE_MAKE) -j1 -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1" + $(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk" SCAN_DEPTH=5 SCAN_EXTRA="" + $(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1" for type in package target; do \ f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \ [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \ @@ -91,7 +91,7 @@ kernel_menuconfig: .config FORCE tmp/.prereq-build: include/prereq-build.mk mkdir -p tmp rm -f tmp/.host.mk - @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \ + @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \ echo "Prerequisite check failed. Use FORCE=1 to override."; \ false; \ } @@ -104,14 +104,14 @@ download: .config FORCE @+$(SUBMAKE) target/download clean dirclean: .config - @+$(SUBMAKE) $@ + @+$(SUBMAKE) -r $@ prereq:: .config - @+$(MAKE) -s tmp/.prereq-build $(PREP_MK) - @+$(NO_TRACE_MAKE) -s $@ + @+$(MAKE) -r -s tmp/.prereq-build $(PREP_MK) + @+$(NO_TRACE_MAKE) -r -s $@ %:: - @+$(PREP_MK) $(NO_TRACE_MAKE) -s prereq + @+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq @+$(SUBMAKE) -r $@ help: |