add missing flag

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index a520ffd..ad3b3b8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,19 @@ RELEASE:=Kamikaze
 # Just run 'make menuconfig', configure stuff, then run 'make'.
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------
 # Just run 'make menuconfig', configure stuff, then run 'make'.
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------

-export TOPDIR=${shell pwd}
-include $(TOPDIR)/include/verbose.mk
+
+all: world
+
+SHELL:=/usr/bin/env bash
+export LC_ALL=C
+export LANG=C
+export TOPDIR=${CURDIR}
+export IS_TTY=$(shell tty -s && echo 1 || echo 0)
+
+include ./rules.mk 
+include $(INCLUDE_DIR)/depends.mk
+include $(INCLUDE_DIR)/subdir.mk
+include tools/Makefile

 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)
 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)


@@ -28,88 +39,101 @@ else
 endif
 export OPENWRTVERSION
 
 endif
 export OPENWRTVERSION
 

-all: world
-
-ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
-.pkginfo: FORCE
-.config: FORCE
+ifeq ($(FORCE),)
+  .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
+  world: tmp/.prereq-package tmp/.prereq-target

 endif
 
 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 2>&- || echo "ERROR: please fix package/$${dir}/Makefile" >&2; \
-       done > $@
+package/%/Makefile: ;
+target/%/Makefile: ;

 
 

-.config.in: .pkginfo
-       @./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
+SCAN_COOKIE?=$(shell echo $$$$)
+export SCAN_COOKIE

 
 

-pkginfo-clean: FORCE
-       -rm -f .pkginfo .config.in
+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=""

 
 

-./scripts/config/mconf: .config.in
-       @$(MAKE) -C scripts/config all
+tmpinfo-clean: FORCE
+       -rm -rf tmp/.*info

 
 

-./scripts/config/conf: .config.in
-       @$(MAKE) -C scripts/config conf
+tmp/.config-%.in: tmp/.%info scripts/metadata.pl
+       ./scripts/metadata.pl $*_config < $< > $@ || rm -f $@

 
 

-config: ./scripts/config/conf FORCE
+.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:
+       $(MAKE) -C scripts/config all
+
+scripts/config/conf:
+       $(MAKE) -C scripts/config conf
+
+
+
+config: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE

        $< Config.in
 
        $< Config.in
 

-defconfig: ./scripts/config/conf FORCE
+config-clean: FORCE
+       $(NO_TRACE_MAKE) -C scripts/config clean
+
+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 FORCE
+oldconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE

        $< -o Config.in
 
        $< -o Config.in
 

-menuconfig: ./scripts/config/mconf 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
 

-config-clean: FORCE
-       $(NO_TRACE_MAKE) -C scripts/config clean
-
-package/%: .pkginfo FORCE
-       $(MAKE) -C package $(patsubst package/%,%,$@)
+kernel_oldconfig: .config FORCE
+       $(NO_TRACE_MAKE) -C target/linux oldconfig

 
 

-target/%: .pkginfo FORCE
-       $(MAKE) -C target $(patsubst target/%,%,$@)
+kernel_menuconfig: .config FORCE
+       $(NO_TRACE_MAKE) -C target/linux menuconfig

 
 

-toolchain/%: FORCE
-       $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+package/% target/%: tmp/.packageinfo
+toolchain/% package/% target/%: tmp/.targetinfo
+package/% target/% toolchain/%: FORCE
+       $(MAKE) -C $(patsubst %/$*,%,$@) $*

 
 

-.config: ./scripts/config/conf
-       @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
-       @$< -D .config Config.in &> /dev/null

 
 

-.prereq-build: $(TOPDIR)/include/prereq-build.mk
-       @$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
+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; \
        }
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }

-       @touch $@
+       touch $@

 
 

-.prereq-packages: $(TOPDIR)/include/prereq.mk .pkginfo .config
-       @$(NO_TRACE_MAKE) -s -C package 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 $@
-       
-prereq: .prereq-build .prereq-packages FORCE
+       touch $@
+
+prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target FORCE

 
 download: .config FORCE
 
 download: .config FORCE

+       $(MAKE) tools/download

        $(MAKE) toolchain/download
        $(MAKE) package/download
        $(MAKE) target/download
 
        $(MAKE) toolchain/download
        $(MAKE) package/download
        $(MAKE) target/download
 

-ifeq ($(FORCE),)
-.config ./scripts/config/conf ./scripts/config/mconf: .prereq-build
-world: .prereq-packages
-endif
-
-world: .config FORCE
+world: .config $(tools/stamp) FORCE

        $(MAKE) toolchain/install
        $(MAKE) target/compile
        $(MAKE) package/compile
        $(MAKE) toolchain/install
        $(MAKE) target/compile
        $(MAKE) package/compile


@@ -118,16 +142,26 @@ world: .config FORCE
        $(MAKE) package/index
 
 clean: FORCE
        $(MAKE) package/index
 
 clean: FORCE

-       rm -rf build_* bin
+       rm -rf build_* bin tmp

 
 dirclean: clean
 
 dirclean: clean

-       rm -rf staging_dir_* toolchain_build_*
+       rm -rf staging_dir_* toolchain_build_* tool_build
+
+distclean: dirclean config-clean symlinkclean docs/clean
+       rm -rf dl
+
+help:
+       cat README
+
+docs docs/compile: FORCE
+       $(MAKE) -C docs compile

 
 

-distclean: dirclean config-clean
-       rm -rf dl .*config* .pkg* .prereq
+docs/clean: FORCE
+       $(MAKE) -C docs clean

 
 

+symlinkclean:
+       -find package -type l | xargs rm -f
+       rm -rf tmp

 
 

-.SILENT: clean dirclean distclean config-clean download world
-FORCE: ;
-.PHONY: FORCE
-%: ;
+.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