diff options
Diffstat (limited to 'include/toplevel.mk')
| -rw-r--r-- | include/toplevel.mk | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/include/toplevel.mk b/include/toplevel.mk index d37ddb917..b8608eeae 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -1,14 +1,16 @@ # Makefile for OpenWrt # -# Copyright (C) 2007-2011 OpenWrt.org +# Copyright (C) 2007-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -RELEASE:=Attitude Adjustment +RELEASE:=Barrier Breaker PREP_MK= OPENWRT_BUILD= QUIET=0 +export IS_TTY=$(shell tty -s && echo 1 || echo 0) + include $(TOPDIR)/include/verbose.mk ifeq ($(SDK),1) @@ -22,10 +24,10 @@ OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION))) export RELEASE export REVISION export OPENWRTVERSION -export IS_TTY=$(shell tty -s && echo 1 || echo 0) export LD_LIBRARY_PATH:=$(subst ::,:,$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib) export DYLD_LIBRARY_PATH:=$(subst ::,:,$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib) export GIT_CONFIG_PARAMETERS='core.autocrlf=false' +export MAKE_JOBSERVER=$(filter --jobserver%,$(MAKEFLAGS)) # prevent perforce from messing with the patch utility unexport P4PORT P4USER P4CONFIG P4CLIENT @@ -50,6 +52,8 @@ export SCAN_COOKIE SUBMAKE:=umask 022; $(SUBMAKE) +ULIMIT_FIX=_limit=`ulimit -n`; [ "$$_limit" = "unlimited" -o "$$_limit" -ge 1024 ] || ulimit -n 1024; + prepare-mk: FORCE ; prepare-tmpinfo: FORCE @@ -85,10 +89,15 @@ config-clean: FORCE defconfig: scripts/config/conf prepare-tmpinfo FORCE touch .config - $< -D .config Config.in + $< --defconfig=.config Config.in + +confdefault-y=allyes +confdefault-m=allmod +confdefault-n=allno +confdefault:=$(confdefault-$(CONFDEFAULT)) oldconfig: scripts/config/conf prepare-tmpinfo FORCE - $< -$(if $(CONFDEFAULT),$(CONFDEFAULT),o) Config.in + $< --$(if $(confdefault),$(confdefault),old)config Config.in menuconfig: scripts/config/mconf prepare-tmpinfo FORCE if [ \! -e .config -a -e $(HOME)/.openwrt/defconfig ]; then \ @@ -143,12 +152,12 @@ prereq:: prepare-tmpinfo .config @+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq @( \ cp .config tmp/.config; \ - ./scripts/config/conf -D tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \ + ./scripts/config/conf --defconfig tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \ if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \ - echo "WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!"; \ + printf "$(_R)WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!$(_N)\n" >&2; \ fi \ ) - @+$(SUBMAKE) -r $@ + @+$(ULIMIT_FIX) $(SUBMAKE) -r $@ help: cat README |