X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a42663dac86665e5cf3a38fd1591fe7d4784c343..2f1f57762eebd54951e731e6d34392c61f19a1be:/Makefile

diff --git a/Makefile b/Makefile
index fe10e07dd..89ca7d38b 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,18 +85,23 @@ 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
-	@$(NO_TRACE_MAKE) -s -C package TMPDIR="$(TOPDIR)/tmp" prereq 2>/dev/null || { \
+	@$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
 		echo "Prerequisite check failed. Use FORCE=1 to override."; \
 		false; \
 	}
@@ -106,11 +111,13 @@ toolchain/%: FORCE
 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
@@ -122,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 ccache_*
 
 .SILENT: clean dirclean distclean config-clean download world
 FORCE: ;