X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=Makefile;h=f157b9d3a9fe109d4aeaaf9c46c9ad58a412c9b1;hp=eed9335a5be66ba6f5d657f9d775d49f4f7bd6cf;hb=8f25a745c736d777b87d8e0f713d170659a7a126;hpb=5be70dfb578c8793084aa8b4526fad08d68a6155 diff --git a/Makefile b/Makefile index eed9335a5..f157b9d3a 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ endif ifeq ($(FORCE),) .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build - world: tmp/.prereq-packages + world: tmp/.prereq-packages tmp/.prereq-target endif tmp/.pkginfo: @@ -120,6 +120,7 @@ toolchain/%: tmp/.targetinfo FORCE tmp/.prereq-build: include/prereq-build.mk @mkdir -p tmp + @rm -f tmp/.host.mk @$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \ echo "Prerequisite check failed. Use FORCE=1 to override."; \ false; \ @@ -128,13 +129,23 @@ tmp/.prereq-build: include/prereq-build.mk tmp/.prereq-packages: include/prereq.mk tmp/.pkginfo .config @mkdir -p tmp + @rm -f tmp/.host.mk @$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \ echo "Prerequisite check failed. Use FORCE=1 to override."; \ false; \ } @touch $@ - -prereq: tmp/.prereq-build tmp/.prereq-packages FORCE + +tmp/.prereq-target: include/prereq.mk tmp/.targetinfo .config + @mkdir -p tmp + @rm -f tmp/.host.mk + @$(NO_TRACE_MAKE) -s -C target prereq 2>/dev/null || { \ + echo "Prerequisite check failed. Use FORCE=1 to override."; \ + false; \ + } + @touch $@ + +prereq: tmp/.prereq-build tmp/.prereq-packages tmp/.prereq-target FORCE download: .config FORCE $(MAKE) tools/download