From 196ad55bd2bdad8c5c86249afd4b1cec04855d35 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 30 Jul 2007 21:14:08 +0000 Subject: next round of cleanup, convert target/ - make -j works now ;) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8242 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host-build.mk | 3 ++- include/kernel-build.mk | 6 ++++++ include/package.mk | 3 ++- include/prereq.mk | 3 ++- include/subdir.mk | 13 ++++++++++--- include/target.mk | 8 ++------ include/toplevel.mk | 8 +++++--- 7 files changed, 29 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/host-build.mk b/include/host-build.mk index 2950ec721..d83446558 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,6 +12,7 @@ include $(INCLUDE_DIR)/depends.mk STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared_$(shell find ${CURDIR} $(PKG_FILE_DEPEND) $(DEP_FINDPARAMS) | md5s) STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured STAMP_BUILT:=$(PKG_BUILD_DIR)/.built +override MAKEFLAGS= include $(INCLUDE_DIR)/quilt.mk diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 7a02d5553..24c538fbb 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -11,6 +11,8 @@ include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/prereq.mk +override MAKEFLAGS= + GENERIC_LINUX_CONFIG:=$(GENERIC_PLATFORM_DIR)/config-$(shell [ -f "$(GENERIC_PLATFORM_DIR)/config-$(KERNEL_PATCHVER)" ] && echo "$(KERNEL_PATCHVER)" || echo template ) LINUX_CONFIG_DIR ?= ./config$(shell [ -d "./config-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) LINUX_CONFIG ?= $(LINUX_CONFIG_DIR)/default @@ -172,6 +174,7 @@ oldconfig menuconfig: $(STAMP_PREPARED) FORCE $(SCRIPT_DIR)/config.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG) install: $(LINUX_DIR)/.image + $(MAKE) -C image install clean: FORCE rm -f $(STAMP_DIR)/.linux-compile @@ -184,4 +187,7 @@ rebuild: FORCE fi @$(MAKE) compile +image-prereq: + $(MAKE) -C image prereq +prereq: image-prereq diff --git a/include/package.mk b/include/package.mk index e322cb908..c68bd1065 100644 --- a/include/package.mk +++ b/include/package.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006,2007 OpenWrt.org +# Copyright (C) 2006-2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -24,6 +24,7 @@ include $(INCLUDE_DIR)/package-defaults.mk include $(INCLUDE_DIR)/package-dumpinfo.mk include $(INCLUDE_DIR)/package-ipkg.mk +override MAKEFLAGS= export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME) ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),) diff --git a/include/prereq.mk b/include/prereq.mk index 8a08be8e6..660f67cb1 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -47,3 +47,4 @@ define RequireCommand $$(eval $$(call Require,$(1),$(2))) endef +.NOTPARALLEL: diff --git a/include/subdir.mk b/include/subdir.mk index da37573c7..4348c7b93 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -24,7 +24,8 @@ define subdir $(call warn,$(1),d,BD $(1)/$(bd)) $(foreach target,$(SUBTARGETS), $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(target): $($(1)/$(bd)/$(target)) $(call $(1)//$(target),$(1)/$(bd))) - @+$$(MAKE) -j1 -C $(1)/$(bd) $(target) + +$$(MAKE) -j1 -C $(1)/$(bd) $(target) + $$(if $(call debug,$(1)/$(bd),v),,.SILENT: $(1)/$(bd)/$(target)) # legacy targets $(call warn_eval,$(1)/$(bd),l,T,$(1)/$(bd)-$(target): $(1)/$(bd)/$(target)) @@ -36,12 +37,18 @@ endef # Parameters: define stampfile $(1)/stamp-$(3):=$(STAGING_DIR)/stampfiles/.$(2)_$(3) - $(call rdep,$(1),$$($(1)/stamp-$(3)),) + $(if __rdep_$(1),, + $(call rdep,$(1),$$($(1)/stamp-$(3)),) + __rdep_$(1):=1 + ) $$($(1)/stamp-$(3)): - @+$(MAKE) $(1)/$(3) + @+$(MAKE) $$($(1)/flags-$(3)) $(1)/$(3) @mkdir -p $$$$(dirname $$($(1)/stamp-$(3))) @touch $$($(1)/stamp-$(3)) + + $$(if $(call debug,$(1),v),,.SILENT: $$($(1)/stamp-$(3))) + .PRECIOUS: $$($(1)/stamp-$(3)) # work around a make bug $(1)//clean:=$(1)/stamp-$(3)/clean diff --git a/include/target.mk b/include/target.mk index 1718a869c..b0a178e30 100644 --- a/include/target.mk +++ b/include/target.mk @@ -1,11 +1,10 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # - define AddProfile ifeq ($(CONFIG_LINUX_$(1)),y) $(call Profile/$(1)) @@ -13,13 +12,10 @@ define AddProfile endif endef -include $(TMP_DIR)/.target.mk +-include $(TMP_DIR)/.target.mk ifeq ($(IB),1) $(TMP_DIR)/.target.mk: $(TOPDIR)/.target.mk $(CP) $< $@ -else -$(TMP_DIR)/.target.mk: $(TMP_DIR)/.targetinfo - $(SCRIPT_DIR)/metadata.pl target_mk < $(TMP_DIR)/.targetinfo > $@ endif diff --git a/include/toplevel.mk b/include/toplevel.mk index 33b318abb..af4b390e4 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -30,7 +30,7 @@ endif SCAN_COOKIE?=$(shell echo $$$$) export SCAN_COOKIE -tmp/.packageinfo tmp/.targetinfo prepare-tmpinfo: 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=4 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="" @@ -39,6 +39,8 @@ tmp/.packageinfo tmp/.targetinfo prepare-tmpinfo: FORCE [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config < "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \ done ./scripts/metadata.pl package_mk < tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; } + ./scripts/metadata.pl target_mk < $(TMP_DIR)/.targetinfo > tmp/.target.mk + touch $(TOPDIR)/tmp/.build .config: ./scripts/config/conf prepare-tmpinfo @+if [ \! -f .config ]; then \ @@ -101,7 +103,7 @@ prereq:: .config %:: @+$(PREP_MK) $(NO_TRACE_MAKE) -s prereq - @+$(MAKE) $@ + @+$(MAKE) -r $@ help: cat README @@ -117,7 +119,7 @@ symlinkclean: rm -rf tmp 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 tmp/.prereq-target tmp/.packageinfo tmp/.targetinfo prepare-tmpinfo + .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 tmp/.prereq-target prepare-tmpinfo endif .PHONY: help FORCE .NOTPARALLEL: -- cgit v1.2.3