X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=Makefile;h=ed1e34db474f93dc62991a476afb813f300d52d6;hp=5b90c482f0a657420986e1eb3d15762af22ba8b6;hb=16e76af3ef0431a0ccddcb4d195e1b30ce3faf3e;hpb=c6753b594214c24fa26458539a74e82aa75e053e

diff --git a/Makefile b/Makefile
index 5b90c482f..ed1e34db4 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ pkginfo-clean: FORCE
 .config.in: .pkginfo
 	@./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
 
-.config: ./scripts/config/conf
+.config: ./scripts/config/conf .config.in
 	@[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
 	@$< -D .config Config.in &> /dev/null
 
@@ -85,14 +85,19 @@ package/%: .pkginfo FORCE
 target/%: .pkginfo FORCE
 	$(MAKE) -C target $(patsubst target/%,%,$@)
 
+tools/%: FORCE
+	$(MAKE) -C tools $(patsubst tools/%,%,$@)
+
 toolchain/%: FORCE
 	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
 .prereq-build: include/prereq-build.mk
 	@$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
 		echo "Prerequisite check failed. Use FORCE=1 to override."; \
+		rm -rf $(TOPDIR)/tmp; \
 		false; \
 	}
+	@rm -rf $(TOPDIR)/tmp
 	@touch $@
 
 .prereq-packages: include/prereq.mk .pkginfo .config
@@ -100,16 +105,19 @@ toolchain/%: FORCE
 		echo "Prerequisite check failed. Use FORCE=1 to override."; \
 		false; \
 	}
+	@rm -rf "$(TOPDIR)/tmp"
 	@touch $@
 	
 prereq: .prereq-build .prereq-packages FORCE
 
 download: .config FORCE
+	$(MAKE) tools/download
 	$(MAKE) toolchain/download
 	$(MAKE) package/download
 	$(MAKE) target/download
 
 world: .config FORCE
+	$(MAKE) tools/install
 	$(MAKE) toolchain/install
 	$(MAKE) target/compile
 	$(MAKE) package/compile
@@ -121,10 +129,10 @@ clean: FORCE
 	rm -rf build_* bin
 
 dirclean: clean
-	rm -rf staging_dir_* toolchain_build_*
+	rm -rf staging_dir_* toolchain_build_* tool_build
 
 distclean: dirclean config-clean
-	rm -rf dl .*config* .pkg* .prereq
+	rm -rf dl .*config* .pkg* .prereq 
 
 .SILENT: clean dirclean distclean config-clean download world
 FORCE: ;