X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=Makefile;h=ab4c4d57b65c6ff3dc6fff905a6780468272bb7a;hp=15074c58c3afe66f3bcccea05a5c13a116c5899b;hb=e3bbc7fac112af7fa514495078a9f5357095be8d;hpb=387ca04afc1fcef6553c64d2c7a12b83f85ada92

diff --git a/Makefile b/Makefile
index 15074c58c..ab4c4d57b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,15 @@ RELEASE:=Kamikaze
 
 all: world
 
-export TOPDIR=${shell pwd}
+SHELL:=/usr/bin/env bash
+export LC_ALL=C
+export LANG=C
+export TOPDIR=${CURDIR}
+ifeq ($(KBUILD_VERBOSE),99)
+  MAKE:=3>/dev/null $(MAKE)
+endif
+export IS_TTY=$(shell tty -s && echo 1 || echo 0)
+
 include $(TOPDIR)/include/verbose.mk
 
 OPENWRTVERSION:=$(RELEASE)
@@ -31,29 +39,29 @@ else
 endif
 export OPENWRTVERSION
 
-ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
-  .pkginfo .config: FORCE
-endif
-
 ifeq ($(FORCE),)
-  .config scripts/config/conf scripts/config/mconf: .prereq-build
-  world: .prereq-packages
+  .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
+  world: tmp/.prereq-packages tmp/.prereq-target
 endif
 
-.pkginfo:
-	@echo Collecting package info...
-	@-for dir in package/*/; do \
-		echo Source-Makefile: $${dir}Makefile; \
-		$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir || echo "ERROR: please fix $${dir}Makefile" >&2; \
-	done > $@
+tmp/.pkginfo: FORCE
+	@mkdir -p tmp/info
+	@$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="pkginfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(shell ls include/package*.mk) include/kernel.mk" SCAN_EXTRA=""
+
+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="$(shell ls include/kernel*.mk)" SCAN_EXTRA=""
+
+tmpinfo-clean: FORCE
+	@-rm -rf tmp/.pkginfo tmp/.targetinfo
 
-pkginfo-clean: FORCE
-	-rm -f .pkginfo .config.in
+tmp/.config.in: tmp/.pkginfo
+	@./scripts/metadata.pl package_config < $< > $@ || rm -f $@
 
-.config.in: .pkginfo
-	@./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
+tmp/.config-target.in: tmp/.targetinfo
+	@./scripts/metadata.pl target_config < $< > $@ || rm -f $@
 
-.config: ./scripts/config/conf
+.config: ./scripts/config/conf tmp/.config.in tmp/.config-target.in
 	@[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
 	@$< -D .config Config.in &> /dev/null
 
@@ -63,54 +71,80 @@ scripts/config/mconf:
 scripts/config/conf:
 	@$(MAKE) -C scripts/config conf
 
-config: scripts/config/conf .config.in FORCE
+config: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
 	$< Config.in
 
 config-clean: FORCE
 	$(NO_TRACE_MAKE) -C scripts/config clean
 
-defconfig: scripts/config/conf .config.in FORCE
+defconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
 	touch .config
 	$< -D .config Config.in
 
-oldconfig: scripts/config/conf .config.in FORCE
+oldconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
 	$< -o Config.in
 
-menuconfig: scripts/config/mconf .config.in FORCE
+menuconfig: scripts/config/mconf tmp/.config.in tmp/.config-target.in FORCE
 	$< Config.in
 
-package/%: .pkginfo FORCE
+kernel_menuconfig: .config FORCE
+	-$(MAKE) target/linux-prepare
+	$(NO_TRACE_MAKE) -C target/linux menuconfig
+
+scan_packages:
+	@$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
+	
+
+package/%: scan_packages
 	$(MAKE) -C package $(patsubst package/%,%,$@)
 
-target/%: .pkginfo FORCE
+target/%: scan_packages
+	@$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
 	$(MAKE) -C target $(patsubst target/%,%,$@)
 
-toolchain/%: FORCE
+tools/%: FORCE
+	$(MAKE) -C tools $(patsubst tools/%,%,$@)
+
+toolchain/%: tmp/.targetinfo FORCE
 	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
-.prereq-build: include/prereq-build.mk
+tmp/.prereq-build: include/prereq-build.mk
+	@mkdir -p tmp
+	@rm -f tmp/.host.mk
 	@$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
 		echo "Prerequisite check failed. Use FORCE=1 to override."; \
 		false; \
 	}
 	@touch $@
 
-.prereq-packages: include/prereq.mk .pkginfo .config
-	@$(NO_TRACE_MAKE) -s -C package TMPDIR="$(TOPDIR)/tmp" prereq 2>/dev/null || { \
+tmp/.prereq-packages: include/prereq.mk tmp/.pkginfo .config
+	@mkdir -p tmp
+	@rm -f tmp/.host.mk
+	@$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
 		echo "Prerequisite check failed. Use FORCE=1 to override."; \
 		false; \
 	}
-	rm -rf "$(TOPDIR)/tmp"
 	@touch $@
-	
-prereq: .prereq-build .prereq-packages FORCE
+
+tmp/.prereq-target: include/prereq.mk tmp/.targetinfo .config
+	@mkdir -p tmp
+	@rm -f tmp/.host.mk
+	@$(NO_TRACE_MAKE) -s -C target prereq 2>/dev/null || { \
+		echo "Prerequisite check failed. Use FORCE=1 to override."; \
+		false; \
+	}
+	@touch $@
+
+prereq: tmp/.prereq-build tmp/.prereq-packages tmp/.prereq-target FORCE
 
 download: .config FORCE
+	$(MAKE) tools/download
 	$(MAKE) toolchain/download
 	$(MAKE) package/download
 	$(MAKE) target/download
 
 world: .config FORCE
+	$(MAKE) tools/install
 	$(MAKE) toolchain/install
 	$(MAKE) target/compile
 	$(MAKE) package/compile
@@ -119,15 +153,27 @@ world: .config FORCE
 	$(MAKE) package/index
 
 clean: FORCE
-	rm -rf build_* bin
+	rm -rf build_* bin tmp
 
 dirclean: clean
-	rm -rf staging_dir_* toolchain_build_*
+	rm -rf staging_dir_* toolchain_build_* tool_build
+
+distclean: dirclean config-clean symlinkclean docclean
+	rm -rf dl
+
+help:
+	cat README
+
+doc:
+	$(MAKE) -C docs/ openwrt.pdf
+
+docclean:
+	$(MAKE) -C docs/ clean
 
-distclean: dirclean config-clean
-	rm -rf dl .*config* .pkg* .prereq
+symlinkclean:
+	find package -type l -exec rm -f {} \;
 
-.SILENT: clean dirclean distclean config-clean download world
+.SILENT: clean dirclean distclean symlinkclean config-clean download world
 FORCE: ;
-.PHONY: FORCE
+.PHONY: FORCE help
 %: ;