From patchwork Thu Apr 19 13:58:25 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: 133776 Delivered-To: patch@linaro.org Received: by 10.46.66.142 with SMTP id h14csp682662ljf; Thu, 19 Apr 2018 07:09:47 -0700 (PDT) X-Google-Smtp-Source: AB8JxZq/6XP5ohnYVs5YJPZoiIjqhtR6RQg15Wj0kh6/dYb7bCKRmK/8aH4cmB1YrbUNCW18y7nM X-Received: by 2002:ac8:44cd:: with SMTP id b13-v6mr1335948qto.394.1524146987150; Thu, 19 Apr 2018 07:09:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524146987; cv=none; d=google.com; s=arc-20160816; b=0FPMkid01eR0arTyFFUmtpUwjU3mLPBxTGBGzkCKAwwasrHhnbxF7aOIk8jpZOJz3F n+yNW2Xcek+l6wNMg3S3Jd+2MM1Rg5qLidjMKBKZyqGCFeSaH7khnBwt8XGOhM++moFE a5je7SfpYW0psgCxiKT7+/P/IYNtQ6k0Bil2wbMPUvn1O7fZPQDUYkS4JzvZXMm1SRr9 ncH3n+5V++xdJtxdMAgL+1OOfHMxO9qTaL12isMxnlf/bieOL2+UO1ZvT//TVfy2kegR NUlXjCz7O4TiX2mxqXe77OE+nIP13wVUt74ktZpcKe0aoT6x9+8Uky1SdzcjPjEFnKrs MjHw== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=ioTotYAqkFBKd5KnrtG52D7NPXHT5Pw9gIfB7plDrJM=; b=orZG/I+wJmIcm4Ngml0z3pDSlWe+81DbsiWkSfslMHwWqwAHYCBMrqAQLsmXI1q6lr MqSQnZLqzL84HnztP8DyS/y+8DjZLloGAIWQyS89aE3Kt/LTzbTQ5RtR36zp5AWJlO7O KcT2a8om3mJToyv7hunR63ryKnzNdcaxhsdrCjUImNYfUlalSSXmru8SU5FwPe/szmSk tvjKn28N4qaPAWN51PFr0+RmWfh/2VQPzfr+qeZ9nmPSOREF5oryrmx9gdAcFv5XKXmt OEbq7u0feD2LpO9efAvLj6NK7n9yBpw+J3IEIvZbPSoN9NShRBseGnDuWkUg5/BWi7+o sdnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LDvT1J9+; 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 b191si4856067qkg.318.2018.04.19.07.09.46 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 19 Apr 2018 07:09:47 -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=LDvT1J9+; 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]:50004 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9AFu-00063b-H7 for patch@linaro.org; Thu, 19 Apr 2018 10:09:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9A5i-00060N-6a for qemu-devel@nongnu.org; Thu, 19 Apr 2018 09:59:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9A5g-0002DY-Uy for qemu-devel@nongnu.org; Thu, 19 Apr 2018 09:59:14 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:38067) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f9A5g-0002Aa-L3 for qemu-devel@nongnu.org; Thu, 19 Apr 2018 09:59:12 -0400 Received: by mail-wr0-x244.google.com with SMTP id h3-v6so14359052wrh.5 for ; Thu, 19 Apr 2018 06:59:12 -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 :mime-version:content-transfer-encoding; bh=ioTotYAqkFBKd5KnrtG52D7NPXHT5Pw9gIfB7plDrJM=; b=LDvT1J9+TqD1dBQmem2A8E6TiyG1M+0f1PlCwYLKoydbhu3RWZP/plqTKuztzXHrNg KStCzek/XLFnKnGBVP01agaNs5aDdNQQb1A34UBCTDntZaVdBFEBfqKxslpyHFOQv9lR GT9u8+3yqW2d7ctGrw4jbVIiTeQlCJSWsbaF4= 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:mime-version:content-transfer-encoding; bh=ioTotYAqkFBKd5KnrtG52D7NPXHT5Pw9gIfB7plDrJM=; b=XHKvl/GMeWBkg6H6W0r6YmzFNtW7E1Eua0+VOA43mDFFdoppEGxRFGRV1Vyvg2tevV r/M0S5eR0z6RbBhYm6+nZc12HUZ4fcF/Ec1QCB+jamQZDQg3ThFuUvbJcxcD7cv3ykbr DizL63pxDTm5ynI6Pr0rKPBHBhuOe+s8DJURV2x0rXkibHPmx/ycuSqbXLt+RNWFxp3E 2Jdk2QeEe63i3T2fHTljqkjeGqB5YNKUHuD6JacIHqG0x9GLLYpnwWjoEniuzjdIcynq kyqcg5fyQqMNAbEVcLZvkbdE4pB27irXiPK6WNCheD10oGqCfrytnUvzbzmLvRyoSqCc ipGA== X-Gm-Message-State: ALQs6tDErVJ12NMJuOYtcAzBlO+YkYsdIUdKnOEBwRX8Y9pPuc6/M9jT JTKKPitEKiCqLCf0tQ7s8yqdcA== X-Received: by 2002:adf:a850:: with SMTP id l74-v6mr4627596wrc.42.1524146351444; Thu, 19 Apr 2018 06:59:11 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v134sm3130872wmv.32.2018.04.19.06.59.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 06:59:06 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 13D3B3E0342; Thu, 19 Apr 2018 14:59:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Thu, 19 Apr 2018 14:58:25 +0100 Message-Id: <20180419135901.30035-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180419135901.30035-1-alex.bennee@linaro.org> References: <20180419135901.30035-1-alex.bennee@linaro.org> MIME-Version: 1.0 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 v2 07/43] 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: qemu-devel@nongnu.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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- Makefile | 20 ++++++++++---------- configure | 2 +- scripts/create_config | 2 +- tests/Makefile.include | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) -- 2.17.0 Reviewed-by: Richard Henderson diff --git a/Makefile b/Makefile index d71dd5bea4..e894431a89 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 44d310a692..0988c88d9f 100755 --- a/configure +++ b/configure @@ -6125,7 +6125,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))