include $(TOPDIR)/rules.mk in the image makefiles

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 1d45582..faeecaa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -86,9 +86,16 @@ target/%: .pkginfo FORCE
 toolchain/%: FORCE
        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
 toolchain/%: FORCE
        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 

-world: ./scripts/config/conf FORCE
-       touch .config
+.config: ./scripts/config/conf FORCE
+       @[ -f .config ] || $(MAKE) menuconfig

        $< -D .config Config.in >/dev/null 2>/dev/null
        $< -D .config Config.in >/dev/null 2>/dev/null

+
+download: .config FORCE
+       $(MAKE) toolchain/download
+       $(MAKE) package/download
+       $(MAKE) target/download
+
+world: .config FORCE

        $(MAKE) toolchain/install
        $(MAKE) target/compile
        $(MAKE) package/compile
        $(MAKE) toolchain/install
        $(MAKE) target/compile
        $(MAKE) package/compile


@@ -98,11 +105,11 @@ world: ./scripts/config/conf FORCE
 clean: FORCE
        rm -rf build_* bin
 
 clean: FORCE
        rm -rf build_* bin
 

-dirclean: clean FORCE
+dirclean: clean

        rm -rf staging_dir_* toolchain_build_*
 
        rm -rf staging_dir_* toolchain_build_*
 

-distclean: dirclean FORCE
-       rm -rf .* dl
+distclean: dirclean config-clean
+       rm -rf dl .*config* .pkg*

 
 .PHONY: FORCE
 FORCE:
 
 .PHONY: FORCE
 FORCE: