upgrade the ixp4xx ethernet driver to v0.3.1, split the Gateway 7001 support to two...

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index facebe6..d9db236 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,11 +20,13 @@ all: world
 SHELL:=/usr/bin/env bash
 export LC_ALL=C
 export LANG=C
-export TOPDIR=${shell pwd}
-include $(TOPDIR)/include/verbose.mk
+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)
 ifneq ($(VERSION),)
@@ -37,29 +39,48 @@ 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 3>/dev/null || echo "ERROR: please fix $${dir}Makefile" >&2; \
-       done > $@
+define stamp
+tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile | (md5sum || md5) 2>/dev/null | cut -d' ' -f1)
+endef
+
+STAMP_pkginfo=$(call stamp,pkginfo,package)
+STAMP_targetinfo=$(call stamp,targetinfo,target/linux)
+define scan_info
+
+$(STAMP_$(1)):
+       @mkdir -p tmp/info
+       @rm -f tmp/info/.stamp-$(1)*
+       @touch $$@
+
+$(foreach FILE,$(shell ls $(2)/*/Makefile),
+tmp/.$(1): $(FILE)
+$(FILE):
+)
+
+tmp/.$(1): $(STAMP_$(1))
+       @echo -n Collecting $(3) info... 
+       @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$(1)" SCAN_DIR="$(2)" SCAN_NAME="$(3)" SCAN_DEPS="$(4)"
+
+endef
+
+$(eval $(call scan_info,pkginfo,package,package,include/package.mk))
+$(eval $(call scan_info,targetinfo,target/linux,target,include/kernel-build.mk include/kernel-version.mk))
 
-pkginfo-clean: FORCE
-       -rm -f .pkginfo .config.in
+tmpinfo-clean: FORCE
+       @-rm -rf tmp/.pkginfo tmp/.targetinfo
 
-.config.in: .pkginfo
-       @./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
+tmp/.config.in: tmp/.pkginfo
+       @./scripts/metadata.pl package_config < $< > $@ || rm -f $@
 
-.config: ./scripts/config/conf .config.in
+tmp/.config-target.in: tmp/.targetinfo
+       @./scripts/metadata.pl target_config < $< > $@ || rm -f $@
+
+.config: ./scripts/config/conf tmp/.config.in tmp/.config-target.in
        @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
        @$< -D .config Config.in &> /dev/null
 
@@ -69,52 +90,68 @@ 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
+
+package/%: 
+       @$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
        $(MAKE) -C package $(patsubst package/%,%,$@)
 
-target/%: .pkginfo FORCE
+target/%:
+       @$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
        $(MAKE) -C target $(patsubst target/%,%,$@)
 
 tools/%: FORCE
        $(MAKE) -C tools $(patsubst tools/%,%,$@)
 
-toolchain/%: FORCE
+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."; \
-               rm -rf $(TOPDIR)/tmp; \
                false; \
        }
-       @rm -rf $(TOPDIR)/tmp
        @touch $@
 
-.prereq-packages: include/prereq.mk .pkginfo .config
+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
@@ -132,15 +169,24 @@ 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_* tool_build
 
 distclean: dirclean config-clean
-       rm -rf dl .*config* .pkg* .prereq 
+       rm -rf dl
+
+help:
+       cat README
+
+doc:
+       $(MAKE) -C docs/ openwrt.pdf
+
+docclean:
+       $(MAKE) -C docs/ clean
 
 .SILENT: clean dirclean distclean config-clean download world
 FORCE: ;
-.PHONY: FORCE
+.PHONY: FORCE help
 %: ;