X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=include%2Ftoplevel.mk;h=d8b16d1d90f408991b33ae7d271c6d4a5e8a37af;hp=63325aa01834addb2cc5d30099605f36805a2b42;hb=8c155049507f2106aa6cbb001825c879d36469ff;hpb=35cfcec116f3effc436e79c6bd5d0617d6523c8a diff --git a/include/toplevel.mk b/include/toplevel.mk index 63325aa018..d8b16d1d90 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -12,12 +12,25 @@ PREP_MK= OPENWRT_BUILD= QUIET=0 include $(TOPDIR)/include/verbose.mk -REVISION:=$(shell $(TOPDIR)/scripts/getver.sh) +ifeq ($(SDK),1) + include $(TOPDIR)/include/version.mk +else + REVISION:=$(shell $(TOPDIR)/scripts/getver.sh) +endif + 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:=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib +export DYLD_LIBRARY_PATH:=$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib + +# prevent perforce from messing with the patch utility +unexport P4PORT P4USER P4CONFIG P4CLIENT + +# make sure that a predefined CFLAGS variable does not disturb packages +export CFLAGS= ifeq ($(FORCE),) .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build @@ -30,8 +43,8 @@ prepare-mk: FORCE ; prepare-tmpinfo: FORCE mkdir -p tmp/info - +$(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=5 SCAN_EXTRA="" - +$(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="" SCAN_MAKEOPTS="TARGET_BUILD=1" + $(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk $(TOPDIR)/overlay/*/*.mk" SCAN_DEPTH=5 SCAN_EXTRA="" + $(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1" for type in package target; do \ f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \ [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \ @@ -39,25 +52,25 @@ prepare-tmpinfo: FORCE ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; } touch $(TOPDIR)/tmp/.build -.config: ./scripts/config/conf prepare-tmpinfo - @+if [ \! -f .config ]; then \ +.config: ./scripts/config/conf $(if $(CONFIG_HAVE_DOT_CONFIG),,prepare-tmpinfo) + @+if [ \! -e .config ] || ! grep CONFIG_HAVE_DOT_CONFIG .config >/dev/null; then \ [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \ - $(NO_TRACE_MAKE) menuconfig $(PREP_MK); \ + $(_SINGLE)$(NO_TRACE_MAKE) menuconfig $(PREP_MK); \ fi scripts/config/mconf: - @+$(MAKE) -C scripts/config all + @$(_SINGLE)$(SUBMAKE) -s -C scripts/config all $(eval $(call rdep,scripts/config,scripts/config/mconf)) scripts/config/conf: - @+$(MAKE) -C scripts/config conf + @$(_SINGLE)$(SUBMAKE) -s -C scripts/config conf config: scripts/config/conf prepare-tmpinfo FORCE $< Config.in config-clean: FORCE - $(NO_TRACE_MAKE) -C scripts/config clean + $(_SINGLE)$(NO_TRACE_MAKE) -C scripts/config clean defconfig: scripts/config/conf prepare-tmpinfo FORCE touch .config @@ -67,58 +80,64 @@ oldconfig: scripts/config/conf prepare-tmpinfo FORCE $< -$(if $(CONFDEFAULT),$(CONFDEFAULT),o) Config.in menuconfig: scripts/config/mconf prepare-tmpinfo FORCE - if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \ + if [ \! -e .config -a -e $(HOME)/.openwrt/defconfig ]; then \ cp $(HOME)/.openwrt/defconfig .config; \ fi $< Config.in -kernel_oldconfig: .config FORCE - $(NO_TRACE_MAKE) -C target/linux oldconfig +prepare_kernel_conf: .config FORCE -kernel_menuconfig: .config FORCE - $(NO_TRACE_MAKE) -C target/linux menuconfig +ifeq ($(wildcard staging_dir/host/bin/sed),) + prepare_kernel_conf: + @+$(SUBMAKE) -r tools/sed/install +else + prepare_kernel_conf: ; +endif + +kernel_oldconfig: prepare_kernel_conf + $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux oldconfig + +kernel_menuconfig: prepare_kernel_conf + $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux menuconfig 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 || { \ + @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \ echo "Prerequisite check failed. Use FORCE=1 to override."; \ false; \ } touch $@ download: .config FORCE - $(MAKE) -j1 tools/download - $(MAKE) -j1 toolchain/download - $(MAKE) -j1 package/download - $(MAKE) -j1 target/download + @+$(SUBMAKE) tools/download + @+$(SUBMAKE) toolchain/download + @+$(SUBMAKE) package/download + @+$(SUBMAKE) target/download clean dirclean: .config - @$(MAKE) $@ + @+$(SUBMAKE) -r $@ -prereq:: .config - @+$(SUBMAKE) -s tmp/.prereq-build $(PREP_MK) - @$(NO_TRACE_MAKE) -s $@ +prereq:: prepare-tmpinfo .config + @+$(MAKE) -r -s tmp/.prereq-build $(PREP_MK) + @+$(NO_TRACE_MAKE) -r -s $@ %:: - @+$(PREP_MK) $(NO_TRACE_MAKE) -s prereq - @+$(MAKE) -r $@ + @+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq + @+$(SUBMAKE) -r $@ help: cat README docs docs/compile: FORCE - $(MAKE) -C docs compile + @$(_SINGLE)$(SUBMAKE) -C docs compile docs/clean: FORCE - $(MAKE) -C docs clean - -symlinkclean: - -find package -type l | xargs rm -f - rm -rf tmp + @$(_SINGLE)$(SUBMAKE) -C docs clean distclean: - rm -rf tmp build_dir staging_dir dl .config* feeds + rm -rf tmp build_dir staging_dir dl .config* feeds package/feeds package/openwrt-packages bin + @$(_SINGLE)$(SUBMAKE) -C scripts/config clean ifeq ($(findstring v,$(DEBUG)),) .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package prepare-tmpinfo