X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/785609e573cf594b772c439d57e150da6dacc745..812c57251d46d48385290ba17cdf31d3ce5146f6:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 5b966b752..85091f618 100644
--- a/Makefile
+++ b/Makefile
@@ -31,14 +31,17 @@ export OPENWRTVERSION
 
 all: world
 
-.pkginfo: FORCE
 ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
+.pkginfo: FORCE
+.config: FORCE
+endif
+
+.pkginfo:
 	@echo Collecting package info...
 	@-for dir in package/*/; do \
 		echo Source-Makefile: $${dir}Makefile; \
 		$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \
 	done > $@
-endif
 
 .config.in: .pkginfo
 	@./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
@@ -66,7 +69,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/%,%,$@)
@@ -77,21 +80,43 @@ target/%: .pkginfo FORCE
 toolchain/%: FORCE
 	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
-.config: ./scripts/config/conf FORCE
+.config: ./scripts/config/conf
 	@[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
 	@$< -D .config Config.in &> /dev/null
 
+.prereq-build: $(TOPDIR)/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."; \
+		false; \
+	}
+	@touch $@
+
+.prereq-packages: $(TOPDIR)/include/prereq.mk .pkginfo .config
+	@$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
+		echo "Prerequisite check failed. Use FORCE=1 to override."; \
+		false; \
+	}
+	@touch $@
+	
+prereq: .prereq-build .prereq-packages FORCE
+
 download: .config FORCE
 	$(MAKE) toolchain/download
 	$(MAKE) package/download
 	$(MAKE) target/download
 
+ifeq ($(FORCE),)
+.config ./scripts/config/conf ./scripts/config/mconf: .prereq-build
+world: .prereq-packages
+endif
+
 world: .config FORCE
 	$(MAKE) toolchain/install
 	$(MAKE) target/compile
 	$(MAKE) package/compile
 	$(MAKE) package/install
 	$(MAKE) target/install
+	$(MAKE) package/index
 
 clean: FORCE
 	rm -rf build_* bin
@@ -100,7 +125,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: