X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=inline;f=Makefile;h=2d3758df38229df5b76c91c600e1edb6a5ee3a86;hb=4d9ce4dca05fffb7ab04e1fecb6c7e912949c357;hp=e2430164fe992a3671e3ea4760578c24c33f3259;hpb=5da92a31009eff4b765b5a5bfd5b85e61525e884;p=openwrt-10.03%2F.git

diff --git a/Makefile b/Makefile
index e2430164f..2d3758df3 100644
--- a/Makefile
+++ b/Makefile
@@ -44,10 +44,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
@@ -90,7 +93,6 @@ menuconfig: scripts/config/mconf tmp/.config-target.in tmp/.config-package.in FO
 	$< Config.in
 
 kernel_menuconfig: .config FORCE
-	-$(MAKE) target/linux-prepare
 	$(NO_TRACE_MAKE) -C target/linux menuconfig
 
 
@@ -141,20 +143,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: ;