projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
allow target specific builddir list override
[openwrt.git] / Makefile
diff --git a/Makefile b/Makefile
index 447457e..ad3b3b8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,12 +21,12 @@ SHELL:=/usr/bin/env bash
 export LC_ALL=C
 export LANG=C
 export TOPDIR=${CURDIR}
 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)
 
 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),)
 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)
@@ -39,120 +39,93 @@ else
 endif
 export OPENWRTVERSION
 
 endif
 export OPENWRTVERSION
 
-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.pkginfo package scripts include),tmp/.pkginfo)
-  tmp/.pkginfo: FORCE
-endif
-
-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.targetinfo target/linux scripts include),tmp/.targetinfo)
-  tmp/.targetinfo: FORCE
-endif
-
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
-  world: tmp/.prereq-packages tmp/.prereq-target
+  world: tmp/.prereq-package tmp/.prereq-target
 endif
 
 endif
 
-ifeq ($(IS_TTY),1)
-  define progress
-       printf "\033[M\r$(1)" >&2;
-  endef
-endif
+package/%/Makefile: ;
+target/%/Makefile: ;
 
 
-define dumpinfo
-       @mkdir -p tmp
-       @echo -n Collecting package info... 
-       @-for dir in $(1)/*/; do \
-               [ -f "$${dir}/Makefile" ] || continue; \
-               $(call progress,Collecting package info... $${dir%%/}) \
-               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; \
-               echo; \
-       done > $@
-       $(call progress,Collecting package info... done)
-       echo
-endef
-
-tmp/.pkginfo:
-       $(call dumpinfo,package)
-
-tmp/.targetinfo:
-       $(call dumpinfo,target/linux)
+SCAN_COOKIE?=$(shell echo $$$$)
+export SCAN_COOKIE
 
 
-tmpinfo-clean: FORCE
-       @-rm -rf tmp/.pkginfo tmp/.targetinfo
+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="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=""
 
 
-tmp/.config.in: tmp/.pkginfo
-       @./scripts/gen_package_config.pl < $< > $@ || rm -f $@
+tmpinfo-clean: FORCE
+       -rm -rf tmp/.*info
 
 
-tmp/.config-target.in: tmp/.targetinfo
-       @./scripts/gen_target_config.pl < $< > $@ || rm -f $@
+tmp/.config-%.in: tmp/.%info scripts/metadata.pl
+       ./scripts/metadata.pl $*_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
+.config: ./scripts/config/conf tmp/.config-target.in tmp/.config-package.in
+       if [ \! -f .config ]; then \
+               [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
+               $(NO_TRACE_MAKE) menuconfig; \
+       fi
+       $< -D .config Config.in &> /dev/null
 
 scripts/config/mconf:
 
 scripts/config/mconf:
-       @$(MAKE) -C scripts/config all
+       $(MAKE) -C scripts/config all
 
 scripts/config/conf:
 
 scripts/config/conf:
-       @$(MAKE) -C scripts/config conf
+       $(MAKE) -C scripts/config conf
+
 
 
-config: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
+
+config: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
        $< Config.in
 
 config-clean: FORCE
        $(NO_TRACE_MAKE) -C scripts/config clean
 
        $< Config.in
 
 config-clean: FORCE
        $(NO_TRACE_MAKE) -C scripts/config clean
 
-defconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
+defconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
        touch .config
        $< -D .config Config.in
 
        touch .config
        $< -D .config Config.in
 
-oldconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
+oldconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
        $< -o Config.in
 
        $< -o Config.in
 
-menuconfig: scripts/config/mconf tmp/.config.in tmp/.config-target.in FORCE
+menuconfig: scripts/config/mconf tmp/.config-target.in tmp/.config-package.in FORCE
+       if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \
+               cp $(HOME)/.openwrt/defconfig .config; \
+       fi
        $< Config.in
 
        $< Config.in
 
-package/%: tmp/.pkginfo tmp/.targetinfo FORCE
-       $(MAKE) -C package $(patsubst package/%,%,$@)
+kernel_oldconfig: .config FORCE
+       $(NO_TRACE_MAKE) -C target/linux oldconfig
 
 
-target/%: tmp/.pkginfo tmp/.targetinfo FORCE
-       $(MAKE) -C target $(patsubst target/%,%,$@)
+kernel_menuconfig: .config FORCE
+       $(NO_TRACE_MAKE) -C target/linux menuconfig
 
 
-tools/%: FORCE
-       $(MAKE) -C tools $(patsubst tools/%,%,$@)
+package/% target/%: tmp/.packageinfo
+toolchain/% package/% target/%: tmp/.targetinfo
+package/% target/% toolchain/%: FORCE
+       $(MAKE) -C $(patsubst %/$*,%,$@) $*
 
 
-toolchain/%: tmp/.targetinfo FORCE
-       $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
 tmp/.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 $@
-
-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 || { \
+       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; \
        }
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }
-       @touch $@
+       touch $@
 
 
-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 || { \
+tmp/.prereq-%: include/prereq.mk tmp/.%info .config
+       mkdir -p tmp
+       rm -f tmp/.host.mk
+       $(NO_TRACE_MAKE) -s -C $* prereq 2>/dev/null || { \
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }
-       @touch $@
+       touch $@
 
 
-prereq: tmp/.prereq-build tmp/.prereq-packages tmp/.prereq-target FORCE
+prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target FORCE
 
 download: .config FORCE
        $(MAKE) tools/download
 
 download: .config FORCE
        $(MAKE) tools/download
@@ -160,8 +133,7 @@ download: .config FORCE
        $(MAKE) package/download
        $(MAKE) target/download
 
        $(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
        $(MAKE) toolchain/install
        $(MAKE) target/compile
        $(MAKE) package/compile
@@ -175,13 +147,21 @@ clean: FORCE
 dirclean: clean
        rm -rf staging_dir_* toolchain_build_* tool_build
 
 dirclean: clean
        rm -rf staging_dir_* toolchain_build_* tool_build
 
-distclean: dirclean config-clean
+distclean: dirclean config-clean symlinkclean docs/clean
        rm -rf dl
 
 help:
        cat README
 
        rm -rf dl
 
 help:
        cat README
 
-.SILENT: clean dirclean distclean config-clean download world
-FORCE: ;
-.PHONY: FORCE help
-%: ;
+docs docs/compile: FORCE
+       $(MAKE) -C docs compile
+
+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
+.PHONY: help
Personal OpenWRT clone
This page took 0.031192 seconds and 4 git commands to generate.