X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=Makefile;h=ad3b3b8e12f1d296aabdf3fe7c83cb89c3bd5f2c;hp=e2430164fe992a3671e3ea4760578c24c33f3259;hb=7a209707c3e61b00ab1666d73778372fe4bb4790;hpb=5da92a31009eff4b765b5a5bfd5b85e61525e884

diff --git a/Makefile b/Makefile
index e2430164fe..ad3b3b8e12 100644
--- 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),)
@@ -44,10 +47,13 @@ endif
 package/%/Makefile: ;
 target/%/Makefile: ;
 
+SCAN_COOKIE?=$(shell echo $$$$)
+export SCAN_COOKIE
+
 tmp/.packageinfo tmp/.targetinfo: FORCE
 	mkdir -p tmp/info
-	$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="" SCAN_TARGET_DEPS="$(wildcard target/*/Makefile include/kernel*.mk)" SCAN_EXTRA=""
-	$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(wildcard package/*/Makefile include/package*.mk include/kernel.mk)" SCAN_EXTRA=""
+	$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk" SCAN_DEPTH=2 SCAN_EXTRA=""
+	$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk" SCAN_DEPTH=4 SCAN_EXTRA=""
 
 tmpinfo-clean: FORCE
 	-rm -rf tmp/.*info
@@ -89,14 +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
-	-$(MAKE) target/linux-prepare
 	$(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 %/$*,%,$@) $*
 
 
@@ -126,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
@@ -141,21 +147,21 @@ clean: FORCE
 dirclean: clean
 	rm -rf staging_dir_* toolchain_build_* tool_build
 
-distclean: dirclean config-clean symlinkclean docclean
+distclean: dirclean config-clean symlinkclean docs/clean
 	rm -rf dl
 
 help:
 	cat README
 
-doc:
-	$(MAKE) -C docs/ openwrt.pdf
+docs docs/compile: FORCE
+	$(MAKE) -C docs compile
 
-docclean:
-	$(MAKE) -C docs/ clean
+docs/clean: FORCE
+	$(MAKE) -C docs clean
 
 symlinkclean:
 	-find package -type l | xargs rm -f
+	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