From patchwork Tue Apr 10 19:38:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 133096 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1633772ljb; Tue, 10 Apr 2018 12:42:32 -0700 (PDT) X-Google-Smtp-Source: AIpwx48pP001JI6rvzrmHkgD9LhyoBhqoHSAup2xlCsRWtoCHQhItCKskKEFCeQbApkRzbpIz61S X-Received: by 10.55.54.212 with SMTP id d203mr2696613qka.200.1523389352448; Tue, 10 Apr 2018 12:42:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523389352; cv=none; d=google.com; s=arc-20160816; b=z/LtaEuPLbCfdyIP0wDkY3Y4PQEuNOTJbYmF4ot0W0sNCAqkylPa9SaNjDmUEarcqg Uvk7FAAA6Os4xJqwsP/pTKXmgCxi5f81GWy6BDEwN5sdzBtoYtI9qWku3DWI5N5PYCGU NmC+tDpgHGs3vAQZJ2XBm2A/qgPDq0plmFRrY2IpHOAlbjeVpW9x/fACTnq7o1X8kgFs VXnjyHgWd2qP9XeOjxJg/32eptkapnw030qdTDhbxoXqXdqaVuGjZEZUvF0DwPGEEyDV 13aqpmpwZjGI92ptVfsGMJHYKWccJe/rQ8iz2pMyx8ZtUYMnDvqrd3+hogMExl6NXYyj GpYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=xgG5Axk5bsmPvhu34Y0a6pe0+Dghf64EuBfnzorJ7Kc=; b=FVh7hYrQUweLWYTIACQxFEZV9jgBzdpK/6jkexA7b2Ahvuy8YcTu2bR2nYl9jXohs+ C93vOHlpF9HbWWAR3KvOILM0SDu7Wadrq5WgXghJ8cdE2Ca6ErMN/4HLywpLXlLj+ZN3 J6wFFWYpY0UgauX2rZped8bCY3iAueef4+TgrJkiQPYPyhtoWZz0eQU9osZWGL13rxPu OmMP2c5hVvxCVOebkZMhT7v3V9b6zDSWGDgdVLPIhoyPv8TaKfpY2CVxmlTk5qIBAqG3 +CIAA37VRWRmNrHJXuxSlIlWfxwbzbnG2Kn0tYmQ8yOG52Emic3tEsyd72U0uFmwN7q0 4c2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=P0ewuyPS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v9si4360758qta.171.2018.04.10.12.42.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 10 Apr 2018 12:42:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=P0ewuyPS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5z9z-0001oS-Ny for patch@linaro.org; Tue, 10 Apr 2018 15:42:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5z6z-00005T-OO for qemu-devel@nongnu.org; Tue, 10 Apr 2018 15:39:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5z6y-0006GW-KD for qemu-devel@nongnu.org; Tue, 10 Apr 2018 15:39:25 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:44350) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f5z6y-0006G0-BM for qemu-devel@nongnu.org; Tue, 10 Apr 2018 15:39:24 -0400 Received: by mail-wr0-x244.google.com with SMTP id u46so13917303wrc.11 for ; Tue, 10 Apr 2018 12:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xgG5Axk5bsmPvhu34Y0a6pe0+Dghf64EuBfnzorJ7Kc=; b=P0ewuyPS8cRH4ZcRKA0H4R+SuLoUXiXKkP7MKKRKIMlhOhptpYr9HCF+rNXhm8gSJH v+CRqJFzJuAo8O/bNYtOB4jpBWREkWT6XVGCRZv9xwU2cmX/g1clmE4jJwu34rJymjOa vu1Ql1EyQ3p9pxfPxCBJHme4ke49S803xc/NE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xgG5Axk5bsmPvhu34Y0a6pe0+Dghf64EuBfnzorJ7Kc=; b=RPXAXAKUlRAArdDi4HJkCtSyg0jIoGc3lxM+EXFnXwBgN0b5nnOekBaioikI353OKL adP/9l4OyoXyM2SVKa0GQzZ79N+TClKuNLInQmmOj+BU0LjCtR4brMoSS8D/m0SHJ2HQ X1PgV8CqTg+7h7uRsz7OIxhpkOpq408OF3tV2laWS51w+njtfi6AkLLspkL5X6czt5MG qWHl3dFTSVJNrxVC/eHJ+qVRxXTtQ7fu3OL+6RxiY8wTuHv1ugWS91X4orkNamjJnI9D WOR19RUyRO40nDglJxhF4ftCqjNaRYtoaBo/wxC16xvo24wUFiuYEYIj8qbT55VHGCZQ CF4A== X-Gm-Message-State: ALQs6tC5SRULKZrrglTg+6QrFCgNO+Yod/K4/9FrPeLbVlmUAypAGIUJ pUDZZWBw3vQhoBcchZ7xBtr0Mw== X-Received: by 10.223.170.152 with SMTP id h24mr1224030wrc.193.1523389163234; Tue, 10 Apr 2018 12:39:23 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y144sm3081164wmd.47.2018.04.10.12.39.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 12:39:20 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id AE3843E0946; Tue, 10 Apr 2018 20:39:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 10 Apr 2018 20:38:59 +0100 Message-Id: <20180410193919.28026-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180410193919.28026-1-alex.bennee@linaro.org> References: <20180410193919.28026-1-alex.bennee@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PATCH v1 04/24] Makefile: Rename TARGET_DIRS to TARGET_LIST X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: famz@redhat.com, cota@braap.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Fam Zheng To be more accurate on its purpose and make code that looks for a certain target out of this variable more readable. Signed-off-by: Fam Zheng --- Makefile | 20 ++++++++++---------- configure | 2 +- scripts/create_config | 2 +- tests/Makefile.include | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) -- 2.16.2 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/Makefile b/Makefile index 727ef118f3..2c54cd8345 100644 --- a/Makefile +++ b/Makefile @@ -62,8 +62,8 @@ seems to have been used for an in-tree build. You can fix this by running \ endif endif -CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y) -CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y) +CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_LIST)),y) +CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_LIST)),y) CONFIG_XEN := $(CONFIG_XEN_BACKEND) CONFIG_ALL=y -include config-all-devices.mak @@ -362,8 +362,8 @@ DOCS= endif SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR) -SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) -SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS)) +SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_LIST)) +SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_LIST)) ifeq ($(SUBDIR_DEVICES_MAK),) config-all-devices.mak: @@ -466,7 +466,7 @@ config-host.h-timestamp: config-host.mak qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@") -SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) +SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_LIST)) SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) $(SOFTMMU_SUBDIR_RULES): $(block-obj-y) @@ -510,7 +510,7 @@ ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) romsubdir-%: $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/" CFLAGS="$(filter -O% -g%,$(CFLAGS))",) -ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) +ALL_SUBDIRS=$(TARGET_LIST) $(patsubst %,pc-bios/%, $(ROMS)) recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) @@ -763,7 +763,7 @@ distclean: clean rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html rm -f docs/qemu-block-drivers.7 - for d in $(TARGET_DIRS); do \ + for d in $(TARGET_LIST); do \ rm -rf $$d || exit 1 ; \ done rm -Rf .sdk @@ -864,7 +864,7 @@ endif $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ done $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all" - for d in $(TARGET_DIRS); do \ + for d in $(TARGET_LIST); do \ $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \ done @@ -1062,9 +1062,9 @@ endif @echo ' ctags/TAGS - Generate tags file for editors' @echo ' cscope - Generate cscope index' @echo '' - @$(if $(TARGET_DIRS), \ + @$(if $(TARGET_LIST), \ echo 'Architecture specific targets:'; \ - $(foreach t, $(TARGET_DIRS), \ + $(foreach t, $(TARGET_LIST), \ printf " %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \ echo '') @echo 'Cleaning targets:' diff --git a/configure b/configure index add87ff4d4..5a41c87cc3 100755 --- a/configure +++ b/configure @@ -6094,7 +6094,7 @@ qemu_version=$(head $source_path/VERSION) echo "VERSION=$qemu_version" >>$config_host_mak echo "PKGVERSION=$pkgversion" >>$config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak -echo "TARGET_DIRS=$target_list" >> $config_host_mak +echo "TARGET_LIST=$target_list" >> $config_host_mak if [ "$docs" = "yes" ] ; then echo "BUILD_DOCS=yes" >> $config_host_mak fi diff --git a/scripts/create_config b/scripts/create_config index d727e5e36e..58948a67a4 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -107,7 +107,7 @@ case $line in target_name=${line#*=} echo "#define TARGET_NAME \"$target_name\"" ;; - TARGET_DIRS=*) + TARGET_LIST=*) # do nothing ;; TARGET_*=y) # configuration diff --git a/tests/Makefile.include b/tests/Makefile.include index 3b9a5e31a2..3d2f0458ab 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -854,7 +854,7 @@ endif # QTest rules -TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) +TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_LIST))) ifeq ($(CONFIG_POSIX),y) QTEST_TARGETS = $(TARGETS) check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))