initial attempt at cleaning up subdirectory handling. tools/Makefile is now being...

[openwrt-10.03/.git] / Makefile

diff --git a/Makefile b/Makefile
index 2d3758df38229df5b76c91c600e1edb6a5ee3a86..ad3b3b8e12f1d296aabdf3fe7c83cb89c3bd5f2c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,10 @@ export LANG=C
 export TOPDIR=${CURDIR}
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 
-include $(TOPDIR)/include/verbose.mk
+include ./rules.mk 
+include $(INCLUDE_DIR)/depends.mk
+include $(INCLUDE_DIR)/subdir.mk
+include tools/Makefile
 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)
@@ -92,13 +95,15 @@ menuconfig: scripts/config/mconf tmp/.config-target.in tmp/.config-package.in FO
        fi
        $< Config.in
 
+kernel_oldconfig: .config FORCE
+       $(NO_TRACE_MAKE) -C target/linux oldconfig
+
 kernel_menuconfig: .config FORCE
        $(NO_TRACE_MAKE) -C target/linux menuconfig
 
-
 package/% target/%: tmp/.packageinfo
 toolchain/% package/% target/%: tmp/.targetinfo
-package/% target/% tools/% toolchain/%: FORCE
+package/% target/% toolchain/%: FORCE
        $(MAKE) -C $(patsubst %/$*,%,$@) $*
 
 
@@ -128,8 +133,7 @@ download: .config FORCE
        $(MAKE) package/download
        $(MAKE) target/download
 
-world: .config FORCE
-       $(MAKE) tools/install
+world: .config $(tools/stamp) FORCE
        $(MAKE) toolchain/install
        $(MAKE) target/compile
        $(MAKE) package/compile
@@ -160,5 +164,4 @@ symlinkclean:
        rm -rf tmp
 
 .SILENT: clean dirclean distclean symlinkclean config-clean download world help tmp/.packageinfo tmp/.targetinfo tmpinfo-clean tmp/.config-package.in tmp/.config-target.in .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target
-FORCE: ;
-.PHONY: FORCE help
+.PHONY: help