revert last prereq.mk - seems to be a different issue

[oweals/openwrt.git] / openwrt / Makefile

diff --git a/openwrt/Makefile b/openwrt/Makefile
index 5b966b752c9dec85fb763ba7213954315f7e4840..e2e467cd8c22b58274ea01715f049a623803a7a7 100644 (file)
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -66,7 +66,7 @@ menuconfig: ./scripts/config/mconf FORCE
        $< Config.in
 
 config-clean: FORCE
-       $(MAKE) -C scripts/config clean
+       $(NO_TRACE_MAKE) -C scripts/config clean
 
 package/%: .pkginfo FORCE
        $(MAKE) -C package $(patsubst package/%,%,$@)
@@ -81,11 +81,24 @@ toolchain/%: FORCE
        @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
        @$< -D .config Config.in &> /dev/null
 
+.prereq: $(TOPDIR)/include/prereq.mk .pkginfo
+       @$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq.mk prereq 2>/dev/null || { \
+               echo "Prerequisite check failed. Use FORCE=1 to override."; \
+               false; \
+       }
+       @touch $@
+
+prereq: .prereq FORCE
+
 download: .config FORCE
        $(MAKE) toolchain/download
        $(MAKE) package/download
        $(MAKE) target/download
 
+ifeq ($(FORCE),)
+world: .prereq
+endif
+
 world: .config FORCE
        $(MAKE) toolchain/install
        $(MAKE) target/compile
@@ -100,7 +113,9 @@ dirclean: clean
        rm -rf staging_dir_* toolchain_build_*
 
 distclean: dirclean config-clean
-       rm -rf dl .*config* .pkg*
+       rm -rf dl .*config* .pkg* .prereq
+
 
+.SILENT: clean dirclean distclean config-clean download world
 .PHONY: FORCE
 FORCE: