awx: improve memory allocation handling

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index cc5c5b4..f06b151 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,9 @@ all: world
 SHELL:=/usr/bin/env bash
 export LC_ALL=C
 export LANG=C
 SHELL:=/usr/bin/env bash
 export LC_ALL=C
 export LANG=C

-export TOPDIR=${shell pwd}
+export TOPDIR=${CURDIR}
+export IS_TTY=$(shell tty -s && echo 1 || echo 0)
+

 include $(TOPDIR)/include/verbose.mk
 
 OPENWRTVERSION:=$(RELEASE)
 include $(TOPDIR)/include/verbose.mk
 
 OPENWRTVERSION:=$(RELEASE)


@@ -34,84 +36,90 @@ else
 endif
 export OPENWRTVERSION
 
 endif
 export OPENWRTVERSION
 

-ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
-  .pkginfo .config: FORCE
-endif
-

 ifeq ($(FORCE),)
 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-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 3>/dev/null || echo "ERROR: please fix $${dir}Makefile" >&2; \
-       done > $@
+package/%/Makefile: ;
+target/%/Makefile: ;

 
 

-pkginfo-clean: FORCE
-       -rm -f .pkginfo .config.in
+tmp/.packageinfo: $(wildcard package/*/Makefile include/package*.mk include/kernel.mk) FORCE
+tmp/.targetinfo: $(wildcard target/*/Makefile include/kernel*.mk)  FORCE
+tmp/.%info:
+       mkdir -p tmp/info
+       $(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$*info" SCAN_DIR="$(patsubst target,target/linux,$*)" SCAN_NAME="$*" SCAN_DEPS="$(filter-out FORCE, $^)" SCAN_EXTRA=""

 
 

-.config.in: .pkginfo
-       @./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
+tmpinfo-clean: FORCE
+       -rm -rf tmp/.*info

 
 

-.config: ./scripts/config/conf .config.in
-       @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
-       @$< -D .config Config.in &> /dev/null
+tmp/.config-%.in: tmp/.%info scripts/metadata.pl
+       ./scripts/metadata.pl $*_config < $< > $@ || rm -f $@
+
+.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 .config.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 .config.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 .config.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 .config.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/%: .pkginfo FORCE
-       $(MAKE) -C package $(patsubst package/%,%,$@)
+kernel_menuconfig: .config FORCE
+       -$(MAKE) target/linux-prepare
+       $(NO_TRACE_MAKE) -C target/linux menuconfig

 
 

-target/%: .pkginfo FORCE
-       $(MAKE) -C target $(patsubst target/%,%,$@)

 
 

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

 
 

-toolchain/%: FORCE
-       $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)

 
 

-.prereq-build: 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."; \
                echo "Prerequisite check failed. Use FORCE=1 to override."; \

-               rm -rf $(TOPDIR)/tmp; \

                false; \
        }
                false; \
        }

-       @rm -rf $(TOPDIR)/tmp
-       @touch $@
+       touch $@

 
 

-.prereq-packages: 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; \
        }

-       @rm -rf "$(TOPDIR)/tmp"
-       @touch $@
-       
-prereq: .prereq-build .prereq-packages FORCE
+       touch $@
+
+prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target FORCE

 
 download: .config FORCE
        $(MAKE) tools/download
 
 download: .config FORCE
        $(MAKE) tools/download


@@ -129,15 +137,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
        rm -rf staging_dir_* toolchain_build_* tool_build
 
 
 dirclean: clean
        rm -rf staging_dir_* toolchain_build_* tool_build
 

-distclean: dirclean config-clean
-       rm -rf dl .*config* .pkg* .prereq 
+distclean: dirclean config-clean symlinkclean docclean
+       rm -rf dl
+
+help:
+       cat README
+
+doc:
+       $(MAKE) -C docs/ openwrt.pdf
+
+docclean:
+       $(MAKE) -C docs/ clean
+
+symlinkclean:
+       -find package -type l | xargs rm -f

 
 

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

-.PHONY: FORCE
-%: ;
+.PHONY: FORCE help