UML target completed. Added ext2 target fs for use with uml images

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 5b966b7..27526d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -81,11 +81,24 @@ toolchain/%: FORCE
        @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
        @$< -D .config Config.in &> /dev/null
 
        @[ -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
 
 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
 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 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:
 .PHONY: FORCE
 FORCE: