From patchwork Tue Jun 5 16:05:38 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: 137777 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1155600lji; Tue, 5 Jun 2018 09:17:30 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLPBbxG4U670PmyPInNIW042Ucr4CaF3MSJ58+fQXkefTDneZG8cim6H9kqJQghbSsWL4C+ X-Received: by 2002:a0c:b01d:: with SMTP id k29-v6mr15045426qvc.121.1528215450057; Tue, 05 Jun 2018 09:17:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528215450; cv=none; d=google.com; s=arc-20160816; b=JanZEwyEKk5SaUhokP7UKQb3oKvc+0ZaYYue7kKs3C//iZmt/OKw2/8CkN1KNV9yEm RJ51Gjr6/qb9l2nMtqlXVj8oPt5k78dkoONFzBt68EhYVpYucFw+FaQFayDyg3gzPP9C vLgW4p1soGgeXJGNXR+nZ8uCYxotJzCMgoykgNUC041kFujFbM709iHrJEKxtJdx6TLc kCycal85SHqSboQDYINVcKYSxOVZCEvYzNXyoQvi/e3N9H0RGTi6t24qSIIf8epup9RA ZXTzFSU1WIzUIKwOuRndZ4XDH0N4tq0sXZP5+wURgUkzWlti7fPYSjh5ekNcy/DKtOOH DOfg== 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=jgjltl47xPy+3+jIHw8dBiWvAEsxbuKQzVYZhZalN2Q=; b=bhTX1/w6Wap5xQq/qPAN1hOOdePg6pzpXG19tBc0IPPJ/BAY3QnK+Nl0R790YwITQL Qwex0csFyjWETSFblgJezpv4GMqFwZxu3Vl3qYgvMBxIyD6IktRH4eQtGO8MBmYfsOmq eCybnqLdJ4zqGLfM/sHW7xLhjiAFsxlA/h6UcpHTaCp0SylycjSi/0FMviZPrVPmI3mq 4h6nTGDht/hUwklHWvmyd1RCZKX1yyejm0vipgQAwQN5jcBFpTaRnhs7jPaz7Z7ArqK4 NWpsXbj/zVtI97Tup3Fi0Z5vyB9nkb3U/O3rWfuZSgoUWECEZ6sNr1DiW7Qi2qAe3+r6 gukw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DTP5sETU; 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 a184-v6si25892270qke.81.2018.06.05.09.17.29 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Jun 2018 09:17:30 -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=DTP5sETU; 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]:47912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEeH-0000CE-G5 for patch@linaro.org; Tue, 05 Jun 2018 12:17:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53121) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEVE-0000v6-Kw for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQESw-0004Kj-11 for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:08 -0400 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:40300) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fQESv-0004Jv-Ks for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:05:45 -0400 Received: by mail-wm0-x22f.google.com with SMTP id n5-v6so6140923wmc.5 for ; Tue, 05 Jun 2018 09:05:45 -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=jgjltl47xPy+3+jIHw8dBiWvAEsxbuKQzVYZhZalN2Q=; b=DTP5sETUUlxKCDKPhycN8bv/tZE69TWSe/Yqi7II2kIzM8Wq07X4tSfPwSKL9qiAcs 7FJK3LuOKQrLunpJh5zf76tjogrpo9cvn6O4Caa1YNxQwQF4P81nBqWVgSSj0Vd1139X jrtBMrgH8V6cguRDAZmPwLQeHY3P3xo7L6jpk= 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=jgjltl47xPy+3+jIHw8dBiWvAEsxbuKQzVYZhZalN2Q=; b=gFtXiH3pMJlikzL8PKpca98/J1Ftt4z3f5knDl6yq+1Dib5FeA6iBOZ4Fmdj8Cpxtn ruQi0VF9DU+u1LEvf8J/lNVhEnLYRZ59vlbpBmpbBbIUHhzzZHakdW4YQxm5khdAW8Bq F8LLEKpTgopVeJICC19mfXvs05BW6E7GL6fdsoJt5OaDeW5kFEm+94n/T65/If7XY2eq 8AGAhURxtbedQtZNgUE3e2vDfQ4RIu17JtObHPOVw/gz2Zdm+Wd2fNvO1tiPk8+IP/om LJrOiCCuEwEjXmNqd/0/OYWB6/bhuXMaenjdcZJ4zyl8xRZmskuAbXn9BjFOEGd7f420 IpkQ== X-Gm-Message-State: ALKqPwepuoTLik5hODRZri3pJuUWaRlhuWa4RIQI8MdIryzx9374MNcY DN5wdu1DvAlXD05yVOedLG5jotpJbFU= X-Received: by 2002:a1c:e388:: with SMTP id a130-v6mr12318174wmh.27.1528214744406; Tue, 05 Jun 2018 09:05:44 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c131-v6sm2132995wma.41.2018.06.05.09.05.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jun 2018 09:05:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D292B3E09FC; Tue, 5 Jun 2018 17:05:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 5 Jun 2018 17:05:38 +0100 Message-Id: <20180605160541.10664-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180605160541.10664-1-alex.bennee@linaro.org> References: <20180605160541.10664-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:c09::22f Subject: [Qemu-devel] [PULL 3/6] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , 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é Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée -- 2.17.0 diff --git a/Makefile b/Makefile index 6d588d1f71..023b3437ec 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 @@ -366,8 +366,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: @@ -470,7 +470,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) @@ -514,7 +514,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) @@ -772,7 +772,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 @@ -873,7 +873,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 @@ -1071,9 +1071,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 db8c9d8288..14b11130a7 100755 --- a/configure +++ b/configure @@ -6128,7 +6128,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 86f90c0cb0..9854e7794b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -858,7 +858,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))